summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/miranda32_10.vcxproj80
-rw-r--r--src/miranda32_10.vcxproj.filters236
-rw-r--r--src/resource.h1
-rw-r--r--src/resource.rc45
4 files changed, 330 insertions, 32 deletions
diff --git a/src/miranda32_10.vcxproj b/src/miranda32_10.vcxproj
index 910f4525df..4ed44e12c8 100644
--- a/src/miranda32_10.vcxproj
+++ b/src/miranda32_10.vcxproj
@@ -636,6 +636,86 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <None Include="res\always_visible.ico" />
+ <None Include="res\auth_add.ico" />
+ <None Include="res\auth_grant.ico" />
+ <None Include="res\auth_request.ico" />
+ <None Include="res\auth_revoke.ico" />
+ <None Include="res\chat_channel.ico" />
+ <None Include="res\chat_join.ico" />
+ <None Include="res\chat_leave.ico" />
+ <None Include="res\check_off.ico" />
+ <None Include="res\check_on.ico" />
+ <None Include="res\contact_add.ico" />
+ <None Include="res\contact_delete.ico" />
+ <None Include="res\contact_groups.ico" />
+ <None Include="res\contact_rename.ico" />
+ <None Include="res\contact_view_details.ico" />
+ <None Include="res\cursor_drag_copy.cur" />
+ <None Include="res\cursor_drop_user.cur" />
+ <None Include="res\cursor_hyperlink.cur" />
+ <None Include="res\female.ico" />
+ <None Include="res\group_closed.ico" />
+ <None Include="res\group_opened.ico" />
+ <None Include="res\icon_accmgr.ico" />
+ <None Include="res\icon_all.ico" />
+ <None Include="res\icon_ansi.ico" />
+ <None Include="res\icon_auth_request.ico" />
+ <None Include="res\icon_connecting.ico" />
+ <None Include="res\icon_down_arrow.ico" />
+ <None Include="res\Icon_exit.ico" />
+ <None Include="res\icon_file.ico" />
+ <None Include="res\icon_find_user.ico" />
+ <None Include="res\icon_frame.ico" />
+ <None Include="res\icon_help.ico" />
+ <None Include="res\icon_history.ico" />
+ <None Include="res\icon_loaded.ico" />
+ <None Include="res\icon_loaded_gray.ico" />
+ <None Include="res\icon_mail.ico" />
+ <None Include="res\icon_mainmenu.ico" />
+ <None Include="res\icon_message.ico" />
+ <None Include="res\icon_notloaded.ico" />
+ <None Include="res\icon_notloaded_gray.ico" />
+ <None Include="res\icon_options.ico" />
+ <None Include="res\icon_search_all.ico" />
+ <None Include="res\Icon_show_hide.ico" />
+ <None Include="res\icon_small_dot.ico" />
+ <None Include="res\icon_sms.ico" />
+ <None Include="res\icon_typing.ico" />
+ <None Include="res\icon_undo.ico" />
+ <None Include="res\icon_unicode.ico" />
+ <None Include="res\icon_url.ico" />
+ <None Include="res\icon_window.ico" />
+ <None Include="res\icon_windows.ico" />
+ <None Include="res\male.ico" />
+ <None Include="res\meta_add.ico" />
+ <None Include="res\meta_convert.ico" />
+ <None Include="res\meta_edit.ico" />
+ <None Include="res\meta_menu.ico" />
+ <None Include="res\meta_menuof.ico" />
+ <None Include="res\meta_remove2.ico" />
+ <None Include="res\meta_set_as_default.ico" />
+ <None Include="res\miranda_home.ico" />
+ <None Include="res\miranda_logo.ico" />
+ <None Include="res\miranda_manager.ico" />
+ <None Include="res\never_visible.ico" />
+ <None Include="res\Off.ico" />
+ <None Include="res\On.ico" />
+ <None Include="res\status_away.ico" />
+ <None Include="res\status_DND.ico" />
+ <None Include="res\status_free4chat.ico" />
+ <None Include="res\status_invisible.ico" />
+ <None Include="res\status_locked.ico" />
+ <None Include="res\status_NA.ico" />
+ <None Include="res\status_occupied.ico" />
+ <None Include="res\status_offline.ico" />
+ <None Include="res\status_online.ico" />
+ <None Include="res\status_on_the_phone.ico" />
+ <None Include="res\status_out2lunch.ico" />
+ <None Include="res\status_user_online.ico" />
+ <None Include="res\_blank.ico" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
diff --git a/src/miranda32_10.vcxproj.filters b/src/miranda32_10.vcxproj.filters
index 6d57666c92..858975caad 100644
--- a/src/miranda32_10.vcxproj.filters
+++ b/src/miranda32_10.vcxproj.filters
@@ -636,4 +636,240 @@
<Filter>Resources</Filter>
</ResourceCompile>
</ItemGroup>
+ <ItemGroup>
+ <None Include="res\_blank.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\contact_view_details.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\always_visible.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\auth_add.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\auth_grant.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\auth_request.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\auth_revoke.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\chat_channel.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\chat_join.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\chat_leave.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\check_off.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\check_on.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\contact_add.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\contact_delete.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\contact_groups.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\contact_rename.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\On.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\cursor_drag_copy.cur">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\cursor_drop_user.cur">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\cursor_hyperlink.cur">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\female.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\group_closed.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\group_opened.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\icon_accmgr.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\icon_all.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\icon_ansi.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\icon_auth_request.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\icon_connecting.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\icon_down_arrow.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\Icon_exit.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\icon_file.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\icon_find_user.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\icon_frame.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\icon_help.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\icon_history.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\icon_loaded.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\icon_loaded_gray.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\icon_mail.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\icon_mainmenu.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\icon_message.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\icon_notloaded.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\icon_notloaded_gray.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\icon_options.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\icon_search_all.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\Icon_show_hide.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\icon_small_dot.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\icon_sms.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\icon_typing.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\icon_undo.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\icon_unicode.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\icon_url.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\icon_window.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\icon_windows.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\male.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\meta_add.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\meta_convert.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\meta_edit.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\meta_menu.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\meta_menuof.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\meta_remove2.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\meta_set_as_default.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\miranda_home.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\miranda_logo.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\miranda_manager.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\never_visible.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\Off.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\status_user_online.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\status_away.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\status_DND.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\status_free4chat.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\status_invisible.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\status_locked.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\status_NA.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\status_occupied.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\status_offline.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\status_on_the_phone.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\status_online.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ <None Include="res\status_out2lunch.ico">
+ <Filter>Resources\Icons</Filter>
+ </None>
+ </ItemGroup>
</Project> \ No newline at end of file
diff --git a/src/resource.h b/src/resource.h
index 7d74952446..77a602bc32 100644
--- a/src/resource.h
+++ b/src/resource.h
@@ -51,7 +51,6 @@
#define IDD_METASELECT 151
#define IDD_METAEDIT 152
#define IDD_METAOPTIONS 153
-#define IDD_METACOPYPROGRESS 156
#define IDI_DND 158
#define IDI_OCCUPIED 159
#define IDI_USERDETAILS 160
diff --git a/src/resource.rc b/src/resource.rc
index fbb6d448c2..0d9b63df66 100644
--- a/src/resource.rc
+++ b/src/resource.rc
@@ -769,41 +769,23 @@ BEGIN
PUSHBUTTON "&Apply",IDC_VALIDATE,328,241,50,14
END
-IDD_METAOPTIONS DIALOGEX 0, 0, 298, 168
+IDD_METAOPTIONS DIALOGEX 0, 0, 298, 169
STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_CHILD
EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- GROUPBOX "Context Menu",IDC_STATIC,4,4,289,109
- CONTROL "Use contact's unique ID",IDC_RAD_UID,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,30,264,10
- CONTROL "Use contact's display name",IDC_RAD_DID,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,16,43,264,10
- GROUPBOX "Contact Labels",IDC_STATIC,9,16,278,45,WS_GROUP
- GROUPBOX "Function",IDC_STATIC,10,65,277,45,WS_GROUP
- CONTROL "Set default and open message window",IDC_RAD_MSG,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,76,264,10
- CONTROL "Show subcontact context menu",IDC_RAD_MENU,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,16,87,264,10
- CONTROL "Show user information",IDC_RAD_INFO,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,16,97,264,10
- GROUPBOX "Contact List",IDC_STATIC,4,117,289,47,WS_GROUP
- CONTROL "Display subcontact nickname",IDC_RAD_NICK,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,10,129,277,10
- CONTROL "Display subcontact display name",IDC_RAD_NAME,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,10,140,277,10
- CONTROL "Lock name to first contact",IDC_CHK_LOCKHANDLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,151,278,10
-END
-
-IDD_METACOPYPROGRESS DIALOG 0, 0, 186, 90
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
-CAPTION "History Copy"
-FONT 8, "MS Shell Dlg"
-BEGIN
- CONTROL "Progress1",IDC_PROG,"msctls_progress32",0x0,28,49,130,13
- CTEXT "Please wait while the contact's history is copied.",IDC_STATIC,3,27,182,8
-END
-
-IDD_METADELPROGRESS DIALOG 0, 0, 186, 90
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
-CAPTION "History Remove"
-FONT 8, "MS Shell Dlg"
-BEGIN
- CONTROL "Progress1",IDC_PROG,"msctls_progress32",0x0,28,49,130,13
- CTEXT "Please wait while the contact's history is removed.",IDC_STATIC,3,27,182,8
+ GROUPBOX "Context Menu",IDC_STATIC,4,4,289,108
+ GROUPBOX "Contact Labels",IDC_STATIC,10,16,278,40,WS_GROUP
+ CONTROL "Use contact's unique ID",IDC_RAD_UID,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,29,264,10
+ CONTROL "Use contact's display name",IDC_RAD_DID,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,16,41,264,10
+ GROUPBOX "When I click on a sub in the popup menu...",IDC_STATIC,10,57,278,50,WS_GROUP
+ CONTROL "Set default and open message window",IDC_RAD_MSG,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,69,264,10
+ CONTROL "Show subcontact context menu",IDC_RAD_MENU,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,16,81,264,10
+ CONTROL "Show user information",IDC_RAD_INFO,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,16,93,264,10
+ GROUPBOX "Contact List",IDC_STATIC,4,113,289,51,WS_GROUP
+ CONTROL "Display subcontact nickname",IDC_RAD_NICK,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,10,124,277,10
+ CONTROL "Display subcontact display name",IDC_RAD_NAME,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,10,136,277,10
+ CONTROL "Lock name to first contact",IDC_CHK_LOCKHANDLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,148,278,10
END
IDD_OPT_LANGUAGES DIALOGEX 0, 0, 301, 191
@@ -1122,6 +1104,7 @@ BEGIN
VERTGUIDE, 280
VERTGUIDE, 287
VERTGUIDE, 293
+ BOTTOMMARGIN, 164
END
IDD_OPT_LANGUAGES, DIALOG
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 01:26:46 +0000