diff options
Diffstat (limited to 'popup/src')
| -rw-r--r-- | popup/src/main.cpp | 13 | ||||
| -rw-r--r-- | popup/src/opt_class.cpp | 6 | ||||
| -rw-r--r-- | popup/src/opt_skins.cpp | 17 | ||||
| -rw-r--r-- | popup/src/srmm_menu.cpp | 10 |
4 files changed, 26 insertions, 20 deletions
diff --git a/popup/src/main.cpp b/popup/src/main.cpp index 8dd9ae9..41ad1b5 100644 --- a/popup/src/main.cpp +++ b/popup/src/main.cpp @@ -143,7 +143,7 @@ static int OptionsInitialize(WPARAM wParam,LPARAM lParam) odp.ptszTab = LPGENT("General");
odp.pfnDlgProc = DlgProcPopUpGeneral;
- odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUP_PAGE1);
+ odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUP_GENERAL);
CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp);
odp.ptszTab = LPGENT("Classes");
@@ -151,11 +151,6 @@ static int OptionsInitialize(WPARAM wParam,LPARAM lParam) odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_NOTIFICATIONS);
CallService( MS_OPT_ADDPAGE, wParam,(LPARAM)&odp );
- odp.ptszTab = LPGENT("Skins");
- odp.pfnDlgProc = DlgProcPopSkinsOpts;
- odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SKIN2);
- CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp);
-
odp.ptszTab = LPGENT("Actions");
odp.pfnDlgProc = DlgProcPopupActions;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ACTIONS);
@@ -172,6 +167,12 @@ static int OptionsInitialize(WPARAM wParam,LPARAM lParam) odp.flags |= ODPF_EXPERTONLY;
CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp);
+ odp.ptszGroup = LPGENT("Skins");
+ odp.ptszTab = LPGENT(MODULNAME_PLU);
+ odp.pfnDlgProc = DlgProcPopSkinsOpts;
+ odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SKIN2);
+ CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp);
+
//Test page
//odp.ptszTab = LPGEN("General (old)");
//odp.pfnDlgProc = DlgProcPopUpOpts;
diff --git a/popup/src/opt_class.cpp b/popup/src/opt_class.cpp index 12b1233..b6376b8 100644 --- a/popup/src/opt_class.cpp +++ b/popup/src/opt_class.cpp @@ -160,7 +160,7 @@ INT_PTR CALLBACK DlgProcOptsClasses(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l {IDC_SOFFLINE, SKINICON_STATUS_OFFLINE, "Offline", PF2_IDLE, PF2_IDLE},
{IDC_SONLINE, SKINICON_STATUS_ONLINE, "Online", PF2_ONLINE, PF2_ONLINE},
{IDC_SAWAY, SKINICON_STATUS_AWAY, "Away", PF2_SHORTAWAY, PF2_SHORTAWAY},
- {IDC_SNA, SKINICON_STATUS_NA, "N/A", PF2_LONGAWAY, PF2_LONGAWAY},
+ {IDC_SNA, SKINICON_STATUS_NA, "NA", PF2_LONGAWAY, PF2_LONGAWAY},
{IDC_SOCCUPIED, SKINICON_STATUS_OCCUPIED, "Occupied", PF2_LIGHTDND, PF2_LIGHTDND},
{IDC_SDND, SKINICON_STATUS_DND, "DND", PF2_HEAVYDND, PF2_HEAVYDND},
{IDC_SFREE4CHAT, SKINICON_STATUS_FREE4CHAT, "Free for chat", PF2_FREECHAT, PF2_FREECHAT},
@@ -171,7 +171,7 @@ INT_PTR CALLBACK DlgProcOptsClasses(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l {IDC_SOFFLINE2, SKINICON_STATUS_OFFLINE, "Offline", PF2_IDLE, PF2_IDLE<<16},
{IDC_SONLINE2, SKINICON_STATUS_ONLINE, "Online", PF2_ONLINE, PF2_ONLINE<<16},
{IDC_SAWAY2, SKINICON_STATUS_AWAY, "Away", PF2_SHORTAWAY, PF2_SHORTAWAY<<16},
- {IDC_SNA2, SKINICON_STATUS_NA, "N/A", PF2_LONGAWAY, PF2_LONGAWAY<<16},
+ {IDC_SNA2, SKINICON_STATUS_NA, "NA", PF2_LONGAWAY, PF2_LONGAWAY<<16},
{IDC_SOCCUPIED2, SKINICON_STATUS_OCCUPIED, "Occupied", PF2_LIGHTDND, PF2_LIGHTDND<<16},
{IDC_SDND2, SKINICON_STATUS_DND, "DND", PF2_HEAVYDND, PF2_HEAVYDND<<16},
{IDC_SFREE4CHAT2, SKINICON_STATUS_FREE4CHAT, "Free for chat", PF2_FREECHAT, PF2_FREECHAT<<16},
@@ -396,7 +396,7 @@ INT_PTR CALLBACK DlgProcOptsClasses(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l OPENOPTIONSDIALOG ood = {0};
ood.cbSize = sizeof(OPENOPTIONSDIALOG);
ood.pszGroup = "Customize";
- ood.pszPage = Translate("Fonts & Colors");
+ ood.pszPage = "Fonts & Colors";
CallService(MS_OPT_OPENOPTIONS, 0, (LPARAM)&ood);
}
break;
diff --git a/popup/src/opt_skins.cpp b/popup/src/opt_skins.cpp index 64b49b0..d91efe5 100644 --- a/popup/src/opt_skins.cpp +++ b/popup/src/opt_skins.cpp @@ -235,12 +235,12 @@ int SkinOptionList_AddSkin(OPTTREE_OPTION* &options, int *OptionsCount, int pos int SkinOptionList_AddMain(OPTTREE_OPTION* &options, int *OptionsCount, int pos, DWORD *dwGlobalOptions) {
BOOL bCheck;
LPTSTR mainOption [] = {
- _T("Show clock"),
- _T("Drop shadow effect (Windows XP+)"),
- _T("Drop shadow effect (Windows XP+)/non rectangular"),
- _T("Enable Aero Glass (Vista+)"),
- _T("Use Windows colours"),
- _T("Use advanced text render")};
+ LPGENT("Show clock"),
+ LPGENT("Drop shadow effect (Windows XP+)"),
+ LPGENT("Drop shadow effect (Windows XP+)/non rectangular"),
+ LPGENT("Enable Aero Glass (Vista+)"),
+ LPGENT("Use Windows colours"),
+ LPGENT("Use advanced text render")};
for (int i = 0; i < SIZEOF(mainOption); i++) {
bCheck = 0;
switch (i) {
@@ -334,7 +334,7 @@ void LoadOption_Skins() { PopUpOptions.DisplayTime = DBGetContactSettingByte(NULL,MODULNAME, "DisplayTime", TRUE);
PopUpOptions.DropShadow = DBGetContactSettingByte(NULL,MODULNAME, "DropShadow", TRUE);
PopUpOptions.EnableFreeformShadows = DBGetContactSettingByte(NULL,MODULNAME, "EnableShadowRegion", 1);
- PopUpOptions.EnableAeroGlass = DBGetContactSettingByte(NULL,MODULNAME, "EnableAeroGlass", 0);
+ PopUpOptions.EnableAeroGlass = DBGetContactSettingByte(NULL,MODULNAME, "EnableAeroGlass", 1);
PopUpOptions.UseWinColors = DBGetContactSettingByte(NULL,MODULNAME, "UseWinColors", FALSE);
PopUpOptions.UseMText = DBGetContactSettingByte(NULL,MODULNAME, "UseMText", TRUE);
}
@@ -477,6 +477,9 @@ INT_PTR CALLBACK DlgProcPopSkinsOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
}//end IDC_BTN_RELOAD:
break;
+ case IDC_GETSKINS:
+ CallService(MS_UTILS_OPENURL,0,(LPARAM)"http://addons.miranda-im.org/index.php?action=display&id=72");
+ break;
default:
break;
}//end switch(idCtrl)
diff --git a/popup/src/srmm_menu.cpp b/popup/src/srmm_menu.cpp index a200286..398d500 100644 --- a/popup/src/srmm_menu.cpp +++ b/popup/src/srmm_menu.cpp @@ -39,8 +39,8 @@ Last change by : $Author: Merlin_de $ *************************************************************************************/
static HANDLE hDialogsList = NULL;
+static HANDLE hIconPressed=0,hWindowEvent=0;
-static void SrmmMenu_UpdateIcon(HANDLE hContact);
static int SrmmMenu_ProcessEvent(WPARAM wParam, LPARAM lParam);
static int SrmmMenu_ProcessIconClick(WPARAM wParam, LPARAM lParam);
@@ -60,7 +60,7 @@ void SrmmMenu_Load() CallService(MS_MSG_ADDICON, 0, (LPARAM)&sid);
sid.dwId = 1;
- sid.szTooltip = Translate("Popup Mode: Favourtite");
+ sid.szTooltip = Translate("Popup Mode: Favourite");
sid.hIcon = sid.hIconDisabled = IcoLib_GetIcon(ICO_FAV,0);
CallService(MS_MSG_ADDICON, 0, (LPARAM)&sid);
@@ -74,8 +74,8 @@ void SrmmMenu_Load() sid.hIcon = sid.hIconDisabled = IcoLib_GetIcon(ICO_POPUP_OFF,0);
CallService(MS_MSG_ADDICON, 0, (LPARAM)&sid);
- HookEvent(ME_MSG_ICONPRESSED, SrmmMenu_ProcessIconClick);
- HookEvent(ME_MSG_WINDOWEVENT, SrmmMenu_ProcessEvent);
+ hIconPressed = HookEvent(ME_MSG_ICONPRESSED, SrmmMenu_ProcessIconClick);
+ hWindowEvent = HookEvent(ME_MSG_WINDOWEVENT, SrmmMenu_ProcessEvent);
/*
HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);
while (hContact)
@@ -89,6 +89,8 @@ void SrmmMenu_Load() void SrmmMenu_Unload()
{
+ UnhookEvent(hIconPressed);
+ UnhookEvent(hWindowEvent);
}
static void SrmmMenu_UpdateIcon(HANDLE hContact)
|