Separate writing of "infobar", "titlebar", "statusbar", etc.

git-svn-id: http://svn.miranda-ng.org/main/trunk@7458 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

5 files changed, 11 insertions, 11 deletions

diff --git a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp
index da132602d1..1fd4275f57 100644
--- a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp
+++ b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp
@@ -1748,13 +1748,13 @@ static int CLUIFramesLoadMainMenu()
 

 	// create "show all titlebars" menu

 	mi.position = separator++;

-	mi.pszName = LPGEN("Show All Titlebars");

+	mi.pszName = LPGEN("Show all title bars");

 	mi.pszService = MS_CLIST_FRAMES_SHOWALLFRAMESTB;

 	Menu_AddMainMenuItem(&mi);

 

 	// create "hide all titlebars" menu

 	mi.position = separator++;

-	mi.pszName = LPGEN("Hide All Titlebars");

+	mi.pszName = LPGEN("Hide all title bars");

 	mi.pszService = MS_CLIST_FRAMES_HIDEALLFRAMESTB;

 	Menu_AddMainMenuItem(&mi);

 	return 0;

@@ -3012,8 +3012,8 @@ static LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam
 				else{AppendMenu(hmenu,MF_STRING,frame_menu_visible,TranslateT("Visible"));};

 

 				if (g_pfwFrames[framepos].TitleBar.ShowTitleBar)

-				{AppendMenu(hmenu,MF_STRING|MF_CHECKED,frame_menu_showtitlebar,TranslateT("Show TitleBar"));}

-				else{AppendMenu(hmenu,MF_STRING,frame_menu_showtitlebar,TranslateT("Show TitleBar"));};

+				{AppendMenu(hmenu,MF_STRING|MF_CHECKED,frame_menu_showtitlebar,TranslateT("Show title bar"));}

+				else{AppendMenu(hmenu,MF_STRING,frame_menu_showtitlebar,TranslateT("Show title bar"));};

 

 				if (g_pfwFrames[framepos].floating)

 				{AppendMenu(hmenu,MF_STRING|MF_CHECKED,frame_menu_floating,TranslateT("Floating"));}

diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index 8778863d15..7737335a23 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -138,10 +138,10 @@ static int clcHookModulesLoaded(WPARAM wParam, LPARAM lParam)
 		hSmileyAddOptionsChangedHook = HookEvent(ME_SMILEYADD_OPTIONSCHANGED,clcHookSmileyAddOptionsChanged);

 	}

 

-	CallService(MS_BACKGROUNDCONFIG_REGISTER,(WPARAM)(LPGEN("List Background")"/CLC"),0);

-	CallService(MS_BACKGROUNDCONFIG_REGISTER,(WPARAM)(LPGEN("Menu Background")"/Menu"),0);

-	CallService(MS_BACKGROUNDCONFIG_REGISTER,(WPARAM)(LPGEN("StatusBar Background")"/StatusBar"),0);

-	CallService(MS_BACKGROUNDCONFIG_REGISTER,(WPARAM)(LPGEN("Frames TitleBar BackGround")"/FrameTitleBar"),0);

+	CallService(MS_BACKGROUNDCONFIG_REGISTER,(WPARAM)(LPGEN("List background")"/CLC"),0);

+	CallService(MS_BACKGROUNDCONFIG_REGISTER,(WPARAM)(LPGEN("Menu background")"/Menu"),0);

+	CallService(MS_BACKGROUNDCONFIG_REGISTER,(WPARAM)(LPGEN("Status bar background")"/StatusBar"),0);

+	CallService(MS_BACKGROUNDCONFIG_REGISTER,(WPARAM)(LPGEN("Frames title bar background")"/FrameTitleBar"),0);

 

 	HookEvent(ME_BACKGROUNDCONFIG_CHANGED,clcHookBkgndConfigChanged);

 	HookEvent(ME_BACKGROUNDCONFIG_CHANGED,BgStatusBarChange);

diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp
index 05dfb26625..0a8519eefd 100644
--- a/plugins/Clist_modern/src/modern_clcopts.cpp
+++ b/plugins/Clist_modern/src/modern_clcopts.cpp
@@ -122,7 +122,7 @@ static struct ColourOptionsList colourOptionsList[] =
 	{ "Menu",           "TextColour",        CLCCOLOURSGROUP,  LPGENT("Menu text"),                               CLCDEFAULT_TEXTCOLOUR },

 	{ "Menu",           "SelTextColour",     CLCCOLOURSGROUP,  LPGENT("Selected menu text"),                      CLCDEFAULT_MODERN_SELTEXTCOLOUR },

 	{ "FrameTitleBar",  "TextColour",        CLCCOLOURSGROUP,  LPGENT("Frame title text"),                        CLCDEFAULT_TEXTCOLOUR },

-	{ "StatusBar",      "TextColour",        CLCCOLOURSGROUP,  LPGENT("Statusbar text"),                          CLCDEFAULT_TEXTCOLOUR },

+	{ "StatusBar",      "TextColour",        CLCCOLOURSGROUP,  LPGENT("Status bar text"),                          CLCDEFAULT_TEXTCOLOUR },

 	{ "ModernSettings", "KeyColor",          CLCCOLOURSGROUP,  LPGENT("3rd party frames transparent back color"), SETTING_KEYCOLOR_DEFAULT }

 };

 

diff --git a/plugins/Clist_modern/src/modern_clistevents.cpp b/plugins/Clist_modern/src/modern_clistevents.cpp
index 511efe34aa..a4a0e10380 100644
--- a/plugins/Clist_modern/src/modern_clistevents.cpp
+++ b/plugins/Clist_modern/src/modern_clistevents.cpp
@@ -403,7 +403,7 @@ static void EventArea_HideShowNotifyFrame()
 int EventArea_Create(HWND hCluiWnd)

 {

 

-	CallService(MS_BACKGROUNDCONFIG_REGISTER,(WPARAM)(LPGEN("Event Area Background")"/EventArea"),0);

+	CallService(MS_BACKGROUNDCONFIG_REGISTER,(WPARAM)(LPGEN("Event area background")"/EventArea"),0);

 	HookEvent(ME_BACKGROUNDCONFIG_CHANGED,ehhEventAreaBackgroundSettingsChanged);

 	ehhEventAreaBackgroundSettingsChanged(0, 0);

 

diff --git a/plugins/Clist_modern/src/modern_toolbar.cpp b/plugins/Clist_modern/src/modern_toolbar.cpp
index 8541674d50..6d500bc172 100644
--- a/plugins/Clist_modern/src/modern_toolbar.cpp
+++ b/plugins/Clist_modern/src/modern_toolbar.cpp
@@ -304,7 +304,7 @@ static int Toolbar_ModuleReloaded(WPARAM wParam, LPARAM lParam)
 

 static int Toolbar_ModulesLoaded(WPARAM, LPARAM)

 {

-	CallService(MS_BACKGROUNDCONFIG_REGISTER, (WPARAM)(LPGEN("ToolBar Background")"/ToolBar"),0);

+	CallService(MS_BACKGROUNDCONFIG_REGISTER, (WPARAM)(LPGEN("Toolbar background")"/ToolBar"),0);

 

 	HookEvent(ME_DB_CONTACT_SETTINGCHANGED, ehhToolBarSettingsChanged);