Tooltip notification. Check for update fixes.

src/plugin/PluginClass.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginClass.h"
 #include "PluginSettings.h"
 #include "PluginSystem.h"
 #ifdef SUPPORT_FILTER
 #include "PluginFilter.h"
 #endif
 #include "PluginMimeFilterClient.h"
 #include "PluginClient.h"
 #include "PluginClientFactory.h"
 #include "PluginMutex.h"
 #include "sddl.h"
 #include "PluginUtil.h"
 #include "PluginUserSettings.h"
+#include "../shared/Utils.h"
 
 #include "../shared/Dictionary.h"
 

[Felix Dahlke, 2013/09/11 15:22:59]

As before, no need to add another line of whitespace here IMO.

+
 #ifdef DEBUG_HIDE_EL
 DWORD profileTime = 0;
 #endif
 
 typedef HANDLE (WINAPI *OPENTHEMEDATA)(HWND, LPCWSTR);
 typedef HRESULT (WINAPI *DRAWTHEMEBACKGROUND)(HANDLE, HDC, INT, INT, LPRECT, LPRECT);
 typedef HRESULT (WINAPI *CLOSETHEMEDATA)(HANDLE);
 
 
 HICON CPluginClass::s_hIcons[ICON_MAX] = { NULL, NULL, NULL };
@@ skipping 177 matching lines @@
   else
   {
     url = m_tab->GetDocumentUrl();
   }
 
   return url;
 }
 
 DWORD WINAPI CPluginClass::StartInitObject(LPVOID thisPtr)
 {
+  INITCOMMONCONTROLSEX commControls;
+  commControls.dwSize = sizeof(INITCOMMONCONTROLSEX);
+  commControls.dwICC = ICC_USEREX_CLASSES | ICC_STANDARD_CLASSES | ICC_BAR_CLASSES;

[Wladimir Palant, 2013/09/11 13:07:06]

Isn't ICC_BAR_CLASSES enough for a tooltip?

+  InitCommonControlsEx(&commControls);

[Wladimir Palant, 2013/09/11 13:07:06]

Given that common controls are used by the NotificationMessage class, that's
where I would initialize them. E.g. use a static boolean variable
commonControlsInitialized and run this code in the constructor if it is false.

[Felix Dahlke, 2013/09/11 15:22:59]

I'd rather keep this where it is, the call is not specific to creating a
tooltip.

[Wladimir Palant, 2013/09/12 14:13:34]

It is. Looking at the documentation, InitCommonControlsEx() calls are additive -
which means that this function can be called multiple times, with different
flags. The idea behind it is that different parts of the application call with,
with the features they need. A single centralized InitCommonControlsEx() call is
unnecessary.

[Felix Dahlke, 2013/09/12 14:23:49]

Then let's put it in the NotificationMessage class. We wouldn't even have to
bother with the static variable.

[Oleksandr, 2013/09/12 14:26:26]

NotificationMessage sounds best for me as well then. (Sorry I forgot to include
it in this patchset. Will be added in the next one)

On 2013/09/12 14:23:49, Felix H. Dahlke wrote:

   if (thisPtr == NULL)
     return 0;
   if (!((CPluginClass*)thisPtr)->InitObject(true))
   {
     ((CPluginClass*)thisPtr)->Unadvice();
   }
 
   return 0;
 }
 
@@ skipping 1037 matching lines @@
   int nCommand = ::TrackPopupMenu(hMenu, nMenuFlags, pt.x, pt.y, 0, hMenuWnd, 0);
 
   ::DestroyMenu(hMenu);
   ::DestroyWindow(hMenuWnd);
 
   switch (nCommand)
   {
   case ID_MENU_UPDATE:
     {
       CPluginClient* client = CPluginClient::GetInstance();
-      client->CheckForUpdates();
+      notifMessage.SetParent(m_hPaneWnd);
+      Dictionary* dictionary = Dictionary::GetInstance();
+      std::wstring checkingText = dictionary->Lookup("updater", "checking-for-updates-text");
+      std::wstring checkingTitle = dictionary->Lookup("updater", "checking-for-updates-title");
+
+      notifMessage.Show(checkingText.c_str(), TTI_INFO);
+      notifMessage.SetTextAndIcon(checkingText.c_str(), checkingTitle.c_str(), TTI_INFO);

[Wladimir Palant, 2013/09/11 13:07:06]

Assuming that NotificationMessage is our class, these methods should take const
std::wstring& as paramers, not WCHAR*. Also, not quite understanding why we have
to pass in checkingText twice.

+      client->CheckForUpdates(m_hPaneWnd);
     }
     break;
   case ID_MENU_DISABLE:
     {
       CPluginSettings* settings = CPluginSettings::GetInstance();
 
       settings->TogglePluginEnabled();
 
       // Enable / disable mime filter
       s_criticalSectionLocal.Lock();
@@ skipping 486 matching lines @@
     break;
   case SC_CLOSE:
     break;
 
   case WM_UPDATEUISTATE:
     {
       CPluginTab* tab = GetTab(::GetCurrentThreadId());
       if (tab)
       {
         tab->OnActivate();
+        RECT rect;
+        GetWindowRect(pClass->m_hPaneWnd, &rect);
+        pClass->notifMessage.Move(rect.left + (rect.right - rect.left) / 2, rect.top + (rect.bottom - rect.top) / 2); 
       }
+      pClass->notifMessage.Hide();

[Wladimir Palant, 2013/09/11 13:07:06]

Shouldn't the notification be only hidden if we get UIS_CLEAR in wParam?

+    }
+    break;
+  case WM_WINDOWPOSCHANGING:
+    {
+      RECT rect;
+      GetWindowRect(pClass->m_hPaneWnd, &rect);
+      pClass->notifMessage.Move(rect.left + (rect.right - rect.left) / 2, rect.top + (rect.bottom - rect.top) / 2); 

[Wladimir Palant, 2013/09/11 13:07:06]

Shouldn't we check whether the notification is actually visible before wasting
time on adjusting its position?

+    }
+    break;
+  case WM_ALREADY_UP_TO_DATE:
+    {
+      Dictionary* dictionary = Dictionary::GetInstance();
+      std::wstring upToDateText = dictionary->Lookup("updater", "update-already-up-to-date-text");
+      std::wstring upToDateTitle = dictionary->Lookup("updater", "update-already-up-to-date-title");
+      pClass->notifMessage.SetTextAndIcon(upToDateText.c_str(), upToDateTitle.c_str(), TTI_INFO);
+    }
+    break;
+  case WM_UPDATE_CHECK_ERROR:
+    {
+      Dictionary* dictionary = Dictionary::GetInstance();
+      std::wstring errorText = dictionary->Lookup("updater", "update-error-text");
+      std::wstring errorTitle = dictionary->Lookup("updater", "update-error-title");
+      pClass->notifMessage.SetTextAndIcon(errorText.c_str(), errorText.c_str(), TTI_ERROR);
+    }
+    break;
+  case WM_DOWNLOADING_UPDATE:
+    {
+      Dictionary* dictionary = Dictionary::GetInstance();
+      std::wstring downloadingText = dictionary->Lookup("updater", "downloading-update-text");
+      std::wstring downloadingTitle = dictionary->Lookup("updater", "downloading-update-title");
+      pClass->notifMessage.SetTextAndIcon(downloadingText.c_str(), downloadingTitle.c_str(), TTI_ERROR);
     }
     break;
   }
 
   return DefWindowProc(hWnd, message, wParam, lParam);
 }
 
 
 void CPluginClass::UpdateStatusBar()
 {
@@ skipping 121 matching lines @@
         }
       }
     }
 
     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
   }
 
   return hTabWnd;
 
 }