[Pkg-kde-commits] rev 2429 - trunk/packages/kdebase/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Tue Nov 29 22:26:47 UTC 2005
Author: chrsmrtn
Date: 2005-11-29 22:26:45 +0000 (Tue, 29 Nov 2005)
New Revision: 2429
Added:
trunk/packages/kdebase/debian/patches/01_kdebase_branch_r484203.diff
Log:
kdebase branch pull.
Added: trunk/packages/kdebase/debian/patches/01_kdebase_branch_r484203.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/01_kdebase_branch_r484203.diff 2005-11-29 22:26:20 UTC (rev 2428)
+++ trunk/packages/kdebase/debian/patches/01_kdebase_branch_r484203.diff 2005-11-29 22:26:45 UTC (rev 2429)
@@ -0,0 +1,195 @@
+#DPATCHLEVEL=0
+--- ksmserver/test.cpp (.../tags/KDE/3.5.0/kdebase) (revision 484203)
++++ ksmserver/test.cpp (.../branches/KDE/3.5/kdebase) (revision 484203)
+@@ -14,9 +14,10 @@
+ a.iconLoader()->addAppDir("ksmserver");
+ KSMShutdownFeedback::start();
+
++ QString bopt;
+ KApplication::ShutdownType sdtype = KApplication::ShutdownTypeNone;
+ (void)KSMShutdownDlg::confirmShutdown( true,
+- sdtype );
++ sdtype, bopt );
+ /* (void)KSMShutdownDlg::confirmShutdown( false,
+ sdtype ); */
+
+--- kcontrol/screensaver/scrnsave.cpp (.../tags/KDE/3.5.0/kdebase) (revision 484203)
++++ kcontrol/screensaver/scrnsave.cpp (.../branches/KDE/3.5/kdebase) (revision 484203)
+@@ -548,7 +548,7 @@
+ mSaverListView->setCurrentItem(selectedItem);
+ mSaverListView->ensureItemVisible(selectedItem);
+ mSetupBt->setEnabled(!mSaverList.at(mSelected)->setup().isEmpty());
+- mTestBt->setEnabled(!mSaverList.at(mSelected)->setup().isEmpty());
++ mTestBt->setEnabled(true);
+ }
+
+ connect( mSaverListView, SIGNAL( currentChanged( QListViewItem * ) ),
+--- kcontrol/xinerama/xineramawidget.ui (.../tags/KDE/3.5.0/kdebase) (revision 484203)
++++ kcontrol/xinerama/xineramawidget.ui (.../branches/KDE/3.5/kdebase) (revision 484203)
+@@ -1,4 +1,4 @@
+-<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
++<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
+ <class>XineramaWidget</class>
+ <widget class="QWidget">
+ <property name="name">
+@@ -63,6 +63,9 @@
+ <property name="showGrid">
+ <bool>true</bool>
+ </property>
++ <property name="readOnly">
++ <bool>true</bool>
++ </property>
+ <property name="selectionMode">
+ <enum>NoSelection</enum>
+ </property>
+@@ -320,7 +323,4 @@
+ </slots>
+ <layoutdefaults spacing="3" margin="6"/>
+ <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+-<includehints>
+- <includehint>qwidget.h</includehint>
+-</includehints>
+ </UI>
+--- kicker/applets/minipager/pagerbutton.cpp (.../tags/KDE/3.5.0/kdebase) (revision 484203)
++++ kicker/applets/minipager/pagerbutton.cpp (.../branches/KDE/3.5/kdebase) (revision 484203)
+@@ -148,11 +148,12 @@
+
+ QByteArray data, replyData;
+ QCString replyType;
+- if (client->call("kdesktop", "KBackgroundIface", "isCommon()", data, replyType, replyData))
++ if (client->call("kdesktop", "KBackgroundIface", "isCommon()",
++ data, replyType, replyData))
+ {
+- QDataStream reply(replyData, IO_ReadOnly);
+ if (replyType == "bool")
+ {
++ QDataStream reply(replyData, IO_ReadOnly);
+ reply >> m_isCommon;
+ }
+ }
+@@ -202,7 +203,7 @@
+ }
+ else
+ {
+- kdDebug() << "Error getting the background\n";
++ kdWarning() << "Error getting the background\n";
+ }
+ }
+
+@@ -214,7 +215,7 @@
+ bool down = isDown();
+ QPixmap buffer(w, h);
+ QBitmap mask(w, h, true);
+- QPainter bp(&buffer, this);
++ QPainter bp(&buffer);
+ QPainter mp(&mask);
+
+ QBrush background;
+@@ -383,25 +384,26 @@
+ {
+ QString label = (m_pager->labelType() == PagerSettings::EnumLabelType::LabelNumber) ?
+ QString::number(m_desktop) : m_desktopName;
+- QPainter tp;
+- QPixmap textPixmap(width(), height());
++ QPixmap textPixmap(w, h);
+
+ textPixmap.fill(QColor(0,0,0));
+ textPixmap.setMask(textPixmap.createHeuristicMask(true));
+
+ // draw text
+- tp.begin(&textPixmap);
+- tp.setPen(Qt::white);
+- tp.setFont(font()); // get the font from the root painter
+- tp.drawText(0, 0, w, h, AlignCenter, label);
+- tp.end();
++ {
++ QPainter tp(&textPixmap);
++ tp.setPen(Qt::white);
++ tp.setFont(font()); // get the font from the root painter
++ tp.drawText(0, 0, w, h, AlignCenter, label);
++ tp.end();
++ }
+
+ // draw shadow
+- QImage img = m_pager->shadowEngine()->makeShadow(textPixmap,
++ QPixmap img;
++ img.convertFromImage(m_pager->shadowEngine()->makeShadow(textPixmap,
+ liveBkgnd ? Qt::black
+- : Qt::white);
+-
+- bp.drawImage(0, 0, img);
++ : Qt::white));
++ bp.drawPixmap(0, 0, img);
+ bp.drawText(0, 0, w, h, AlignCenter, label);
+ }
+
+@@ -497,7 +499,6 @@
+
+ void KMiniPagerButton::dragEnterEvent(QDragEnterEvent* e)
+ {
+- kdDebug() << "received drag " << e->format() << endl;
+ if (PanelDrag::canDecode(e))
+ {
+ // ignore container drags
+--- konqueror/konq_mainwindow.cc (.../tags/KDE/3.5.0/kdebase) (revision 484203)
++++ konqueror/konq_mainwindow.cc (.../branches/KDE/3.5/kdebase) (revision 484203)
+@@ -3648,7 +3648,7 @@
+
+ void KonqMainWindow::focusLocationBar()
+ {
+- if ( m_combo->isVisible() )
++ if ( m_combo->isVisible() || !isVisible() )
+ m_combo->setFocus();
+ }
+
+--- l10n/ca/entry.desktop (.../tags/KDE/3.5.0/kdebase) (revision 484203)
++++ l10n/ca/entry.desktop (.../branches/KDE/3.5/kdebase) (revision 484203)
+@@ -66,7 +66,6 @@
+ Region=northamerica
+ Languages=en_GB,fr,en_US
+ DecimalSymbol=.
+-DecimalSymbol[fr]=,
+ ThousandsSeparator=,
+ ThousandsSeparator[fr]=$0 $0
+ CurrencySymbol=$
+@@ -96,6 +95,6 @@
+ TimeFormat[eo]=%H:%M:%S
+ WeekStartDay=7
+ PageSize=2
+-MeasureSystem=1
++MeasureSystem=0
+ AddressFormat=%0(%N\n)%0(%CM\n)%0(%S\n)%0(PO BOX %p\n)%0(%L%w%R)%,%z
+ AddressCountryPosition=BELOW
+--- ksysguard/gui/SensorDisplayLib/SignalPlotter.cc (.../tags/KDE/3.5.0/kdebase) (revision 484203)
++++ ksysguard/gui/SensorDisplayLib/SignalPlotter.cc (.../branches/KDE/3.5/kdebase) (revision 484203)
+@@ -144,7 +144,8 @@
+ void SignalPlotter::removeBeam( uint pos )
+ {
+ mBeamColor.remove( mBeamColor.at( pos ) );
+- mBeamData.remove( pos );
++ double *p = mBeamData.take( pos );
++ delete [] p;
+ }
+
+ void SignalPlotter::setTitle( const QString &title )
+@@ -360,7 +361,8 @@
+ memcpy( nd + ( newSampleNum - overlap ), mBeamData.at( i ) +
+ ( mSamples - overlap ), overlap * sizeof( double ) );
+
+- mBeamData.remove( i );
++ double *p = mBeamData.take( i );
++ delete [] p;
+ mBeamData.insert( i, nd );
+ }
+
+--- ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc (.../tags/KDE/3.5.0/kdebase) (revision 484203)
++++ ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc (.../branches/KDE/3.5/kdebase) (revision 484203)
+@@ -71,7 +71,7 @@
+ label = new QLabel( i18n( "Maximum value:" ), groupBox );
+ boxLayout->addWidget( label, 0, 3 );
+
+- mMaxValue = new KDoubleSpinBox( 0, 100, 0.5, 100, 2, groupBox );
++ mMaxValue = new KDoubleSpinBox( 0, 10000, 0.5, 100, 2, groupBox );
+ QWhatsThis::add( mMaxValue, i18n( "Enter the maximum value for the display here. If both values are 0 automatic range detection is enabled." ) );
+ boxLayout->addWidget( mMaxValue, 0, 4 );
+ label->setBuddy( mMaxValue );
More information about the pkg-kde-commits
mailing list