diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-01-19 21:40:51 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-01-19 21:40:51 +0000 |
| commit | f4fac2038f723df23d1771e8632ad3d74357f8e5 (patch) | |
| tree | 1216113e31072a4556c492b0978825826ee18925 /plugins/TabSRMM/src/themeio.cpp | |
| parent | 6b4cfc3055b541413333c8af4a3b141027a4daa9 (diff) | |
- chat log background color setting merged with kernel chats;
- constants for chat modules
git-svn-id: http://svn.miranda-ng.org/main/trunk@7780 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/TabSRMM/src/themeio.cpp')
| -rw-r--r-- | plugins/TabSRMM/src/themeio.cpp | 53 |
1 files changed, 28 insertions, 25 deletions
diff --git a/plugins/TabSRMM/src/themeio.cpp b/plugins/TabSRMM/src/themeio.cpp index 4a610c3b27..301a031f21 100644 --- a/plugins/TabSRMM/src/themeio.cpp +++ b/plugins/TabSRMM/src/themeio.cpp @@ -48,7 +48,7 @@ static struct _tagExtSettings { "Message Log", "InputBG", FONTMODULE, "inputbg", SRMSGDEFSET_BKGCOLOUR,
"Message Log", "HgridColor", FONTMODULE, "hgrid", SRMSGDEFSET_BKGCOLOUR,
"Message Log", "DWFlags", SRMSGMOD_T, "mwflags", MWF_LOG_DEFAULT,
- "Chat", "UserListBG", "Chat", "ColorNicklistBG", SRMSGDEFSET_BKGCOLOUR,
+ CHAT_MODULE, "UserListBG", CHAT_MODULE, "ColorNicklistBG", SRMSGDEFSET_BKGCOLOUR,
"Message Log", "LeftIndent", SRMSGMOD_T, "IndentAmount", 20,
"Message Log", "RightIndent", SRMSGMOD_T, "RightIndent", 20,
};
@@ -57,33 +57,36 @@ static struct _tagExtSettings { * new in TabSRMM3 / theme version 5
* don't read these values from themes with version < 5
*/
-static struct _tagExtSettings_v5 {
+struct
+{
char* szIniSection;
char* szIniName;
char* szDbModule;
char* szDbSetting;
DWORD dwDef;
-} _extSettings_v5[18] = {
- "CommonClrs", "IP_High", FONTMODULE, "ipfieldsbgHigh", 0xf0f0f0,
- "CommonClrs", "IP_Low", FONTMODULE, "ipfieldsbg", 0x62caff,
- "CommonClrs", "TB_High", FONTMODULE, "tbBgHigh", 0,
- "CommonClrs", "TB_Low", FONTMODULE, "tbBgLow", 0,
- "CommonClrs", "FillColor", FONTMODULE, "fillColor", 0,
- "CommonClrs", "RichBorders", FONTMODULE, "cRichBorders", 0,
- "CommonClrs", "GenericTxt", FONTMODULE, "genericTxtClr", RGB(20, 20, 20),
- "AeroMode", "Style", SRMSGMOD_T, "aerostyle", CSkin::AERO_EFFECT_MILK,
- "AeroMode", "AeroGlowColor", FONTMODULE, "aeroGlow", RGB(40, 40, 255),
-
- "Colored Tabs", "NormalText", SRMSGMOD_T, "tab_txt_normal", RGB(1, 1, 1),
- "Colored Tabs", "ActiveText", SRMSGMOD_T, "tab_txt_active", RGB(1, 1, 1),
- "Colored Tabs", "HottrackText", SRMSGMOD_T, "tab_txt_hottrack", RGB(1, 1, 1),
- "Colored Tabs", "UnreadText", SRMSGMOD_T, "tab_txt_unread", RGB(1, 1, 1),
-
- "Colored Tabs", "NormalBG", SRMSGMOD_T, "tab_bg_normal", 0xf0f0f0,
- "Colored Tabs", "ActiveBG", SRMSGMOD_T, "tab_bg_active", 0xf0f0f0,
- "Colored Tabs", "HottrackBG", SRMSGMOD_T, "tab_bg_hottrack", 0xf0f0f0,
- "Colored Tabs", "UnreadBG", SRMSGMOD_T, "tab_bg_unread", 0xf0f0f0,
- "Chat", "Background", FONTMODULE, SRMSGSET_BKGCOLOUR_MUC, SRMSGDEFSET_BKGCOLOUR
+}
+static _extSettings_v5[18] =
+{
+ { "CommonClrs", "IP_High", FONTMODULE, "ipfieldsbgHigh", 0xf0f0f0 },
+ { "CommonClrs", "IP_Low", FONTMODULE, "ipfieldsbg", 0x62caff },
+ { "CommonClrs", "TB_High", FONTMODULE, "tbBgHigh", 0 },
+ { "CommonClrs", "TB_Low", FONTMODULE, "tbBgLow", 0 },
+ { "CommonClrs", "FillColor", FONTMODULE, "fillColor", 0 },
+ { "CommonClrs", "RichBorders", FONTMODULE, "cRichBorders", 0 },
+ { "CommonClrs", "GenericTxt", FONTMODULE, "genericTxtClr", RGB(20, 20, 20) },
+ { "AeroMode", "Style", SRMSGMOD_T, "aerostyle", CSkin::AERO_EFFECT_MILK },
+ { "AeroMode", "AeroGlowColor", FONTMODULE, "aeroGlow", RGB(40, 40, 255) },
+
+ { "Colored Tabs", "NormalText", SRMSGMOD_T, "tab_txt_normal", RGB(1, 1, 1) },
+ { "Colored Tabs", "ActiveText", SRMSGMOD_T, "tab_txt_active", RGB(1, 1, 1) },
+ { "Colored Tabs", "HottrackText", SRMSGMOD_T, "tab_txt_hottrack", RGB(1, 1, 1) },
+ { "Colored Tabs", "UnreadText", SRMSGMOD_T, "tab_txt_unread", RGB(1, 1, 1) },
+
+ { "Colored Tabs", "NormalBG", SRMSGMOD_T, "tab_bg_normal", 0xf0f0f0 },
+ { "Colored Tabs", "ActiveBG", SRMSGMOD_T, "tab_bg_active", 0xf0f0f0 },
+ { "Colored Tabs", "HottrackBG", SRMSGMOD_T, "tab_bg_hottrack", 0xf0f0f0 },
+ { "Colored Tabs", "UnreadBG", SRMSGMOD_T, "tab_bg_unread", 0xf0f0f0 },
+ { CHAT_MODULE, "Background", CHAT_MODULE, "ColorLogBG", SRMSGDEFSET_BKGCOLOUR }
};
/*
@@ -159,7 +162,7 @@ static struct _tagFontBlocks { } fontBlocks[] = {
FONTMODULE, 0, MSGDLGFONTCOUNT, "Font%d", "StdFonts",
FONTMODULE, 100, IPFONTCOUNT, "IPFont%d", "MiscFonts",
- CHAT_FONTMODULE, 0, CHATFONTCOUNT, "ChatFont%d", "ChatFonts",
+ CHATFONT_MODULE, 0, CHATFONTCOUNT, "ChatFont%d", CHATFONT_MODULE,
NULL, 0, 0, NULL
};
@@ -345,7 +348,7 @@ void TSAPI ReadThemeFromINI(const TCHAR *szIniFilenameT, TContainerData *dat, in defclr = g_Settings.UserListColors[CHAT_STATUS_NORMAL];
g_Settings.nickColors[i] = GetPrivateProfileIntA("Nick Colors", _itoa(i, szTemp, 10), defclr, szIniFilename);
mir_snprintf(szTemp, SIZEOF(szTemp), "NickColor%d", i);
- db_set_dw(0, "Chat", szTemp, g_Settings.nickColors[i]);
+ db_set_dw(0, CHAT_MODULE, szTemp, g_Settings.nickColors[i]);
}
}
} else {
|