Author: tgoettlicher
Date: Mon Jul 30 16:11:53 2007
New Revision: 6295
URL: http://svn.opensuse.org/viewcvs/zypp?rev=6295&view=rev
Log:
added recurring notification when updates exist (#292556)
Added:
trunk/updater-kde/po/createPot (with props)
trunk/updater-kde/po/opensuseupdater.pot
Modified:
trunk/updater-kde/opensuse-updater-kde.spec.in
trunk/updater-kde/updater/ConfigWidgetUI.h
trunk/updater-kde/updater/ConfigWidgetUI.ui
trunk/updater-kde/updater/TrayIcon.cpp
trunk/updater-kde/updater/TrayIcon.h
trunk/updater-kde/updater/opensuseupdater_settings.kcfg
Modified: trunk/updater-kde/opensuse-updater-kde.spec.in
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/opensuse-updater-kde.spec.in?rev=6295&r1=6294&r2=6295&view=diff
==============================================================================
--- trunk/updater-kde/opensuse-updater-kde.spec.in (original)
+++ trunk/updater-kde/opensuse-updater-kde.spec.in Mon Jul 30 16:11:53 2007
@@ -20,7 +20,7 @@
URL: http://en.opensuse.org/KDE_Updater_Applet
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
-Requires: zypper >= 0.5.3
+Requires: zypper >= 0.8.4
Obsoletes: opensuse-updater
Conflicts: opensuse-updater
@@ -32,6 +32,7 @@
Narayan Newton
Duncan Mac-Vicar
Martin Vidner
+ Thomas Goettlicher
%prep
%setup -q -n %{name}-%{version}
@@ -88,3 +89,6 @@
- fix build
* Tue Aug 29 2006 - dmacvicar@suse.de
- revision 390
+
+
+
Added: trunk/updater-kde/po/createPot
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/po/createPot?rev=6295&view=auto
==============================================================================
--- trunk/updater-kde/po/createPot (added)
+++ trunk/updater-kde/po/createPot Mon Jul 30 16:11:53 2007
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# search for sourcecode-files
+SRCFILES=`find .. -type d -name testsuite -prune , \
+ -type f -name "*.h" \
+ -o -name "*.pm" \
+ -o -name "*.c" \
+ -o -name "*.cc" \
+ -o -name "*.cpp"`
+echo $SRCFILES
+#calling xgettext with the sourcefiles
+xgettext --no-wrap --add-comments --add-location --keyword=i18n --keyword=_ --keyword=_:1,2 --keyword=__ --keyword=N_ --foreign-user --copyright-holder="SuSE Linux Products GmbH, Nuernberg" --default-domain=libzypp --output=opensuseupdater.pot $SRCFILES
Added: trunk/updater-kde/po/opensuseupdater.pot
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/po/opensuseupdater.pot?rev=6295&view=auto
==============================================================================
--- trunk/updater-kde/po/opensuseupdater.pot (added)
+++ trunk/updater-kde/po/opensuseupdater.pot Mon Jul 30 16:11:53 2007
@@ -0,0 +1,575 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-07-12 19:46-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../kxmlrpcclient/kxmlrpcquery.cpp:131
+msgid "Received invalid XML markup: %1 at %2:%3"
+msgstr ""
+
+#: ../kxmlrpcclient/kxmlrpcquery.cpp:141
+msgid "Unknown type of XML markup received"
+msgstr ""
+
+#: ../udshttp/udshttp.cpp:128
+msgid "There were errors getting data from job"
+msgstr ""
+
+#: ../udshttp/udshttp.cpp:270
+msgid "Timeout on server"
+msgstr ""
+
+#: ../udshttp/udshttp.cpp:285
+msgid "Bad url"
+msgstr ""
+
+#: ../udshttp/udshttp.cpp:392
+msgid "Unauthorized access"
+msgstr ""
+
+#: ../udshttp/udshttp.cpp:395 ../udshttp/udshttp.cpp:397
+msgid "URL Invalid"
+msgstr ""
+
+#: ../udshttp/udshttp.cpp:400
+msgid "Server Error"
+msgstr ""
+
+#: ../udshttp/udshttp.cpp:403
+msgid "Service unavailable"
+msgstr ""
+
+#: ../updater/simpleview.cpp:37 ../updater/simpleview.cpp:183
+msgid "<b>New software for your system is available</b>"
+msgstr ""
+
+#: ../updater/simpleview.cpp:46
+msgid "Choose the updates to be installed:"
+msgstr ""
+
+#: ../updater/simpleview.cpp:48 ../updater/simpleview.cpp:188
+msgid "Install %1 recommeded updates additionally"
+msgstr ""
+
+#: ../updater/simpleview.cpp:49
+msgid "Don't install updates that require a restart"
+msgstr ""
+
+#. -------------------- Buttons ------------------------
+#: ../updater/simpleview.cpp:61
+msgid "Details ..."
+msgstr ""
+
+#: ../updater/simpleview.cpp:65 ../updater/osupdaterpopup.cpp:73
+#: ../updater/MainWindow.cpp:81 ../updater/MainWindow.cpp:207
+msgid "Install"
+msgstr ""
+
+#: ../updater/simpleview.cpp:66
+msgid "Close"
+msgstr ""
+
+#: ../updater/simpleview.cpp:146
+msgid "<b>Checking for updates...</b>"
+msgstr ""
+
+#: ../updater/simpleview.cpp:158
+msgid "<b>Error:</b>"
+msgstr ""
+
+#: ../updater/simpleview.cpp:170
+msgid "<b>No Updates Available</b>"
+msgstr ""
+
+#: ../updater/simpleview.cpp:184
+msgid "%1 security updates are available"
+msgstr ""
+
+#: ../updater/simpleview.cpp:207
+msgid "<b>Updating...</b>"
+msgstr ""
+
+#: ../updater/zypp/ZYppUpdater.cpp:112 ../updater/zypp/ZYppUpdater.cpp:114
+#: ../updater/zypp_traditional/ZYppUpdater.cpp:131
+#: ../updater/zypp_traditional/ZYppUpdater.cpp:133
+msgid ""
+"helper program returned:\n"
+"%1"
+msgstr ""
+
+#: ../updater/zypp/ZYppUpdater.cpp:230
+#: ../updater/zypp_traditional/ZYppUpdater.cpp:233
+msgid "Can't launch zypp-checkpatches-wrapper helper program. Make sure zypper package is installed and working."
+msgstr ""
+
+#: ../updater/zypp/ZYppUpdater.cpp:331
+msgid "Can't launch install helper program. Make sure zypper package is installed and working."
+msgstr ""
+
+#: ../updater/progresspopup.cpp:25
+msgid "<b>Updating ...<b>"
+msgstr ""
+
+#: ../updater/osupdaterpopup.cpp:74
+msgid "Ignore"
+msgstr ""
+
+#: ../updater/osupdaterpopup.cpp:75
+msgid "Details..."
+msgstr ""
+
+#: ../updater/osupdaterpopup.cpp:102
+msgid "1 Patch available"
+msgstr ""
+
+#: ../updater/osupdaterpopup.cpp:105
+msgid "%1 Patches available"
+msgstr ""
+
+#: ../updater/osupdaterpopup.cpp:108
+msgid "1 Package available"
+msgstr ""
+
+#: ../updater/osupdaterpopup.cpp:111
+msgid "%1 Packages available"
+msgstr ""
+
+#: ../updater/osupdaterpopup.cpp:114
+msgid "1 Patch and 1 Package available"
+msgstr ""
+
+#: ../updater/osupdaterpopup.cpp:117
+msgid "%1 Patches and 1 Package available"
+msgstr ""
+
+#: ../updater/osupdaterpopup.cpp:120
+msgid "1 Patch and %1 Packages available"
+msgstr ""
+
+#: ../updater/osupdaterpopup.cpp:123
+msgid "%1 Patches and %2 Packages available"
+msgstr ""
+
+#: ../updater/MainWindow.cpp:78 ../updater/MainWindow.cpp:204
+msgid "Add/Remove Update Sources..."
+msgstr ""
+
+#: ../updater/MainWindow.cpp:79
+msgid "Configure Applet..."
+msgstr ""
+
+#: ../updater/MainWindow.cpp:80
+msgid "Check Now"
+msgstr ""
+
+#: ../updater/MainWindow.cpp:120
+msgid "<b>Available Updates:</b><br> The following are software upgrades and patches to add features and fix bugs.<br>"
+msgstr ""
+
+#: ../updater/MainWindow.cpp:129
+msgid "The following are software patches to fix bugs."
+msgstr ""
+
+#: ../updater/MainWindow.cpp:131 ../updater/MainWindow.cpp:169
+msgid "Name"
+msgstr ""
+
+#: ../updater/MainWindow.cpp:133 ../updater/MainWindow.cpp:171
+msgid "Summary"
+msgstr ""
+
+#: ../updater/MainWindow.cpp:134 ../updater/MainWindow.cpp:172
+msgid "Type"
+msgstr ""
+
+#: ../updater/MainWindow.cpp:135 ../updater/MainWindow.cpp:173
+msgid "New Version"
+msgstr ""
+
+#: ../updater/MainWindow.cpp:136 ../updater/MainWindow.cpp:174
+msgid "Catalog"
+msgstr ""
+
+#: ../updater/MainWindow.cpp:137 ../updater/MainWindow.cpp:175
+msgid "Size"
+msgstr ""
+
+#: ../updater/MainWindow.cpp:138 ../updater/MainWindow.cpp:176
+msgid "Restart"
+msgstr ""
+
+#: ../updater/MainWindow.cpp:143 ../updater/MainWindow.cpp:384
+msgid "Patches"
+msgstr ""
+
+#: ../updater/MainWindow.cpp:148
+msgid "Select All Patches"
+msgstr ""
+
+#: ../updater/MainWindow.cpp:149
+msgid "Clear Patch Selection"
+msgstr ""
+
+#: ../updater/MainWindow.cpp:167
+msgid "<b>For experts only!</b><br>The following are software upgrades to add features."
+msgstr ""
+
+#: ../updater/MainWindow.cpp:185
+msgid "Select All Packages"
+msgstr ""
+
+#: ../updater/MainWindow.cpp:186
+msgid "Clear Package Selection"
+msgstr ""
+
+#: ../updater/MainWindow.cpp:193 ../updater/MainWindow.cpp:385
+msgid "Upgrades"
+msgstr ""
+
+#: ../updater/MainWindow.cpp:242
+msgid "Available Updates"
+msgstr ""
+
+#: ../updater/MainWindow.cpp:460
+msgid "Settings"
+msgstr ""
+
+#: ../updater/zmd/ZmdUpdater.cpp:153
+msgid "Hold Back Package"
+msgstr ""
+
+#: ../updater/zmd/ZmdUpdater.cpp:157
+msgid "Don't Hold Back Package"
+msgstr ""
+
+#: ../updater/zmd/ZmdUpdater.cpp:372
+msgid "Update"
+msgstr ""
+
+#: ../updater/zmd/ZmdUpdater.cpp:410
+#: ../updater/zypp_traditional/ZYppUpdater.cpp:165
+msgid "Patch"
+msgstr ""
+
+#: ../updater/zmd/ZmdUpdater.cpp:457 ../updater/zmd/ZmdUpdater.cpp:471
+msgid "Description: "
+msgstr ""
+
+#: ../updater/zmd/ZmdUpdater.cpp:459
+msgid "<b>Upgrading from old version:</b> "
+msgstr ""
+
+#: ../updater/zmd/ZmdUpdater.cpp:470
+msgid "Patch Category: "
+msgstr ""
+
+#: ../updater/zmd/ZmdUpdater.cpp:473
+msgid "<b>Upgrading to version:</b> "
+msgstr ""
+
+#: ../updater/zmd/ZmdUpdater.cpp:477
+msgid "<b>Reboot Required</b>"
+msgstr ""
+
+#: ../updater/zmd/ZmdUpdater.cpp:482
+msgid "<b>ZMD Restart Required</b>"
+msgstr ""
+
+#: ../updater/zmd/ZmdEditServers.cpp:53 ../updater/zmd/ZmdServerDialog.cpp:124
+msgid "Add Server"
+msgstr ""
+
+#: ../updater/zmd/ZmdEditServers.cpp:54
+msgid "Remove Server"
+msgstr ""
+
+#: ../updater/zmd/ZmdEditServers.cpp:56
+msgid "Services/Catalogs"
+msgstr ""
+
+#. Tell the user what is going on
+#: ../updater/zmd/ZmdEditServers.cpp:99
+msgid "Fetching service list..."
+msgstr ""
+
+#: ../updater/zmd/ZmdEditServers.cpp:141
+msgid "Fetching Catalogs For Service..."
+msgstr ""
+
+#. Tell the user what is going on, this takes a long long time
+#: ../updater/zmd/ZmdEditServers.cpp:218
+msgid "Adding server.."
+msgstr ""
+
+#: ../updater/zmd/ZmdEditServers.cpp:219
+msgid ""
+"We are adding a server to the updater, this may take a long time. \n"
+"Please be patient"
+msgstr ""
+
+#. We don't say you need to have a type, because the groupbox takes care of that
+#: ../updater/zmd/ZmdEditServers.cpp:231
+msgid "You need to specify a name and URL to add a server"
+msgstr ""
+
+#: ../updater/zmd/ZmdEditServers.cpp:248
+msgid "Invalid server: "
+msgstr ""
+
+#: ../updater/zmd/ZmdEditServers.cpp:251
+msgid "The type you specified for the server is invalid:"
+msgstr ""
+
+#: ../updater/zmd/ZmdEditServers.cpp:254
+msgid "Sorry, the server could not be added: "
+msgstr ""
+
+#: ../updater/zmd/ZmdEditServers.cpp:281
+msgid "Service Removed"
+msgstr ""
+
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:75
+msgid "To use this part of the updater, rug must be in your path"
+msgstr ""
+
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:85
+msgid "Connection Options"
+msgstr ""
+
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:88
+msgid "ZMD Is Listening on: "
+msgstr ""
+
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:92
+msgid "ZMD TCP Support: "
+msgstr ""
+
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:95
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:147
+msgid "On"
+msgstr ""
+
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:96
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:148
+msgid "Off"
+msgstr ""
+
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:103
+msgid "Security Options"
+msgstr ""
+
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:106
+msgid "Require GPG Certificates For Servers: "
+msgstr ""
+
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:109
+msgid "Yes"
+msgstr ""
+
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:110
+msgid "No"
+msgstr ""
+
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:116
+msgid "Security Level: "
+msgstr ""
+
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:121
+msgid "Proxy Options"
+msgstr ""
+
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:124
+msgid "Proxy Server:"
+msgstr ""
+
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:128
+msgid "User Name:"
+msgstr ""
+
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:132
+msgid "Password:"
+msgstr ""
+
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:137
+msgid "Other Options"
+msgstr ""
+
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:140
+msgid "ZMD Logging Level: "
+msgstr ""
+
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:144
+msgid "Rollback Support: "
+msgstr ""
+
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:154
+msgid "Max Simultaneous Downloads"
+msgstr ""
+
+#: ../updater/zmd/ZmdAdvancedConfig.cpp:356
+msgid "Rug must be installed to configure ZMD, is it in your path?"
+msgstr ""
+
+#: ../updater/zmd/ZmdServerDialog.cpp:80
+msgid "Please enter server name below"
+msgstr ""
+
+#: ../updater/zmd/ZmdServerDialog.cpp:81
+msgid "Please enter server URL below"
+msgstr ""
+
+#: ../updater/zmd/ZmdServerDialog.cpp:84
+msgid "Server Type"
+msgstr ""
+
+#: ../updater/zmd/ZmdServerDialog.cpp:89
+msgid "NU Server"
+msgstr ""
+
+#: ../updater/zmd/ZmdServerDialog.cpp:90
+msgid "RCE Server"
+msgstr ""
+
+#: ../updater/zmd/ZmdConfigWindow.cpp:62 ../updater/zmd/ZmdConfigWindow.cpp:77
+msgid "Add/Remove Servers"
+msgstr ""
+
+#: ../updater/zmd/ZmdConfigWindow.cpp:63
+msgid "Advanced Options"
+msgstr ""
+
+#: ../updater/zmd/ZmdConfigWindow.cpp:65 ../updater/zmd/ZmdConfigWindow.cpp:88
+msgid "<b>Add/Remove Package Servers:</b><br> You may add or remove update servers below or change your software catalog subscriptions.<br> <u>Make whatever changes you wish and press close.</u>"
+msgstr ""
+
+#: ../updater/zmd/ZmdConfigWindow.cpp:92
+msgid "<b>Configure ZMD:</b><br>The following are advanced options for ZMD. Only change these if you know what you are doing.<br><u>Be aware, disabling TCP support will disable this updater</u>"
+msgstr ""
+
+#: ../updater/zmd/ZmdInstallWindow.cpp:73
+msgid "<b>Installing updates and patches:</b><br> Below is a description of the transaction and its progress.<br>"
+msgstr ""
+
+#. we can't yet abort an upgrade
+#: ../updater/zmd/ZmdInstallWindow.cpp:77
+msgid "Abort Upgrade"
+msgstr ""
+
+#: ../updater/zmd/ZmdInstallWindow.cpp:90
+msgid "Installing Packages..."
+msgstr ""
+
+#: ../updater/zmd/ZmdInstallWindow.cpp:117
+msgid "The following packages will be installed:\n"
+msgstr ""
+
+#: ../updater/zmd/ZmdInstallWindow.cpp:126
+msgid "The following packages will be updated:\n"
+msgstr ""
+
+#: ../updater/zmd/ZmdInstallWindow.cpp:135
+msgid ""
+"\n"
+"The following packages must also be removed:\n"
+msgstr ""
+
+#: ../updater/zmd/ZmdInstallWindow.cpp:142
+msgid "Transaction Summary"
+msgstr ""
+
+#: ../updater/zmd/ZmdInstallWindow.cpp:161
+msgid ""
+"\n"
+"We are currently unable to show the progress for the download. This is caused by a bug in ZMD, which should be fixed soon. We apologize for any inconvenience this may cause."
+msgstr ""
+
+#: ../updater/zmd/ZmdInstallWindow.cpp:161
+msgid ""
+"\n"
+"Packages Are Downloading..."
+msgstr ""
+
+#. if this is the first time we are watching a package
+#: ../updater/zmd/ZmdInstallWindow.cpp:172
+msgid "Packages Are Downloading..."
+msgstr ""
+
+#. we have just started the transaction, download is now done
+#: ../updater/zmd/ZmdInstallWindow.cpp:179
+#: ../updater/zmd/ZmdInstallWindow.cpp:199
+msgid "Done"
+msgstr ""
+
+#. This should never run
+#: ../updater/zmd/ZmdInstallWindow.cpp:186
+msgid "Download failed: "
+msgstr ""
+
+#. if we are not already watching a package and the transaction is running
+#: ../updater/zmd/ZmdInstallWindow.cpp:209
+msgid "Packages Are Being Installed..."
+msgstr ""
+
+#. if the transaction is done and we have not already marked it done
+#: ../updater/zmd/ZmdInstallWindow.cpp:215
+msgid " Done."
+msgstr ""
+
+#: ../updater/zmd/ZmdInstallWindow.cpp:231
+msgid "Sorry, we couldn't resolve the dependencies for this update:\n"
+msgstr ""
+
+#: ../updater/zmd/ZmdInstallWindow.cpp:235
+msgid "Upgrade Failed: "
+msgstr ""
+
+#: ../updater/zmd/ZmdInstallWindow.cpp:239
+msgid "Done!"
+msgstr ""
+
+#: ../updater/zmd/ZmdInstallWindow.cpp:278
+msgid "Resolving Dependencies..."
+msgstr ""
+
+#: ../updater/UpdaterApplication.cpp:82
+msgid ""
+"Backend plugin is not properly configured.\n"
+"Please use the configuration dialog to choose the correct one."
+msgstr ""
+
+#: ../updater/zypp_traditional/ZYppUpdater.cpp:165
+msgid "Security"
+msgstr ""
+
+#: ../updater/TrayIcon.cpp:50 ../updater/TrayIcon.cpp:90
+msgid "New software for your system is available"
+msgstr ""
+
+#: ../updater/TrayIcon.cpp:72
+msgid "Checking for updates..."
+msgstr ""
+
+#: ../updater/TrayIcon.cpp:77
+msgid "Error:\n"
+msgstr ""
+
+#: ../updater/TrayIcon.cpp:82
+msgid "No Updates Available"
+msgstr ""
+
+#: ../updater/TrayIcon.cpp:125
+msgid "Updating..."
+msgstr ""
Modified: trunk/updater-kde/updater/ConfigWidgetUI.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/ConfigWidgetUI.h?rev=6295&r1=6294&r2=6295&view=diff
==============================================================================
--- trunk/updater-kde/updater/ConfigWidgetUI.h (original)
+++ trunk/updater-kde/updater/ConfigWidgetUI.h Mon Jul 30 16:11:53 2007
@@ -21,6 +21,7 @@
class QCheckBox;
class QLabel;
class QFrame;
+class QComboBox;
class ConfigWidgetUI : public QWidget
{
@@ -35,6 +36,7 @@
QCheckBox* kcfg_ShowPackages;
QLabel* textLabel2;
QFrame* BackendFrame;
+ QSpinBox* kcfg_WarnInterval;
protected:
QVBoxLayout* ConfigWidgetUILayout;
Modified: trunk/updater-kde/updater/ConfigWidgetUI.ui
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/ConfigWidgetUI.ui?rev=6295&r1=6294&r2=6295&view=diff
==============================================================================
--- trunk/updater-kde/updater/ConfigWidgetUI.ui (original)
+++ trunk/updater-kde/updater/ConfigWidgetUI.ui Mon Jul 30 16:11:53 2007
@@ -36,6 +36,20 @@
</property>
</widget>
+ <widget class="QSpinBox">
+ <property name="name">
+ <cstring>kcfg_WarnInterval</cstring>
+ </property>
+ <property name="prefix">
+ <string>Show recurring notification every </string>
+ </property>
+ <property name="suffix">
+ <string> Minutes when updates are available</string>
+ </property>
+ <property name="minValue">
+ <number>0</number>
+ </property>
+ </widget>
<widget class="QCheckBox">
<property name="name">
<cstring>kcfg_Autostart</cstring>
Modified: trunk/updater-kde/updater/TrayIcon.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/TrayIcon.cpp?rev=6295&r1=6294&r2=6295&view=diff
==============================================================================
--- trunk/updater-kde/updater/TrayIcon.cpp (original)
+++ trunk/updater-kde/updater/TrayIcon.cpp Mon Jul 30 16:11:53 2007
@@ -23,11 +23,14 @@
#include
#include
#include
+#include
#include
#include "TrayIcon.h"
#include "Updater.h"
+#include "opensuseupdater_settings.h"
+
TrayIcon::TrayIcon(QWidget *parent) : KSystemTray(parent),
patchCount(0),
@@ -85,8 +88,7 @@
case APPLET_UPDATES:
case APPLET_CRITICAL_UPDATES:
setPixmap(loadIcon(TRAY_ICON_YELLOW));
- QToolTip::add(this, i18n("New software for your system is available"));
- popup->show();
+ showPopup();
break;
case APPLET_INSTALLING:
@@ -97,6 +99,22 @@
}
}
+void TrayIcon::showPopup()
+{
+ if ( appletState == APPLET_UPDATES ||
+ appletState == APPLET_CRITICAL_UPDATES )
+ {
+ QToolTip::add(this, i18n("New software for your system is available"));
+ popup->show();
+
+ int warnInterval = UpdaterSettings::self()->warnInterval() * 60 * 1000; // convert minutes to ms
+
+ if (warnInterval > 0 )
+ QTimer::singleShot( warnInterval, this , SLOT(showPopup() ));
+ }
+}
+
+
void TrayIcon::setUpdates(int patches, int packages)
{
if (patches >= 0)
Modified: trunk/updater-kde/updater/TrayIcon.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/TrayIcon.h?rev=6295&r1=6294&r2=6295&view=diff
==============================================================================
--- trunk/updater-kde/updater/TrayIcon.h (original)
+++ trunk/updater-kde/updater/TrayIcon.h Mon Jul 30 16:11:53 2007
@@ -50,6 +50,7 @@
private slots:
void popupClicked();
+ void showPopup();
private:
Modified: trunk/updater-kde/updater/opensuseupdater_settings.kcfg
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/opensuseupdater_settings.kcfg?rev=6295&r1=6294&r2=6295&view=diff
==============================================================================
--- trunk/updater-kde/updater/opensuseupdater_settings.kcfg (original)
+++ trunk/updater-kde/updater/opensuseupdater_settings.kcfg Mon Jul 30 16:11:53 2007
@@ -7,6 +7,10 @@
<label>How often to check for updates.</label>
<default>24</default>
</entry>
+ <entry name="WarnInterval" type="Int">
+ <label>How otfen show recurring warning when updates are available.</label>
+ <default>15</default>
+ </entry> -->
<entry name="Autostart" type="Bool">
<label>Automatically start the applet on login</label>
<default>true</default>
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org