Hello community, here is the log from the commit of package kdepim3 checked in at Sat Aug 25 00:00:41 CEST 2007. -------- --- KDE/kdepim3/kdepim3.changes 2007-08-19 13:44:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdepim3/kdepim3.changes 2007-08-23 18:42:54.000000000 +0200 @@ -1,0 +2,15 @@ +Thu Aug 23 18:42:26 CEST 2007 - dmueller@suse.de + +- fix dialog sizes (#301677) + +------------------------------------------------------------------- +Thu Aug 23 14:58:19 CEST 2007 - cstender@suse.de + +- fixed wrong kitchensync defaults (#303656) + +------------------------------------------------------------------- +Wed Aug 22 00:16:23 CEST 2007 - cstender@suse.de + +- fixed kitchensync requires + +------------------------------------------------------------------- New: ---- 3_5_BRANCH_r703925.diff build-parallel.diff kitchensync-defaults.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim3.spec ++++++ --- /var/tmp/diff_new_pack.gB9389/_old 2007-08-25 00:00:03.000000000 +0200 +++ /var/tmp/diff_new_pack.gB9389/_new 2007-08-25 00:00:03.000000000 +0200 @@ -28,7 +28,7 @@ Group: System/GUI/KDE Summary: Personal Information Manager Software for KDE Version: 3.5.7.enterprise.0.20070731.694771 -Release: 11 +Release: 14 %define realversion 3.5.6.enterprise.0.20070731.694771 URL: http://www.kde.org/ Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3` ) @@ -52,6 +52,9 @@ Patch25: kmail-crash.diff Patch28: kmail_allow_tls_login_auth.diff Patch101: kitchensync-opensuse.diff +Patch102: kitchensync-defaults.diff +Patch103: 3_5_BRANCH_r703925.diff +Patch104: build-parallel.diff Provides: cryptplug Obsoletes: cryptplug %if %suse_version > 1000 @@ -173,7 +176,6 @@ Group: Hardware/PDA Provides: kdepim3-sync Obsoletes: kdepim3-sync -Requires: libopensync >= 0.22 Requires: kdepim3 %description -n kitchensync @@ -208,6 +210,9 @@ %patch25 %patch28 %patch101 +%patch102 +%patch103 +%patch104 . /etc/opt/kde3/common_options update_admin @@ -780,6 +785,12 @@ %endif %changelog +* Thu Aug 23 2007 - dmueller@suse.de +- fix dialog sizes (#301677) +* Thu Aug 23 2007 - cstender@suse.de +- fixed wrong kitchensync defaults (#303656) +* Wed Aug 22 2007 - cstender@suse.de +- fixed kitchensync requires * Sun Aug 19 2007 - stbinner@suse.de - fix build on older distributions * Wed Aug 15 2007 - cstender@suse.de ++++++ 3_5_BRANCH_r703925.diff ++++++ ------------------------------------------------------------------------ r703925 | mueller | 2007-08-23 18:38:22 +0200 (Thu, 23 Aug 2007) | 2 lines fix dialog sizing (bnc:301677) ------------------------------------------------------------------------ Index: certmanager/lib/ui/keyselectiondialog.cpp =================================================================== --- certmanager/lib/ui/keyselectiondialog.cpp (revision 703924) +++ certmanager/lib/ui/keyselectiondialog.cpp (revision 703925) @@ -332,21 +332,18 @@ void Kleo::KeySelectionDialog::init( boo if ( mKeyUsage & SMIMEKeys ) mSMIMEBackend = Kleo::CryptoBackendFactory::instance()->smime(); - QSize dialogSize( 580, 400 ); - if ( kapp ) { - KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() ); - - KConfigGroup dialogConfig( KGlobal::config(), "Key Selection Dialog" ); - dialogSize = dialogConfig.readSizeEntry( "Dialog size", &dialogSize ); - } - resize( dialogSize ); - mCheckSelectionTimer = new QTimer( this ); mStartSearchTimer = new QTimer( this ); QFrame *page = makeMainWidget(); mTopLayout = new QVBoxLayout( page, 0, spacingHint() ); + if ( !text.isEmpty() ) { + QLabel* textLabel = new QLabel( text, page ); + textLabel->setAlignment( textLabel->alignment() | Qt::WordBreak ); + mTopLayout->addWidget( textLabel ); + } + if ( !text.isEmpty() ) mTopLayout->addWidget( new QLabel( text, page ) ); @@ -401,6 +398,16 @@ void Kleo::KeySelectionDialog::init( boo this, SLOT(slotRereadKeys()) ); slotRereadKeys(); + mTopLayout->activate(); + + if ( kapp ) { + KWin::setIcons( winId(), kapp->icon(), kapp->miniIcon() ); + QSize dialogSize( sizeHint() ); + + KConfigGroup dialogConfig( KGlobal::config(), "Key Selection Dialog" ); + dialogSize = dialogConfig.readSizeEntry( "Dialog size", &dialogSize ); + resize( dialogSize ); + } } Kleo::KeySelectionDialog::~KeySelectionDialog() { ++++++ build-parallel.diff ++++++ --- kmail/Makefile.am +++ kmail/Makefile.am @@ -52,6 +52,10 @@ bin_PROGRAMS = kmail kmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) kmail_LDADD = libkmailprivate.la +$(srcdir)/customtemplates.h: customtemplates_base.h +$(srcdir)/globalsettings.h: globalsettings_base.h +$(srcdir)/templatesconfiguration.h: templatesconfiguration_base.h + libkmailprivate_la_SOURCES = kmmessage.cpp kmmainwin.cpp configuredialog.cpp \ configuredialog_p.cpp klistviewindexedsearchline.cpp \ simplestringlisteditor.cpp index.cpp \ ++++++ kitchensync-defaults.diff ++++++ --- kitchensync/src/configguisyncmlhttp.cpp +++ kitchensync/src/configguisyncmlhttp.cpp @@ -121,7 +121,7 @@ mGridLayout->addWidget( label, 5, 0 ); mRecvLimit = new QSpinBox( optionWidget ); - mRecvLimit->setMinValue( 1 ); + mRecvLimit->setMinValue( 0 ); mRecvLimit->setMaxValue( 65536 ); mGridLayout->addWidget( mRecvLimit, 5, 1 ); @@ -130,7 +130,7 @@ mGridLayout->addWidget( label, 6, 0 ); mMaxObjSize = new QSpinBox( optionWidget ); - mMaxObjSize->setMinValue( 1 ); + mMaxObjSize->setMinValue( 0 ); mMaxObjSize->setMaxValue( 65536 ); mGridLayout->addWidget( mMaxObjSize, 6, 1 ); --- kitchensync/src/configguisyncmlobex.cpp +++ kitchensync/src/configguisyncmlobex.cpp @@ -153,7 +153,7 @@ mGridLayout->addWidget( label, 14, 0 ); mRecvLimit = new QSpinBox( optionsWidget ); - mRecvLimit->setMinValue( 1 ); + mRecvLimit->setMinValue( 0 ); mRecvLimit->setMaxValue( 65536 ); mGridLayout->addWidget( mRecvLimit, 14, 1 ); @@ -162,7 +162,7 @@ mGridLayout->addWidget( label, 15, 0 ); mMaxObjSize = new QSpinBox( optionsWidget ); - mMaxObjSize->setMinValue( 1 ); + mMaxObjSize->setMinValue( 0 ); mMaxObjSize->setMaxValue( 65536 ); mGridLayout->addWidget( mMaxObjSize, 15, 1 ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org