[zypp-commit] r6567 - in /trunk/updater-kde: po/opensuseupdater.pot updater/MainWindow.cpp updater/simpleview.cpp updater/simpleview.h

Author: tgoettlicher Date: Fri Aug 10 14:04:44 2007 New Revision: 6567 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6567&view=rev Log: - fix tracker for problems of popup-dialog: button order (#297588) - fix problematic representation when only optional updates are available (#298946) Modified: trunk/updater-kde/po/opensuseupdater.pot trunk/updater-kde/updater/MainWindow.cpp trunk/updater-kde/updater/simpleview.cpp trunk/updater-kde/updater/simpleview.h Modified: trunk/updater-kde/po/opensuseupdater.pot URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/po/opensuseupdater.pot?rev=6567&r1=6566&r2=6567&view=diff ============================================================================== --- trunk/updater-kde/po/opensuseupdater.pot (original) +++ trunk/updater-kde/po/opensuseupdater.pot Fri Aug 10 14:04:44 2007 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-08-10 09:08+0200\n" +"POT-Creation-Date: 2007-08-10 12:11+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,77 +18,77 @@ #. i18n: file ../updater/ConfigWidgetUI.ui line 16 #: ../po/rc.cpp:3 ../po/rc.cpp:48 ../po/rc.cpp:93 ../po/rc.cpp:138 -#: ../po/rc.cpp:183 +#: ../po/rc.cpp:183 ../po/rc.cpp:228 #, no-c-format msgid "Form1" msgstr "" #. i18n: file ../updater/ConfigWidgetUI.ui line 29 #: ../po/rc.cpp:6 ../po/rc.cpp:51 ../po/rc.cpp:96 ../po/rc.cpp:141 -#: ../po/rc.cpp:186 +#: ../po/rc.cpp:186 ../po/rc.cpp:231 #, no-c-format msgid "Check For Updates Every " msgstr "" #. i18n: file ../updater/ConfigWidgetUI.ui line 32 #: ../po/rc.cpp:9 ../po/rc.cpp:54 ../po/rc.cpp:99 ../po/rc.cpp:144 -#: ../po/rc.cpp:189 +#: ../po/rc.cpp:189 ../po/rc.cpp:234 #, no-c-format msgid " Hours" msgstr "" #. i18n: file ../updater/ConfigWidgetUI.ui line 44 #: ../po/rc.cpp:12 ../po/rc.cpp:57 ../po/rc.cpp:102 ../po/rc.cpp:147 -#: ../po/rc.cpp:192 +#: ../po/rc.cpp:192 ../po/rc.cpp:237 #, no-c-format msgid "Show recurring notification every " msgstr "" #. i18n: file ../updater/ConfigWidgetUI.ui line 47 #: ../po/rc.cpp:15 ../po/rc.cpp:60 ../po/rc.cpp:105 ../po/rc.cpp:150 -#: ../po/rc.cpp:195 +#: ../po/rc.cpp:195 ../po/rc.cpp:240 #, no-c-format msgid " Minutes when updates are available" msgstr "" #. i18n: file ../updater/ConfigWidgetUI.ui line 58 #: ../po/rc.cpp:18 ../po/rc.cpp:63 ../po/rc.cpp:108 ../po/rc.cpp:153 -#: ../po/rc.cpp:198 +#: ../po/rc.cpp:198 ../po/rc.cpp:243 #, no-c-format msgid "Automa&tically start updater on login" msgstr "" #. i18n: file ../updater/ConfigWidgetUI.ui line 61 #: ../po/rc.cpp:21 ../po/rc.cpp:66 ../po/rc.cpp:111 ../po/rc.cpp:156 -#: ../po/rc.cpp:201 +#: ../po/rc.cpp:201 ../po/rc.cpp:246 #, no-c-format msgid "Alt+T" msgstr "" #. i18n: file ../updater/ConfigWidgetUI.ui line 70 #: ../po/rc.cpp:24 ../po/rc.cpp:69 ../po/rc.cpp:114 ../po/rc.cpp:159 -#: ../po/rc.cpp:204 +#: ../po/rc.cpp:204 ../po/rc.cpp:249 #, no-c-format msgid "Show available upgrades when backend provides them (for experts only)" msgstr "" #. i18n: file ../updater/ConfigWidgetUI.ui line 73 #: ../po/rc.cpp:27 ../po/rc.cpp:72 ../po/rc.cpp:117 ../po/rc.cpp:162 -#: ../po/rc.cpp:207 +#: ../po/rc.cpp:207 ../po/rc.cpp:252 #, no-c-format msgid "Alt+U" msgstr "" #. i18n: file ../updater/ConfigWidgetUI.ui line 87 #: ../po/rc.cpp:30 ../po/rc.cpp:75 ../po/rc.cpp:120 ../po/rc.cpp:165 -#: ../po/rc.cpp:210 +#: ../po/rc.cpp:210 ../po/rc.cpp:255 #, no-c-format msgid "Backend:" msgstr "" #. i18n: file ../updater/opensuseupdater_settings.kcfg line 7 #: ../po/rc.cpp:33 ../po/rc.cpp:78 ../po/rc.cpp:123 ../po/rc.cpp:168 -#: ../po/rc.cpp:213 +#: ../po/rc.cpp:213 ../po/rc.cpp:258 #, no-c-format msgid "How often to check for updates." msgstr "" @@ -101,33 +101,34 @@ #. i18n: file ../updater/opensuseupdater_settings.kcfg line 15 #: ../po/rc.cpp:39 ../po/rc.cpp:84 ../po/rc.cpp:129 ../po/rc.cpp:174 -#: ../po/rc.cpp:219 +#: ../po/rc.cpp:219 ../po/rc.cpp:264 #, no-c-format msgid "Automatically start the applet on login" msgstr "" #. i18n: file ../updater/opensuseupdater_settings.kcfg line 19 #: ../po/rc.cpp:42 ../po/rc.cpp:87 ../po/rc.cpp:132 ../po/rc.cpp:177 -#: ../po/rc.cpp:222 +#: ../po/rc.cpp:222 ../po/rc.cpp:267 #, no-c-format msgid "The backend for connecting to package database." msgstr "" #. i18n: file ../updater/opensuseupdater_settings.kcfg line 22 #: ../po/rc.cpp:45 ../po/rc.cpp:90 ../po/rc.cpp:135 ../po/rc.cpp:180 -#: ../po/rc.cpp:225 +#: ../po/rc.cpp:225 ../po/rc.cpp:270 #, no-c-format msgid "Show available upgrades (for experts only)." msgstr "" #. i18n: file ../updater/opensuseupdater_settings.kcfg line 11 #: ../po/rc.cpp:81 ../po/rc.cpp:126 ../po/rc.cpp:171 ../po/rc.cpp:216 +#: ../po/rc.cpp:261 #, no-c-format msgid "How often show recurring warning when updates are available." msgstr "" -#: ../updater/simpleview.cpp:39 ../updater/simpleview.cpp:201 -#: ../updater/simpleview.cpp:219 +#: ../updater/simpleview.cpp:39 ../updater/simpleview.cpp:196 +#: ../updater/simpleview.cpp:213 msgid "<b>New software for your system is available</b>" msgstr "" @@ -136,16 +137,22 @@ msgstr "" #: ../updater/simpleview.cpp:50 ../updater/simpleview.cpp:52 -#: ../updater/simpleview.cpp:226 +#: ../updater/simpleview.cpp:220 msgid "Install %1 recommended updates additionally" msgstr "" #: ../updater/simpleview.cpp:53 +msgid "" +"%1 optional updates are available.\n" +"You can select optional updates in the detailed dialog." +msgstr "" + +#: ../updater/simpleview.cpp:54 msgid "Don't install updates that require a restart" msgstr "" #. -------------------- Buttons ------------------------ -#: ../updater/simpleview.cpp:66 +#: ../updater/simpleview.cpp:67 msgid "Details" msgstr "" @@ -158,39 +165,39 @@ msgid "Close" msgstr "" -#: ../updater/simpleview.cpp:162 +#: ../updater/simpleview.cpp:160 msgid "<b>Checking for updates...</b>" msgstr "" -#: ../updater/simpleview.cpp:175 +#: ../updater/simpleview.cpp:172 msgid "<b>Error:</b>" msgstr "" -#: ../updater/simpleview.cpp:188 +#: ../updater/simpleview.cpp:184 msgid "<b>No Updates Available</b>" msgstr "" -#: ../updater/simpleview.cpp:202 +#: ../updater/simpleview.cpp:197 msgid "Updates that affect your updater itself are available." msgstr "" -#: ../updater/simpleview.cpp:220 +#: ../updater/simpleview.cpp:214 msgid "%1 security updates are available" msgstr "" -#: ../updater/simpleview.cpp:232 +#: ../updater/simpleview.cpp:226 msgid "%1 recommended updates are available" msgstr "" -#: ../updater/simpleview.cpp:261 +#: ../updater/simpleview.cpp:254 msgid "<b>Updating...</b>" msgstr "" -#: ../updater/simpleview.cpp:273 +#: ../updater/simpleview.cpp:265 msgid "<b>Unable to check whether updates are available.</b>" msgstr "" -#: ../updater/simpleview.cpp:274 +#: ../updater/simpleview.cpp:266 msgid "" "Please use \"Add/Remove Update Sources...\"\n" "from the tray icon menu to define a update repository." Modified: trunk/updater-kde/updater/MainWindow.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.cpp?rev=6567&r1=6566&r2=6567&view=diff ============================================================================== --- trunk/updater-kde/updater/MainWindow.cpp (original) +++ trunk/updater-kde/updater/MainWindow.cpp Fri Aug 10 14:04:44 2007 @@ -331,6 +331,7 @@ applet->setState(APPLET_PROBLEM, desc); _simple->setRecommendedCount(0); + _simple->setTotalCount(0); _simple->setSecurityCount(0); _simple->setState(APPLET_PROBLEM, desc); } @@ -343,6 +344,7 @@ applet->setState(APPLET_PROBLEM, desc); _simple->setRecommendedCount(0); + _simple->setTotalCount(0); _simple->setSecurityCount(0); _simple->setState(APPLET_PROBLEM, desc); @@ -357,6 +359,11 @@ applet->setState(state); applet->setUpdates(patches, packages); + if (_caps.canProvidePackages && UpdaterSettings::self()->showPackages()) + _simple->setTotalCount(patches + packages); + else + _simple->setTotalCount(patches); + _simple->setRecommendedCount(patchCountRecommended()); _simple->setSecurityCount(patchCountSecurity()); _simple->setRestartCount(patchCountRestart()); Modified: trunk/updater-kde/updater/simpleview.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/simpleview.cpp?rev=6567&r1=6566&r2=6567&view=diff ============================================================================== --- trunk/updater-kde/updater/simpleview.cpp (original) +++ trunk/updater-kde/updater/simpleview.cpp Fri Aug 10 14:04:44 2007 @@ -48,8 +48,8 @@ title->setText(i18n("Choose the updates to be installed:")); recommended = new QCheckBox(i18n("Install %1 recommended updates additionally").arg(0), centralWidget); - recommended2 = new QLabel(centralWidget); - recommended2->setText(i18n("Install %1 recommended updates additionally").arg(0)); + additionalText = new QLabel(centralWidget); + additionalText->setText(i18n("Install %1 recommended updates additionally").arg(0)); norestart = new QCheckBox(i18n("Don't install updates that require a restart"), centralWidget); bar = new QProgressBar(centralWidget); @@ -57,14 +57,13 @@ layout->addMultiCellWidget(title,1,1,1,3); layout->addMultiCellWidget(recommended,3,3,1,3); - layout->addMultiCellWidget(recommended2,3,3,1,3); + layout->addMultiCellWidget(additionalText,3,3,1,3); layout->addMultiCellWidget(bar,3,3,1,3); layout->addMultiCellWidget(norestart,5,5,1,3); // -------------------- Buttons ------------------------ details = new KPushButton(i18n("Details"),centralWidget); - cancel = new KPushButton(KStdGuiItem::cancel(), centralWidget); install = new KPushButton(KStdGuiItem::ok(), centralWidget); ok = new KPushButton(KStdGuiItem::ok(), centralWidget); install->setText(i18n("Install")); @@ -74,15 +73,13 @@ // -------------------------- layout ----------------------- layout->addWidget(details,6,0); - layout->addWidget(cancel,6,2); - layout->addWidget(install,6,3); - layout->addWidget(ok,6,1); + layout->addWidget(install,6,2); + layout->addWidget(ok,6,3); // -------------------------- connect ----------------------- connect(details, SIGNAL(clicked()), this, SLOT(slotDetailsButtonClicked())); connect(install, SIGNAL(clicked()), this, SLOT(slotStartInstall())); - connect(cancel, SIGNAL(clicked()), this, SLOT(hide())); connect(ok, SIGNAL(clicked()), this, SLOT(hide())); connect(recommended, SIGNAL(clicked()), this, SLOT(updateSelection())); @@ -162,12 +159,11 @@ headline->setText(i18n("<b>Checking for updates...</b>")); title->setText(""); recommended->hide(); - recommended2->hide(); + additionalText->hide(); norestart->hide(); install->hide(); ok->show(); details->hide(); - cancel->hide(); bar->hide(); break; @@ -175,12 +171,11 @@ headline->setText(i18n("<b>Error:</b>")); title->setText(i18n(description)); recommended->hide(); - recommended2->hide(); + additionalText->hide(); norestart->hide(); install->hide(); ok->show(); details->hide(); - cancel->hide(); bar->hide(); break; @@ -188,12 +183,11 @@ headline->setText(i18n("<b>No Updates Available</b>")); title->setText(""); recommended->hide(); - recommended2->hide(); + additionalText->hide(); norestart->hide(); install->hide(); ok->show(); details->hide(); - cancel->hide(); bar->hide(); break; @@ -202,15 +196,14 @@ title->setText(i18n("Updates that affect your updater itself are available.")); recommended->hide(); - recommended2->hide(); + additionalText->hide(); recommended->setDown(true); securityCount=999; norestart->hide(); install->show(); - ok->hide(); details->hide(); - cancel->show(); + ok->show(); bar->hide(); break; @@ -225,36 +218,42 @@ { recommended->setText(i18n("Install %1 recommended updates additionally").arg(recommendedCount)); recommended->show(); - recommended2->hide(); + additionalText->hide(); } else { - recommended2->setText(i18n("%1 recommended updates are available").arg(recommendedCount)); - recommended2->show(); + additionalText->setText(i18n("%1 recommended updates are available").arg(recommendedCount)); + additionalText->show(); recommended->hide(); } } else { recommended->hide(); - recommended2->hide(); + additionalText->hide(); } - - + install->show(); + install->setEnabled(true); + details->show(); + ok->show(); + bar->hide(); if (restartCount > 0) norestart->show(); else norestart->hide(); - install->show(); - ok->hide(); - details->show(); - cancel->show(); - bar->hide(); + + if(securityCount == 0 && recommendedCount == 0 ) + { + install->setEnabled(false); + title->setText(i18n("%1 optional updates are available.\nYou can select optional updates in the detailed dialog.").arg(totalCount)); +// additionalText->show(); + } + break; case APPLET_INSTALLING: @@ -265,7 +264,6 @@ install->hide(); ok->show(); details->hide(); - cancel->hide(); bar->show(); break; @@ -277,7 +275,6 @@ install->hide(); ok->show(); details->hide(); - cancel->hide(); bar->hide(); break; @@ -287,6 +284,11 @@ adjustSize(); } +void SimpleView::setTotalCount(int count) +{ + totalCount=count; +} + void SimpleView::setRecommendedCount(int count) { recommendedCount=count; Modified: trunk/updater-kde/updater/simpleview.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/simpleview.h?rev=6567&r1=6566&r2=6567&view=diff ============================================================================== --- trunk/updater-kde/updater/simpleview.h (original) +++ trunk/updater-kde/updater/simpleview.h Fri Aug 10 14:04:44 2007 @@ -21,25 +21,26 @@ private: QLabel *title; QCheckBox *recommended; - QLabel *recommended2; + QLabel *additionalText; QCheckBox *norestart; void showEvent(QShowEvent *); MainWindow *_detailWindow; QLabel *headline; KPushButton *install; KPushButton *details; - KPushButton *cancel; KPushButton *ok; QProgressBar *bar; int recommendedCount; int securityCount; int restartCount; + int totalCount; public slots: void setState(int state, const QString &description = QString() ); void setRecommendedCount(int count); + void setTotalCount(int count); void setSecurityCount(int count); void setRestartCount(int count); void setProgress(int step); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org