diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2017-11-27 00:12:03 +0300 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2017-11-27 00:12:03 +0300 |
| commit | 48affc01c9a19f3ce39a4600ec6b8e0b247b80c1 (patch) | |
| tree | bf3b9a4e139ec0fb2831da27942772933e43ef28 /plugins | |
| parent | 56d1702de011963f3506a481a43c68beb97c8fe8 (diff) | |
add module name (part 1)
Diffstat (limited to 'plugins')
94 files changed, 128 insertions, 22 deletions
diff --git a/plugins/AddContactPlus/src/main.cpp b/plugins/AddContactPlus/src/main.cpp index 26df21c584..368c37c2b8 100644 --- a/plugins/AddContactPlus/src/main.cpp +++ b/plugins/AddContactPlus/src/main.cpp @@ -94,6 +94,7 @@ static int OnAccListChanged(WPARAM, LPARAM) CMenuItem mi;
SET_UID(mi, 0xb19db907, 0x870e, 0x49fa, 0xa7, 0x1e, 0x43, 0x5e, 0xa8, 0xe5, 0x9b, 0xbd);
+ mi.Module = "AddContact+";
mi.position = 500020001;
mi.flags = CMIF_UNICODE;
mi.hIcolibItem = icon.hIcolib;
diff --git a/plugins/Alarms/src/frame.cpp b/plugins/Alarms/src/frame.cpp index fcbc4d75e0..28252c7bfa 100755 --- a/plugins/Alarms/src/frame.cpp +++ b/plugins/Alarms/src/frame.cpp @@ -531,6 +531,7 @@ int CreateFrame() mi.name.a = LPGEN("Show reminders");
mi.pszService = MODULE "/ShowHideReminders";
mi.position = 500010000;
+ mi.Module = MODULE;
hMenuShowReminders = Menu_AddMainMenuItem(&mi);
/////////////////////
diff --git a/plugins/Alarms/src/options.cpp b/plugins/Alarms/src/options.cpp index ec2a9a3467..87d0b35ee8 100755 --- a/plugins/Alarms/src/options.cpp +++ b/plugins/Alarms/src/options.cpp @@ -823,6 +823,7 @@ void AddMenuItem() mi.name.a = "Set alarm";
mi.pszService = MODULE "/NewAlarm";
mi.position = 500010000;
+ mi.Module = MODULE;
hMainMenuItem = Menu_AddMainMenuItem(&mi);
}
diff --git a/plugins/AuthState/src/main.cpp b/plugins/AuthState/src/main.cpp index db2de1db13..b6ce411788 100644 --- a/plugins/AuthState/src/main.cpp +++ b/plugins/AuthState/src/main.cpp @@ -183,6 +183,7 @@ extern "C" int __declspec(dllexport) Load(void) mi.flags = CMIF_UNICODE;
mi.name.w = LPGENW("Enable AuthState icons");
mi.pszService = "AuthState/MenuItem";
+ mi.Module = MODULENAME;
hUserMenu = Menu_AddContactMenuItem(&mi);
// IcoLib support
diff --git a/plugins/AutoShutdown/src/settingsdlg.cpp b/plugins/AutoShutdown/src/settingsdlg.cpp index 662196b3ca..5c7c38cc59 100644 --- a/plugins/AutoShutdown/src/settingsdlg.cpp +++ b/plugins/AutoShutdown/src/settingsdlg.cpp @@ -440,6 +440,7 @@ void SetShutdownMenuItem(bool fActive) CMenuItem mi;
SET_UID(mi, 0x61e2a38f, 0xcd94, 0x4f72, 0x84, 0x8c, 0x72, 0x92, 0xde, 0x1d, 0x6d, 0x5);
mi.position = 2001090000;
+ mi.Module = "AutoShutdown";
if (fActive) {
mi.hIcolibItem = iconList[1].hIcolib;
mi.name.w = LPGENW("Stop automatic &shutdown");
diff --git a/plugins/AvatarHistory/src/AvatarDlg.cpp b/plugins/AvatarHistory/src/AvatarDlg.cpp index a352efd61b..c56c680e3b 100644 --- a/plugins/AvatarHistory/src/AvatarDlg.cpp +++ b/plugins/AvatarHistory/src/AvatarDlg.cpp @@ -503,6 +503,7 @@ void InitMenuItem() mi.position = 1000090010;
mi.hIcolibItem = createDefaultOverlayedIcon(FALSE);
mi.pszService = MS_AVATARHISTORY_SHOWDIALOG;
+ mi.Module = MODULE_NAME;
hMenu = Menu_AddContactMenuItem(&mi);
DestroyIcon((HICON)mi.hIcolibItem);
}
diff --git a/plugins/BasicHistory/src/BasicHistory.cpp b/plugins/BasicHistory/src/BasicHistory.cpp index b017c33188..18b197f786 100644 --- a/plugins/BasicHistory/src/BasicHistory.cpp +++ b/plugins/BasicHistory/src/BasicHistory.cpp @@ -100,6 +100,7 @@ void InitMenuItems() SET_UID(mi, 0x28848d7a, 0x6995, 0x4799, 0x82, 0xd7, 0x18, 0x40, 0x3d, 0xe3, 0x71, 0xc4);
mi.position = 1000090000;
+ mi.Module = MODULE;
mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_HISTORY);
mi.name.a = LPGEN("View &History");
mi.pszService = MS_HISTORY_SHOWCONTACTHISTORY;
@@ -126,6 +127,7 @@ void InitTaskMenuItems() CMenuItem mi;
SET_UID(mi, 0xbf66499, 0x1b39, 0x47a2, 0x9b, 0x74, 0xa6, 0xae, 0x89, 0x95, 0x59, 0x59);
mi.position = 500060005;
+ mi.Module = MODULE;
mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_HISTORY);
mi.name.a = LPGEN("Execute history task");
hTaskMainMenu = Menu_AddMainMenuItem(&mi);
@@ -146,6 +148,7 @@ void InitTaskMenuItems() mi.pszService = MS_HISTORY_EXECUTE_TASK;
mi.root = hTaskMainMenu;
mi.name.w = (wchar_t*)taskIt->taskName.c_str();
+ mi.Module = MODULE;
HGENMENU menu = Menu_AddMainMenuItem(&mi);
Menu_ConfigureItem(menu, MCI_OPT_EXECPARAM, pos++);
taskMenus.push_back(menu);
diff --git a/plugins/Boltun/src/boltun.cpp b/plugins/Boltun/src/boltun.cpp index 0c9e889d7b..355aefb6b5 100644 --- a/plugins/Boltun/src/boltun.cpp +++ b/plugins/Boltun/src/boltun.cpp @@ -548,6 +548,7 @@ extern "C" int __declspec(dllexport) Load(void) mi.position = -50010002; //TODO: check the warning
mi.name.a = BOLTUN_AUTO_CHAT;
mi.pszService = SERV_CONTACT_AUTO_CHAT;
+ mi.Module = BOLTUN_NAME;
hMenuItemAutoChat = Menu_AddContactMenuItem(&mi);
SET_UID(mi, 0x726af984, 0x988c, 0x4d5d, 0x97, 0x30, 0xdc, 0x46, 0x55, 0x76, 0x1, 0x73);
diff --git a/plugins/BossKeyPlus/src/BossKey.cpp b/plugins/BossKeyPlus/src/BossKey.cpp index 9d7df65878..9f357f2ea1 100644 --- a/plugins/BossKeyPlus/src/BossKey.cpp +++ b/plugins/BossKeyPlus/src/BossKey.cpp @@ -536,6 +536,7 @@ void BossKeyMenuItemInit(void) // Add menu item mi.hIcolibItem = IcoLib_GetIcon("hidemim");
mi.name.w = LPGENW("Hide");
mi.pszService = MS_BOSSKEY_HIDE;
+ mi.Module = MOD_NAME;
g_hMenuItem = Menu_AddMainMenuItem(&mi);
HookEvent(ME_CLIST_PREBUILDMAINMENU, GenMenuInit);
diff --git a/plugins/BuddyExpectator/src/BuddyExpectator.cpp b/plugins/BuddyExpectator/src/BuddyExpectator.cpp index d8b1ef3749..5db20f206b 100644 --- a/plugins/BuddyExpectator/src/BuddyExpectator.cpp +++ b/plugins/BuddyExpectator/src/BuddyExpectator.cpp @@ -613,6 +613,7 @@ int ModulesLoaded(WPARAM, LPARAM) mi.position = 200000;
mi.name.w = LPGENW("Enable Miss You");
mi.pszService = "BuddyExpectator/actionMissYouClick";
+ mi.Module = MODULE_NAME;
hContactMenu = Menu_AddContactMenuItem(&mi);
}
diff --git a/plugins/BuddyPounce/src/main.cpp b/plugins/BuddyPounce/src/main.cpp index 250e76658f..df1be51572 100644 --- a/plugins/BuddyPounce/src/main.cpp +++ b/plugins/BuddyPounce/src/main.cpp @@ -50,6 +50,7 @@ int MainInit(WPARAM, LPARAM) mi.hIcolibItem = LoadIcon(hInst,MAKEINTRESOURCE(IDI_POUNCE));
mi.name.a = LPGEN("&Buddy Pounce");
mi.pszService = "BuddyPounce/MenuCommand";
+ mi.Module = modname;
Menu_AddContactMenuItem(&mi);
return 0;
}
diff --git a/plugins/BuddyPounce/src/stdafx.h b/plugins/BuddyPounce/src/stdafx.h index 1187a52a6f..833571d8e8 100644 --- a/plugins/BuddyPounce/src/stdafx.h +++ b/plugins/BuddyPounce/src/stdafx.h @@ -23,7 +23,7 @@ //=======================================================
// Definitions
//=======================================================
-#define modname "buddypounce"
+#define modname "BuddyPounce"
#define modFullname "Buddy Pounce"
#define msg(a,b) MessageBox(0,a,b,MB_OK)
diff --git a/plugins/CSList/src/cslist.cpp b/plugins/CSList/src/cslist.cpp index 10cfefe065..7543eb27d9 100644 --- a/plugins/CSList/src/cslist.cpp +++ b/plugins/CSList/src/cslist.cpp @@ -244,6 +244,7 @@ void addProtoStatusMenuItem(char *protoName) mi.position = 2000040000; mi.pszService = buf; mi.root = hRoot; + mi.Module = MODNAME; Menu_AddStatusMenuItem(&mi); RegisterHotkeys(buf, pdescr->tszAccountName, pdescr->iOrder); diff --git a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp index 05a4423f30..342d8fed89 100644 --- a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp +++ b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp @@ -339,6 +339,7 @@ int MirandaLoaded(WPARAM, LPARAM) mi.name.w = LPGENW("Enable c&lient change notification");
mi.pszService = MS_CCN_TOGGLEPOPUPS;
+ mi.Module = MOD_NAME;
g_hTogglePopupsMenuItem = Menu_AddMainMenuItem(&mi);
}
diff --git a/plugins/Clist_modern/src/cluiframes.cpp b/plugins/Clist_modern/src/cluiframes.cpp index f5e130c5e7..ad492e83d9 100644 --- a/plugins/Clist_modern/src/cluiframes.cpp +++ b/plugins/Clist_modern/src/cluiframes.cpp @@ -1495,6 +1495,7 @@ static int CLUIFramesLoadMainMenu() mi.position = separator++;
mi.name.w = F.TitleBar.tbname ? F.TitleBar.tbname : F.name;
mi.pszService = nullptr;
+ mi.Module = "Clist_modern";
g_frameMenus.insert(F.MenuHandles.MainMenuItem = Menu_AddMainMenuItem(&mi));
CLUIFramesCreateMenuForFrame(F.id, F.MenuHandles.MainMenuItem, separator, true);
CLUIFramesModifyMainMenuItems(F.id, 0);
@@ -3332,6 +3333,7 @@ int LoadCLUIFramesModule(void) mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_FRAME);
mi.position = 3000090000;
mi.name.a = LPGEN("Frames");
+ mi.Module = "Clist_modern";
cont.MainMenuItem = Menu_AddMainMenuItem(&mi);
UNSET_UID(mi);
diff --git a/plugins/Clist_modern/src/groupmenu.cpp b/plugins/Clist_modern/src/groupmenu.cpp index 3f1cc65679..c6bde070fa 100644 --- a/plugins/Clist_modern/src/groupmenu.cpp +++ b/plugins/Clist_modern/src/groupmenu.cpp @@ -63,6 +63,7 @@ void InitGroupMenus(void) mi.pszService = "Clist/ShowHide";
mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_SHOWHIDE);
mi.name.a = LPGEN("&Hide/show");
+ mi.Module = "Clist_modern";
Menu_AddGroupMenuItem(&mi);
SET_UID(mi, 0xb0f29663, 0x68b6, 0x494c, 0xaf, 0xab, 0xf6, 0x86, 0x45, 0xb8, 0xdb, 0xde);
@@ -137,5 +138,6 @@ void InitSubGroupMenus(void) mi.position = 1002;
mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";
mi.name.a = LPGEN("&Show offline users in here");
+ mi.Module = "Clist_modern";
hShowOfflineUsersHereMenuItem = Menu_AddSubGroupMenuItem(&mi, &gmp);
}
diff --git a/plugins/Clist_modern/src/modern_clistmenus.cpp b/plugins/Clist_modern/src/modern_clistmenus.cpp index 4148a30712..56e95f8ebf 100644 --- a/plugins/Clist_modern/src/modern_clistmenus.cpp +++ b/plugins/Clist_modern/src/modern_clistmenus.cpp @@ -128,6 +128,7 @@ int LoadFavoriteContactMenu() SET_UID(mi, 0xf99a2320, 0xc024, 0x48bd, 0x81, 0xf7, 0x9f, 0xa2, 0x5, 0xb0, 0x7f, 0xdc);
mi.name.w = FAVMENUROOTNAME;
mi.flags = CMIF_UNICODE;
+ mi.Module = "Clist_modern";
hFavoriteContactMenu = Menu_AddContactMenuItem(&mi);
Menu_ConfigureItem(hFavoriteContactMenu, MCI_OPT_UNIQUENAME, "ModernClistMenu_ContactRate");
diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp index 521f49d15d..ef66617cb9 100644 --- a/plugins/Clist_modern/src/modern_clui.cpp +++ b/plugins/Clist_modern/src/modern_clui.cpp @@ -332,6 +332,7 @@ HRESULT CLUI::RegisterAvatarMenu() mi.hIcolibItem = iconItem[0].hIcolib;
mi.name.a = LPGEN("Show contact &avatar");
mi.pszService = "CList/ShowContactAvatar";
+ mi.Module = "Clist_modern";
hShowAvatarMenuItem = Menu_AddContactMenuItem(&mi);
SET_UID(mi, 0x13f93d1b, 0xd470, 0x45de, 0x86, 0x8f, 0x22, 0x3b, 0x89, 0x4f, 0x4f, 0xa3);
diff --git a/plugins/Clist_nicer/src/clistmenus.cpp b/plugins/Clist_nicer/src/clistmenus.cpp index 0aef011081..a9cbc52167 100644 --- a/plugins/Clist_nicer/src/clistmenus.cpp +++ b/plugins/Clist_nicer/src/clistmenus.cpp @@ -371,6 +371,7 @@ int InitCustomMenus(void) mi.pszService = "CList/SetContactIgnore";
mi.hIcolibItem = iconItem[0].hIcolib;
mi.name.a = LPGEN("&Contact list settings...");
+ mi.Module = "Clist_nicer";
Menu_AddContactMenuItem(&mi);
return 0;
}
diff --git a/plugins/Clist_nicer/src/cluiframes.cpp b/plugins/Clist_nicer/src/cluiframes.cpp index 0a2a2d1499..e8345ad2bc 100644 --- a/plugins/Clist_nicer/src/cluiframes.cpp +++ b/plugins/Clist_nicer/src/cluiframes.cpp @@ -1350,6 +1350,7 @@ static int CLUIFramesLoadMainMenu() mi.position = separator; mi.name.w = F.TitleBar.tbname ? F.TitleBar.tbname : F.name; mi.pszService = nullptr; + mi.Module = "Clist_nicer"; g_frameMenus.insert(F.MenuHandles.MainMenuItem = Menu_AddMainMenuItem(&mi)); CLUIFramesCreateMenuForFrame(F.id, F.MenuHandles.MainMenuItem, separator, true); CLUIFramesModifyMainMenuItems(F.id, 0); @@ -2962,6 +2963,7 @@ int LoadCLUIFramesModule(void) mi.position = 3000090000; mi.name.a = LPGEN("Frames"); mi.pszService = nullptr; + mi.Module = "Clist_nicer"; cont.MainMenuItem = Menu_AddMainMenuItem(&mi); UNSET_UID(mi); diff --git a/plugins/Clist_nicer/src/groupmenu.cpp b/plugins/Clist_nicer/src/groupmenu.cpp index 62b955c8c7..1ee775fd69 100644 --- a/plugins/Clist_nicer/src/groupmenu.cpp +++ b/plugins/Clist_nicer/src/groupmenu.cpp @@ -102,6 +102,7 @@ void InitGroupMenus(void) mi.pszService = "Clist/ShowHide";
mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_SHOWHIDE);
mi.name.a = LPGEN("&Hide/show");
+ mi.Module = "Clist_nicer";
hHideShowMainMenuItem = Menu_AddGroupMenuItem(&mi);
SET_UID(mi, 0xb0f29663, 0x68b6, 0x494c, 0xaf, 0xab, 0xf6, 0x86, 0x45, 0xb8, 0xdb, 0xde);
diff --git a/plugins/CloudFile/src/menus.cpp b/plugins/CloudFile/src/menus.cpp index acfd469092..9e18038d58 100644 --- a/plugins/CloudFile/src/menus.cpp +++ b/plugins/CloudFile/src/menus.cpp @@ -30,6 +30,7 @@ void InitializeMenus() mi.position = -2000019999; mi.hIcon = LoadIconEx(IDI_UPLOAD); + mi.Module = MODULE; hContactMenu = Menu_AddContactMenuItem(&mi); if (defaultService) diff --git a/plugins/Console/src/Console.cpp b/plugins/Console/src/Console.cpp index 43c85aea52..f55e201e74 100644 --- a/plugins/Console/src/Console.cpp +++ b/plugins/Console/src/Console.cpp @@ -1150,6 +1150,7 @@ static int OnSystemModulesLoaded(WPARAM, LPARAM) mi.position = 1900000000;
mi.name.w = (IsWindowVisible(hwndConsole)) ? LPGENW("Hide Console") : LPGENW("Show Console");
mi.pszService = MS_CONSOLE_SHOW_HIDE;
+ mi.Module = "Console";
hMenu = Menu_AddMainMenuItem(&mi);
OnFontChange(0, 0);
diff --git a/plugins/ContactsPlus/src/main.cpp b/plugins/ContactsPlus/src/main.cpp index 66b604553d..9c38b6dd34 100644 --- a/plugins/ContactsPlus/src/main.cpp +++ b/plugins/ContactsPlus/src/main.cpp @@ -141,6 +141,7 @@ static int HookModulesLoaded(WPARAM, LPARAM) mi.position = -2000009990; //position in menu
mi.pszService = MS_CONTACTS_SEND;
mi.hIcolibItem = LoadIcon(hInst, MAKEINTRESOURCE(IDI_CONTACTS));
+ mi.Module = MODULENAME;
hContactMenuItem = Menu_AddContactMenuItem(&mi);
HookEvent(ME_CLIST_PREBUILDCONTACTMENU, HookPreBuildContactMenu);
diff --git a/plugins/CrashDumper/src/crshdmp.cpp b/plugins/CrashDumper/src/crshdmp.cpp index f31de55e7c..f634d5c3d5 100644 --- a/plugins/CrashDumper/src/crshdmp.cpp +++ b/plugins/CrashDumper/src/crshdmp.cpp @@ -264,6 +264,7 @@ static int ModulesLoaded(WPARAM, LPARAM) mi.name.a = LPGEN("Copy to clipboard");
mi.hIcolibItem = GetIconHandle(IDI_VITOCLIP);
mi.pszService = MS_CRASHDUMPER_STORETOCLIP;
+ mi.Module = PluginName;
Menu_AddMainMenuItem(&mi);
SET_UID(mi, 0x54109094, 0x494e, 0x4535, 0x9c, 0x3a, 0xf6, 0x9e, 0x9a, 0xf7, 0xcd, 0xbe);
diff --git a/plugins/CyrTranslit/src/MirandaContact.cpp b/plugins/CyrTranslit/src/MirandaContact.cpp index 173696bcbf..55041d0efe 100644 --- a/plugins/CyrTranslit/src/MirandaContact.cpp +++ b/plugins/CyrTranslit/src/MirandaContact.cpp @@ -68,6 +68,7 @@ void MirandaContact::addMenuItem() mi.name.a = MENU_ITEM_TEXT;
mi.position = 65535;
mi.pszService = MENU_COMMAND_CALLBACK_SERVICE;
+ mi.Module = SETTINGS_MODULE;
hTransliterateCmdMenuItem = Menu_AddContactMenuItem(&mi);
}
diff --git a/plugins/Db3x_mmap/src/ui.cpp b/plugins/Db3x_mmap/src/ui.cpp index 2e088b95d8..2c279f9c80 100644 --- a/plugins/Db3x_mmap/src/ui.cpp +++ b/plugins/Db3x_mmap/src/ui.cpp @@ -340,6 +340,7 @@ static int OnModulesLoaded(PVOID obj, WPARAM, LPARAM) mi.hIcolibItem = iconList[1].hIcolib;
mi.name.w = db->GetMenuTitle();
mi.pszService = MS_DB_CHANGEPASSWORD;
+ mi.Module = "Dbx_mmap";
hSetPwdMenu = Menu_AddMainMenuItem(&mi);
return 0;
}
diff --git a/plugins/DbEditorPP/src/main.cpp b/plugins/DbEditorPP/src/main.cpp index e3c6084450..1fa1618db8 100644 --- a/plugins/DbEditorPP/src/main.cpp +++ b/plugins/DbEditorPP/src/main.cpp @@ -120,6 +120,7 @@ int ModulesLoaded(WPARAM, LPARAM) mi.hIcolibItem = GetIcoLibHandle(ICO_DBE_BUTT);
mi.name.a = modFullname;
mi.pszService = "DBEditorpp/MenuCommand";
+ mi.Module = modname;
Menu_AddMainMenuItem(&mi);
SET_UID(mi, 0x2fed8613, 0xac43, 0x4148, 0xbd, 0x5c, 0x44, 0x88, 0xaf, 0x68, 0x69, 0x10);
diff --git a/plugins/Db_autobackups/src/main.cpp b/plugins/Db_autobackups/src/main.cpp index a0a2e37751..2c4d36f0c6 100644 --- a/plugins/Db_autobackups/src/main.cpp +++ b/plugins/Db_autobackups/src/main.cpp @@ -72,6 +72,7 @@ static int ModulesLoad(WPARAM, LPARAM) mi.pszService = MS_AB_BACKUP;
mi.hIcolibItem = iconList[0].hIcolib;
mi.position = 500100000;
+ mi.Module = "AutoBackups";
Menu_AddMainMenuItem(&mi);
SET_UID(mi, 0x15e93f83, 0x930e, 0x4cf9, 0x91, 0x31, 0x4c, 0x2b, 0xb, 0xaa, 0xd2, 0x18);
diff --git a/plugins/Dropbox/src/dropbox_menus.cpp b/plugins/Dropbox/src/dropbox_menus.cpp index 1a96848edd..65939434ab 100644 --- a/plugins/Dropbox/src/dropbox_menus.cpp +++ b/plugins/Dropbox/src/dropbox_menus.cpp @@ -26,6 +26,7 @@ void CDropbox::InitializeMenus() mi.name.a = LPGEN("Upload files to Dropbox");
mi.position = -2000020000 + CMI_SEND_FILES;
mi.hIcolibItem = GetIconHandleByName("upload");
+ mi.Module = MODULE;
contactMenuItems[CMI_SEND_FILES] = Menu_AddContactMenuItem(&mi);
CreateServiceFunctionObj(mi.pszService, SendFilesToDropboxCommand, this);
}
diff --git a/plugins/Exchange/src/hooked_events.cpp b/plugins/Exchange/src/hooked_events.cpp index fdb239a046..cfcfa55c9c 100644 --- a/plugins/Exchange/src/hooked_events.cpp +++ b/plugins/Exchange/src/hooked_events.cpp @@ -67,6 +67,7 @@ int OnModulesLoaded(WPARAM, LPARAM) mi.pszService = MS_EXCHANGE_CHECKEMAIL;
mi.flags = CMIF_UNICODE;
mi.name.w = LPGENW("Check exchange mailbox");
+ mi.Module = ModuleName;
Menu_AddMainMenuItem(&mi);
hEmailsDlg = nullptr; //CreateDialog(hInstance, MAKEINTRESOURCE(IDD_EMAILS), NULL, DlgProcEmails); //create emails window
diff --git a/plugins/FTPFileYM/src/ftpfile.cpp b/plugins/FTPFileYM/src/ftpfile.cpp index bc4d4dc996..7827fb9f8e 100644 --- a/plugins/FTPFileYM/src/ftpfile.cpp +++ b/plugins/FTPFileYM/src/ftpfile.cpp @@ -96,6 +96,7 @@ void InitMenuItems() mi.hIcolibItem = iconList[ServerList::FTP_COUNT].hIcolib;
mi.position = 3000090001;
mi.name.w = LPGENW("FTP File");
+ mi.Module = MODULE;
hMainMenu = Menu_AddMainMenuItem(&mi);
if (opt.bUseSubmenu)
@@ -124,6 +125,7 @@ void InitMenuItems() mi2.root = hSubMenu[i];
mi2.pszService = MS_FTPFILE_CONTACTMENU;
mi2.name.w = LPGENW("Upload file(s)");
+ mi2.Module = MODULE;
HGENMENU tmp = Menu_AddContactMenuItem(&mi2);
Menu_ConfigureItem(tmp, MCI_OPT_EXECPARAM, mi2.position = i + UploadJob::FTP_RAWFILE);
diff --git a/plugins/FileAsMessage/src/main.cpp b/plugins/FileAsMessage/src/main.cpp index 594e95e395..2ba39d1619 100644 --- a/plugins/FileAsMessage/src/main.cpp +++ b/plugins/FileAsMessage/src/main.cpp @@ -184,6 +184,7 @@ static int OnModulesLoaded(WPARAM, LPARAM) mi.name.a = LPGEN("File As Message...");
mi.pszService = SERVICE_NAME "/FESendFile";
mi.flags = CMIF_NOTOFFLINE;
+ mi.Module = SERVICE_NAME;
Menu_AddContactMenuItem(&mi);
return 0;
}
diff --git a/plugins/FloatingContacts/src/main.cpp b/plugins/FloatingContacts/src/main.cpp index d840c61e62..a7c1a72a04 100644 --- a/plugins/FloatingContacts/src/main.cpp +++ b/plugins/FloatingContacts/src/main.cpp @@ -727,6 +727,7 @@ static void LoadMenus() mi.hIcolibItem = LoadIcon(hInst, MAKEINTRESOURCE(IDI_HIDE));
mi.name.w = LPGENW("Remove thumb");
mi.pszService = MODULE "/RemoveThumb";
+ mi.Module = MODULE;
hMenuItemRemove = Menu_AddContactMenuItem(&mi);
// Hide all thumbs main menu item
diff --git a/plugins/GmailNotifier/src/main.cpp b/plugins/GmailNotifier/src/main.cpp index ff6946fadc..e0f98c2383 100644 --- a/plugins/GmailNotifier/src/main.cpp +++ b/plugins/GmailNotifier/src/main.cpp @@ -149,6 +149,7 @@ extern "C" int __declspec(dllexport) Load() mi.hIcolibItem = Skin_LoadProtoIcon(MODULE_NAME, ID_STATUS_ONLINE);
mi.name.a = LPGEN("&Check all Gmail inboxes");
mi.pszService = MODULE_NAME "/MenuCommand";
+ mi.Module = MODULE_NAME;
Menu_AddMainMenuItem(&mi);
SET_UID(mi, 0x22c6ace1, 0xba0c, 0x44b5, 0xa4, 0xd2, 0x1, 0x7d, 0xb1, 0xe0, 0x51, 0xeb);
diff --git a/plugins/HTTPServer/src/GuiElements.cpp b/plugins/HTTPServer/src/GuiElements.cpp index 5e1134b2c9..0dffe76acd 100644 --- a/plugins/HTTPServer/src/GuiElements.cpp +++ b/plugins/HTTPServer/src/GuiElements.cpp @@ -1480,6 +1480,7 @@ void InitGuiElements() mi.position = -2000019955;
mi.name.w = LPGENW("HTTP Share new file");
mi.pszService = MS_SHARE_NEW_FILE;
+ mi.Module = MODULE;
hShareNewFileMenuItem = Menu_AddContactMenuItem(&mi);
if (db_get_b(NULL, MODULE, "AddStatisticsMenuItem", 1) != 0) {
diff --git a/plugins/HTTPServer/src/main.cpp b/plugins/HTTPServer/src/main.cpp index fb821023f6..4c8ba27c82 100644 --- a/plugins/HTTPServer/src/main.cpp +++ b/plugins/HTTPServer/src/main.cpp @@ -926,6 +926,7 @@ extern "C" __declspec(dllexport) int Load() mi.position = 1000085000;
mi.name.a = LPGEN("Enable HTTP server");
mi.pszService = MS_HTTP_ACCEPT_CONNECTIONS;
+ mi.Module = MODULE;
hAcceptConnectionsMenuItem = Menu_AddMainMenuItem(&mi);
}
diff --git a/plugins/HistoryLinkListPlus/src/linklist.cpp b/plugins/HistoryLinkListPlus/src/linklist.cpp index 3c8a94d11a..2e411f451d 100644 --- a/plugins/HistoryLinkListPlus/src/linklist.cpp +++ b/plugins/HistoryLinkListPlus/src/linklist.cpp @@ -58,6 +58,7 @@ extern "C" __declspec(dllexport) int Load(void) mi.hIcolibItem = LoadIcon(hInst, MAKEINTRESOURCE(IDI_LINKLISTICON));
mi.name.w = LPGENW("&Create Linklist");
mi.pszService = "Linklist/MenuCommand";
+ mi.Module = LINKLIST_MODULE;
Menu_AddContactMenuItem(&mi);
hWindowList = WindowList_Create();
diff --git a/plugins/HistoryPlusPlus/historypp.dpr b/plugins/HistoryPlusPlus/historypp.dpr index 7a5a4dbd09..81ed90ce33 100644 --- a/plugins/HistoryPlusPlus/historypp.dpr +++ b/plugins/HistoryPlusPlus/historypp.dpr @@ -250,6 +250,7 @@ begin menuItem.szName.w := MenuHandles[miContact].Name;
menuItem.pszService := MS_HISTORY_SHOWCONTACTHISTORY;
menuItem.hIcon := hppIcons[HPP_ICON_CONTACTHISTORY].handle;
+ menuItem.Module := 'HistoryPlusPlus';
MenuHandles[miContact].Handle := Menu_AddContactMenuItem(@menuItem);
// create empty item in contact menu
diff --git a/plugins/HistoryStats/src/mu_common.cpp b/plugins/HistoryStats/src/mu_common.cpp index 212485233a..50e05d5dcf 100644 --- a/plugins/HistoryStats/src/mu_common.cpp +++ b/plugins/HistoryStats/src/mu_common.cpp @@ -25,6 +25,7 @@ namespace mu mi.hIcolibItem = hIcon;
mi.pszService = const_cast<char*>(pszService);
mi.root = hRoot;
+ mi.Module = "HistoryStats";
mi.uid = menu_id; menu_id.d[7]++;
return Menu_AddMainMenuItem(&mi);
}
@@ -38,6 +39,7 @@ namespace mu mi.position = position;
mi.hIcolibItem = hIcon;
mi.pszService = const_cast<char*>(pszService);
+ mi.Module = "HistoryStats";
mi.uid = menu_id; menu_id.d[7]++;
return Menu_AddContactMenuItem(&mi);
}
diff --git a/plugins/IEHistory/src/IEHistory.cpp b/plugins/IEHistory/src/IEHistory.cpp index 2096b2d701..d30cd7c705 100644 --- a/plugins/IEHistory/src/IEHistory.cpp +++ b/plugins/IEHistory/src/IEHistory.cpp @@ -82,6 +82,7 @@ extern "C" int __declspec(dllexport) Load(void) mi.position = 1000090000; mi.hIcolibItem = hIcon; mi.pszService = MS_HISTORY_SHOWCONTACTHISTORY; + mi.Module = ModuleName; Menu_AddContactMenuItem(&mi); /// @todo (White-Tiger#1#08/19/14): fully implement System History someday^^ diff --git a/plugins/Import/src/main.cpp b/plugins/Import/src/main.cpp index 33ae9d1494..b092bfe0a3 100644 --- a/plugins/Import/src/main.cpp +++ b/plugins/Import/src/main.cpp @@ -126,6 +126,7 @@ extern "C" __declspec(dllexport) int Load(void) mi.name.a = LPGEN("&Import...");
mi.position = 500050000;
mi.pszService = IMPORT_SERVICE;
+ mi.Module = IMPORT_MODULE;
Menu_AddMainMenuItem(&mi);
HookEvent(ME_SYSTEM_MODULESLOADED, ModulesLoaded);
diff --git a/plugins/ImportTXT/importtxt.dpr b/plugins/ImportTXT/importtxt.dpr index 5c5d635e0b..bb344db8ca 100644 --- a/plugins/ImportTXT/importtxt.dpr +++ b/plugins/ImportTXT/importtxt.dpr @@ -135,6 +135,7 @@ begin mi.hIcon := LoadIcon(hInstance, MAKEINTRESOURCE(IDI_DEFAULT));
mi.szName.a := 'Import history';
mi.pszService := IMPORT_TXT_SERVICE;
+ mi.Module := IMPORT_TXT_MODULE;
Menu_AddContacTMenuItem(@mi);
SET_UID(@mi, '0610209E-5BE0-4D57-AAE8-E1CCF1FB78B8');
diff --git a/plugins/ListeningTo/src/listeningto.cpp b/plugins/ListeningTo/src/listeningto.cpp index ad77475d8a..28865dfe1c 100644 --- a/plugins/ListeningTo/src/listeningto.cpp +++ b/plugins/ListeningTo/src/listeningto.cpp @@ -104,6 +104,7 @@ void RebuildMenu() | (ListeningToEnabled(info->proto, TRUE) ? CMIF_CHECKED : 0)
| (opts.enable_sending ? 0 : CMIF_GRAYED);
+ mi.Module = MODULE_NAME;
info->hMenu = Menu_AddMainMenuItem(&mi);
Menu_ConfigureItem(info->hMenu, MCI_OPT_EXECPARAM, i);
}
@@ -198,6 +199,7 @@ int ModulesLoaded(WPARAM, LPARAM) mi.name.w = LPGENW("Listening to");
mi.flags = CMIF_UNICODE;
mi.hIcolibItem = iconList[0].hIcolib;
+ mi.Module = MODULE_NAME;
hMainMenuGroup = Menu_AddMainMenuItem(&mi);
mi.root = hMainMenuGroup;
@@ -211,6 +213,7 @@ int ModulesLoaded(WPARAM, LPARAM) mi.flags = CMIF_UNICODE
| (ListeningToEnabled(nullptr, true) ? CMIF_CHECKED : 0)
| (opts.enable_sending ? 0 : CMIF_GRAYED);
+ mi.Module = MODULE_NAME;
proto_items.resize(1);
proto_items[0].hMenu = Menu_AddMainMenuItem(&mi);
proto_items[0].proto[0] = 0;
diff --git a/plugins/LotusNotify/src/LotusNotify.cpp b/plugins/LotusNotify/src/LotusNotify.cpp index e76912891c..7cb72764e1 100644 --- a/plugins/LotusNotify/src/LotusNotify.cpp +++ b/plugins/LotusNotify/src/LotusNotify.cpp @@ -1704,6 +1704,7 @@ extern "C" int __declspec(dllexport) Load(void) mi.hIcolibItem = LoadIcon(hInst, MAKEINTRESOURCE(IDI_ICON1));
mi.name.w = LPGENW("&Check Lotus");
mi.pszService = "LotusNotify/MenuCommand"; //service name thet listning for menu call
+ mi.Module = PLUGINNAME;
hMenuHandle = Menu_AddMainMenuItem(&mi); //create menu pos.
Menu_EnableItem(hMenuHandle, FALSE);
diff --git a/plugins/MenuItemEx/src/main.cpp b/plugins/MenuItemEx/src/main.cpp index 4a2ba849e7..f3dce36bdb 100644 --- a/plugins/MenuItemEx/src/main.cpp +++ b/plugins/MenuItemEx/src/main.cpp @@ -741,6 +741,7 @@ static HGENMENU AddSubmenuItem(HGENMENU hRoot, wchar_t* name, HICON icon, DWORD mi.hIcolibItem = icon;
mi.flags = CMIF_UNICODE | CMIF_UNMOVABLE | flag;
mi.pszService = service;
+ mi.Module = MODULENAME;
HGENMENU res = Menu_AddContactMenuItem(&mi);
Menu_ConfigureItem(res, MCI_OPT_EXECPARAM, param);
@@ -947,6 +948,7 @@ static int PluginInit(WPARAM, LPARAM) mi.position = 120000;
mi.name.w = LPGENW("Always visible");
mi.pszService = MS_SETVIS;
+ mi.Module = MODULENAME;
hmenuVis = Menu_AddContactMenuItem(&mi);
SET_UID(mi, 0x7d93de78, 0xb1c, 0x4c51, 0x8c, 0x88, 0x33, 0x72, 0x12, 0xb5, 0xb8, 0xe7);
diff --git a/plugins/MirOTR/src/mirotrmenu.cpp b/plugins/MirOTR/src/mirotrmenu.cpp index 21ae10a7f9..6ecb8d9593 100644 --- a/plugins/MirOTR/src/mirotrmenu.cpp +++ b/plugins/MirOTR/src/mirotrmenu.cpp @@ -170,6 +170,7 @@ void InitMirOTRMenu(void) mi.flags = CMIF_DISABLED | CMIF_UNICODE; mi.name.w = LPGENW("OTR Status"); mi.position = 0; + mi.Module = MODULENAME; hStatusInfoItem = AddMirOTRMenuItem(&mi, nullptr); mi.flags = CMIF_UNICODE | CMIF_NOTPRIVATE | CMIF_NOTUNVERIFIED; diff --git a/plugins/MirOTR/src/svcs_menu.cpp b/plugins/MirOTR/src/svcs_menu.cpp index 5b9d4703d7..65606d84ce 100644 --- a/plugins/MirOTR/src/svcs_menu.cpp +++ b/plugins/MirOTR/src/svcs_menu.cpp @@ -161,6 +161,7 @@ void InitMenu() CMenuItem mi; mi.flags = CMIF_NOTOFFLINE | CMIF_UNICODE; mi.position = -400000; + mi.Module = MODULENAME; SET_UID(mi, 0xAB574FAD, 0x15D8, 0x49FF, 0xB7, 0x03, 0xDA, 0x2B, 0x45, 0x46, 0xC3, 0x56); mi.name.w = _A2W(LANG_STOP_OTR); diff --git a/plugins/Msg_Export/src/main.cpp b/plugins/Msg_Export/src/main.cpp index e4b7fcaf51..c48abefec2 100755 --- a/plugins/Msg_Export/src/main.cpp +++ b/plugins/Msg_Export/src/main.cpp @@ -119,6 +119,7 @@ int MainInit(WPARAM /*wparam*/, LPARAM /*lparam*/) mi.position = 1000090100;
mi.name.a = LPGEN("Open E&xported History");
mi.pszService = MS_SHOW_EXPORT_HISTORY;
+ mi.Module = MODULE;
Menu_AddContactMenuItem(&mi);
}
diff --git a/plugins/MyDetails/src/frame.cpp b/plugins/MyDetails/src/frame.cpp index 14b878a9b5..ba74454749 100644 --- a/plugins/MyDetails/src/frame.cpp +++ b/plugins/MyDetails/src/frame.cpp @@ -337,6 +337,7 @@ int CreateFrame() mi.hIcolibItem = Skin_LoadIcon(SKINICON_OTHER_USERDETAILS);
mi.name.w = LPGENW("Show my details");
mi.pszService = MODULE_NAME"/ShowHideMyDetails";
+ mi.Module = MODULE_NAME;
hMenuShowHideFrame = Menu_AddMainMenuItem(&mi);
Menu_ConfigureItem(hMenuShowHideFrame, MCI_OPT_EXECPARAM, -0x7FFFFFFF);
diff --git a/plugins/MyDetails/src/mydetails.cpp b/plugins/MyDetails/src/mydetails.cpp index 459ee0572d..5a71480877 100644 --- a/plugins/MyDetails/src/mydetails.cpp +++ b/plugins/MyDetails/src/mydetails.cpp @@ -93,6 +93,7 @@ static int MainInit(WPARAM, LPARAM) mi.flags = CMIF_UNICODE;
mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_USERDETAILS);
mi.name.w = LPGENW("My details");
+ mi.Module = MODULE_NAME;
HGENMENU hMenuRoot = Menu_AddMainMenuItem(&mi);
mi.flags = CMIF_UNICODE;
diff --git a/plugins/NewAwaySysMod/src/AwaySys.cpp b/plugins/NewAwaySysMod/src/AwaySys.cpp index 4ab5f98280..1e3f9e43b6 100644 --- a/plugins/NewAwaySysMod/src/AwaySys.cpp +++ b/plugins/NewAwaySysMod/src/AwaySys.cpp @@ -635,6 +635,7 @@ int MirandaLoaded(WPARAM, LPARAM) mi.hIcolibItem = iconList[SendOnEvent ? 1 : 0].hIcolib;
mi.name.w = SendOnEvent ? DISABLE_SOE_COMMAND : ENABLE_SOE_COMMAND;
mi.pszService = MS_AWAYSYS_AUTOREPLY_TOGGLE;
+ mi.Module = MOD_NAME;
g_hToggleSOEMenuItem = Menu_AddMainMenuItem(&mi);
memset(&mi, 0, sizeof(mi));
diff --git a/plugins/NewEventNotify/src/menuitem.cpp b/plugins/NewEventNotify/src/menuitem.cpp index 63be89ce14..6486014db2 100644 --- a/plugins/NewEventNotify/src/menuitem.cpp +++ b/plugins/NewEventNotify/src/menuitem.cpp @@ -59,6 +59,7 @@ int MenuitemInit(BOOL bStatus) mi.hIcolibItem = LoadIcon(g_hInst, MAKEINTRESOURCE(IDI_ENABLED));
mi.pszService = MS_NEN_MENUNOTIFY;
mi.flags = 0;
+ mi.Module = MODULE;
hMenuitemNotify = Menu_AddMainMenuItem(&mi);
bNotify = bStatus;
diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp index eea1cf800f..8ac084d704 100644 --- a/plugins/NewXstatusNotify/src/main.cpp +++ b/plugins/NewXstatusNotify/src/main.cpp @@ -1074,6 +1074,7 @@ void InitMainMenuItem() if (ServiceExists(MS_POPUP_ADDPOPUPT))
mi.root = Menu_CreateRoot(MO_MAIN, LPGENW("Popups"), 0);
mi.pszService = MS_STATUSCHANGE_MENUCOMMAND;
+ mi.Module = MODULE;
hEnableDisableMenu = Menu_AddMainMenuItem(&mi);
opt.TempDisabled = !opt.TempDisabled;
diff --git a/plugins/New_GPG/src/init.cpp b/plugins/New_GPG/src/init.cpp index 27bfb72b0f..9314e73174 100644 --- a/plugins/New_GPG/src/init.cpp +++ b/plugins/New_GPG/src/init.cpp @@ -187,6 +187,7 @@ extern "C" int __declspec(dllexport) Load() mi.hIcolibItem = Skin_LoadIcon(SKINICON_OTHER_MIRANDA);
mi.name.w = LPGENW("Load public GPG key");
mi.pszService = "/LoadPubKey";
+ mi.Module = szGPGModuleName;
hLoadPubKey = Menu_AddContactMenuItem(&mi);
SET_UID(mi, 0xc8008193, 0x56a9, 0x414a, 0x82, 0x98, 0x78, 0xe8, 0xa8, 0x84, 0x20, 0x67);
diff --git a/plugins/NoHistory/src/dllmain.cpp b/plugins/NoHistory/src/dllmain.cpp index f20a68161b..2e5a27d902 100644 --- a/plugins/NoHistory/src/dllmain.cpp +++ b/plugins/NoHistory/src/dllmain.cpp @@ -252,6 +252,7 @@ int ModulesLoaded(WPARAM, LPARAM) mi.name.w = LPGENW("Disable History");
mi.pszService = MS_NOHISTORY_TOGGLE;
mi.hIcolibItem = hIconRemove;
+ mi.Module = MODULE;
hMenuToggle = Menu_AddContactMenuItem(&mi);
SET_UID(mi, 0x1c4b1c21, 0xc0d1, 0x44d1, 0xb5, 0x3c, 0xc7, 0x8d, 0xcf, 0x96, 0x51, 0xd7);
diff --git a/plugins/Non-IM Contact/src/main.cpp b/plugins/Non-IM Contact/src/main.cpp index 5f7f769469..7023450286 100644 --- a/plugins/Non-IM Contact/src/main.cpp +++ b/plugins/Non-IM Contact/src/main.cpp @@ -152,6 +152,7 @@ extern "C" __declspec(dllexport) int Load() mi.name.a = LPGEN("&Add Non-IM Contact");
mi.pszService = "AddLCcontact";
mi.hIcolibItem = icoList[0].hIcolib;
+ mi.Module = MODNAME;
Menu_AddMainMenuItem(&mi);
SET_UID(mi, 0xa511c5e, 0x26d2, 0x41b1, 0xbd, 0xb7, 0x3e, 0x62, 0xc8, 0x44, 0x37, 0xc9);
diff --git a/plugins/NotesAndReminders/src/main.cpp b/plugins/NotesAndReminders/src/main.cpp index 0ea7fd65e3..52909e7961 100644 --- a/plugins/NotesAndReminders/src/main.cpp +++ b/plugins/NotesAndReminders/src/main.cpp @@ -203,6 +203,7 @@ int OnModulesLoaded(WPARAM, LPARAM) mi.hIcolibItem = iconList[2].hIcolib;
mi.name.w = LPGENW("New &Note");
mi.pszService = MODULENAME"/MenuCommandAddNew";
+ mi.Module = MODULENAME;
addMenuItem(mi);
mi.position = 1600000001;
diff --git a/plugins/Nudge/src/main.cpp b/plugins/Nudge/src/main.cpp index 990546769b..582167ab13 100644 --- a/plugins/Nudge/src/main.cpp +++ b/plugins/Nudge/src/main.cpp @@ -344,6 +344,7 @@ extern "C" int __declspec(dllexport) Load(void) mi.hIcolibItem = iconList[0].hIcolib;
mi.name.w = LPGENW("Send &nudge");
mi.pszService = MS_NUDGE_SEND;
+ mi.Module = MODULENAME;
g_hContactMenu = Menu_AddContactMenuItem(&mi);
// register special type of event
diff --git a/plugins/OpenFolder/src/openFolder.cpp b/plugins/OpenFolder/src/openFolder.cpp index 97509a117b..b07baea84e 100644 --- a/plugins/OpenFolder/src/openFolder.cpp +++ b/plugins/OpenFolder/src/openFolder.cpp @@ -103,6 +103,7 @@ extern "C" int __declspec(dllexport) Load() mi.hIcolibItem = icon.hIcolib;
mi.name.w = LPGENW("Open Folder");
mi.pszService = MS_OPENFOLDER_OPEN;
+ mi.Module = OPENFOLDER_MODULE_NAME;
Menu_AddMainMenuItem(&mi);
return 0;
diff --git a/plugins/PackUpdater/Src/PackUpdater.cpp b/plugins/PackUpdater/Src/PackUpdater.cpp index ca83b8ae11..4dc8088b16 100644 --- a/plugins/PackUpdater/Src/PackUpdater.cpp +++ b/plugins/PackUpdater/Src/PackUpdater.cpp @@ -77,6 +77,7 @@ extern "C" __declspec(dllexport) int Load(void) mi.hIcolibItem = IcoLib_GetIcon("check_update");
mi.name.w = LPGENW("Check for pack updates");
mi.pszService = MODNAME"/CheckUpdates";
+ mi.Module = MODNAME;
Menu_AddMainMenuItem(&mi);
// Add empty updates folder menu item
CreateServiceFunction(MODNAME"/EmptyFolder", EmptyFolder);
diff --git a/plugins/PasteIt/src/PasteIt.cpp b/plugins/PasteIt/src/PasteIt.cpp index 96de6b8a51..fece91b1b8 100644 --- a/plugins/PasteIt/src/PasteIt.cpp +++ b/plugins/PasteIt/src/PasteIt.cpp @@ -289,6 +289,7 @@ void InitMenuItems() mi.hIcolibItem = icon.hIcolib;
mi.position = 3000090005;
mi.name.w = LPGENW("Paste It");
+ mi.Module = MODULE;
hContactMenu = Menu_AddContactMenuItem(&mi);
memset(&mi, 0, sizeof(mi));
@@ -311,6 +312,7 @@ void InitMenuItems() CMenuItem mi2;
mi2.pszService = MS_PASTEIT_CONTACTMENU;
mi2.root = hDefWebMenu;
+ mi2.Module = MODULE;
for (int i = 0; i < PasteToWeb::pages; ++i)
{
mi2.flags = CMIF_UNICODE | CMIF_UNMOVABLE;
diff --git a/plugins/Ping/src/menu.cpp b/plugins/Ping/src/menu.cpp index 3f2a0bd198..dda8287e46 100644 --- a/plugins/Ping/src/menu.cpp +++ b/plugins/Ping/src/menu.cpp @@ -16,6 +16,7 @@ void InitMenus() mi.hIcolibItem = hIconResponding;
mi.name.w = LPGENW("Enable all pings");
mi.pszService = PLUG "/EnableAll";
+ mi.Module = PLUG;
Menu_AddMainMenuItem(&mi);
SET_UID(mi, 0x1dac6ea6, 0x116e, 0x41a3, 0xa6, 0xe8, 0x42, 0xdf, 0xf7, 0x27, 0xc4, 0x7c);
diff --git a/plugins/Ping/src/pingthread.cpp b/plugins/Ping/src/pingthread.cpp index 1cc8632675..388aaa2291 100644 --- a/plugins/Ping/src/pingthread.cpp +++ b/plugins/Ping/src/pingthread.cpp @@ -896,6 +896,7 @@ void InitList() mi.position = 3000320001;
mi.name.w = LPGENW("Show/Hide &Ping Window");
mi.pszService = PLUG "/ShowWindow";
+ mi.Module = PLUG;
Menu_AddMainMenuItem(&mi);
if (options.attach_to_clist) AttachToClist(true);
diff --git a/plugins/PluginUpdater/src/PluginUpdater.cpp b/plugins/PluginUpdater/src/PluginUpdater.cpp index 863a93ac7b..2cc9490322 100644 --- a/plugins/PluginUpdater/src/PluginUpdater.cpp +++ b/plugins/PluginUpdater/src/PluginUpdater.cpp @@ -90,6 +90,7 @@ extern "C" __declspec(dllexport) int Load(void) SET_UID(mi, 0xfa2cbe01, 0x3b37, 0x4a4c, 0xa6, 0x97, 0xe4, 0x6f, 0x31, 0xa9, 0xfc, 0x33);
mi.name.a = LPGEN("Check for updates");
mi.hIcolibItem = iconList[0].hIcolib;
+ mi.Module = MODULEA;
#else
CLISTMENUITEM mi = { 0 };
mi.cbSize = sizeof(mi);
diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp index 7471eddb29..78790ef51c 100644 --- a/plugins/Popup/src/main.cpp +++ b/plugins/Popup/src/main.cpp @@ -175,6 +175,7 @@ void InitMenuItems(void) {
CMenuItem mi;
mi.flags = CMIF_UNICODE;
+ mi.Module = MODULNAME_PLU;
HANDLE hIcon = GetIconHandle(PopupOptions.ModuleIsEnabled ? IDI_POPUP : IDI_NOPOPUP);
diff --git a/plugins/ProfileManager/src/pmanagerEx.cpp b/plugins/ProfileManager/src/pmanagerEx.cpp index 4b221431e1..dbd500bf60 100644 --- a/plugins/ProfileManager/src/pmanagerEx.cpp +++ b/plugins/ProfileManager/src/pmanagerEx.cpp @@ -113,6 +113,7 @@ extern "C" __declspec(dllexport) int Load(void) CMenuItem mi;
mi.root = Menu_CreateRoot(MO_MAIN, LPGENW("Database"), -500200000);
+ mi.Module = "Profile manager";
for (int i = 0; i < _countof(iconList); i++) {
mi.name.a = iconList[i].szDescr;
diff --git a/plugins/QuickContacts/src/quickcontacts.cpp b/plugins/QuickContacts/src/quickcontacts.cpp index 75034af9ca..26e7ffbdcc 100644 --- a/plugins/QuickContacts/src/quickcontacts.cpp +++ b/plugins/QuickContacts/src/quickcontacts.cpp @@ -188,6 +188,7 @@ int ModulesLoaded(WPARAM, LPARAM) mi.flags = CMIF_UNICODE;
mi.name.w = LPGENW("Quick Contacts...");
mi.pszService = MS_QC_SHOW_DIALOG;
+ mi.Module = MODULE_NAME;
Menu_AddMainMenuItem(&mi);
return 0;
}
diff --git a/plugins/QuickSearch/sr_global.pas b/plugins/QuickSearch/sr_global.pas index 5e5eb5dc4b..b54dc76401 100644 --- a/plugins/QuickSearch/sr_global.pas +++ b/plugins/QuickSearch/sr_global.pas @@ -240,6 +240,7 @@ begin mi.position :=500050000;
mi.pszService :=QS_SHOWSERVICE;
mi.hIcon :=IcoLib_GetIcon(QS_QS,0);
+ mi.Module :=qs_module;
MainMenuItem :=Menu_AddMainMenuItem(@mi);
end;
diff --git a/plugins/QuickSearch/sr_window.pas b/plugins/QuickSearch/sr_window.pas index e1d44f8e11..cdd7673e3d 100644 --- a/plugins/QuickSearch/sr_window.pas +++ b/plugins/QuickSearch/sr_window.pas @@ -816,6 +816,7 @@ begin mi.flags :=CMIF_UNICODE;
mi.szName.w :='Change setting through QS';
mi.pszService:='QS/dummy';
+ mi.Module:=qs_module;
mnuhandle:=Menu_AddContactMenuItem(@mi);
end
else
diff --git a/plugins/Quotes/src/Forex.cpp b/plugins/Quotes/src/Forex.cpp index 0a56404ca4..a6314860f5 100644 --- a/plugins/Quotes/src/Forex.cpp +++ b/plugins/Quotes/src/Forex.cpp @@ -78,6 +78,7 @@ void InitMenu() {
CMenuItem mi;
mi.flags = CMIF_UNICODE;
+ mi.Module = QUOTES_PROTOCOL_NAME;
mi.root = Menu_CreateRoot(MO_MAIN, LPGENW("Quotes"), 0, Quotes_GetIconHandle(IDI_ICON_MAIN));
Menu_ConfigureItem(mi.root, MCI_OPT_UID, "B474F556-22B6-42A1-A91E-22FE4F671388");
diff --git a/plugins/RecentContacts/src/RecentContacts.cpp b/plugins/RecentContacts/src/RecentContacts.cpp index 0ed7142472..c79483b967 100644 --- a/plugins/RecentContacts/src/RecentContacts.cpp +++ b/plugins/RecentContacts/src/RecentContacts.cpp @@ -455,6 +455,7 @@ int Create_MenuitemShowList(void) mi.hIcolibItem = icon.hIcolib;
mi.name.a = LPGEN("Recent Contacts");
mi.pszService = msLastUC_ShowList;
+ mi.Module = MODULENAME;
Menu_AddMainMenuItem(&mi);
SET_UID(mi, 0xe22ce213, 0x362a, 0x444a, 0xa5, 0x82, 0xc, 0xcf, 0xf5, 0x4b, 0xd1, 0x8e);
diff --git a/plugins/RemovePersonalSettings/src/rps.cpp b/plugins/RemovePersonalSettings/src/rps.cpp index 0f792822c0..5af1a4d4a7 100644 --- a/plugins/RemovePersonalSettings/src/rps.cpp +++ b/plugins/RemovePersonalSettings/src/rps.cpp @@ -99,6 +99,7 @@ extern "C" int __declspec(dllexport) Load() mi.hIcolibItem = Skin_LoadIcon(SKINICON_OTHER_MIRANDA);
mi.name.a = LPGEN("Remove Personal Settings...");
mi.pszService="RemovePersonalSettings/RemoveAll";
+ mi.Module = "RemovePersonalSettings";
Menu_AddMainMenuItem(&mi);
CreateServiceFunction(mi.pszService, RemoveAllService);
diff --git a/plugins/Restart/src/restart.cpp b/plugins/Restart/src/restart.cpp index 7f2ad366ac..1658e55a21 100644 --- a/plugins/Restart/src/restart.cpp +++ b/plugins/Restart/src/restart.cpp @@ -52,6 +52,7 @@ extern "C" __declspec(dllexport) int Load(void) mi.hIcolibItem = icon.hIcolib;
mi.name.a = LPGEN("Restart");
mi.pszService = "System/RestartMe";
+ mi.Module = "Restart";
Menu_AddMainMenuItem(&mi);
Menu_AddTrayMenuItem(&mi);
return 0;
diff --git a/plugins/SMS/src/SMS_svc.cpp b/plugins/SMS/src/SMS_svc.cpp index 330c089f08..54b10e4ce5 100644 --- a/plugins/SMS/src/SMS_svc.cpp +++ b/plugins/SMS/src/SMS_svc.cpp @@ -35,6 +35,7 @@ int LoadModules(void) mi.name.w = SMS_SEND_STR;
mi.pszService = szServiceFunction;
mi.flags = CMIF_UNICODE;
+ mi.Module = PROTOCOL_NAMEA;
Menu_AddMainMenuItem(&mi);
SET_UID(mi, 0x736e4cff, 0x769e, 0x45dc, 0x8b, 0x78, 0x83, 0xf9, 0xe4, 0xbb, 0x81, 0x9e);
diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp index d7c0f1ac32..b4e0fb00ea 100644 --- a/plugins/Scriver/src/msgs.cpp +++ b/plugins/Scriver/src/msgs.cpp @@ -577,6 +577,7 @@ static int OnModulesLoaded(WPARAM, LPARAM) mi.hIcolibItem = Skin_GetIconHandle(SKINICON_EVENT_MESSAGE);
mi.name.a = LPGEN("&Message");
mi.pszService = MS_MSG_SENDMESSAGE;
+ mi.Module = "Scriver";
hMsgMenuItem = Menu_AddContactMenuItem(&mi);
IcoLib_ReleaseIcon((HICON)mi.hIcolibItem);
diff --git a/plugins/SecureIM/src/main.cpp b/plugins/SecureIM/src/main.cpp index a56200fff4..2b026a2bd5 100644 --- a/plugins/SecureIM/src/main.cpp +++ b/plugins/SecureIM/src/main.cpp @@ -45,6 +45,7 @@ static HGENMENU MyAddMenuItem(LPCWSTR name, int pos, LPCSTR szUid, HICON hicon, mi.hIcolibItem = hicon;
mi.name.w = (wchar_t*)name;
mi.pszService = (char*)service;
+ mi.Module = MODULENAME;
HGENMENU res = Menu_AddContactMenuItem(&mi);
Menu_ConfigureItem(res, MCI_OPT_UID, szUid);
return res;
@@ -58,6 +59,7 @@ static HGENMENU MyAddSubItem(HGENMENU hRoot, LPCSTR name, int pos, int poppos, L mi.name.a = (char*)name;
mi.root = hRoot;
mi.pszService = (char*)service;
+ mi.Module = MODULENAME;
HGENMENU res = Menu_AddContactMenuItem(&mi);
Menu_ConfigureItem(res, MCI_OPT_EXECPARAM, poppos);
return res;
diff --git a/plugins/SeenPlugin/src/menu.cpp b/plugins/SeenPlugin/src/menu.cpp index 4a385b67d6..9b70a349d6 100644 --- a/plugins/SeenPlugin/src/menu.cpp +++ b/plugins/SeenPlugin/src/menu.cpp @@ -74,6 +74,7 @@ void InitMenuitem() mi.position = -0x7FFFFFFF;
mi.name.a = LPGEN("Last seen");
mi.pszService = "LastSeenUserDetails";
+ mi.Module = S_MOD;
hmenuitem = Menu_AddContactMenuItem(&mi);
HookEvent(ME_CLIST_PREBUILDCONTACTMENU, BuildContactMenu);
diff --git a/plugins/SendScreenshotPlus/src/Main.cpp b/plugins/SendScreenshotPlus/src/Main.cpp index 6710d8e16e..0aa23e45fe 100644 --- a/plugins/SendScreenshotPlus/src/Main.cpp +++ b/plugins/SendScreenshotPlus/src/Main.cpp @@ -297,6 +297,7 @@ DLL_EXPORT int Load(void) CMenuItem mi; mi.flags = CMIF_UNICODE; mi.hIcolibItem = GetIconHandle(ICO_MAINXS); + mi.Module = SZ_SENDSS; SET_UID(mi, 0xa559a22e, 0xd0f9, 0x4553, 0x8e, 0x68, 0x55, 0xb3, 0xae, 0xc4, 0x5d, 0x93); mi.name.w = LPGENW("Take a screenshot"); diff --git a/plugins/Sessions/Src/Main.cpp b/plugins/Sessions/Src/Main.cpp index 6a365b73dc..ad1829e390 100644 --- a/plugins/Sessions/Src/Main.cpp +++ b/plugins/Sessions/Src/Main.cpp @@ -769,6 +769,7 @@ static int PluginInit(WPARAM, LPARAM) // Main menu
CMenuItem mi;
mi.position = 1000000000;
+ mi.Module = MODNAME;
mi.root = Menu_CreateRoot(MO_MAIN, LPGENW("Sessions Manager"), 1000000000);
Menu_ConfigureItem(mi.root, MCI_OPT_UID, "D77B9AB4-AF7E-43DB-A487-BD581704D635");
diff --git a/plugins/SimpleAR/src/Main.cpp b/plugins/SimpleAR/src/Main.cpp index 8feceb95bf..51c45bc482 100644 --- a/plugins/SimpleAR/src/Main.cpp +++ b/plugins/SimpleAR/src/Main.cpp @@ -253,6 +253,7 @@ extern "C" int __declspec(dllexport)Load(void) CreateServiceFunction(protocolname"/ToggleAutoanswer", Toggle);
CMenuItem mi;
+ mi.Module = protocolname;
SET_UID(mi, 0xac1c64a, 0x82ca, 0x4845, 0x86, 0x89, 0x59, 0x76, 0x12, 0x74, 0x72, 0x7b);
mi.position = 500090000;
diff --git a/plugins/SimpleStatusMsg/src/awaymsg.cpp b/plugins/SimpleStatusMsg/src/awaymsg.cpp index 37ae062f63..31f5c1d4d5 100644 --- a/plugins/SimpleStatusMsg/src/awaymsg.cpp +++ b/plugins/SimpleStatusMsg/src/awaymsg.cpp @@ -384,6 +384,7 @@ int LoadAwayMsgModule(void) CMenuItem mi;
mi.flags = CMIF_UNICODE;
+ mi.Module = "SimpleStatusMsg";
SET_UID(mi, 0xd3282acc, 0x9ff1, 0x4ede, 0x8a, 0x1e, 0x36, 0x72, 0x3f, 0x44, 0x4f, 0x84);
CreateServiceFunction(MS_AWAYMSG_SHOWAWAYMSG, GetMessageCommand);
diff --git a/plugins/SimpleStatusMsg/src/main.cpp b/plugins/SimpleStatusMsg/src/main.cpp index f1fc07fed6..293071bf04 100644 --- a/plugins/SimpleStatusMsg/src/main.cpp +++ b/plugins/SimpleStatusMsg/src/main.cpp @@ -1383,6 +1383,7 @@ static int ChangeStatusMsgPrebuild(WPARAM, LPARAM) CMenuItem mi;
mi.flags = CMIF_UNICODE;
+ mi.Module = "SimpleStatusMsg";
if (!db_get_b(NULL, "SimpleStatusMsg", "ShowStatusMenuItem", 1))
mi.flags |= CMIF_HIDDEN;
mi.hIcolibItem = GetIconHandle(IDI_CSMSG);
diff --git a/plugins/SmileyAdd/src/main.cpp b/plugins/SmileyAdd/src/main.cpp index 81c3c9bb19..93379d5623 100644 --- a/plugins/SmileyAdd/src/main.cpp +++ b/plugins/SmileyAdd/src/main.cpp @@ -57,6 +57,7 @@ static int ModulesLoaded(WPARAM, LPARAM) mi.position = 2000070050;
mi.hIcolibItem = icon.hIcolib;
mi.name.a = LPGEN("Assign smiley category");
+ mi.Module = MODULENAME;
hContactMenuItem = Menu_AddContactMenuItem(&mi);
DownloadInit();
diff --git a/plugins/SmileyAdd/src/services.cpp b/plugins/SmileyAdd/src/services.cpp index c4583145d3..a53351122f 100644 --- a/plugins/SmileyAdd/src/services.cpp +++ b/plugins/SmileyAdd/src/services.cpp @@ -291,6 +291,7 @@ int RebuildContactMenu(WPARAM wParam, LPARAM) mi.root = hContactMenuItem;
mi.flags = CMIF_UNICODE | CMIF_SYSTEM;
mi.pszService = MS_SMILEYADD_CUSTOMCATMENU;
+ mi.Module = MODULENAME;
bool nonecheck = true;
HGENMENU hMenu;
diff --git a/plugins/StartupSilence/src/main.cpp b/plugins/StartupSilence/src/main.cpp index 86b7295749..eb663d5959 100644 --- a/plugins/StartupSilence/src/main.cpp +++ b/plugins/StartupSilence/src/main.cpp @@ -294,6 +294,7 @@ static INT_PTR InitMenu() mi.hIcolibItem = GetIconHandle(MENU_NAME);
mi.name.a = MENU_NAME;
mi.pszService = SS_SERVICE_NAME;
+ mi.Module = MODULE_NAME;
hSSMenuToggleOnOff = Menu_AddMainMenuItem(&mi);
UpdateMenu();
return 0;
diff --git a/plugins/StatusManager/src/StartupStatus/ss_profiles.cpp b/plugins/StatusManager/src/StartupStatus/ss_profiles.cpp index d90a5a890b..83281e9b75 100644 --- a/plugins/StatusManager/src/StartupStatus/ss_profiles.cpp +++ b/plugins/StatusManager/src/StartupStatus/ss_profiles.cpp @@ -55,6 +55,7 @@ static int CreateMainMenuItems(WPARAM, LPARAM) CMenuItem mi; mi.position = 2000100000; mi.flags = CMIF_UNICODE; + mi.Module = SSMODULENAME; mcount = 0; int count = GetProfileCount(0, 0); for (int i = 0; i < count && mcount < MAX_MMITEMS; i++) { diff --git a/plugins/StopSpamMod/src/init.cpp b/plugins/StopSpamMod/src/init.cpp index 794c54cdb0..4582dc0a2c 100755 --- a/plugins/StopSpamMod/src/init.cpp +++ b/plugins/StopSpamMod/src/init.cpp @@ -157,6 +157,7 @@ extern "C" int __declspec(dllexport) Load() mi.hIcolibItem = Skin_LoadIcon(SKINICON_OTHER_MIRANDA);
mi.name.a = LPGEN("Remove Temporary Contacts");
mi.pszService = "/RemoveTmp";
+ mi.Module = pluginName;
Menu_AddMainMenuItem(&mi);
diff --git a/plugins/StopSpamPlus/src/stopspam.cpp b/plugins/StopSpamPlus/src/stopspam.cpp index 3409b6d8e8..631d2c39c5 100644 --- a/plugins/StopSpamPlus/src/stopspam.cpp +++ b/plugins/StopSpamPlus/src/stopspam.cpp @@ -59,6 +59,7 @@ extern "C" int __declspec(dllexport) Load(void) mi.hIcolibItem = Skin_LoadIcon(SKINICON_OTHER_MIRANDA);
mi.name.w = LPGENW("Remove Temporary Contacts");
mi.pszService = pluginName"/RemoveTempContacts";
+ mi.Module = pluginName;
Menu_AddMainMenuItem(&mi);
return 0;
diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp index a002a44042..2dd65a150d 100644 --- a/plugins/TabSRMM/src/globals.cpp +++ b/plugins/TabSRMM/src/globals.cpp @@ -124,6 +124,7 @@ void CGlobals::reloadSystemModulesChanged() mi.hIcolibItem = Skin_GetIconHandle(SKINICON_EVENT_MESSAGE);
mi.name.a = LPGEN("&Message");
mi.pszService = MS_MSG_SENDMESSAGE;
+ mi.Module = "TabSRMM";
PluginConfig.m_hMenuItem = Menu_AddContactMenuItem(&mi);
m_useAeroPeek = M.GetByte("useAeroPeek", 1);
@@ -311,6 +312,7 @@ int CGlobals::ModulesLoaded(WPARAM, LPARAM) mi.hIcolibItem = PluginConfig.g_iconContainer;
mi.name.a = LPGEN("&Messaging settings...");
mi.pszService = MS_TABMSG_SETUSERPREFS;
+ mi.Module = "TabSRMM";
PluginConfig.m_UserMenuItem = Menu_AddContactMenuItem(&mi);
if (sendLater->isAvail()) {
diff --git a/plugins/TabSRMM/src/typingnotify.cpp b/plugins/TabSRMM/src/typingnotify.cpp index fcef66e691..8e3c4cce61 100644 --- a/plugins/TabSRMM/src/typingnotify.cpp +++ b/plugins/TabSRMM/src/typingnotify.cpp @@ -456,7 +456,7 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA case PSN_APPLY:
for (int i = 0; i < sizeof(colorPicker) / sizeof(colorPicker[0]); i++) {
colorPicker[i].color = SendDlgItemMessage(hwndDlg, colorPicker[i].res, CPM_GETCOLOUR, 0, 0);
- db_set_dw(0, Module, colorPicker[i].desc, colorPicker[i].color);
+ db_set_dw(0, TypigModule, colorPicker[i].desc, colorPicker[i].color);
}
Timeout = newTimeout; TimeoutMode = newTimeoutMode;
@@ -471,14 +471,14 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA OnePopup = IsDlgButtonChecked(hwndDlg, IDC_ONEPOPUP);
ShowMenu = IsDlgButtonChecked(hwndDlg, IDC_SHOWMENU);
- db_set_b(0, Module, SET_ONEPOPUP, OnePopup);
- db_set_b(0, Module, SET_SHOWDISABLEMENU, ShowMenu);
- db_set_b(0, Module, SET_DISABLED, (BYTE)(StartDisabled | StopDisabled));
- db_set_b(0, Module, SET_COLOR_MODE, ColorMode);
- db_set_b(0, Module, SET_TIMEOUT_MODE, TimeoutMode);
- db_set_b(0, Module, SET_TIMEOUT, (BYTE)Timeout);
- db_set_b(0, Module, SET_TIMEOUT_MODE2, TimeoutMode2);
- db_set_b(0, Module, SET_TIMEOUT2, (BYTE)Timeout2);
+ db_set_b(0, TypigModule, SET_ONEPOPUP, OnePopup);
+ db_set_b(0, TypigModule, SET_SHOWDISABLEMENU, ShowMenu);
+ db_set_b(0, TypigModule, SET_DISABLED, (BYTE)(StartDisabled | StopDisabled));
+ db_set_b(0, TypigModule, SET_COLOR_MODE, ColorMode);
+ db_set_b(0, TypigModule, SET_TIMEOUT_MODE, TimeoutMode);
+ db_set_b(0, TypigModule, SET_TIMEOUT, (BYTE)Timeout);
+ db_set_b(0, TypigModule, SET_TIMEOUT_MODE2, TimeoutMode2);
+ db_set_b(0, TypigModule, SET_TIMEOUT2, (BYTE)Timeout2);
return TRUE;
}
}
@@ -507,23 +507,23 @@ int TN_ModuleInit() {
hPopupsList = WindowList_Create();
- OnePopup = M.GetByte(Module, SET_ONEPOPUP, DEF_ONEPOPUP);
- ShowMenu = M.GetByte(Module, SET_SHOWDISABLEMENU, DEF_SHOWDISABLEMENU);
+ OnePopup = M.GetByte(TypigModule, SET_ONEPOPUP, DEF_ONEPOPUP);
+ ShowMenu = M.GetByte(TypigModule, SET_SHOWDISABLEMENU, DEF_SHOWDISABLEMENU);
- int i = M.GetByte(Module, SET_DISABLED, DEF_DISABLED);
+ int i = M.GetByte(TypigModule, SET_DISABLED, DEF_DISABLED);
Disabled = i & 1;
StartDisabled = i & 2;
StopDisabled = i & 4;
- ColorMode = M.GetByte(Module, SET_COLOR_MODE, DEF_COLOR_MODE);
- TimeoutMode = M.GetByte(Module, SET_TIMEOUT_MODE, DEF_TIMEOUT_MODE);
- Timeout = M.GetByte(Module, SET_TIMEOUT, DEF_TIMEOUT);
- TimeoutMode2 = M.GetByte(Module, SET_TIMEOUT_MODE2, DEF_TIMEOUT_MODE2);
- Timeout2 = M.GetByte(Module, SET_TIMEOUT2, DEF_TIMEOUT2);
+ ColorMode = M.GetByte(TypigModule, SET_COLOR_MODE, DEF_COLOR_MODE);
+ TimeoutMode = M.GetByte(TypigModule, SET_TIMEOUT_MODE, DEF_TIMEOUT_MODE);
+ Timeout = M.GetByte(TypigModule, SET_TIMEOUT, DEF_TIMEOUT);
+ TimeoutMode2 = M.GetByte(TypigModule, SET_TIMEOUT_MODE2, DEF_TIMEOUT_MODE2);
+ Timeout2 = M.GetByte(TypigModule, SET_TIMEOUT2, DEF_TIMEOUT2);
- if (!(M.GetDword(Module, colorPicker[0].desc, 1) && !M.GetDword(Module, colorPicker[0].desc, 0)))
+ if (!(M.GetDword(TypigModule, colorPicker[0].desc, 1) && !M.GetDword(TypigModule, colorPicker[0].desc, 0)))
for (i = 0; i < _countof(colorPicker); i++)
- colorPicker[i].color = M.GetDword(Module, colorPicker[i].desc, 0);
+ colorPicker[i].color = M.GetDword(TypigModule, colorPicker[i].desc, 0);
mir_snwprintf(szStart, TranslateT("...is typing a message."));
mir_snwprintf(szStop, TranslateT("...has stopped typing."));
@@ -543,6 +543,7 @@ int TN_ModuleInit() }
mi.pszService = "TypingNotify/EnableDisableMenuCommand";
mi.root = Menu_CreateRoot(MO_MAIN, LPGENW("Popups"), 0);
+ mi.Module = "TabSRMM";
hDisableMenu = Menu_AddMainMenuItem(&mi);
}
@@ -554,6 +555,6 @@ int TN_ModuleInit() int TN_ModuleDeInit()
{
WindowList_Destroy(hPopupsList);
- db_set_b(0, Module, SET_DISABLED, (BYTE)(Disabled | StartDisabled | StopDisabled));
+ db_set_b(0, TypigModule, SET_DISABLED, (BYTE)(Disabled | StartDisabled | StopDisabled));
return 0;
}
diff --git a/plugins/TabSRMM/src/typingnotify.h b/plugins/TabSRMM/src/typingnotify.h index c851c51991..800cdb5930 100644 --- a/plugins/TabSRMM/src/typingnotify.h +++ b/plugins/TabSRMM/src/typingnotify.h @@ -10,7 +10,7 @@ #define COLOR_WINDOWS 2
#define COLOR_POPUP 3
-#define Module "TypingNotify"
+#define TypigModule "TypingNotify"
#define SET_WO "NotWhenFocused"
#define DEF_WO 0
diff --git a/plugins/mRadio/i_tray.inc b/plugins/mRadio/i_tray.inc index ff8b76a585..3967e32f0e 100644 --- a/plugins/mRadio/i_tray.inc +++ b/plugins/mRadio/i_tray.inc @@ -101,6 +101,7 @@ begin mi.position :=i;
mi.pszService:=@buf;
mi.szName.w :=tmp.name;
+ mi.Module :=cPluginName;
tmp.menuitem:=Menu_AddTrayMenuItem(@mi);
end;
end;
@@ -136,6 +137,7 @@ begin mi.flags :=CMIF_UNICODE;
mi.szName.w:=cPluginName;
mi.hIcon :=IcoLib_GetIcon(IcoBtnSettings,0);
+ mi.MOdule :=cPluginName;
trayradioparent:=Menu_AddTrayMenuItem(@mi);
FillChar(mi, sizeof(mi), 0);
diff --git a/plugins/mRadio/i_visual.inc b/plugins/mRadio/i_visual.inc index 2f95f0daa2..9d7cd58f06 100644 --- a/plugins/mRadio/i_visual.inc +++ b/plugins/mRadio/i_visual.inc @@ -36,6 +36,7 @@ begin SET_UID(@mi, 'DA1F1DA5-0C78-4FD5-B705-5F2C22EBDAD4');
mi.pszService:=MS_RADIO_RECORD;
mi.szName.a :='Start/Stop Record';
+ mi.Module :=cPluginName;
hCMenuItemRec:=Menu_AddContactMenuItem(@mi);
SET_UID(@mi, '03C42002-709A-48CA-A9AF-450BEBDBE3E0');
|