Status bar menu added

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"
@@ skipping 51 matching lines @@
   m_hTabWnd = NULL;
   m_hStatusBarWnd = NULL;
   m_hPaneWnd = NULL;
   m_nPaneWidth = 0;
   m_pWndProcStatus = NULL;
   m_hTheme = NULL;
   m_isInitializedOk = false;
 
 
   m_tab = new CPluginTab(this);
-
-  // Load settings (fetch the available subscriptions, if still not fetched)
-  CPluginSettings* settings = CPluginSettings::GetInstance();
 
   CPluginSystem* system = CPluginSystem::GetInstance();
 
   std::wstring locale((LPCWSTR)system->GetBrowserLanguage());
   Dictionary::Create(locale);
 }
 
 CPluginClass::~CPluginClass()
 {
   delete m_tab;
@@ skipping 1140 matching lines @@
 
   return fRet;
 }
 
 void CPluginClass::DisplayPluginMenu(HMENU hMenu, int nToolbarCmdID, POINT pt, UINT nMenuFlags)
 {
   CPluginClient* client = CPluginClient::GetInstance();
 
   CPluginSystem* system = CPluginSystem::GetInstance();
 
-  CString url;
-  int navigationErrorId = 0;

[Wladimir Palant, 2013/08/01 10:48:19]

These two variables are unused now, please remove.

Nice case for declaring variables close to their use :)

-
   // Create menu parent window
   HWND hMenuWnd = ::CreateWindowEx(
     NULL,
     MAKEINTATOM(GetAtomPaneClass()),
     _T(""),
     0,
     0,0,0,0,
     NULL,
     NULL,
     _Module.m_hInst,
     NULL);
 
   if (!hMenuWnd)
   {
     DestroyMenu(hMenu);
     return;
   }
 
   // Display menu
   nMenuFlags |= TPM_NONOTIFY | TPM_RETURNCMD | TPM_LEFTBUTTON;
 
   int nCommand = ::TrackPopupMenu(hMenu, nMenuFlags, pt.x, pt.y, 0, hMenuWnd, 0);
 
   ::DestroyMenu(hMenu);
   ::DestroyWindow(hMenuWnd);
 
   switch (nCommand)
   {
-  case ID_PLUGIN_ENABLE:
+  case ID_MENU_DISABLE:
     {
       CPluginSettings* settings = CPluginSettings::GetInstance();
 
       settings->TogglePluginEnabled();
 
       // Enable / disable mime filter
       s_criticalSectionLocal.Lock();
       {
         if (settings->GetPluginEnabled())
         {
           s_mimeFilter = CPluginClientFactory::GetMimeFilterClientInstance();
         }
         else
         {
           s_mimeFilter = NULL;
 
           CPluginClientFactory::ReleaseMimeFilterClientInstance();
         }
       }
       s_criticalSectionLocal.Unlock();
     }
     break;
-  case ID_SETTINGS:
+  case ID_MENU_SETTINGS:
     {
       CComQIPtr<IWebBrowser2> browser = GetAsyncBrowser();
       if (browser)
       {
         VARIANT vFlags;
         vFlags.vt = VT_I4;
         vFlags.intVal = navOpenInNewTab;
 
-        HRESULT hr = browser->Navigate(BString(UserSettingsFileUrl()), &vFlags, NULL, NULL, NULL);
+        BSTR urlToNavigate = BString(UserSettingsFileUrl());
+        HRESULT hr = browser->Navigate(urlToNavigate, &vFlags, NULL, NULL, NULL);
         if (FAILED(hr))
         {
           vFlags.intVal = navOpenInNewWindow;
 
-          hr = browser->Navigate(BString(UserSettingsFileUrl()), &vFlags, NULL, NULL, NULL);
+          hr = browser->Navigate(urlToNavigate, &vFlags, NULL, NULL, NULL);
           if (FAILED(hr))
           {
             DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_NAVIGATION, PLUGIN_ERROR_NAVIGATION_SETTINGS, "Navigation::Failed")
           }
         }
       }
       break;
     }
-  case ID_WHITELISTDOMAIN:
+  case ID_MENU_DISABLE_ON_SITE:
     {
       CPluginSettings* settings = CPluginSettings::GetInstance();
       CString urlString = GetTab()->GetDocumentUrl();
       if (client->IsWhitelistedUrl(std::wstring(urlString)))
       {
         settings->RemoveWhiteListedDomain(ExtractDomain(urlString));
-
       }
       else
       {
         settings->AddWhiteListedDomain(ExtractDomain(urlString));
       }
       GetBrowser()->Refresh();
     }
   default:
     break;
   }
@@ skipping 32 matching lines @@
   miiSep.cbSize = sizeof(MENUITEMINFO);
   miiSep.fMask = MIIM_TYPE | MIIM_FTYPE;
   miiSep.fType = MFT_SEPARATOR;
 
   CPluginClient* client = CPluginClient::GetInstance();
 
   CPluginSettings* settings = CPluginSettings::GetInstance();
 
 #ifdef SUPPORT_WHITELIST
   {
-    // White list domain
+    ctext = dictionary->Lookup("menu", "menu-disable-on-site");
+    // Is domain in white list?
+    ReplaceString(ctext, L"?1?", ExtractDomain(url).GetString());
     if (client->IsWhitelistedUrl(std::wstring(GetTab()->GetDocumentUrl())))
     {
-      ctext = dictionary->Lookup("menu", "enable-on-site");
+      fmii.fState = MFS_CHECKED | MFS_ENABLED;
     }
     else
     {
-      ctext = dictionary->Lookup("menu", "disable-on-site");
+      fmii.fState = MFS_UNCHECKED | MFS_ENABLED;
     }
     fmii.fMask = MIIM_STRING | MIIM_STATE;
-    fmii.fState = MFS_ENABLED;
     fmii.dwTypeData = const_cast<LPWSTR>(ctext.c_str());
     fmii.cch = ctext.size();
 
-    ::SetMenuItemInfoW(hMenu, ID_WHITELISTDOMAIN, FALSE, &fmii);
+    ::SetMenuItemInfoW(hMenu, ID_MENU_DISABLE_ON_SITE, FALSE, &fmii);
   }
 #else
   {
-    ::DeleteMenu(hMenu, ID_WHITELISTDOMAIN, FALSE);
+    ::DeleteMenu(hMenu, ID_MENU_DISABLE_ON_SITE, FALSE);
   }
 #endif // SUPPORT_WHITELIST
 
   // Plugin enable
+  ctext = dictionary->Lookup("menu", "menu-disable");
   if (settings->GetPluginEnabled())
   {
-    ctext = dictionary->Lookup("menu", "disable");
+    fmii.fState = MFS_UNCHECKED | MFS_ENABLED;
   }
   else
   {
-    ctext = dictionary->Lookup("menu", "enable");
+    fmii.fState = MFS_CHECKED | MFS_ENABLED;
   }
   fmii.fMask  = MIIM_STATE | MIIM_STRING;
-  fmii.fState = client ? MFS_ENABLED : MFS_DISABLED;
   fmii.dwTypeData = const_cast<LPWSTR>(ctext.c_str());
   fmii.cch = ctext.size();
-  ::SetMenuItemInfoW(hMenu, ID_PLUGIN_ENABLE, FALSE, &fmii);
+  ::SetMenuItemInfoW(hMenu, ID_MENU_DISABLE, FALSE, &fmii);
 
   // Settings
-  ctext = dictionary->Lookup("menu", "settings");
+  ctext = dictionary->Lookup("menu", "menu-settings");
   fmii.fMask  = MIIM_STATE | MIIM_STRING;
   fmii.fState = MFS_ENABLED;
   fmii.dwTypeData = const_cast<LPWSTR>(ctext.c_str());
   fmii.cch = ctext.size();
-  ::SetMenuItemInfoW(hMenu, ID_SETTINGS, FALSE, &fmii);
+  ::SetMenuItemInfoW(hMenu, ID_MENU_SETTINGS, FALSE, &fmii);
 
   return true;
 }
 
 
 STDMETHODIMP CPluginClass::Exec(const GUID*, DWORD nCmdID, DWORD, VARIANTARG*, VARIANTARG*)
 {
   HWND hBrowserWnd = GetBrowserHWND();
   if (!hBrowserWnd)
   {
@@ skipping 473 matching lines @@
         }
       }
     }
 
     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
   }
 
   return hTabWnd;
 
 }