Changeset 6d3bbc1 in nscp for modules/SysTray

Timestamp:

02/26/08 23:03:01 (5 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

8c7d67f

Parents:

99b84bf

Message:

+ Added installer

Location:

modules/SysTray

Files:

• TrayIcon.cpp (modified) (4 diffs)
• TrayIcon.h (modified) (1 diff)

modules/SysTray/TrayIcon.cpp

@@ -26 +26 @@
 #include <ShellAPI.h>
 #include "SysTray.h"
+#include <error.hpp>
 
 
 extern SysTray gSysTray;
 
+//BOOL ChangeWindowMessageFilter(UINT message,DWORD dwFlag);
 
 unsigned IconWidget_::threadProc(LPVOID lpParameter)
@@ -40 +42 @@
 void IconWidget_::createDialog(void) {
   hDlgWnd = ::CreateDialog(NSCModuleWrapper::getModule(),MAKEINTRESOURCE(IDD_NSTRAYDLG),NULL,TrayIcon::DialogProc);
+
+  UINT UDM_TASKBARCREATED = RegisterWindowMessage(_T("TaskbarCreated"));
+  if (UDM_TASKBARCREATED == 0) {
+    NSC_LOG_ERROR_STD(_T("Failed to register 'TaskbarCreated': ") + error::lookup::last_error());
+  }
 
   MSG Msg;
@@ -47 +54 @@
     if (Msg.message == WM_MY_CLOSE) {
       ::DestroyWindow(hDlgWnd);
+//    } else if (Msg.message == WM_QUERYENDSESSION) {
+//      NSC_LOG_ERROR_STD(_T("Got WM_QUERYENDSESSION thingy..."));
+    } else if (Msg.message == UDM_TASKBARCREATED) {
+      NSC_LOG_MESSAGE_STD(_T("Recreating systray icon..."));
+      TrayIcon::addIcon(Msg.hwnd);
     } else if (bRet == -1) {
       // handle the error and possibly exit
@@ -186 +198 @@
 }
 
+
+
 void insert_logrecord(HWND hwndLV, const SysTray::log_entry &entry) {
   LVITEM item;

modules/SysTray/TrayIcon.h

@@ -48 +48 @@
   INT_PTR CALLBACK InjectDialogProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam);
   INT_PTR CALLBACK LogDialogProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam);
+  void setupUI();
   
   void removeIcon(HWND hWnd);