Merge branch 'master' of https://github.com/malensek/3RVX

Author: malensek

3RVX/CommCtl.h

@@ -1,3 +1,5 @@
+#pragma once
+
 #pragma comment(lib, "comctl32.lib")
 
 #include <CommCtrl.h>

3RVX/OSD/VolumeOSD.cpp

@@ -5,6 +5,7 @@
 #include <string>
 
 #include "..\HotkeyInfo.h"
+#include "..\LanguageTranslator.h"
 #include "..\MeterWnd\Meters\CallbackMeter.h"
 #include "..\Monitor.h"
 #include "..\Skin.h"
@@ -44,13 +45,19 @@ _muteWnd(L"3RVX-MuteOSD", L"3RVX-MuteOSD") {
 
     /* Set up context menu */
     if (settings->NotifyIconEnabled()) {
+        LanguageTranslator *translator = settings->Translator();
+        _menuSetStr = translator->Translate(_menuSetStr);
+        _menuDevStr = translator->Translate(_menuDevStr);
+        _menuMixerStr = translator->Translate(_menuMixerStr);
+        _menuExitStr = translator->Translate(_menuExitStr);
+
         _menu = CreatePopupMenu();
         _deviceMenu = CreatePopupMenu();
 
-        InsertMenu(_menu, -1, MF_ENABLED, MENU_SETTINGS, L"Settings");
-        InsertMenu(_menu, -1, MF_POPUP, UINT(_deviceMenu), L"Audio Device");
-        InsertMenu(_menu, -1, MF_ENABLED, MENU_MIXER, L"Mixer");
-        InsertMenu(_menu, -1, MF_ENABLED, MENU_EXIT, L"Exit");
+        InsertMenu(_menu, -1, MF_ENABLED, MENU_SETTINGS, _menuSetStr.c_str());
+        InsertMenu(_menu, -1, MF_POPUP, UINT(_deviceMenu), _menuDevStr.c_str());
+        InsertMenu(_menu, -1, MF_ENABLED, MENU_MIXER, _menuMixerStr.c_str());
+        InsertMenu(_menu, -1, MF_ENABLED, MENU_EXIT, _menuExitStr.c_str());
 
         _menuFlags = TPM_RIGHTBUTTON;
         if (GetSystemMetrics(SM_MENUDROPALIGNMENT) != 0) {

3RVX/OSD/VolumeOSD.h

@@ -70,4 +70,10 @@ class VolumeOSD : public OSD, MeterCallbackReceiver {
 
     virtual LRESULT
         WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
+
+private:
+    std::wstring _menuSetStr = L"Settings";
+    std::wstring _menuDevStr = L"Audio Device";
+    std::wstring _menuMixerStr = L"Mixer";
+    std::wstring _menuExitStr = L"Exit 3RVX";
 };

CHANGELOG.md

@@ -1,6 +1,13 @@
 3RVX3 Changelog
 ===============
 
+Beta 9
+------
+* Compatiblity mode for the old (v2) skin format
+* Automatic updates
+* Hotkey to disable/enable the OSD 
+* Option to temporarily disable the OSD when a DirectX application is running full screen
+
 Beta 8
 ------
 * Full screen detection
@@ -9,8 +16,10 @@ Beta 8
 * Installer-based (non-portable) setup. Portable distributions will still be provided as well.
 * Update checking functionality
 * Launching multiple settings instances will now simply raise and activate the first instance
+* Added content to the About tab
 * Bugfix: Corrupted "Run on Startup" registry entry
 * Bugfix: Play sound for custom volume increments
+* Bugfix: low-color icons were being loaded for the notification area
 
 Beta 7
 ------

Languages/TestLanguage.xml

@@ -22,6 +22,24 @@
     <translation>XXXXX</translation>
   </string>
 
+  <!-- Notification Icon Menu Strings -->
+  <string>
+    <original>Settings</original>
+    <translation>XXXXXXXX</translation>
+  </string>
+  <string>
+    <original>Audio Device</original>
+    <translation>XXXXX XXXXXX</translation>
+  </string>
+  <string>
+    <original>Mixer</original>
+    <translation>XXXXX</translation>
+  </string>
+  <string>
+    <original>Exit</original>
+    <original>XXXX</original>
+  </string>
+
 
   <!-- Tab Names -->
   <string>