diff options
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/Tox/Tox.vcxproj | 3 | ||||
| -rw-r--r-- | protocols/Tox/res/copy.ico | bin | 0 -> 1150 bytes | |||
| -rw-r--r-- | protocols/Tox/res/resource.rc | 2 | ||||
| -rw-r--r-- | protocols/Tox/src/resource.h | 1 | ||||
| -rw-r--r-- | protocols/Tox/src/tox_icons.cpp | 7 | ||||
| -rw-r--r-- | protocols/Tox/src/tox_menus.cpp | 5 | ||||
| -rw-r--r-- | protocols/Tox/src/tox_profile.cpp | 2 |
7 files changed, 11 insertions, 9 deletions
diff --git a/protocols/Tox/Tox.vcxproj b/protocols/Tox/Tox.vcxproj index 5004a62a3a..8458a3cb75 100644 --- a/protocols/Tox/Tox.vcxproj +++ b/protocols/Tox/Tox.vcxproj @@ -31,9 +31,6 @@ </ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
- <None Include="res\*.ico" />
- </ItemGroup>
- <ItemGroup>
<ProjectReference Include="..\..\libs\libjson\libjson.vcxproj">
<Project>{f6a9340e-b8d9-4c75-be30-47dc66d0abc7}</Project>
</ProjectReference>
diff --git a/protocols/Tox/res/copy.ico b/protocols/Tox/res/copy.ico Binary files differnew file mode 100644 index 0000000000..5d6cb4b6cb --- /dev/null +++ b/protocols/Tox/res/copy.ico diff --git a/protocols/Tox/res/resource.rc b/protocols/Tox/res/resource.rc index 5ba9c28ba3..2e49c71997 100644 --- a/protocols/Tox/res/resource.rc +++ b/protocols/Tox/res/resource.rc @@ -66,6 +66,8 @@ IDI_TOX ICON "tox.ico" IDI_ME ICON "me.ico"
+IDI_COPY ICON "copy.ico"
+
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
diff --git a/protocols/Tox/src/resource.h b/protocols/Tox/src/resource.h index 0b62cff30d..db0cf0fc55 100644 --- a/protocols/Tox/src/resource.h +++ b/protocols/Tox/src/resource.h @@ -5,6 +5,7 @@ #define IDI_TOX 100
#define IDI_ME 101
#define IDI_EDIT 102
+#define IDI_COPY 103
#define IDD_USER_INFO 150
#define IDD_PASSWORD_ENTER 151
#define IDD_PASSWORD_CHANGE 152
diff --git a/protocols/Tox/src/tox_icons.cpp b/protocols/Tox/src/tox_icons.cpp index 50d11f5303..2cefa1133a 100644 --- a/protocols/Tox/src/tox_icons.cpp +++ b/protocols/Tox/src/tox_icons.cpp @@ -2,9 +2,10 @@ static IconItem iconList[] =
{
- { LPGEN("Protocol icon"), "main", IDI_TOX },
- { LPGEN("Action icon"), "main", IDI_ME },
- { LPGEN("Correction icon"), "edit", IDI_EDIT },
+ { LPGEN("Protocol icon"), "main", IDI_TOX },
+ { LPGEN("Action icon"), "main", IDI_ME },
+ { LPGEN("Correction icon"), "edit", IDI_EDIT },
+ { LPGEN("Copy ID"), "copy", IDI_COPY },
};
void CToxProto::InitIcons()
diff --git a/protocols/Tox/src/tox_menus.cpp b/protocols/Tox/src/tox_menus.cpp index debe3b5ae6..2ea767b0e4 100644 --- a/protocols/Tox/src/tox_menus.cpp +++ b/protocols/Tox/src/tox_menus.cpp @@ -35,7 +35,6 @@ int CToxProto::UpdateStatusMenu(WPARAM, LPARAM) Menu_ShowItem(StatusMenuItems[SMI_PASSWORD_CREATE], !passwordExists);
Menu_ShowItem(StatusMenuItems[SMI_PASSWORD_CHANGE], passwordExists);
Menu_ShowItem(StatusMenuItems[SMI_PASSWORD_REMOVE], passwordExists);
-
return 0;
}
@@ -49,16 +48,18 @@ void CToxProto::OnBuildProtoMenu() mi.pszService = "/CopyToxID";
CreateProtoService(mi.pszService, &CToxProto::OnCopyToxID);
mi.name.w = LPGENW("Copy Tox ID");
+ mi.hIcolibItem = g_plugin.getIconHandle(IDI_COPY);
mi.position = SMI_POSITION + SMI_TOXID_COPY;
StatusMenuItems[SMI_TOXID_COPY] = Menu_AddProtoMenuItem(&mi, m_szModuleName);
// Password
mi.pszService = nullptr;
mi.name.w = LPGENW("Password");
+ mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_KEYS);
StatusMenuItems[SMI_PASSWORD] = Menu_AddProtoMenuItem(&mi, m_szModuleName);
- mi.root = StatusMenuItems[SMI_PASSWORD];
// Create password command
+ mi.root = StatusMenuItems[SMI_PASSWORD];
mi.pszService = "/CreatePassword";
CreateProtoService(mi.pszService, &CToxProto::OnCreatePassword);
mi.name.w = LPGENW("Create password");
diff --git a/protocols/Tox/src/tox_profile.cpp b/protocols/Tox/src/tox_profile.cpp index c514dacf3c..57fbb83a18 100644 --- a/protocols/Tox/src/tox_profile.cpp +++ b/protocols/Tox/src/tox_profile.cpp @@ -89,7 +89,7 @@ bool CToxProto::LoadToxProfile(Tox_Options *options) }
mir_free(data);
data = decryptedData;
- size = decryptedSize;
+ size = (long)decryptedSize;
}
if (data) {
|