From e7424b22cd63cfbd3be99790bd080acd431a4f3e Mon Sep 17 00:00:00 2001 From: dartraiden Date: Tue, 26 Mar 2019 14:58:30 +0300 Subject: StdPopup and Popup decapitalization --- plugins/Popup/res/resource.rc | 2 +- plugins/Popup/src/history.cpp | 4 ++-- plugins/Popup/src/icons.cpp | 2 +- plugins/Popup/src/main.cpp | 24 ++++++++++++------------ plugins/Popup/src/opt_adv.cpp | 2 +- src/core/stdpopup/res/resource.rc | 2 +- src/core/stdpopup/src/icons.cpp | 2 +- src/core/stdpopup/src/services.cpp | 4 ++-- src/core/stdpopup/src/yapp.cpp | 10 +++++----- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/plugins/Popup/res/resource.rc b/plugins/Popup/res/resource.rc index 8beb28511f..9bdf0f69d3 100644 --- a/plugins/Popup/res/resource.rc +++ b/plugins/Popup/res/resource.rc @@ -142,7 +142,7 @@ END IDD_HISTORY DIALOG 0, 0, 293, 236 STYLE DS_SETFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME -CAPTION "Popup History" +CAPTION "Popup history" FONT 8, "MS Shell Dlg" BEGIN LISTBOX IDC_POPUP_LIST,5,5,283,226,LBS_OWNERDRAWVARIABLE | LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP diff --git a/plugins/Popup/src/history.cpp b/plugins/Popup/src/history.cpp index c4da220b9c..dd9f6afa62 100644 --- a/plugins/Popup/src/history.cpp +++ b/plugins/Popup/src/history.cpp @@ -98,7 +98,7 @@ void PopupHistoryAdd(POPUPDATA2 *ppdNew) void PopupHistoryShow() { if (!PopupOptions.EnableHistory) { - MessageBox(nullptr, TranslateT("Popup History is disabled"), TranslateT("Popup History message"), MB_OK); + MessageBox(nullptr, TranslateT("Popup history is disabled"), TranslateT("Popup history message"), MB_OK); return; } @@ -110,7 +110,7 @@ void PopupHistoryShow() } else { hwndHistory = CreateDialog(g_plugin.getInst(), MAKEINTRESOURCE(IDD_HISTORY), nullptr, HistoryDlgProc); - SetWindowText(hwndHistory, TranslateT("Popup History")); + SetWindowText(hwndHistory, TranslateT("Popup history")); } } diff --git a/plugins/Popup/src/icons.cpp b/plugins/Popup/src/icons.cpp index c3aa00fab2..083593ac11 100644 --- a/plugins/Popup/src/icons.cpp +++ b/plugins/Popup/src/icons.cpp @@ -28,7 +28,7 @@ static IconItem iconList1[] = // common popup { LPGEN("With \"favorite\" overlay"), "favourite", IDI_PU_FAVOURITE }, { LPGEN("With \"fullscreen\" overlay"), "fullscreen", IDI_PU_FULLSCREEN }, - { LPGEN("Popup History"), "history", IDI_HISTORY }, + { LPGEN("Popup history"), "history", IDI_HISTORY }, // notifications { LPGEN("Information"), "info", IDI_MB_INFO }, diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp index f9d4ccbb78..b6d55dae02 100644 --- a/plugins/Popup/src/main.cpp +++ b/plugins/Popup/src/main.cpp @@ -126,11 +126,11 @@ static int TTBLoaded(WPARAM, LPARAM) ttb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP | TTBBF_ASPUSHBUTTON; if (Popup_Enabled()) ttb.dwFlags |= TTBBF_PUSHED; - ttb.name = LPGEN("Toggle Popups"); + ttb.name = LPGEN("Toggle popups"); ttb.hIconHandleUp = Skin_GetIconHandle(SKINICON_OTHER_NOPOPUP); ttb.hIconHandleDn = Skin_GetIconHandle(SKINICON_OTHER_POPUP); - ttb.pszTooltipUp = LPGEN("Enable Popups"); - ttb.pszTooltipDn = LPGEN("Disable Popups"); + ttb.pszTooltipUp = LPGEN("Enable popups"); + ttb.pszTooltipDn = LPGEN("Disable popups"); hTTButton = g_plugin.addTTB(&ttb); return 0; } @@ -143,13 +143,13 @@ INT_PTR svcEnableDisableMenuCommand(WPARAM, LPARAM) // The module is enabled. // The action to do is "disable popups" (show disabled) and we must write "enable popup" in the new item. Popup_Enable(false); - Menu_ModifyItem(hMenuItem, LPGENW("Enable Popups"), hIcon = Skin_GetIconHandle(SKINICON_OTHER_NOPOPUP)); + Menu_ModifyItem(hMenuItem, LPGENW("Enable popups"), hIcon = Skin_GetIconHandle(SKINICON_OTHER_NOPOPUP)); } else { // The module is disabled. // The action to do is enable popups (show enabled), then write "disable popup" in the new item. Popup_Enable(true); - Menu_ModifyItem(hMenuItem, LPGENW("Disable Popups"), hIcon = Skin_GetIconHandle(SKINICON_OTHER_POPUP)); + Menu_ModifyItem(hMenuItem, LPGENW("Disable popups"), hIcon = Skin_GetIconHandle(SKINICON_OTHER_POPUP)); } Menu_ModifyItem(hMenuRoot, nullptr, hIcon); @@ -181,16 +181,16 @@ void InitMenuItems(void) SET_UID(mi, 0x4353d44e, 0x177, 0x4843, 0x88, 0x30, 0x25, 0x5d, 0x91, 0xad, 0xdf, 0x3f); mi.pszService = MENUCOMMAND_SVC; CreateServiceFunction(mi.pszService, svcEnableDisableMenuCommand); - mi.name.w = Popup_Enabled() ? LPGENW("Disable Popups") : LPGENW("Enable Popups"); + mi.name.w = Popup_Enabled() ? LPGENW("Disable popups") : LPGENW("Enable popups"); mi.hIcolibItem = hIcon; hMenuItem = Menu_AddMainMenuItem(&mi); - // Popup History + // Popup history SET_UID(mi, 0x92c386ae, 0x6e81, 0x452d, 0xb5, 0x71, 0x87, 0x46, 0xe9, 0x2, 0x66, 0xe9); mi.pszService = MENUCOMMAND_HISTORY; CreateServiceFunction(mi.pszService, svcShowHistory); mi.position = 1000000000; - mi.name.w = LPGENW("Popup History"); + mi.name.w = LPGENW("Popup history"); mi.hIcolibItem = GetIconHandle(IDI_HISTORY); hMenuItemHistory = Menu_AddMainMenuItem(&mi); } @@ -201,14 +201,14 @@ void LoadHotkey() HOTKEYDESC hk = {}; hk.dwFlags = HKD_UNICODE; hk.pszName = "Toggle Popups"; - hk.szDescription.w = LPGENW("Toggle Popups"); + hk.szDescription.w = LPGENW("Toggle popups"); hk.szSection.w = MODULNAME_PLUW; hk.pszService = MENUCOMMAND_SVC; g_plugin.addHotkey(&hk); - // 'Popup History' Hotkey + // 'Popup history' Hotkey hk.pszName = "Popup History"; - hk.szDescription.w = LPGENW("Popup History"); + hk.szDescription.w = LPGENW("Popup history"); hk.pszService = MENUCOMMAND_HISTORY; g_plugin.addHotkey(&hk); } @@ -247,7 +247,7 @@ static int ModulesLoaded(WPARAM, LPARAM) // hook TopToolBar HookEvent(ME_TTB_MODULELOADED, TTBLoaded); // Folder plugin support - folderId = FoldersRegisterCustomPathT(LPGEN("Skins"), LPGEN("Popup Plus"), MIRANDA_PATHT L"\\Skins\\Popup"); + folderId = FoldersRegisterCustomPathT(LPGEN("Skins"), LPGEN("Popup plus"), MIRANDA_PATHT L"\\Skins\\Popup"); // load skin skins.load(); const PopupSkin *skin; diff --git a/plugins/Popup/src/opt_adv.cpp b/plugins/Popup/src/opt_adv.cpp index e279e7ebb2..04dfe50948 100644 --- a/plugins/Popup/src/opt_adv.cpp +++ b/plugins/Popup/src/opt_adv.cpp @@ -111,7 +111,7 @@ INT_PTR CALLBACK DlgProcPopupAdvOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM HWND hCtrl = GetDlgItem(hwnd, IDC_SHOWHISTORY); SendMessage(hCtrl, BUTTONSETASFLATBTN, TRUE, 0); - SendMessage(hCtrl, BUTTONADDTOOLTIP, (WPARAM)Translate("Popup History"), 0); + SendMessage(hCtrl, BUTTONADDTOOLTIP, (WPARAM)Translate("Popup history"), 0); SendMessage(hCtrl, BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadIconEx(IDI_HISTORY)); EnableWindow(GetDlgItem(hwnd, IDC_HISTORY_STATIC1), PopupOptions.EnableHistory); diff --git a/src/core/stdpopup/res/resource.rc b/src/core/stdpopup/res/resource.rc index da3edb45ab..27facda6fd 100644 --- a/src/core/stdpopup/res/resource.rc +++ b/src/core/stdpopup/res/resource.rc @@ -66,7 +66,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Default Timeout",IDC_STATIC,4,7,153,36 + GROUPBOX "Default timeout",IDC_STATIC,4,7,153,36 CONTROL "Never timeout",IDC_RAD_NOTIMEOUT,"Button",BS_AUTORADIOBUTTON | BS_LEFTTEXT | WS_GROUP,10,16,77,10,WS_EX_RIGHT CONTROL "Set timeout:",IDC_RAD_TIMEOUT,"Button",BS_AUTORADIOBUTTON | BS_LEFTTEXT,10,28,77,10,WS_EX_RIGHT EDITTEXT IDC_ED_TIMEOUT,93,26,40,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT diff --git a/src/core/stdpopup/src/icons.cpp b/src/core/stdpopup/src/icons.cpp index 4b0a61c819..129d00c181 100644 --- a/src/core/stdpopup/src/icons.cpp +++ b/src/core/stdpopup/src/icons.cpp @@ -12,7 +12,7 @@ static IconItem iconList2[] = // common { LPGEN("Popups are enabled"), ICO_POPUP_ON, IDI_POPUP }, { LPGEN("Popups are disabled"), ICO_POPUP_OFF, IDI_NOPOPUP }, - { LPGEN("Popup History"), ICO_HISTORY, IDI_HISTORY }, + { LPGEN("Popup history"), ICO_HISTORY, IDI_HISTORY }, }; void InitIcons() diff --git a/src/core/stdpopup/src/services.cpp b/src/core/stdpopup/src/services.cpp index 7303183f86..7b853e9f93 100644 --- a/src/core/stdpopup/src/services.cpp +++ b/src/core/stdpopup/src/services.cpp @@ -195,11 +195,11 @@ void UpdateMenu() { bool isEnabled = Popup_Enabled() == 1; if (isEnabled) { - Menu_ModifyItem(hMenuItem, LPGENW("Disable Popups"), IcoLib_GetIcon(ICO_POPUP_ON)); + Menu_ModifyItem(hMenuItem, LPGENW("Disable popups"), IcoLib_GetIcon(ICO_POPUP_ON)); Menu_ModifyItem(hMenuRoot, nullptr, IcoLib_GetIcon(ICO_POPUP_ON)); } else { - Menu_ModifyItem(hMenuItem, LPGENW("Enable Popups"), IcoLib_GetIcon(ICO_POPUP_OFF)); + Menu_ModifyItem(hMenuItem, LPGENW("Enable popups"), IcoLib_GetIcon(ICO_POPUP_OFF)); Menu_ModifyItem(hMenuRoot, nullptr, IcoLib_GetIcon(ICO_POPUP_OFF)); } diff --git a/src/core/stdpopup/src/yapp.cpp b/src/core/stdpopup/src/yapp.cpp index b440675cf6..4408cf5aef 100644 --- a/src/core/stdpopup/src/yapp.cpp +++ b/src/core/stdpopup/src/yapp.cpp @@ -79,11 +79,11 @@ static int TTBLoaded(WPARAM, LPARAM) ttb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP | TTBBF_ASPUSHBUTTON; if (Popup_Enabled()) ttb.dwFlags |= TTBBF_PUSHED; - ttb.name = LPGEN("Toggle Popups"); + ttb.name = LPGEN("Toggle popups"); ttb.hIconHandleUp = IcoLib_GetIconHandle(ICO_TB_POPUP_OFF); ttb.hIconHandleDn = IcoLib_GetIconHandle(ICO_TB_POPUP_ON); - ttb.pszTooltipUp = LPGEN("Enable Popups"); - ttb.pszTooltipDn = LPGEN("Disable Popups"); + ttb.pszTooltipUp = LPGEN("Enable popups"); + ttb.pszTooltipDn = LPGEN("Disable popups"); hTTButton = g_plugin.addTTB(&ttb); return 0; } @@ -169,13 +169,13 @@ static void InitMenuItems(void) SET_UID(mi, 0x92c386ae, 0x6e81, 0x452d, 0xb5, 0x71, 0x87, 0x46, 0xe9, 0x2, 0x66, 0xe9); mi.hIcolibItem = IcoLib_GetIcon(ICO_HISTORY, 0); mi.pszService= MS_POPUP_SHOWHISTORY; - mi.name.w = LPGENW("Popup History"); + mi.name.w = LPGENW("Popup history"); hMenuItemHistory = Menu_AddMainMenuItem(&mi); SET_UID(mi, 0x4353d44e, 0x177, 0x4843, 0x88, 0x30, 0x25, 0x5d, 0x91, 0xad, 0xdf, 0x3f); mi.hIcolibItem = IcoLib_GetIcon(isEnabled ? ICO_POPUP_ON : ICO_POPUP_OFF, 0); mi.pszService = "Popup/EnableDisableMenuCommand"; - mi.name.w = (isEnabled ? LPGENW("Disable Popups") : LPGENW("Enable Popups")); + mi.name.w = (isEnabled ? LPGENW("Disable popups") : LPGENW("Enable popups")); hMenuItem = Menu_AddMainMenuItem(&mi); } -- cgit v1.2.3