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 1211 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;
-
   // 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_MENU_SETTINGS:
+    {
+      CComQIPtr<IWebBrowser2> browser = GetAsyncBrowser();
+      if (browser)
+      {
+        VARIANT vFlags;
+        vFlags.vt = VT_I4;
+        vFlags.intVal = navOpenInNewTab;
+
+        BSTR urlToNavigate = BString(UserSettingsFileUrl());
+        HRESULT hr = browser->Navigate(urlToNavigate, &vFlags, NULL, NULL, NULL);
+        if (FAILED(hr))
+        {
+          vFlags.intVal = navOpenInNewWindow;
+
+          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_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;
   }
 
   // Invalidate and redraw the control
   UpdateStatusBar();
-
-  CComQIPtr<IWebBrowser2> browser = GetBrowser();
-  if (!url.IsEmpty() && browser)
-  {
-    VARIANT vFlags;
-    vFlags.vt = VT_I4;
-    vFlags.intVal = navOpenInNewTab;
-
-    HRESULT hr = browser->Navigate(CComBSTR(url), &vFlags, NULL, NULL, NULL);
-    if (FAILED(hr))
-    {
-      vFlags.intVal = navOpenInNewWindow;
-
-      hr = browser->Navigate(CComBSTR(url), &vFlags, NULL, NULL, NULL);
-      if (FAILED(hr))
-      {
-        DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_NAVIGATION, navigationErrorId, "Navigation::Failed")
-      }
-    }
-  }
 }
 
 
 bool CPluginClass::SetMenuBar(HMENU hMenu, const CString& url)
 {
   std::wstring ctext;
 
   s_criticalSectionLocal.Lock();
   {
 #ifdef SUPPORT_WHITELIST
@@ skipping 19 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", "disable-on-site");
+    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())))
+    {
+      fmii.fState = MFS_CHECKED | MFS_ENABLED;
+    }
+    else
+    {
+      fmii.fState = MFS_UNCHECKED | MFS_ENABLED;
+    }
     fmii.fMask = MIIM_STRING | MIIM_STATE;
-    fmii.fState = MFS_DISABLED;
     fmii.dwTypeData = const_cast<LPWSTR>(ctext.c_str());
     fmii.cch = ctext.size();
 
-    UINT index = WM_WHITELIST_DOMAIN;
-
-    ::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 171 matching lines @@
     {
     }
 #ifdef SUPPORT_WHITELIST
     else if (client->IsWhitelistedUrl(std::wstring(url)))
     {
       hIcon = GetIcon(ICON_PLUGIN_DISABLED);
     }
 #endif // SUPPORT_WHITELIST
     else
     {
-      //Deativate adblock icon if adblock limit reached
       CPluginSettings* settings = CPluginSettings::GetInstance();
-      if (!settings->GetPluginEnabled()) {
-        hIcon = GetIcon(ICON_PLUGIN_DEACTIVATED);
-        return hIcon;
-      }
       hIcon = GetIcon(ICON_PLUGIN_ENABLED);
     }
 
 #endif // PRODUCT_ADBLOCKPLUS
   }
 
   return hIcon;
 }
 
 
@@ skipping 101 matching lines @@
 
   case WM_LBUTTONUP:
   case WM_RBUTTONUP:
     {
       CString strURL = pClass->GetBrowserUrl();
       if (strURL != pClass->GetTab()->GetDocumentUrl())
       {
         pClass->GetTab()->SetDocumentUrl(strURL);
       }
 
-#ifdef SUPPORT_SHOW_PLUGIN_MENU
       // Create menu
       HMENU hMenu = pClass->CreatePluginMenu(strURL);
       if (!hMenu)
       {
         return 0;
       }
 
       // Display menu
       POINT pt;
       ::GetCursorPos(&pt);
 
       RECT rc;
       ::GetWindowRect(hWnd, &rc);
 
       if (rc.left >= 0 && rc.top >= 0)
       {
         pt.x = rc.left;
         pt.y = rc.top;
       }
 
       pClass->DisplayPluginMenu(hMenu, -1, pt, TPM_LEFTALIGN|TPM_BOTTOMALIGN);
-#else
-      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);
-        if (FAILED(hr))
-        {
-          vFlags.intVal = navOpenInNewWindow;
-
-          hr = browser->Navigate(BString(UserSettingsFileUrl()), &vFlags, NULL, NULL, NULL);
-          if (FAILED(hr))
-          {
-            DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_NAVIGATION, PLUGIN_ERROR_NAVIGATION_SETTINGS, "Navigation::Failed")
-          }
-        }
-      }
-#endif
     }
     break;
   case WM_DESTROY:
     break;
   case SC_CLOSE:
     break;
 
   case WM_UPDATEUISTATE:
     {
       CPluginTab* tab = GetTab(::GetCurrentThreadId());
@@ skipping 139 matching lines @@
         }
       }
     }
 
     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
   }
 
   return hTabWnd;
 
 }