Mailinglist Archive: zypp-commit (325 mails)

< Previous Next >
[zypp-commit] r7105 - in /trunk/updater-kde: icons/ updater/
  • From: tgoettlicher@xxxxxxxxxxxxxxxx
  • Date: Wed, 05 Sep 2007 09:40:46 -0000
  • Message-id: <20070905094047.1914B250D1@xxxxxxxxxxxxxxxx>
Author: tgoettlicher
Date: Wed Sep  5 11:40:46 2007
New Revision: 7105

URL: http://svn.opensuse.org/viewcvs/zypp?rev=7105&view=rev
Log:
added state no network with gray tray icon

Added:
    trunk/updater-kde/icons/cr16-app-opensuseupdater_gray.png   (with props)
    trunk/updater-kde/icons/cr24-app-opensuseupdater_gray.png   (with props)
    trunk/updater-kde/icons/cr32-app-opensuseupdater_gray.png   (with props)
    trunk/updater-kde/icons/cr48-app-opensuseupdater_gray.png   (with props)
    trunk/updater-kde/icons/opensuseupdater_gray.png   (with props)
Modified:
    trunk/updater-kde/updater/Constants.h
    trunk/updater-kde/updater/MainWindow.cpp
    trunk/updater-kde/updater/TrayIcon.cpp
    trunk/updater-kde/updater/Updater.h
    trunk/updater-kde/updater/simpleview.cpp

Added: trunk/updater-kde/icons/cr16-app-opensuseupdater_gray.png
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/icons/cr16-app-opensuseupdater_gray.png?rev=7105&view=auto
==============================================================================
Binary file - no diff available.

Added: trunk/updater-kde/icons/cr24-app-opensuseupdater_gray.png
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/icons/cr24-app-opensuseupdater_gray.png?rev=7105&view=auto
==============================================================================
Binary file - no diff available.

Added: trunk/updater-kde/icons/cr32-app-opensuseupdater_gray.png
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/icons/cr32-app-opensuseupdater_gray.png?rev=7105&view=auto
==============================================================================
Binary file - no diff available.

Added: trunk/updater-kde/icons/cr48-app-opensuseupdater_gray.png
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/icons/cr48-app-opensuseupdater_gray.png?rev=7105&view=auto
==============================================================================
Binary file - no diff available.

Added: trunk/updater-kde/icons/opensuseupdater_gray.png
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/icons/opensuseupdater_gray.png?rev=7105&view=auto
==============================================================================
Binary file - no diff available.

Modified: trunk/updater-kde/updater/Constants.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/Constants.h?rev=7105&r1=7104&r2=7105&view=diff
==============================================================================
--- trunk/updater-kde/updater/Constants.h (original)
+++ trunk/updater-kde/updater/Constants.h Wed Sep  5 11:40:46 2007
@@ -22,7 +22,7 @@
 
 #define PROGRAM_NAME "opensuseupdater"
 #define PROGRAM_DISPLAY_NAME "openSUSE Updater"
-#define VERSION "0.4"
+#define VERSION "0.6"
 
 #define TRAY_ICON_GREEN "opensuseupdater_green"
 #define TRAY_ICON_RED  "opensuseupdater_red"
@@ -31,6 +31,7 @@
 #define TRAY_ICON_CHECKING "opensuseupdater_busy"
 #define TRAY_ICON_INSTALLING "opensuseupdater_busy"
 #define TRAY_ICON_UNKNOWN "opensuseupdater_unknown"
+#define TRAY_ICON_GRAY "opensuseupdater_gray"
 
 #define PROGRAM_ICON "opensuseupdater"
 

Modified: trunk/updater-kde/updater/MainWindow.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.cpp?rev=7105&r1=7104&r2=7105&view=diff
==============================================================================
--- trunk/updater-kde/updater/MainWindow.cpp (original)
+++ trunk/updater-kde/updater/MainWindow.cpp Wed Sep  5 11:40:46 2007
@@ -376,7 +376,7 @@
        _check_updates_action->setEnabled(true);
        _edit_sources_action->setEnabled(true);
 
-       if ( state == APPLET_CHECKING || state == APPLET_INSTALLING  )
+       if ( state == APPLET_CHECKING || state == APPLET_INSTALLING || state == APPLET_NO_NETWORK )
                _check_updates_action->setEnabled(false);
        else
                _check_updates_action->setEnabled(true);
@@ -734,9 +734,10 @@
        if (ConnectionManager::self()->status() != NetworkStatus::Online &&
            ConnectionManager::self()->status() != NetworkStatus::NoNetworks )
        {
-               ConnectionManager::self()->registerConnectSlot(this,SLOT(checkUpdates(displayProgress)));
+               ConnectionManager::self()->registerConnectSlot(this,SLOT(checkUpdatesWithoutProgress()));
                kdDebug() << "No network available" << endl;
                kdDebug() << "Waiting for network connection..." << endl;
+               slotAppletState(APPLET_NO_NETWORK, 0, 0);
                return;
        }
 

Modified: trunk/updater-kde/updater/TrayIcon.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/TrayIcon.cpp?rev=7105&r1=7104&r2=7105&view=diff
==============================================================================
--- trunk/updater-kde/updater/TrayIcon.cpp (original)
+++ trunk/updater-kde/updater/TrayIcon.cpp Wed Sep  5 11:40:46 2007
@@ -103,6 +103,11 @@
                        setPixmap(loadIcon(TRAY_ICON_GREEN));
                        break;
 
+               case APPLET_NO_NETWORK:
+                       QToolTip::add(this, i18n("Unable to check whether updates are available."));
+                       setPixmap(loadIcon(TRAY_ICON_GRAY));
+                       break;
+
                case APPLET_PKGMGR_UPDATES:
     case APPLET_CRITICAL_UPDATES:
                        QToolTip::add(this, i18n("New software updates are available."));

Modified: trunk/updater-kde/updater/Updater.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/Updater.h?rev=7105&r1=7104&r2=7105&view=diff
==============================================================================
--- trunk/updater-kde/updater/Updater.h (original)
+++ trunk/updater-kde/updater/Updater.h Wed Sep  5 11:40:46 2007
@@ -55,7 +55,8 @@
   APPLET_INSTALLING,    /** installing patches or packages **/
   APPLET_PKGMGR_UPDATES,                /** Updates available that affect the package manager **/
   APPLET_UNKNOWN,       /** Unknown update status: No repositories are known to zypper **/
-  APPLET_ONLY_OPTIONAL_UPDATES          /** Only optional updates are available (for trayicon) **/
+  APPLET_ONLY_OPTIONAL_UPDATES,                 /** Only optional updates are available (for trayicon) **/
+  APPLET_NO_NETWORK             /** No Network connection available **/
 };
 
 /**

Modified: trunk/updater-kde/updater/simpleview.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/simpleview.cpp?rev=7105&r1=7104&r2=7105&view=diff
==============================================================================
--- trunk/updater-kde/updater/simpleview.cpp (original)
+++ trunk/updater-kde/updater/simpleview.cpp Wed Sep  5 11:40:46 2007
@@ -309,6 +309,19 @@
                        textBrowser->hide();
       break;
 
+    case APPLET_NO_NETWORK:
+                       headline->setText(i18n("<b>Unable to check whether updates are available.</b>"));
+                       title->show();
+                       title->setText("");
+                       recommended->hide();
+                       norestart->hide();
+                       install->hide();
+                       ok->show();
+                       details->hide();
+                       bar->hide();
+                       textBrowser->hide();
+      break;
+
   }
 
        updateSelection();

--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages