Hello community,
here is the log from the commit of package kdebase3
checked in at Mon Nov 27 18:19:19 CET 2006.
--------
--- KDE/kdebase3/kdebase3.changes 2006-11-25 13:34:17.000000000 +0100
+++ /mounts/work_src_done/STABLE/STABLE/kdebase3/kdebase3.changes 2006-11-27 17:54:03.000000000 +0100
@@ -1,0 +2,12 @@
+Mon Nov 27 17:53:03 CET 2006 - dmueller@suse.de
+
+- fix translation issue in kickoff Leave tab (#221299)
+- fix kickoff tab labels not being drawn centered
+- add (hidden) option to disable flip animation
+
+-------------------------------------------------------------------
+Mon Nov 27 17:24:17 CET 2006 - stbinner@suse.de
+
+- set all logout/shutdown/restart delays to 30 seconds
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase3.spec ++++++
--- /var/tmp/diff_new_pack.jczENc/_old 2006-11-27 18:17:00.000000000 +0100
+++ /var/tmp/diff_new_pack.jczENc/_new 2006-11-27 18:17:00.000000000 +0100
@@ -52,7 +52,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://www.kde.org/
Version: 3.5.5
-Release: 72
+Release: 74
%define kde_version 3.5.5
Source0: kdebase-%{kde_version}.tar.bz2
Source3: startkde.suse.sh
@@ -382,7 +382,7 @@
Summary: Set and list fileshares
Group: System/Management
Version: 2.0
-Release: 201
+Release: 203
%description -n fileshareset
This package contains the the fileshareset utility to allow users to
@@ -1520,6 +1520,12 @@
%endif
%changelog -n kdebase3
+* Mon Nov 27 2006 - dmueller@suse.de
+- fix translation issue in kickoff Leave tab (#221299)
+- fix kickoff tab labels not being drawn centered
+- add (hidden) option to disable flip animation
+* Mon Nov 27 2006 - stbinner@suse.de
+- set all logout/shutdown/restart delays to 30 seconds
* Sat Nov 25 2006 - coolo@suse.de
- correctly handle media mounted on startup (#223413)
* Fri Nov 24 2006 - coolo@suse.de
++++++ kickoff.diff ++++++
--- /var/tmp/diff_new_pack.jczENc/_old 2006-11-27 18:17:00.000000000 +0100
+++ /var/tmp/diff_new_pack.jczENc/_new 2006-11-27 18:17:00.000000000 +0100
@@ -170,7 +170,7 @@
--- libkicker/kickerSettings.kcfg
+++ libkicker/kickerSettings.kcfg
-@@ -98,6 +98,27 @@
+@@ -98,6 +98,32 @@
<label>A list of extensions that have been loaded at runtime. In the case of a crash these extensions will not be loaded at the next Kicker start, in case they caused the crash</label>
</entry>
@@ -184,6 +184,11 @@
+ <default>true</default>
+ </entry>
+
++<entry name="ScrollFlipView" type="Bool" >
++ <label>When this option is enabled, the SUSE Menu application view switching will scroll.</label>
++ <default>true</default>
++ </entry>
++
+<entry name="KMenuWidth" type="Int">
+ <label>Preferred width of the KMenu</label>
+ <default>0</default>
@@ -198,7 +203,7 @@
</group>
<group name="menus">
-@@ -172,6 +193,19 @@
+@@ -172,6 +198,19 @@
<default>false</default>
</entry>
@@ -218,7 +223,7 @@
</group>
<group name="button_tiles">
-@@ -337,6 +371,29 @@
+@@ -337,6 +376,29 @@
</group>
@@ -281,7 +286,7 @@
m_tippingEnabled--;
}
-+ assert(m_tippingEnabled >= 0);
++ assert(m_tippingEnabled >= -1);
+
if (m_tippingEnabled < 1 && m_self)
{
@@ -1989,7 +1994,15 @@
#include "k_mnu.h"
#include "showdesktop.h"
#include "panelbutton.h"
-@@ -206,7 +208,7 @@
+@@ -106,6 +108,7 @@
+
+ KGlobal::iconLoader()->addExtraDesktopThemes();
+
++ KGlobal::locale()->insertCatalogue("kdmgreet");
+ KGlobal::locale()->insertCatalogue("libkonq");
+ KGlobal::locale()->insertCatalogue("libdmctl");
+ KGlobal::locale()->insertCatalogue("libtaskbar");
+@@ -206,7 +209,7 @@
void Kicker::showKMenu()
{
@@ -2279,7 +2292,7 @@
_mimecheckTimer->start(0);
--- kicker/ui/flipscrollview.cpp
+++ kicker/ui/flipscrollview.cpp
-@@ -0,0 +1,319 @@
+@@ -0,0 +1,324 @@
+/*****************************************************************
+
+Copyright (c) 2006 Will Stephenson
@@ -2310,7 +2323,7 @@
+
+#include "itemview.h"
+#include "flipscrollview.h"
-+
++#include "kickerSettings.h"
+
+/* Flip scroll steps, as percentage of itemview width to scroll per
+ * step. Assumes the itemview is scrolled in ten steps */
@@ -2495,8 +2508,10 @@
+{
+ mStepsRemaining--;
+ assert( mStepsRemaining >= 0 && mStepsRemaining < int(sizeof( scrollSteps ) / sizeof( double )) );
-+ scrollBy( ( int )( mScrollDirection * mLeftView->width() * scrollSteps[ mStepsRemaining ] ), 0 );
-+ //scrollBy( mScrollDirection * mLeftView->width() / max_steps, 0 );
++ if (KickerSettings::scrollFlipView())
++ scrollBy( ( int )( mScrollDirection * mLeftView->width() * scrollSteps[ mStepsRemaining ] ), 0 );
++ else
++ scrollBy( ( int )( mScrollDirection * mLeftView->width()), 0 );
+
+ if ( mStepsRemaining == 0 )
+ {
@@ -2589,7 +2604,10 @@
+
+ mLeftView->setVScrollBarMode( QScrollView::AlwaysOff );
+ mRightView->setVScrollBarMode( QScrollView::AlwaysOff );
-+ mStepsRemaining = max_steps;
++ if (KickerSettings::scrollFlipView())
++ mStepsRemaining = max_steps;
++ else
++ mStepsRemaining = 1;
+ mTimer->start( 30 );
+ mSelectMenuPath = selectMenuPath;
+ if (!mSelectMenuPath.isEmpty()) {
@@ -4018,7 +4036,7 @@
+ m_exitView->leftView()->insertItem( "exit", i18n( "Shutdown Computer" ),
+ i18n( "Turn off computer" ), "kicker:/shutdown", nId++, index++ );
+
-+ m_exitView->leftView()->insertItem( "reload", i18n( "Restart Computer" ),
++ m_exitView->leftView()->insertItem( "reload", i18n( "&Restart Computer" ).replace("&",""),
+ i18n( "Restart and boot this system" ),
+ "kicker:/restart", nId++, index++ );
+
@@ -4888,7 +4906,7 @@
+ setTabOrder(m_kcommand, m_searchResultsWidget);
+
+ if (showHelp) {
-+ const int width = m_searchResultsWidget->width();
++ const int width = m_searchResultsWidget->width()-10;
+ QFontMetrics fm = m_searchResultsWidget->fontMetrics();
+
+ QListViewItem* item;
@@ -6598,7 +6616,7 @@
setFocusPolicy(NoFocus);
--- kicker/ui/kickoff_bar.cpp
+++ kicker/ui/kickoff_bar.cpp
-@@ -0,0 +1,176 @@
+@@ -0,0 +1,172 @@
+/*****************************************************************
+
+ Copyright (c) 1996-2000 the kicker authors. See file AUTHORS.
@@ -6659,25 +6677,7 @@
+ style().drawControl( QStyle::CE_TabBarTab, p, this, t->rect(),
+ colorGroup(), flags, QStyleOption(t) );
+
-+ QRect r( t->rect() );
-+ p->setFont( font() );
-+
-+ int iw = 0;
-+ int ih = 0;
-+ if ( t->iconSet() != 0 ) {
-+ iw = t->iconSet()->pixmap( QIconSet::Large, QIconSet::Normal ).width();
-+ ih = t->iconSet()->pixmap( QIconSet::Large, QIconSet::Normal ).height() + 4;
-+ }
-+ QFontMetrics fm = p->fontMetrics();
-+ int fw = fm.width( t->text() );
-+ fw -= t->text().contains('&') * fm.width('&');
-+ fw += t->text().contains("&&") * fm.width('&');
-+ int w = QMAX(iw, fw + 4);
-+ int h = ih + fm.height() + 4;
-+ int offset = 3;
-+ paintLabel( p, QRect( r.left() + (r.width()-w)/2 - offset,
-+ r.top() + (r.height()-h)/2,
-+ w, h ), t, t->identifier() == keyboardFocusTab() );
++ paintLabel( p, t->rect(), t, t->identifier() == keyboardFocusTab() );
+}
+
+
@@ -6686,8 +6686,19 @@
+ QRect r = br;
+
+ bool selected = m_tabsActivated && (currentTab() == t->identifier());
++ int vframe = style().pixelMetric( QStyle::PM_TabBarTabVSpace, this );
++
++ p->setFont( font() );
++ QFontMetrics fm = p->fontMetrics();
++ int fw = fm.width( t->text() );
++ fw -= t->text().contains('&') * fm.width('&');
++ fw += t->text().contains("&&") * fm.width('&');
+
-+ if ( t->iconSet()) {
++ QRect rt(r);
++ rt.setWidth(fw);
++
++ if ( t->iconSet())
++ {
+ // the tab has an iconset, draw it in the right mode
+ QIconSet::Mode mode = (t->isEnabled() && isEnabled())
+ ? QIconSet::Normal : QIconSet::Disabled;
@@ -6696,17 +6707,20 @@
+ QPixmap pixmap = t->iconSet()->pixmap( QIconSet::Large, mode );
+ int pixw = pixmap.width();
+ int pixh = pixmap.height();
-+ int xoff, yoff = 0;
-+ xoff = br.x() + (br.width() - pixw)/2;
-+ yoff = br.y() + (br.height() - pixh - p->fontMetrics().height() - 2)/2;
-+
-+ if(!selected) {
-+ xoff += style().pixelMetric(QStyle::PM_TabBarTabShiftHorizontal, this);
-+ yoff += style().pixelMetric(QStyle::PM_TabBarTabShiftVertical, this);
-+ }
-+ p->drawPixmap( 2 + xoff, 2 + yoff, pixmap );
-+ r.setTop(2 + yoff + pixh + 2);
++ int xoff = br.x() + (br.width() - pixw)/2;
++ int yoff = br.y() + (br.height() - 4 - pixh - fm.height() - vframe)/2;
++
++ p->drawPixmap( xoff, 4 + yoff, pixmap );
++
++ r.setTop(vframe/2 + yoff + pixh - 8);
++ rt.setTop(vframe/2 + yoff + pixh - 8);
++ rt.setHeight(fm.height() + vframe/2);
+ }
++ else
++ rt.setHeight(vframe/2);
++
++ rt.setWidth(fw+8);
++ rt.moveCenter(r.center());
+
+ QStyle::SFlags flags = QStyle::Style_Default;
+
@@ -6720,7 +6734,7 @@
+ // flags |= QStyle::Style_Sunken;
+ if(t->rect().contains(mapFromGlobal(QCursor::pos())))
+ flags |= QStyle::Style_MouseOver;
-+ style().drawControl( QStyle::CE_TabBarLabel, p, this, r,
++ style().drawControl( QStyle::CE_TabBarLabel, p, this, rt,
+ t->isEnabled() ? colorGroup(): palette().disabled(),
+ flags, QStyleOption(t) );
+}
@@ -6756,7 +6770,7 @@
+ QTab* tab = tabAt(QApplication::reverseLayout() ? count() - t - 1 : t);
+ int h = fh;
+ if (tab->iconSet())
-+ h += 6 + s.height() + 6;
++ h += 4 + s.height() + 4;
+ QRect r = tab->rect();
+
+ int fw = fm.width( tab->text() );
++++++ ksmserver-timed.diff ++++++
--- /var/tmp/diff_new_pack.jczENc/_old 2006-11-27 18:17:00.000000000 +0100
+++ /var/tmp/diff_new_pack.jczENc/_new 2006-11-27 18:17:00.000000000 +0100
@@ -188,7 +188,7 @@
+ m_template = i18n( "This computer will turn off automatically\n"
+ "after %1 seconds." );
+ m_logo->setPixmap( BarIcon( "exit", 48 ) );
-+ m_remaining = 120;
++ m_remaining = 31;
+ } else if ( sdtype == KApplication::ShutdownTypeReboot )
+ {
+ if (bootOption.isEmpty())
@@ -198,13 +198,13 @@
+ m_template = i18n( "This computer will reboot automatically\n"
+ "after %1 seconds." );
+ m_logo->setPixmap( BarIcon( "reload", 48 ) );
-+ m_remaining = 60;
++ m_remaining = 31;
+ } else {
+ m_title->setText( i18n( "Would you like to end your current session?" ) );
+ m_template = i18n( "This session will end\n"
+ "after %1 seconds automatically." );
+ m_logo->setPixmap( BarIcon( "previous", 48 ) );
-+ m_remaining = 30;
++ m_remaining = 31;
+ }
+ updateText();
+ QTimer *timer = new QTimer( this );
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org