From 37aee6921e99905c91f0bc9df4897737482c9ede Mon Sep 17 00:00:00 2001 From: spx Date: Sat, 8 Dec 2012 02:42:31 +0900 Subject: [PATCH] Additional fix for 28b96e7 --- Language/Resource.rc | 1 + Library/Rainmeter.cpp | 8 +++---- Library/resource.h | 49 ++++++++++++++++++++++--------------------- 3 files changed, 30 insertions(+), 28 deletions(-) diff --git a/Language/Resource.rc b/Language/Resource.rc index 82ef0b5c..77e33d7c 100644 --- a/Language/Resource.rc +++ b/Language/Resource.rc @@ -252,6 +252,7 @@ STRINGTABLE ID_STR_EDIT, STR_EDIT ID_STR_EXPAND, STR_EXPAND ID_STR_OPENFOLDER, STR_OPENFOLDER + ID_STR_DISABLEDRAGGING, STR_DISABLEDRAGGING ID_STR_0PERCENT, "0%" ID_STR_10PERCENT, "10%" ID_STR_20PERCENT, "20%" diff --git a/Library/Rainmeter.cpp b/Library/Rainmeter.cpp index bc54e7d6..2083f403 100644 --- a/Library/Rainmeter.cpp +++ b/Library/Rainmeter.cpp @@ -2870,12 +2870,12 @@ void CRainmeter::ShowContextMenu(POINT pos, CMeterWindow* meterWindow) MENU_ITEM(IDM_SHOW_HELP, ID_STR_HELP), MENU_SEPARATOR(), MENU_SUBMENU(ID_STR_SKINS, - MENU_ITEM_GRAYED(0, ID_STR_NOTHEMES), + MENU_ITEM_GRAYED(0, ID_STR_NOSKINS), MENU_SEPARATOR(), - MENU_ITEM(IDM_OPENSKINSFOLDER, ID_STR_REFRESHSKIN), - MENU_ITEM(IDM_DISABLEDRAG, ID_STR_REFRESHSKIN)), + MENU_ITEM(IDM_OPENSKINSFOLDER, ID_STR_OPENFOLDER), + MENU_ITEM(IDM_DISABLEDRAG, ID_STR_DISABLEDRAGGING)), MENU_SUBMENU(ID_STR_THEMES, - MENU_ITEM_GRAYED(0, ID_STR_STAYTOPMOST)), + MENU_ITEM_GRAYED(0, ID_STR_NOTHEMES)), MENU_SEPARATOR(), MENU_ITEM(IDM_EDITCONFIG, ID_STR_EDITSETTINGS), MENU_ITEM(IDM_REFRESH, ID_STR_REFRESHALL), diff --git a/Library/resource.h b/Library/resource.h index ccd329ee..1d880e59 100644 --- a/Library/resource.h +++ b/Library/resource.h @@ -166,30 +166,31 @@ #define ID_STR_EDIT 2071 #define ID_STR_EXPAND 2072 #define ID_STR_OPENFOLDER 2073 -#define ID_STR_0PERCENT 2074 -#define ID_STR_10PERCENT 2075 -#define ID_STR_20PERCENT 2076 -#define ID_STR_30PERCENT 2077 -#define ID_STR_40PERCENT 2078 -#define ID_STR_50PERCENT 2079 -#define ID_STR_60PERCENT 2080 -#define ID_STR_70PERCENT 2081 -#define ID_STR_80PERCENT 2082 -#define ID_STR_90PERCENT 2083 -#define ID_STR_MANAGE 2084 -#define ID_STR_ABOUT 2085 -#define ID_STR_HELP 2086 -#define ID_STR_NOSKINS 2087 -#define ID_STR_NOTHEMES 2088 -#define ID_STR_EDITSETTINGS 2089 -#define ID_STR_REFRESHALL 2090 -#define ID_STR_LOGGING 2091 -#define ID_STR_SHOWLOGFILE 2092 -#define ID_STR_STARTLOGGING 2093 -#define ID_STR_STOPLOGGING 2094 -#define ID_STR_DELETELOGFILE 2095 -#define ID_STR_DEBUGMODE 2096 -#define ID_STR_EXIT 2097 +#define ID_STR_DISABLEDRAGGING 2074 +#define ID_STR_0PERCENT 2075 +#define ID_STR_10PERCENT 2076 +#define ID_STR_20PERCENT 2077 +#define ID_STR_30PERCENT 2078 +#define ID_STR_40PERCENT 2079 +#define ID_STR_50PERCENT 2080 +#define ID_STR_60PERCENT 2081 +#define ID_STR_70PERCENT 2082 +#define ID_STR_80PERCENT 2083 +#define ID_STR_90PERCENT 2084 +#define ID_STR_MANAGE 2085 +#define ID_STR_ABOUT 2086 +#define ID_STR_HELP 2087 +#define ID_STR_NOSKINS 2088 +#define ID_STR_NOTHEMES 2089 +#define ID_STR_EDITSETTINGS 2090 +#define ID_STR_REFRESHALL 2091 +#define ID_STR_LOGGING 2092 +#define ID_STR_SHOWLOGFILE 2093 +#define ID_STR_STARTLOGGING 2094 +#define ID_STR_STOPLOGGING 2095 +#define ID_STR_DELETELOGFILE 2096 +#define ID_STR_DEBUGMODE 2097 +#define ID_STR_EXIT 2098 #define IDM_REFRESH 4001 #define IDM_QUIT 4002