[ros-diffs] [janderwald] 36290: - Use updated icons - Only load Taskbar Notifications once

Author: janderwald
Date: Wed Sep 17 11:53:05 2008
New Revision: 36290

URL: http://svn.reactos.org/svn/reactos?rev=36290&view=rev
Log:
- Use updated icons
- Only load Taskbar Notifications once

Added:
    trunk/reactos/dll/win32/netshell/res/neterror.ico   (with props)
    trunk/reactos/dll/win32/netshell/res/netidle.ico   (with props)
    trunk/reactos/dll/win32/netshell/res/netoff.ico   (with props)
    trunk/reactos/dll/win32/netshell/res/netrec.ico   (with props)
    trunk/reactos/dll/win32/netshell/res/nettrans.ico   (with props)
    trunk/reactos/dll/win32/netshell/res/nettrrec.ico   (with props)
Removed:
    trunk/reactos/dll/win32/netshell/res/network-error.png
    trunk/reactos/dll/win32/netshell/res/network-idle.png
    trunk/reactos/dll/win32/netshell/res/network-offline.png
    trunk/reactos/dll/win32/netshell/res/network-receive.png
    trunk/reactos/dll/win32/netshell/res/network-transmit-receive.png
    trunk/reactos/dll/win32/netshell/res/network-transmit.png
Modified:
    trunk/reactos/dll/win32/netshell/lanstatusui.c
    trunk/reactos/dll/win32/netshell/netshell.rc
    trunk/reactos/dll/win32/netshell/resource.h

Modified: trunk/reactos/dll/win32/netshell/lanstatusui.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanstat…
==============================================================================
--- trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] Wed Sep 17 11:53:05 2008
@@ -315,6 +315,9 @@
     ULONG Index;
     NOTIFICATION_ITEM * pItem, *pLast = NULL;
 
+    if (This->pHead)
+        return S_OK;
+
     /* get an instance to of IConnectionManager */
     hr = INetConnectionManager_Constructor(NULL, &IID_INetConnectionManager,
(LPVOID*)&INetConMan);
     if (FAILED(hr))
@@ -348,7 +351,7 @@
                 nid.u.uVersion = 3;
                 nid.uCallbackMessage = WM_SHOWSTATUSDLG;
                 nid.hWnd = hwndDlg;
-                nid.hIcon = LoadIcon(netshell_hInstance,
MAKEINTRESOURCE(IDI_SHELL_NETWORK_FOLDER)); //FIXME
+                nid.hIcon = LoadIcon(netshell_hInstance, MAKEINTRESOURCE(IDI_NET_IDLE));
                 hr = INetConnection_GetProperties(INetCon, &pProps);
                 if (SUCCEEDED(hr))
                 {

Modified: trunk/reactos/dll/win32/netshell/netshell.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshel…
==============================================================================
--- trunk/reactos/dll/win32/netshell/netshell.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/netshell.rc [iso-8859-1] Wed Sep 17 11:53:05 2008
@@ -16,6 +16,12 @@
 
 
 IDI_SHELL_NETWORK_FOLDER    ICON "res/netshell.ico"
+IDI_NET_ERROR               ICON "res/neterror.ico"
+IDI_NET_IDLE                ICON "res/netidle.ico"
+IDI_NET_OFF                 ICON "res/netoff.ico"
+IDI_NET_REC                 ICON "res/netrec.ico"
+IDI_NET_TRANS               ICON "res/nettrans.ico"
+IDI_NET_TRANSREC            ICON "res/nettrrec.ico"
 
 #include "lang/bg-BG.rc"
 #include "lang/de-DE.rc"

Added: trunk/reactos/dll/win32/netshell/res/neterror.ico
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/res/net…
==============================================================================
Binary file - no diff available.

Propchange: trunk/reactos/dll/win32/netshell/res/neterror.ico
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/reactos/dll/win32/netshell/res/netidle.ico
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/res/net…
==============================================================================
Binary file - no diff available.

Propchange: trunk/reactos/dll/win32/netshell/res/netidle.ico
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/reactos/dll/win32/netshell/res/netoff.ico
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/res/net…
==============================================================================
Binary file - no diff available.

Propchange: trunk/reactos/dll/win32/netshell/res/netoff.ico
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/reactos/dll/win32/netshell/res/netrec.ico
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/res/net…
==============================================================================
Binary file - no diff available.

Propchange: trunk/reactos/dll/win32/netshell/res/netrec.ico
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/reactos/dll/win32/netshell/res/nettrans.ico
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/res/net…
==============================================================================
Binary file - no diff available.

Propchange: trunk/reactos/dll/win32/netshell/res/nettrans.ico
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: trunk/reactos/dll/win32/netshell/res/nettrrec.ico
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/res/net…
==============================================================================
Binary file - no diff available.

Propchange: trunk/reactos/dll/win32/netshell/res/nettrrec.ico
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Removed: trunk/reactos/dll/win32/netshell/res/network-error.png
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/res/net…
==============================================================================
Binary file - no diff available.

Removed: trunk/reactos/dll/win32/netshell/res/network-idle.png
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/res/net…
==============================================================================
Binary file - no diff available.

Removed: trunk/reactos/dll/win32/netshell/res/network-offline.png
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/res/net…
==============================================================================
Binary file - no diff available.

Removed: trunk/reactos/dll/win32/netshell/res/network-receive.png
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/res/net…
==============================================================================
Binary file - no diff available.

Removed: trunk/reactos/dll/win32/netshell/res/network-transmit-receive.png
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/res/net…
==============================================================================
Binary file - no diff available.

Removed: trunk/reactos/dll/win32/netshell/res/network-transmit.png
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/res/net…
==============================================================================
Binary file - no diff available.

Modified: trunk/reactos/dll/win32/netshell/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/resourc…
==============================================================================
--- trunk/reactos/dll/win32/netshell/resource.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/netshell/resource.h [iso-8859-1] Wed Sep 17 11:53:05 2008
@@ -5,6 +5,12 @@
 #define IDI_HORIZONTAL           101
 #define IDI_NETSTAT              102
 #define IDI_VERTICAL             103
+#define IDI_NET_ERROR            104
+#define IDI_NET_IDLE             105
+#define IDI_NET_OFF              106
+#define IDI_NET_REC              107
+#define IDI_NET_TRANS            108
+#define IDI_NET_TRANSREC         109
 
 /* dialogs */
 #define IDD_NETPROPERTIES             400