Author: tgoettlicher Date: Wed Jan 23 15:59:28 2008 New Revision: 8348 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8348&view=rev Log: prepared code for battery check Modified: trunk/updater-kde/po/opensuseupdater.pot trunk/updater-kde/updater/ConfigWidgetUI.ui trunk/updater-kde/updater/MainWindow.cpp trunk/updater-kde/updater/MainWindow.h trunk/updater-kde/updater/TrayIcon.cpp trunk/updater-kde/updater/Updater.h trunk/updater-kde/updater/opensuseupdater_settings.kcfg trunk/updater-kde/updater/simpleview.cpp Modified: trunk/updater-kde/po/opensuseupdater.pot URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/po/opensuseupdater.pot?rev=8348&r1=8347&r2=8348&view=diff ============================================================================== --- trunk/updater-kde/po/opensuseupdater.pot (original) +++ trunk/updater-kde/po/opensuseupdater.pot Wed Jan 23 15:59:28 2008 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2007-11-02 15:07+0100\n" +"POT-Creation-Date: 2008-01-23 10:53+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -22,7 +22,7 @@ msgid "Patch" msgstr "" -#: ../updater/zypp/ZYppUpdater.cpp:335 +#: ../updater/zypp/ZYppUpdater.cpp:340 #: ../updater/zypp_traditional/ZYppUpdater.cpp:234 msgid "" "Can't launch zypp-checkpatches-wrapper helper program. Make sure zypper " @@ -40,12 +40,12 @@ "%1" msgstr "" -#: ../updater/zypp/ZYppUpdater.cpp:414 ../updater/zypp/ZYppUpdater.cpp:437 +#: ../updater/zypp/ZYppUpdater.cpp:419 ../updater/zypp/ZYppUpdater.cpp:442 #, c-format msgid "License of %1" msgstr "" -#: ../updater/zypp/ZYppUpdater.cpp:484 +#: ../updater/zypp/ZYppUpdater.cpp:489 msgid "" "Can't launch install helper program. Make sure zypper package is installed " "and working." @@ -84,7 +84,7 @@ msgid "Details" msgstr "" -#: ../updater/MainWindow.cpp:79 ../updater/MainWindow.cpp:204 +#: ../updater/MainWindow.cpp:101 ../updater/MainWindow.cpp:226 #: ../updater/simpleview.cpp:80 msgid "Install" msgstr "" @@ -119,7 +119,7 @@ "%n recommended updates are available" msgstr "" -#: ../updater/simpleview.cpp:283 +#: ../updater/simpleview.cpp:285 #, c-format msgid "" "_n: %n optional update is available.<br>You can select optional updates in " @@ -129,49 +129,77 @@ msgstr "" #: ../updater/simpleview.cpp:289 +#, c-format +msgid "" +"_n: %n optional upgrade is available.<br>You can select optional upgrades in " +"the detailed dialog.\n" +"%n optional upgrades are available.<br>You can select optional upgrades in " +"the detailed dialog." +msgstr "" + +#: ../updater/simpleview.cpp:293 +#, c-format +msgid "" +"_n: %n optional update and upgrade is available.<br>You can select optional " +"updates and upgrades in the detailed dialog.\n" +"%n optional updates and upgrades are available.<br>You can select optional " +"updates and upgrades in the detailed dialog." +msgstr "" + +#: ../updater/simpleview.cpp:300 msgid "<b>Updating...</b>" msgstr "" -#: ../updater/simpleview.cpp:302 ../updater/simpleview.cpp:315 +#: ../updater/simpleview.cpp:313 ../updater/simpleview.cpp:326 +#: ../updater/simpleview.cpp:339 msgid "<b>Unable to check whether updates are available.</b>" msgstr "" -#: ../updater/simpleview.cpp:304 +#: ../updater/simpleview.cpp:315 msgid "" "Please use \"Add/Remove Update Sources...\"\n" "from the tray icon menu to define an update repository." msgstr "" +#: ../updater/simpleview.cpp:328 +msgid "Please connect to the internet." +msgstr "" + +#: ../updater/simpleview.cpp:341 +msgid "The system is busy. Another check will start soon." +msgstr "" + #: ../updater/progresspopup.cpp:25 msgid "<b>Updating ...<b>" msgstr "" -#: ../updater/TrayIcon.cpp:53 ../updater/TrayIcon.cpp:136 +#: ../updater/TrayIcon.cpp:53 ../updater/TrayIcon.cpp:143 msgid "New software for your system is available" msgstr "" -#: ../updater/TrayIcon.cpp:82 +#: ../updater/TrayIcon.cpp:83 msgid "Checking for updates..." msgstr "" -#: ../updater/TrayIcon.cpp:87 +#: ../updater/TrayIcon.cpp:88 msgid "Error:\n" msgstr "" -#: ../updater/TrayIcon.cpp:92 +#: ../updater/TrayIcon.cpp:93 msgid "No Updates Available" msgstr "" -#: ../updater/TrayIcon.cpp:96 ../updater/TrayIcon.cpp:102 -#: ../updater/TrayIcon.cpp:113 +#: ../updater/TrayIcon.cpp:97 ../updater/TrayIcon.cpp:103 +#: ../updater/TrayIcon.cpp:120 msgid "New software updates are available." msgstr "" -#: ../updater/TrayIcon.cpp:107 ../updater/TrayIcon.cpp:124 +#: ../updater/TrayIcon.cpp:108 ../updater/TrayIcon.cpp:113 +#: ../updater/TrayIcon.cpp:131 msgid "Unable to check whether updates are available." msgstr "" -#: ../updater/TrayIcon.cpp:120 +#: ../updater/TrayIcon.cpp:127 msgid "Updating..." msgstr "" @@ -472,118 +500,118 @@ msgid "<h2>Available Updates</h2>" msgstr "" -#: ../updater/UpdaterApplication.cpp:83 +#: ../updater/UpdaterApplication.cpp:84 msgid "" "Backend plugin is not properly configured.\n" "Please use the configuration dialog to choose the correct one." msgstr "" -#: ../updater/UpdaterApplication.cpp:112 +#: ../updater/UpdaterApplication.cpp:133 msgid "Unable to load plugin. ErrNoServiceFound" msgstr "" -#: ../updater/UpdaterApplication.cpp:116 +#: ../updater/UpdaterApplication.cpp:137 msgid "Unable to load plugin. ErrServiceProvidesNoLibrary" msgstr "" -#: ../updater/UpdaterApplication.cpp:120 +#: ../updater/UpdaterApplication.cpp:141 #, c-format msgid "Unable to load plugin. ErrNoLibrary: %1" msgstr "" -#: ../updater/UpdaterApplication.cpp:124 +#: ../updater/UpdaterApplication.cpp:145 msgid "Unable to load plugin. ErrNoFactory" msgstr "" -#: ../updater/UpdaterApplication.cpp:128 +#: ../updater/UpdaterApplication.cpp:149 msgid "Unable to load plugin. ErrNoComponent" msgstr "" -#: ../updater/UpdaterApplication.cpp:132 +#: ../updater/UpdaterApplication.cpp:153 msgid "Unable to load plugin. Unknown Error" msgstr "" -#: ../updater/MainWindow.cpp:76 +#: ../updater/MainWindow.cpp:98 msgid "Add/Remove Update Sources..." msgstr "" -#: ../updater/MainWindow.cpp:77 +#: ../updater/MainWindow.cpp:99 msgid "Configure Applet..." msgstr "" -#: ../updater/MainWindow.cpp:78 +#: ../updater/MainWindow.cpp:100 msgid "Check Now" msgstr "" -#: ../updater/MainWindow.cpp:126 +#: ../updater/MainWindow.cpp:148 msgid "" "The following official patches for openSUSE either fix security holes or " "errors in the software." msgstr "" -#: ../updater/MainWindow.cpp:129 ../updater/MainWindow.cpp:168 +#: ../updater/MainWindow.cpp:151 ../updater/MainWindow.cpp:190 msgid "Name" msgstr "" -#: ../updater/MainWindow.cpp:131 ../updater/MainWindow.cpp:170 +#: ../updater/MainWindow.cpp:153 ../updater/MainWindow.cpp:192 msgid "Summary" msgstr "" -#: ../updater/MainWindow.cpp:132 ../updater/MainWindow.cpp:171 +#: ../updater/MainWindow.cpp:154 ../updater/MainWindow.cpp:193 msgid "Type" msgstr "" -#: ../updater/MainWindow.cpp:133 ../updater/MainWindow.cpp:172 +#: ../updater/MainWindow.cpp:155 ../updater/MainWindow.cpp:194 msgid "New Version" msgstr "" -#: ../updater/MainWindow.cpp:134 ../updater/MainWindow.cpp:173 +#: ../updater/MainWindow.cpp:156 ../updater/MainWindow.cpp:195 msgid "Catalog" msgstr "" -#: ../updater/MainWindow.cpp:135 ../updater/MainWindow.cpp:174 +#: ../updater/MainWindow.cpp:157 ../updater/MainWindow.cpp:196 msgid "Restart" msgstr "" -#: ../updater/MainWindow.cpp:140 ../updater/MainWindow.cpp:458 +#: ../updater/MainWindow.cpp:162 ../updater/MainWindow.cpp:475 msgid "Patches" msgstr "" -#: ../updater/MainWindow.cpp:145 +#: ../updater/MainWindow.cpp:167 msgid "Select All Patches" msgstr "" -#: ../updater/MainWindow.cpp:146 +#: ../updater/MainWindow.cpp:168 msgid "Clear Patch Selection" msgstr "" -#: ../updater/MainWindow.cpp:164 +#: ../updater/MainWindow.cpp:186 msgid "" "The following list contains new versions for software packages installed on " "your system.<br>These updates are provided by the openSUSE community." msgstr "" -#: ../updater/MainWindow.cpp:183 +#: ../updater/MainWindow.cpp:205 msgid "Select All Packages" msgstr "" -#: ../updater/MainWindow.cpp:184 +#: ../updater/MainWindow.cpp:206 msgid "Clear Package Selection" msgstr "" -#: ../updater/MainWindow.cpp:191 ../updater/MainWindow.cpp:459 +#: ../updater/MainWindow.cpp:213 ../updater/MainWindow.cpp:476 msgid "Upgrades" msgstr "" -#: ../updater/MainWindow.cpp:202 +#: ../updater/MainWindow.cpp:224 msgid "Add/Remove Update Repositories..." msgstr "" -#: ../updater/MainWindow.cpp:241 +#: ../updater/MainWindow.cpp:263 msgid "Available Updates" msgstr "" -#: ../updater/MainWindow.cpp:534 +#: ../updater/MainWindow.cpp:553 msgid "Settings" msgstr "" @@ -607,42 +635,70 @@ msgid "Backend:" msgstr "" -#: ../po/rc.cpp:20 +#: ../po/rc.cpp:21 msgid "Automa&tically start updater on login" msgstr "" -#: ../po/rc.cpp:23 +#: ../po/rc.cpp:24 msgid "Show available upgrades when backend provides them (for experts only)" msgstr "" -#: ../po/rc.cpp:26 +#: ../po/rc.cpp:27 msgid "Show notifications" msgstr "" -#: ../po/rc.cpp:28 +#: ../po/rc.cpp:30 +msgid "Always show detailed view" +msgstr "" + +#: ../po/rc.cpp:33 +msgid "Animated icon on check" +msgstr "" + +#: ../po/rc.cpp:35 msgid "How often to check for updates." msgstr "" -#: ../po/rc.cpp:30 +#: ../po/rc.cpp:37 msgid "How often show recurring warning when updates are available." msgstr "" -#: ../po/rc.cpp:32 +#: ../po/rc.cpp:39 msgid "Automatically start the applet on login" msgstr "" -#: ../po/rc.cpp:34 +#: ../po/rc.cpp:41 msgid "The backend for connecting to package database." msgstr "" -#: ../po/rc.cpp:36 +#: ../po/rc.cpp:43 msgid "Show available upgrades (for experts only)." msgstr "" -#: ../po/rc.cpp:38 +#: ../po/rc.cpp:45 msgid "Show notifications." msgstr "" +#: ../po/rc.cpp:47 +msgid "Always show detailed view." +msgstr "" + +#: ../po/rc.cpp:49 +msgid "Show animated tray icon on check." +msgstr "" + +#: ../po/rc.cpp:51 +msgid "Last check for updates." +msgstr "" + +#: ../po/rc.cpp:53 +msgid "Last applet state." +msgstr "" + +#: ../po/rc.cpp:55 +msgid "System's maximum load when checking for updates" +msgstr "" + #: ../kxmlrpcclient/kxmlrpcquery.cpp:131 msgid "Received invalid XML markup: %1 at %2:%3" msgstr "" Modified: trunk/updater-kde/updater/ConfigWidgetUI.ui URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/ConfigWidgetUI.ui?rev=8348&r1=8347&r2=8348&view=diff ============================================================================== --- trunk/updater-kde/updater/ConfigWidgetUI.ui (original) +++ trunk/updater-kde/updater/ConfigWidgetUI.ui Wed Jan 23 15:59:28 2008 @@ -149,8 +149,24 @@ </property> </widget> - - + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_SkipCheckSystemBusy</cstring> + </property> + <property name="text"> + <string>Don't check for updates when the system is busy</string> + </property> + </widget> +<!-- + <widget class="QCheckBox"> + <property name="name"> + <cstring>kcfg_SkipCheckOnBattery</cstring> + </property> + <property name="text"> + <string>Don't check for updates when the system is on battery</string> + </property> + </widget> +--> </vbox> </widget> <layoutdefaults spacing="6" margin="11"/> Modified: trunk/updater-kde/updater/MainWindow.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.cpp?rev=8348&r1=8347&r2=8348&view=diff ============================================================================== --- trunk/updater-kde/updater/MainWindow.cpp (original) +++ trunk/updater-kde/updater/MainWindow.cpp Wed Jan 23 15:59:28 2008 @@ -35,6 +35,8 @@ #include #include #include +#include + #include #include @@ -420,7 +422,12 @@ _check_updates_action->setEnabled(true); _edit_sources_action->setEnabled(true); - if ( state == APPLET_CHECKING || state == APPLET_INSTALLING || state == APPLET_NO_NETWORK || state == APPLET_SYSTEM_BUSY ) + if ( state == APPLET_CHECKING || + state == APPLET_INSTALLING || + state == APPLET_NO_NETWORK || + state == APPLET_SYSTEM_BUSY || + state == APPLET_SYSTEM_IS_ON_BATTERY + ) _check_updates_action->setEnabled(false); else _check_updates_action->setEnabled(true); @@ -782,7 +789,7 @@ // Check whether system is idle or busy - if (systemIsBusy()) + if (UpdaterSettings::self()->skipCheckSystemBusy() && systemIsBusy()) { slotAppletState(APPLET_SYSTEM_BUSY, 0, 0); @@ -793,6 +800,18 @@ return; } + // Check whether system is on battery + if (UpdaterSettings::self()->skipCheckOnBattery() && systemIsOnBattery()) + { + slotAppletState(APPLET_SYSTEM_IS_ON_BATTERY, 0, 0); + + if (displayProgress) + QTimer::singleShot( 1000 * 60 * 5, this , SLOT(checkUpdatesWithProgress() )); + else + QTimer::singleShot( 1000 * 60 * 5, this , SLOT(checkUpdatesWithoutProgress() )); + return; + } + // Check whether network is avaiable: // If no network is available let ConnectionManager call this @@ -913,7 +932,35 @@ return (loadavg > maxloadavg); } +bool MainWindow::systemIsOnBattery() +{ + return false; // this is a dummy function + // prepared for dcop battery call + // FIXME + bool onBattery = false; + if ( kapp->dcopClient()->isApplicationRegistered( "kded" ) ) + { + QByteArray data, replyData; +// QDataStream arg(data, IO_WriteOnly); +// arg << QString("www.novell.com"); + + QCString replyType; + if ( !kapp->dcopClient()->call( "kded", "powermanagement", "onBattery(QString)", + data, replyType, replyData ) ) + { + kdError() << "DCOP error." << endl; + } + else + { + QDataStream reply(replyData, IO_ReadOnly); + if (replyType == "bool") reply >> onBattery; + else kdDebug() << "DCOP: unexpected return type." << endl; + } + } + + return onBattery; +} #include "MainWindow.moc" Modified: trunk/updater-kde/updater/MainWindow.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.h?rev=8348&r1=8347&r2=8348&view=diff ============================================================================== --- trunk/updater-kde/updater/MainWindow.h (original) +++ trunk/updater-kde/updater/MainWindow.h Wed Jan 23 15:59:28 2008 @@ -322,8 +322,8 @@ int patchCountRestart(bool onlySelected=false); int patchCountSecurity(bool onlySelected=false); - bool systemIsBusy(); + bool systemIsOnBattery(); }; #endif Modified: trunk/updater-kde/updater/TrayIcon.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/TrayIcon.cpp?rev=8348&r1=8347&r2=8348&view=diff ============================================================================== --- trunk/updater-kde/updater/TrayIcon.cpp (original) +++ trunk/updater-kde/updater/TrayIcon.cpp Wed Jan 23 15:59:28 2008 @@ -105,10 +105,7 @@ break; case APPLET_NO_NETWORK: - QToolTip::add(this, i18n("Unable to check whether updates are available.")); - setPixmap(loadIcon(TRAY_ICON_GRAY)); - break; - + case APPLET_SYSTEM_IS_ON_BATTERY: case APPLET_SYSTEM_BUSY: QToolTip::add(this, i18n("Unable to check whether updates are available.")); setPixmap(loadIcon(TRAY_ICON_GRAY)); Modified: trunk/updater-kde/updater/Updater.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/Updater.h?rev=8348&r1=8347&r2=8348&view=diff ============================================================================== --- trunk/updater-kde/updater/Updater.h (original) +++ trunk/updater-kde/updater/Updater.h Wed Jan 23 15:59:28 2008 @@ -57,7 +57,8 @@ APPLET_UNKNOWN, /** Unknown update status: No repositories are known to zypper **/ APPLET_ONLY_OPTIONAL_UPDATES, /** Only optional updates are available (for trayicon) **/ APPLET_NO_NETWORK, /** No Network connection available **/ - APPLET_SYSTEM_BUSY /** System (CPU) is busy**/ + APPLET_SYSTEM_BUSY, /** System (CPU) is busy**/ + APPLET_SYSTEM_IS_ON_BATTERY /** No power supply is connected **/ }; /** Modified: trunk/updater-kde/updater/opensuseupdater_settings.kcfg URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/opensuseupdater_settings.kcfg?rev=8348&r1=8347&r2=8348&view=diff ============================================================================== --- trunk/updater-kde/updater/opensuseupdater_settings.kcfg (original) +++ trunk/updater-kde/updater/opensuseupdater_settings.kcfg Wed Jan 23 15:59:28 2008 @@ -44,6 +44,13 @@ <label>System's maximum load when checking for updates</label> <default>3.0</default> </entry> - + <entry name="SkipCheckSystemBusy" type="Bool"> + <label>Don't check for updates when system is under high load</label> + <default>true</default> + </entry> + <entry name="SkipCheckOnBattery" type="Bool"> + <label>Don't check for updates when system system runs on battery</label> + <default>true</default> + </entry> </group> </kcfg> Modified: trunk/updater-kde/updater/simpleview.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/simpleview.cpp?rev=8348&r1=8347&r2=8348&view=diff ============================================================================== --- trunk/updater-kde/updater/simpleview.cpp (original) +++ trunk/updater-kde/updater/simpleview.cpp Wed Jan 23 15:59:28 2008 @@ -346,6 +346,19 @@ details->hide(); bar->hide(); textBrowser->hide(); + break; + + case APPLET_SYSTEM_IS_ON_BATTERY: + headline->setText(i18n("<b>Unable to check whether updates are available.</b>")); + title->show(); + title->setText(i18n("The system is on battery. Please connect a power supply.")); + recommended->hide(); + norestart->hide(); + install->hide(); + ok->show(); + details->hide(); + bar->hide(); + textBrowser->hide(); break; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org