From 8c0fdc97e08a752bf9ca84a0ac17caa3a79bea22 Mon Sep 17 00:00:00 2001 From: pescuma Date: Mon, 26 Jan 2009 01:44:08 +0000 Subject: skins: 0.0.0.4 * Fixed font service iteration * Fixed naming of skin options git-svn-id: http://pescuma.googlecode.com/svn/trunk/Miranda@141 c086bb3d-8645-0410-b8da-73a8550f86e7 --- Plugins/skins/Docs/skins_changelog.txt | 4 ++++ Plugins/skins/Docs/skins_version.txt | 2 +- Plugins/skins/MirandaFont.cpp | 13 ++++++------- Plugins/skins/MirandaFont.h | 2 +- Plugins/skins/MirandaSkinnedDialog.cpp | 2 +- Plugins/skins/SkinLib/FontState.cpp | 3 ++- Plugins/skins/skins.cpp | 10 +--------- 7 files changed, 16 insertions(+), 20 deletions(-) diff --git a/Plugins/skins/Docs/skins_changelog.txt b/Plugins/skins/Docs/skins_changelog.txt index 27a687e..ad95ddd 100644 --- a/Plugins/skins/Docs/skins_changelog.txt +++ b/Plugins/skins/Docs/skins_changelog.txt @@ -2,6 +2,10 @@ Skins Changelog: +. 0.0.0.4 + * Fixed font service iteration + * Fixed naming of skin options + . 0.0.0.3 * Better handling of small sizes diff --git a/Plugins/skins/Docs/skins_version.txt b/Plugins/skins/Docs/skins_version.txt index 92fefe7..45b0912 100644 --- a/Plugins/skins/Docs/skins_version.txt +++ b/Plugins/skins/Docs/skins_version.txt @@ -1 +1 @@ -Skins 0.0.0.3 \ No newline at end of file +Skins 0.0.0.4 \ No newline at end of file diff --git a/Plugins/skins/MirandaFont.cpp b/Plugins/skins/MirandaFont.cpp index 877d9b5..51b0f34 100644 --- a/Plugins/skins/MirandaFont.cpp +++ b/Plugins/skins/MirandaFont.cpp @@ -4,7 +4,7 @@ MirandaFont::MirandaFont(Field *aField, const char *description) : field(aField), hFont(NULL) { ZeroMemory(&fid, sizeof(fid)); - strncpy(fid.name, description, sizeof(fid.name)); + lstrcpyn(fid.name, CharToTchar(description), sizeof(fid.name)); } MirandaFont::~MirandaFont() @@ -21,13 +21,12 @@ void MirandaFont::registerFont(FontState *font) HDC hdc = GetDC(NULL); - // ZeroMemory(&fid, sizeof(fid)); fid.cbSize = sizeof(fid); - strncpy(fid.group, field->getDialog()->getName(), sizeof(fid.group)); + lstrcpyn(fid.group, CharToTchar(dlg->getDescription()), sizeof(fid.group)); strncpy(fid.dbSettingsGroup, dlg->getModule(), sizeof(fid.dbSettingsGroup)); char tmp[sizeof(fid.prefix)]; - mir_snprintf(tmp, sizeof(tmp), "%s_%s_%s_Font_", TcharToChar(dlg->getSkinName()), field->getDialog()->getName(), field->getName()); + mir_snprintf(tmp, sizeof(tmp), "%s%s%sFont", TcharToChar(dlg->getSkinName()), dlg->getName(), field->getName()); strncpy(fid.prefix, tmp, sizeof(fid.prefix)); fid.deffontsettings.colour = font->getColor(); @@ -37,11 +36,11 @@ void MirandaFont::registerFont(FontState *font) | (font->isUnderline() ? DBFONTF_UNDERLINE : 0) | (font->isStrikeOut() ? DBFONTF_STRIKEOUT : 0); fid.deffontsettings.charset = DEFAULT_CHARSET; - strncpy(fid.deffontsettings.szFace, TcharToUtf8(font->getFace()), sizeof(fid.deffontsettings.szFace)); + lstrcpyn(fid.deffontsettings.szFace, font->getFace(), sizeof(fid.deffontsettings.szFace)); fid.order = dlg->getIndexOf(field); fid.flags = FIDF_DEFAULTVALID | FIDF_ALLOWEFFECTS; - CallService(MS_FONT_REGISTER, (WPARAM)&fid, 0); + CallService(MS_FONT_REGISTERT, (WPARAM)&fid, 0); ReleaseDC(NULL, hdc); @@ -55,7 +54,7 @@ void MirandaFont::reloadFont() releaseFont(); LOGFONT log_font; - COLORREF color = (COLORREF) CallService(MS_FONT_GET, (WPARAM) &fid, (LPARAM) &log_font); + COLORREF color = (COLORREF) CallService(MS_FONT_GETT, (WPARAM) &fid, (LPARAM) &log_font); hFont = CreateFontIndirect(&log_font); switch(field->getType()) diff --git a/Plugins/skins/MirandaFont.h b/Plugins/skins/MirandaFont.h index 0664ed3..da9a40a 100644 --- a/Plugins/skins/MirandaFont.h +++ b/Plugins/skins/MirandaFont.h @@ -14,7 +14,7 @@ public: void reloadFont(); private: - FontID fid; + FontIDT fid; HFONT hFont; Field *field; diff --git a/Plugins/skins/MirandaSkinnedDialog.cpp b/Plugins/skins/MirandaSkinnedDialog.cpp index 26c3cb5..579bb6f 100644 --- a/Plugins/skins/MirandaSkinnedDialog.cpp +++ b/Plugins/skins/MirandaSkinnedDialog.cpp @@ -193,7 +193,7 @@ void MirandaSkinnedDialog::setSettting(const char *name, const char *val) void MirandaSkinnedDialog::getSettingName(char *setting, const char * name) { - _snprintf(setting, SETTING_NAME_SIZE, "%s_%s", getName(), name); + mir_snprintf(setting, SETTING_NAME_SIZE, "%s%s%s", TcharToChar(getSkinName()), getName(), name); } void MirandaSkinnedDialog::setOnSkinChangedCallback(MirandaSkinnedCallback cb, void *param) diff --git a/Plugins/skins/SkinLib/FontState.cpp b/Plugins/skins/SkinLib/FontState.cpp index fdf1e09..da9b415 100644 --- a/Plugins/skins/SkinLib/FontState.cpp +++ b/Plugins/skins/SkinLib/FontState.cpp @@ -1,6 +1,7 @@ #include "globals.h" #include "FontState.h" + FontState::FontState(HFONT hFont, COLORREF aColor) : hFont(NULL), externalFont(false), color(aColor) { setHFONT(hFont); @@ -19,7 +20,7 @@ void FontState::rebuildHFONT() void FontState::buildAttribs() { - LOGFONT lf; + LOGFONT lf = {0}; if (hFont == NULL || GetObject(hFont, sizeof(lf), &lf) == 0) { face = _T("Tahoma"); diff --git a/Plugins/skins/skins.cpp b/Plugins/skins/skins.cpp index 1f80611..8641db2 100644 --- a/Plugins/skins/skins.cpp +++ b/Plugins/skins/skins.cpp @@ -30,7 +30,7 @@ PLUGININFOEX pluginInfo={ #else "Skins", #endif - PLUGIN_MAKE_VERSION(0,0,0,2), + PLUGIN_MAKE_VERSION(0,0,0,4), "Skins", "Ricardo Pescuma Domenecci", "", @@ -56,9 +56,6 @@ HANDLE hNetlibUser = 0; HANDLE hSkinsFolder = NULL; TCHAR skinsFolder[1024]; -char *metacontacts_proto = NULL; -BOOL loaded = FALSE; - std::vector dlgs; LIST_INTERFACE li; @@ -161,9 +158,6 @@ extern "C" int __declspec(dllexport) Unload(void) // Called when all the modules are loaded int ModulesLoaded(WPARAM wParam, LPARAM lParam) { - if (ServiceExists(MS_MC_GETPROTOCOLNAME)) - metacontacts_proto = (char *) CallService(MS_MC_GETPROTOCOLNAME, 0, 0); - // add our modules to the KnownModules list CallService("DBEditorpp/RegisterSingleModule", (WPARAM) MODULE_NAME, 0); @@ -194,8 +188,6 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) CallService(MS_UPDATE_REGISTER, 0, (LPARAM)&upd); } - loaded = TRUE; - return 0; } -- cgit v1.2.3