[Pkg-kde-commits] rev 1778 - in
branches/kde-3.4.0/packages/kdebase/debian: . patches
Christopher Martin
chrsmrtn at costa.debian.org
Mon Sep 12 14:19:29 UTC 2005
Author: chrsmrtn
Date: 2005-09-12 14:19:28 +0000 (Mon, 12 Sep 2005)
New Revision: 1778
Added:
branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r458655.diff
branches/kde-3.4.0/packages/kdebase/debian/patches/27_systray_border_mouseover.diff
branches/kde-3.4.0/packages/kdebase/debian/patches/28_kdebase_rubberband.diff
Modified:
branches/kde-3.4.0/packages/kdebase/debian/changelog
Log:
Branch update.
Also a standalone patch from Improving KDE that eliminates an annoying
border around the kicker systray on mouseover.
Also, 28_kdebase_rubberband, is the acompaniment to the Qt/kdelibs
"Impriving KDE" patches. This makes the transparent rubberband selector
rectangle configurable (off by default). Obviously this patch should
only be included in an upload if the Improving KDE patches for Qt and
kdelibs have already been included in uploads, otherwise it will look
odd. So the kdebase uploader may have to remember to manually delete
the patch before building kdebase for upload.
Modified: branches/kde-3.4.0/packages/kdebase/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/changelog 2005-09-12 14:16:21 UTC (rev 1777)
+++ branches/kde-3.4.0/packages/kdebase/debian/changelog 2005-09-12 14:19:28 UTC (rev 1778)
@@ -9,6 +9,13 @@
from KDM 3.3.x, as well as KDM's new behaviour regarding login scripts.
(Closes: #326542, #327191)
+ * Add a patch from the "Improving KDE" set that eliminates a superfluous
+ border around kicker's systray that appeared on mouseover.
+
+ * Add another "Improving KDE" patch that allows the selection of a special
+ tranparent selection rectangle (off by default) to be made from the
+ Control Center's Style module.
+
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 8 Sep 2005 11:13:41 -0400
kdebase (4:3.4.2-2) unstable; urgency=low
Added: branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r458655.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r458655.diff 2005-09-12 14:16:21 UTC (rev 1777)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r458655.diff 2005-09-12 14:19:28 UTC (rev 1778)
@@ -0,0 +1,91 @@
+#DPATCHLEVEL=0
+--- kicker/applets/launcher/quicklauncher.cpp (revision 457706)
++++ kicker/applets/launcher/quicklauncher.cpp (revision 458655)
+@@ -376,15 +376,14 @@
+ if (kurlList.size()<=0) {
+ e->accept(false); return;
+ }
++ QStringList urlList=kurlList.toStringList();
+ _dragButtons=new ButtonGroup;
+ _oldButtons=new ButtonGroup(*_buttons);
+
+-
++ QStringList::const_iterator iter=urlList.begin();
+ QString url;
+- KURL::List::ConstIterator it = kurlList.begin();
+- for ( ; it != kurlList.end(); ++it ) {
+- const KURL &tmpUrl( *it );
+- url = tmpUrl.path();
++ while (iter!=urlList.end()) {
++ url=QuickURL(*iter).url();
+ DEBUGSTR << " Drag Object='"<<url<<"'"<<endl<<flush;
+ int pos=_buttons->findDescriptor(url);
+ if (pos!=NotFound) {
+@@ -394,6 +393,7 @@
+ // otherwise, create a new one
+ _dragButtons->push_back(new QuickButton(url,this));
+ }
++ ++iter;
+ }
+ if (_dragButtons->size()>0) {
+ //make sure we can drag at least one button.
+--- kioslave/smb/kio_smb_auth.cpp (revision 457706)
++++ kioslave/smb/kio_smb_auth.cpp (revision 458655)
+@@ -156,6 +156,8 @@
+ // Returns: 0 on success -1 with errno set on error
+ bool SMBSlave::auth_initialize_smbc()
+ {
++ SMBCCTX *smb_context = NULL;
++
+ kdDebug(KIO_SMB) << "auth_initialize_smbc " << endl;
+ if(m_initialized_smbc == false)
+ {
+@@ -165,12 +167,37 @@
+ cfg.setGroup( "SMB" );
+ int debug_level = cfg.readNumEntry( "DebugLevel", 0 );
+
++#if 0
++ /* old API initialisation routine does not allow to set flags */
++
+ if(smbc_init(::auth_smbc_get_data,debug_level) == -1)
+ {
+ SlaveBase::error(ERR_INTERNAL, i18n("libsmbclient failed to initialize"));
+ return false;
+ }
++#endif
++ smb_context = smbc_new_context();
++ if (smb_context == NULL) {
++ SlaveBase::error(ERR_INTERNAL, i18n("libsmbclient failed to create context"));
++ return false;
++ }
+
++ smb_context->debug = debug_level;
++ smb_context->callbacks.auth_fn = ::auth_smbc_get_data;
++
++ if (!smbc_init_context(smb_context)) {
++ smbc_free_context(smb_context, false);
++ smb_context = NULL;
++ SlaveBase::error(ERR_INTERNAL, i18n("libsmbclient failed to initialize context"));
++ return false;
++ }
++
++#if defined(SMB_CTX_FLAG_USE_KERBEROS) && defined(SMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS)
++ smb_context->flags |= SMB_CTX_FLAG_USE_KERBEROS | SMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS;
++#endif
++
++ smbc_set_context(smb_context);
++
+ m_initialized_smbc = true;
+ }
+
+--- kwin/kcmkwin/kwindecoration/kwindecoration.desktop (revision 457706)
++++ kwin/kcmkwin/kwindecoration/kwindecoration.desktop (revision 458655)
+@@ -39,7 +39,7 @@
+ Name[it]=Decorazioni finestra
+ Name[ja]=ウィンドウ装飾
+ Name[lo]=ການຕົກແຕ່ງຫນ້າຕ່າງ
+-Name[lt]=Lango dekoracija
++Name[lt]=Langų išvaizda
+ Name[mk]=Декорации на прозорците
+ Name[mn]=Цонхны засал
+ Name[mt]=Dekorazzjoni tal-Windows
Added: branches/kde-3.4.0/packages/kdebase/debian/patches/27_systray_border_mouseover.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/27_systray_border_mouseover.diff 2005-09-12 14:16:21 UTC (rev 1777)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/27_systray_border_mouseover.diff 2005-09-12 14:19:28 UTC (rev 1778)
@@ -0,0 +1,24 @@
+--- kde.orig/kicker/applets/systemtray/systemtrayapplet.cpp
++++ kde.patched/kicker/applets/systemtray/systemtrayapplet.cpp
+@@ -186,16 +186,16 @@
+
+ if (showFrame && (frameStyle() == NoFrame))
+ {
+- setFrameStyle( Panel|Sunken );
+- hideFrameTimer->start(100, true);
++ //setFrameStyle( Panel|Sunken );
++ //hideFrameTimer->start(100, true);
+ }
+ }
+
+ void SystemTrayApplet::leaveEvent( QEvent * )
+ {
+- if (showFrame)
+- {
+- checkFrameVisibility();
++if ( showFrame && !geometry().contains( mapFromGlobal( QCursor::pos() ) ) )
++{
++ //checkFrameVisibility();
+ }
+ }
+
Added: branches/kde-3.4.0/packages/kdebase/debian/patches/28_kdebase_rubberband.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/28_kdebase_rubberband.diff 2005-09-12 14:16:21 UTC (rev 1777)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/28_kdebase_rubberband.diff 2005-09-12 14:19:28 UTC (rev 1778)
@@ -0,0 +1,361 @@
+--- kde.orig/kcontrol/style/kcmstyle.cpp
++++ kde.patched/kcontrol/style/kcmstyle.cpp
+@@ -229,6 +229,14 @@
+ containerLayout->addWidget( lblTooltipEffect, 1, 0 );
+ containerLayout->addWidget( comboTooltipEffect, 1, 1 );
+
++ comboRubberbandEffect = new QComboBox( FALSE, containerFrame );
++ comboRubberbandEffect->insertItem( i18n("Disable") );
++ comboRubberbandEffect->insertItem( i18n("Make translucent") );
++ lblRubberbandEffect = new QLabel( i18n("&Rubberband effect:"), containerFrame );
++ lblRubberbandEffect->setBuddy( comboRubberbandEffect );
++ containerLayout->addWidget( lblRubberbandEffect, 2, 0 );
++ containerLayout->addWidget( comboRubberbandEffect, 2, 1 );
++
+ comboMenuEffect = new QComboBox( FALSE, containerFrame );
+ comboMenuEffect->insertItem( i18n("Disable") );
+ comboMenuEffect->insertItem( i18n("Animate") );
+@@ -236,8 +244,8 @@
+ comboMenuEffect->insertItem( i18n("Make Translucent") );
+ lblMenuEffect = new QLabel( i18n("&Menu effect:"), containerFrame );
+ lblMenuEffect->setBuddy( comboMenuEffect );
+- containerLayout->addWidget( lblMenuEffect, 2, 0 );
+- containerLayout->addWidget( comboMenuEffect, 2, 1 );
++ containerLayout->addWidget( lblMenuEffect, 3, 0 );
++ containerLayout->addWidget( comboMenuEffect, 3, 1 );
+
+ comboMenuHandle = new QComboBox( FALSE, containerFrame );
+ comboMenuHandle->insertItem( i18n("Disable") );
+@@ -245,11 +253,11 @@
+ // comboMenuHandle->insertItem( i18n("Enable") );
+ lblMenuHandle = new QLabel( i18n("Me&nu tear-off handles:"), containerFrame );
+ lblMenuHandle->setBuddy( comboMenuHandle );
+- containerLayout->addWidget( lblMenuHandle, 3, 0 );
+- containerLayout->addWidget( comboMenuHandle, 3, 1 );
++ containerLayout->addWidget( lblMenuHandle, 4, 0 );
++ containerLayout->addWidget( comboMenuHandle, 4, 1 );
+
+ cbMenuShadow = new QCheckBox( i18n("Menu &drop shadow"), containerFrame );
+- containerLayout->addWidget( cbMenuShadow, 4, 0 );
++ containerLayout->addWidget( cbMenuShadow, 5, 0 );
+
+ // Push the [label combo] to the left.
+ comboSpacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum );
+@@ -359,6 +367,7 @@
+ connect( cbEnableEffects, SIGNAL(toggled(bool)), this, SLOT(setEffectsDirty()));
+ connect( cbEnableEffects, SIGNAL(toggled(bool)), this, SLOT(setStyleDirty()));
+ connect( comboTooltipEffect, SIGNAL(activated(int)), this, SLOT(setEffectsDirty()));
++ connect( comboRubberbandEffect, SIGNAL(activated(int)), this, SLOT(setStyleDirty()));
+ connect( comboComboEffect, SIGNAL(activated(int)), this, SLOT(setEffectsDirty()));
+ connect( comboMenuEffect, SIGNAL(activated(int)), this, SLOT(setStyleDirty()));
+ connect( comboMenuHandle, SIGNAL(activated(int)), this, SLOT(setStyleDirty()));
+@@ -548,6 +557,11 @@
+ item = comboTooltipEffect->currentItem();
+ config.writeEntry( "EffectAnimateTooltip", item == 1);
+ config.writeEntry( "EffectFadeTooltip", item == 2 );
++ item = comboRubberbandEffect->currentItem();
++ {
++ QSettings settings; // Only for KStyle stuff
++ settings.writeEntry("/KStyle/Settings/SemiTransparentRubberband", item == 1);
++ }
+ item = comboMenuHandle->currentItem();
+ config.writeEntry( "InsertTearOffHandle", item );
+ item = comboMenuEffect->currentItem();
+@@ -683,6 +697,7 @@
+ // Effects..
+ cbEnableEffects->setChecked(false);
+ comboTooltipEffect->setCurrentItem(0);
++ comboRubberbandEffect->setCurrentItem(1);
+ comboComboEffect->setCurrentItem(0);
+ comboMenuEffect->setCurrentItem(0);
+ comboMenuHandle->setCurrentItem(0);
+@@ -916,7 +931,11 @@
+ comboTooltipEffect->setCurrentItem( 2 );
+ else
+ comboTooltipEffect->setCurrentItem( 0 );
+-
++
++ QSettings settings;
++ bool semiTransparentRubberband = settings.readBoolEntry("/KStyle/Settings/SemiTransparentRubberband", false);
++ comboRubberbandEffect->setCurrentItem( semiTransparentRubberband ? 1 : 0 );
++
+ if ( config.readBoolEntry( "EffectAnimateMenu", false) )
+ comboMenuEffect->setCurrentItem( 1 );
+ else if ( config.readBoolEntry( "EffectFadeMenu", false) )
+@@ -927,7 +946,7 @@
+ comboMenuHandle->setCurrentItem(config.readNumEntry("InsertTearOffHandle", 0));
+
+ // KStyle Menu transparency and drop-shadow options...
+- QSettings settings;
++
+ QString effectEngine = settings.readEntry("/KStyle/Settings/MenuTransparencyEngine", "Disabled");
+
+ #ifdef HAVE_XRENDER
+@@ -1056,6 +1075,8 @@
+ QWhatsThis::add( comboTooltipEffect, i18n( "<p><b>Disable: </b>do not use any tooltip effects.</p>\n"
+ "<p><b>Animate: </b>Do some animation.</p>\n"
+ "<b>Fade: </b>Fade in tooltips using alpha-blending.") );
++ QWhatsThis::add( comboRubberbandEffect, i18n( "<p><b>Disable: </b>do not use any rubberband effects.</p>\n"
++ "<b>Make Translucent: </b>Draw a translucent rubberband.") );
+ QWhatsThis::add( comboMenuEffect, i18n( "<p><b>Disable: </b>do not use any menu effects.</p>\n"
+ "<p><b>Animate: </b>Do some animation.</p>\n"
+ "<p><b>Fade: </b>Fade in menus using alpha-blending.</p>\n"
+--- kde.orig/kcontrol/style/kcmstyle.h
++++ kde.patched/kcontrol/style/kcmstyle.h
+@@ -125,11 +125,13 @@
+ QFrame* containerFrame;
+ QGridLayout* containerLayout;
+ QComboBox* comboTooltipEffect;
++ QComboBox* comboRubberbandEffect;
+ QComboBox* comboComboEffect;
+ QComboBox* comboMenuEffect;
+ QComboBox* comboMenuHandle;
+
+ QLabel* lblTooltipEffect;
++ QLabel* lblRubberbandEffect;
+ QLabel* lblComboEffect;
+ QLabel* lblMenuEffect;
+ QLabel* lblMenuHandle;
+--- kde.orig/konqueror/listview/konq_listviewwidget.cc
++++ kde.patched/konqueror/listview/konq_listviewwidget.cc
+@@ -415,9 +415,11 @@
+ {
+ if ( m_rubber )
+ {
+- drawRubber();
+- delete m_rubber;
+- m_rubber = 0;
++
++ QRect r( m_rubber->normalize() );
++ delete m_rubber;
++ m_rubber = 0;
++ repaintContents( r, FALSE );
+ }
+
+ delete m_selected;
+@@ -427,14 +429,15 @@
+ KonqBaseListViewItem* item = isExecuteArea( vp ) ?
+ static_cast<KonqBaseListViewItem*>( itemAt( vp ) ) : 0L;
+
+- if ( item )
++ if ( item ) {
+ KListView::contentsMousePressEvent( e );
++ }
+ else {
+ if ( e->button() == LeftButton )
+ {
+- if ( !( e->state() & ControlButton ) )
+- setSelected( itemAt( vp ), false );
+ m_rubber = new QRect( e->x(), e->y(), 0, 0 );
++ clearSelection();
++ emit selectionChanged();
+ m_fileTip->setItem( 0 );
+ }
+ if ( e->button() != RightButton )
+@@ -450,9 +453,11 @@
+ {
+ if ( m_rubber )
+ {
+- drawRubber();
++
++ QRect r( m_rubber->normalize() );
+ delete m_rubber;
+ m_rubber = 0;
++ repaintContents( r, FALSE );
+ }
+
+ if ( m_scrollTimer )
+@@ -541,23 +546,21 @@
+ KListView::leaveEvent( e );
+ }
+
+-void KonqBaseListViewWidget::drawRubber()
++void KonqBaseListViewWidget::drawRubber( QPainter *p )
+ {
+ if ( !m_rubber )
+ return;
+
+- QPainter p;
+- p.begin( viewport() );
+- p.setRasterOp( NotROP );
+- p.setPen( QPen( color0, 1 ) );
+- p.setBrush( NoBrush );
++ p->setRasterOp( NotROP );
++ p->setPen( QPen( color0, 1 ) );
++ p->setBrush( NoBrush );
+
+ QPoint pt( m_rubber->x(), m_rubber->y() );
+ pt = contentsToViewport( pt );
+- style().drawPrimitive( QStyle::PE_FocusRect, &p,
++ style().drawPrimitive( QStyle::PE_RubberBand, p,
+ QRect( pt.x(), pt.y(), m_rubber->width(), m_rubber->height() ),
+ colorGroup(), QStyle::Style_Default, colorGroup().base() );
+- p.end();
++
+ }
+
+ void KonqBaseListViewWidget::slotAutoScroll()
+@@ -573,10 +576,12 @@
+ if ( vc == m_rubber->bottomRight() )
+ return;
+
++ QRect oldRubber = *m_rubber;
++
+ const int oldTop = m_rubber->normalize().top();
+ const int oldBottom = m_rubber->normalize().bottom();
+
+- drawRubber();
++
+ m_rubber->setBottomRight( vc );
+
+ QListViewItem *cur = itemAt( QPoint(0,0) );
+@@ -584,12 +589,20 @@
+ bool block = signalsBlocked();
+ blockSignals( true );
+
++ QRect rr;
+ QRect nr = m_rubber->normalize();
++ bool changed = FALSE;
++
+ if ( cur )
+ {
+- QRect rect = itemRect( cur );
+- if ( !allColumnsShowFocus() )
++ QRect rect;
++ if ( allColumnsShowFocus() )
++ rect = itemRect( cur );
++ else {
++ rect = itemRect( cur );
+ rect.setWidth( executeArea( cur ) );
++ }
++
+
+ rect = QRect( viewportToContents( rect.topLeft() ),
+ viewportToContents( rect.bottomRight() ) );
+@@ -613,9 +626,26 @@
+ if ( rect.intersects( nr ) )
+ {
+ if ( !cur->isSelected() && cur->isSelectable() )
++ {
+ setSelected( cur, true );
+- } else if ( !m_selected || !m_selected->contains( (KonqBaseListViewItem*)cur ) )
+- setSelected( cur, false );
++ changed = TRUE;
++ rr = rr.unite( itemRect( cur ) );
++ }
++ }
++ else
++ {
++ if ( cur->isSelected() )
++ {
++ changed = TRUE;
++ rr = rr.unite( itemRect( cur ) );
++ }
++
++ if ( !m_selected || !m_selected->contains( (KonqBaseListViewItem*)cur ) )
++ {
++ setSelected( cur, false );
++ }
++ }
++
+
+ cur = cur->itemBelow();
+ if (cur && !allColumnsShowFocus())
+@@ -632,9 +662,26 @@
+ if ( rect.intersects( nr ) )
+ {
+ if ( !cur->isSelected() && cur->isSelectable() )
++ {
+ setSelected( cur, true );
+- } else if ( !m_selected || !m_selected->contains( (KonqBaseListViewItem*)cur ) )
+- setSelected( cur, false );
++ changed = TRUE;
++ rr = rr.unite( itemRect( cur ) );
++ }
++ }
++ else
++ {
++ if ( cur->isSelected() )
++ {
++ changed = TRUE;
++ rr = rr.unite( itemRect( cur ) );
++ }
++
++ if ( !m_selected || !m_selected->contains( (KonqBaseListViewItem*)cur ) )
++ {
++ setSelected( cur, false );
++ }
++ }
++
+
+ cur = cur->itemAbove();
+ if (cur && !allColumnsShowFocus())
+@@ -646,7 +693,31 @@
+ blockSignals( block );
+ emit selectionChanged();
+
+- drawRubber();
++ QRect allRect = oldRubber.normalize();
++ if ( changed )
++ {
++ allRect |= rr.normalize();
++ }
++ allRect |= m_rubber->normalize();
++ QPoint point = contentsToViewport( allRect.topLeft() );
++ allRect = QRect( point.x(), point.y(), allRect.width(), allRect.height() );
++ allRect &= viewport()->rect();
++ allRect.addCoords( -2, -2, 2, 2 );
++
++ QPixmap backrubber( viewport()->rect().size() );
++ backrubber.fill( viewport(), viewport()->rect().topLeft() );
++
++ QPainter p( &backrubber );
++ p.save();
++ drawContentsOffset( &p,
++ contentsX(),
++ contentsY(),
++ contentsX() + allRect.left(), contentsY() + allRect.top(),
++ allRect.width(), allRect.height() );
++ p.restore();
++ drawRubber( &p );
++ p.end();
++ bitBlt( viewport(), allRect.topLeft(), &backrubber, allRect );
+
+ const int scroll_margin = 40;
+ ensureVisible( vc.x(), vc.y(), scroll_margin, scroll_margin );
+@@ -676,9 +747,12 @@
+
+ void KonqBaseListViewWidget::viewportPaintEvent( QPaintEvent *e )
+ {
+- drawRubber();
++
+ KListView::viewportPaintEvent( e );
+- drawRubber();
++
++ QPainter p( viewport() );
++ drawRubber( &p );
++ p.end();
+ }
+
+ void KonqBaseListViewWidget::viewportResizeEvent(QResizeEvent * e)
+--- kde.orig/konqueror/listview/konq_listviewwidget.h
++++ kde.patched/konqueror/listview/konq_listviewwidget.h
+@@ -205,7 +205,7 @@
+ virtual void viewportPaintEvent( QPaintEvent *e );
+ virtual void viewportResizeEvent( QResizeEvent *e );
+
+- virtual void drawRubber();
++ virtual void drawRubber( QPainter * );
+ virtual void contentsMousePressEvent( QMouseEvent *e );
+ virtual void contentsMouseReleaseEvent( QMouseEvent *e );
+ virtual void contentsMouseMoveEvent( QMouseEvent *e );
+@@ -245,7 +245,8 @@
+ QColor m_itemColor;
+
+ QRect *m_rubber;
+-
++ QPixmap *m_backrubber;
++
+ bool m_bTopLevelComplete:1;
+ bool m_showIcons:1;
+ bool m_bCaseInsensitive:1;
More information about the pkg-kde-commits
mailing list