Author: tgoettlicher Date: Fri Nov 9 14:52:56 2007 New Revision: 7771 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7771&view=rev Log: added option to always show the details (305109) Modified: trunk/updater-kde/po/createPot trunk/updater-kde/updater/ConfigWidgetUI.h trunk/updater-kde/updater/ConfigWidgetUI.ui trunk/updater-kde/updater/MainWindow.cpp trunk/updater-kde/updater/TrayIcon.cpp trunk/updater-kde/updater/TrayIcon.h trunk/updater-kde/updater/opensuseupdater_settings.kcfg Modified: trunk/updater-kde/po/createPot URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/po/createPot?rev=7771&r1=7770&r2=7771&view=diff ============================================================================== --- trunk/updater-kde/po/createPot (original) +++ trunk/updater-kde/po/createPot Fri Nov 9 14:52:56 2007 @@ -4,7 +4,7 @@ ### See: http://developer.kde.org/documentation/other/makefile_am_howto/de/_translati... ### ftp://ftp.kde.org/pub/kde/devel/gettext-kde/ -extractrc --tag=cstring ../updater/*.ui ../updater/*.kcfg | grep -v kcfg | grep -v ConfigWidgetUI | grep -v BackendFrame | grep -v l1 | grep -v l2 | grep -v l3 > rc.cpp +extractrc --tag=cstring ../updater/*.ui ../updater/*.kcfg | grep -v kcfg | grep -v ConfigWidgetUI | grep -v BackendFrame | grep -v l1 | grep -v l2 | grep -v l3 | grep -v l4 > rc.cpp # search for sourcecode-files Modified: trunk/updater-kde/updater/ConfigWidgetUI.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/ConfigWidgetUI.h?rev=7771&r1=7770&r2=7771&view=diff ============================================================================== --- trunk/updater-kde/updater/ConfigWidgetUI.h (original) +++ trunk/updater-kde/updater/ConfigWidgetUI.h Fri Nov 9 14:52:56 2007 @@ -35,6 +35,7 @@ QCheckBox* kcfg_Autostart; QCheckBox* kcfg_ShowPackages; QCheckBox* kcfg_ShowNotifications; + QCheckBox* kcfg_NoSimpleView; QLineEdit* kcfg_BackendPlugin; QFrame* BackendFrame; QSpinBox* kcfg_WarnInterval; Modified: trunk/updater-kde/updater/ConfigWidgetUI.ui URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/ConfigWidgetUI.ui?rev=7771&r1=7770&r2=7771&view=diff ============================================================================== --- trunk/updater-kde/updater/ConfigWidgetUI.ui (original) +++ trunk/updater-kde/updater/ConfigWidgetUI.ui Fri Nov 9 14:52:56 2007 @@ -72,11 +72,11 @@ <property name="text"> <string>Backend:</string> </property> - <property name="name"> - <cstring>l3</cstring> - </property> + <property name="name"> + <cstring>l3</cstring> + </property> + </widget> - </widget> <hbox> <widget class="QFrame" row="1" column="1"> <property name="name"> @@ -89,8 +89,16 @@ <enum>Plain</enum> </property> </widget> + <widget class="QLabel"> + <property name="text"> + <string></string> + </property> + <property name="name"> + <cstring>l4</cstring> + </property> + </widget> </hbox> - </hbox> + </hbox> <widget class="QCheckBox"> <property name="name"> @@ -121,6 +129,15 @@ </property> </widget> + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_NoSimpleView</cstring> + </property> + <property name="text"> + <string>Always show detailed view</string> + </property> + </widget> + </vbox> </widget> Modified: trunk/updater-kde/updater/MainWindow.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.cpp?rev=7771&r1=7770&r2=7771&view=diff ============================================================================== --- trunk/updater-kde/updater/MainWindow.cpp (original) +++ trunk/updater-kde/updater/MainWindow.cpp Fri Nov 9 14:52:56 2007 @@ -60,10 +60,15 @@ : KMainWindow(parent) , _simple(simple) { - applet = new TrayIcon(simple); + if (UpdaterSettings::self()->noSimpleView()) + applet = new TrayIcon(this); + else + applet = new TrayIcon(simple); + applet->show(); connect(applet, SIGNAL(quitSelected()), this, SLOT(slotExit())); connect(applet, SIGNAL(showSimpleView()), this, SLOT(showSimpleView())); + connect(applet, SIGNAL(showDetailView()), this, SLOT(showMainWindow())); initGUI(); Modified: trunk/updater-kde/updater/TrayIcon.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/TrayIcon.cpp?rev=7771&r1=7770&r2=7771&view=diff ============================================================================== --- trunk/updater-kde/updater/TrayIcon.cpp (original) +++ trunk/updater-kde/updater/TrayIcon.cpp Fri Nov 9 14:52:56 2007 @@ -156,8 +156,10 @@ void TrayIcon::popupClicked() { - kdDebug() << "popupClicked" << endl; - emit (showSimpleView()); + if (UpdaterSettings::self()->noSimpleView()) + emit (showDetailView()); + else + emit (showSimpleView()); } Modified: trunk/updater-kde/updater/TrayIcon.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/TrayIcon.h?rev=7771&r1=7770&r2=7771&view=diff ============================================================================== --- trunk/updater-kde/updater/TrayIcon.h (original) +++ trunk/updater-kde/updater/TrayIcon.h Fri Nov 9 14:52:56 2007 @@ -63,6 +63,7 @@ signals: void showSimpleView(); + void showDetailView(); }; #endif Modified: trunk/updater-kde/updater/opensuseupdater_settings.kcfg URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/opensuseupdater_settings.kcfg?rev=7771&r1=7770&r2=7771&view=diff ============================================================================== --- trunk/updater-kde/updater/opensuseupdater_settings.kcfg (original) +++ trunk/updater-kde/updater/opensuseupdater_settings.kcfg Fri Nov 9 14:52:56 2007 @@ -26,5 +26,9 @@ <label>Show notifications.</label> <default>true</default> </entry> + <entry name="NoSimpleView" type="Bool"> + <label>Always show detailed view.</label> + <default>false</default> + </entry> </group> </kcfg> -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org