commit kcm_gtk

Hello community, here is the log from the commit of package kcm_gtk checked in at Fri Nov 3 19:01:59 CET 2006. -------- --- KDE/kcm_gtk/kcm_gtk.changes 2006-10-11 01:20:10.000000000 +0200 +++ /mounts/work_src_done/STABLE/kcm_gtk/kcm_gtk.changes 2006-11-03 16:57:49.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Nov 3 16:57:25 CET 2006 - stbinner@suse.de + +- fix combo box selection of currently active style + +------------------------------------------------------------------- New: ---- fix-listing.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcm_gtk.spec ++++++ --- /var/tmp/diff_new_pack.jzPNAC/_old 2006-11-03 19:01:27.000000000 +0100 +++ /var/tmp/diff_new_pack.jzPNAC/_new 2006-11-03 19:01:27.000000000 +0100 @@ -12,17 +12,18 @@ Name: kcm_gtk BuildRequires: dos2unix kdelibs3-devel -License: GPL +License: GNU General Public License (GPL) - all versions Group: System/GUI/KDE Summary: KDE control module for switching GTK+ style Version: 0.7cvs20060209 -Release: 1 +Release: 14 URL: http://www.freedesktop.org/Software/gtk-qt Conflicts: gtk-qt-engine Source: gtk-qt-engine-%{version}.tar.bz2 Patch: %name.diff Patch1: build_only_kcm.diff Patch2: dont-touch-bashrc.diff +Patch3: fix-listing.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -43,13 +44,14 @@ %patch %patch1 %patch2 +%patch3 rm -rf src . /etc/opt/kde3/common_options update_admin %build . /etc/opt/kde3/common_options -./configure $configkde +./configure $configkde --enable-debug make %{?jobs:-j %jobs} %install @@ -73,5 +75,7 @@ /usr/share/applications/*.desktop %changelog -n kcm_gtk +* Fri Nov 03 2006 - stbinner@suse.de +- fix combo box selection of currently active style * Tue Oct 10 2006 - stbinner@suse.de - branch kcm_gtk package from gtk-qt-engine package ++++++ fix-listing.diff ++++++ --- kcm_gtk/kcmgtk.cpp 2006/11/02 14:59:22 1.7 +++ kcm_gtk/kcmgtk.cpp 2006/11/03 15:38:55 @@ -216,9 +216,8 @@ void KcmGtk::load() { parser.parse(QDir::homeDirPath() + "/.gtkrc-2.0"); - - bool usingQtEngine = false; - widget->styleBox->setCurrentText(""); + + QString style = "QtCurve"; if (!parser.style.isEmpty()) { for ( QMapIterator it = themes.begin(); it != themes.end(); ++it ) @@ -226,14 +225,15 @@ if (it.data() != parser.style) continue; - if (it.key() == "Qt") - usingQtEngine = true; - - widget->styleBox->setCurrentText(it.key()); + style = it.key(); } } - else - usingQtEngine = true; + + for (int i=0;i<widget->styleBox->count();i++) + if (widget->styleBox->text(i)==style) { + widget->styleBox->setCurrentItem(i); + break; + } if (!parser.font.isEmpty()) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org