Protocol order option dialog: unused control removed

4 files changed, 6 insertions, 378 deletions

diff --git a/src/mir_app/mir_app.vcxproj b/src/mir_app/mir_app.vcxproj
index 1979222313..f1be852b29 100644
--- a/src/mir_app/mir_app.vcxproj
+++ b/src/mir_app/mir_app.vcxproj
@@ -212,102 +212,10 @@
     <ResourceCompile Include="res\version.rc" />

   </ItemGroup>

   <ItemGroup>

-    <None Include="res\cursor_drag_copy.cur" />

-    <None Include="res\cursor_drop_user.cur" />

-    <None Include="res\cursor_hyperlink.cur" />

     <None Include="src\mir_app.def" />

     <None Include="src\mir_app64.def" />

   </ItemGroup>

   <ItemGroup>

-    <Image Include="res\addgroup.ico" />

-    <Image Include="res\always_visible.ico" />

-    <Image Include="res\auth_add.ico" />

-    <Image Include="res\auth_grant.ico" />

-    <Image Include="res\auth_request.ico" />

-    <Image Include="res\auth_revoke.ico" />

-    <Image Include="res\chat\1.ico" />

-    <Image Include="res\chat\2.ico" />

-    <Image Include="res\chat\3.ico" />

-    <Image Include="res\chat\4.ico" />

-    <Image Include="res\chat\5.ico" />

-    <Image Include="res\chat\6.ico" />

-    <Image Include="res\chat_channel.ico" />

-    <Image Include="res\chat_join.ico" />

-    <Image Include="res\chat_leave.ico" />

-    <Image Include="res\check_off.ico" />

-    <Image Include="res\check_on.ico" />

-    <Image Include="res\contact_add.ico" />

-    <Image Include="res\contact_delete.ico" />

-    <Image Include="res\contact_groups.ico" />

-    <Image Include="res\contact_rename.ico" />

-    <Image Include="res\contact_view_details.ico" />

-    <Image Include="res\database.ico" />

-    <Image Include="res\female.ico" />

-    <Image Include="res\group_closed.ico" />

-    <Image Include="res\group_opened.ico" />

-    <Image Include="res\icon_accmgr.ico" />

-    <Image Include="res\icon_all.ico" />

-    <Image Include="res\icon_ansi.ico" />

-    <Image Include="res\icon_auth_request.ico" />

-    <Image Include="res\icon_connecting.ico" />

-    <Image Include="res\icon_down_arrow.ico" />

-    <Image Include="res\icon_error.ico" />

-    <Image Include="res\Icon_exit.ico" />

-    <Image Include="res\icon_fatal.ico" />

-    <Image Include="res\icon_file.ico" />

-    <Image Include="res\icon_find_user.ico" />

-    <Image Include="res\icon_frame.ico" />

-    <Image Include="res\icon_help.ico" />

-    <Image Include="res\icon_history.ico" />

-    <Image Include="res\icon_loaded_gray.ico" />

-    <Image Include="res\icon_mail.ico" />

-    <Image Include="res\icon_mainmenu.ico" />

-    <Image Include="res\icon_message.ico" />

-    <Image Include="res\icon_notify.ico" />

-    <Image Include="res\icon_notloaded.ico" />

-    <Image Include="res\icon_notloaded_gray.ico" />

-    <Image Include="res\icon_options.ico" />

-    <Image Include="res\icon_password.ico" />

-    <Image Include="res\icon_popup.ico" />

-    <Image Include="res\icon_popup_no.ico" />

-    <Image Include="res\icon_search_all.ico" />

-    <Image Include="res\Icon_show_hide.ico" />

-    <Image Include="res\icon_small_dot.ico" />

-    <Image Include="res\icon_sms.ico" />

-    <Image Include="res\icon_typing.ico" />

-    <Image Include="res\icon_undo.ico" />

-    <Image Include="res\icon_unicode.ico" />

-    <Image Include="res\icon_url.ico" />

-    <Image Include="res\icon_warning.ico" />

-    <Image Include="res\icon_window.ico" />

-    <Image Include="res\icon_windows.ico" />

-    <Image Include="res\male.ico" />

-    <Image Include="res\meta_add.ico" />

-    <Image Include="res\meta_convert.ico" />

-    <Image Include="res\meta_edit.ico" />

-    <Image Include="res\meta_menu.ico" />

-    <Image Include="res\meta_menuof.ico" />

-    <Image Include="res\meta_remove2.ico" />

-    <Image Include="res\meta_set_as_default.ico" />

-    <Image Include="res\miranda_home.ico" />

-    <Image Include="res\miranda_logo.ico" />

-    <Image Include="res\miranda_manager.ico" />

-    <Image Include="res\never_visible.ico" />

-    <Image Include="res\Off.ico" />

-    <Image Include="res\On.ico" />

-    <Image Include="res\sound.ico" />

-    <Image Include="res\status_away.ico" />

-    <Image Include="res\status_DND.ico" />

-    <Image Include="res\status_free4chat.ico" />

-    <Image Include="res\status_invisible.ico" />

-    <Image Include="res\status_locked.ico" />

-    <Image Include="res\status_NA.ico" />

-    <Image Include="res\status_occupied.ico" />

-    <Image Include="res\status_offline.ico" />

-    <Image Include="res\status_online.ico" />

-    <Image Include="res\status_on_the_phone.ico" />

-    <Image Include="res\status_out2lunch.ico" />

-    <Image Include="res\status_user_online.ico" />

-    <Image Include="res\_blank.ico" />

+    <Text Include="..\docs\contributors.txt" />

   </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/src/mir_app/mir_app.vcxproj.filters b/src/mir_app/mir_app.vcxproj.filters
index dafdde8604..b32a67a380 100644
--- a/src/mir_app/mir_app.vcxproj.filters
+++ b/src/mir_app/mir_app.vcxproj.filters
@@ -475,15 +475,6 @@
   <ItemGroup>

     <None Include="src\mir_app.def" />

     <None Include="src\mir_app64.def" />

-    <None Include="res\cursor_hyperlink.cur">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\cursor_drag_copy.cur">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="res\cursor_drop_user.cur">

-      <Filter>Resource Files</Filter>

-    </None>

   </ItemGroup>

   <ItemGroup>

     <Filter Include="Source Files\SRMM">

@@ -518,275 +509,6 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <Image Include="res\miranda_logo.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\miranda_home.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\miranda_manager.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\contact_view_details.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\contact_add.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\contact_rename.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\contact_delete.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\group_closed.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\group_opened.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\status_user_online.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\status_online.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\status_away.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\status_NA.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\status_occupied.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\status_DND.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\status_free4chat.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\status_invisible.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\status_on_the_phone.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\status_out2lunch.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\status_offline.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_connecting.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_typing.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_find_user.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_search_all.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_options.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_accmgr.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_mainmenu.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_help.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_message.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_file.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_history.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_url.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_sms.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_mail.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_small_dot.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_auth_request.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_all.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_down_arrow.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\check_off.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\check_on.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_unicode.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_ansi.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_loaded_gray.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_notloaded.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_notloaded_gray.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_frame.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_fatal.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_error.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_warning.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_notify.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\_blank.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_undo.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_window.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_windows.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\chat_join.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\chat_leave.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\status_locked.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\Icon_show_hide.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\Icon_exit.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\contact_groups.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\On.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\Off.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\always_visible.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\never_visible.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\chat_channel.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\male.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\female.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\auth_add.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\auth_grant.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\auth_request.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\auth_revoke.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\meta_menu.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\meta_menuof.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\meta_edit.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\meta_remove2.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\meta_convert.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\meta_add.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\meta_set_as_default.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\addgroup.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_popup.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_popup_no.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\icon_password.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\sound.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\database.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\chat\1.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\chat\2.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\chat\3.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\chat\4.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\chat\5.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

-    <Image Include="res\chat\6.ico">

-      <Filter>Resource Files</Filter>

-    </Image>

+    <Text Include="..\docs\contributors.txt" />

   </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/src/mir_app/res/resource.rc b/src/mir_app/res/resource.rc
index 56e66a8298..c3a41e8def 100644
--- a/src/mir_app/res/resource.rc
+++ b/src/mir_app/res/resource.rc
@@ -489,11 +489,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

-    CTEXT           "Show accounts in the following order,\ndrag to choose another order:",IDC_STATIC,78,11,150,25

+    CTEXT           "Show accounts in the following order,\ndrag to choose another order:",IDC_STATIC,8,11,298,17

     GROUPBOX        "Account order and visibility",IDC_STATIC,0,0,314,241,0,WS_EX_TRANSPARENT

-    CONTROL         "Tree1",IDC_PROTOCOLORDER,"SysTreeView32",TVS_NOTOOLTIPS | TVS_NOHSCROLL | WS_BORDER | WS_TABSTOP,78,37,151,153

-    PUSHBUTTON      "Reset",IDC_RESETPROTOCOLDATA,96,193,115,14,BS_NOTIFY

-    CTEXT           "Note: Miranda NG will have to be restarted for changes to take effect.",IDC_PROTOCOLORDERWARNING,13,216,280,16

+    CONTROL         "Tree1",IDC_PROTOCOLORDER,"SysTreeView32",TVS_NOTOOLTIPS | TVS_NOHSCROLL | WS_BORDER | WS_TABSTOP,78,32,151,185

+    PUSHBUTTON      "Reset",IDC_RESETPROTOCOLDATA,96,222,115,14,BS_NOTIFY

 END

 

 IDD_OPT_KEYBINDINGS DIALOGEX 0, 0, 316, 251

diff --git a/src/mir_app/src/resource.h b/src/mir_app/src/resource.h
index 880bc69078..377188f3f7 100644
--- a/src/mir_app/src/resource.h
+++ b/src/mir_app/src/resource.h
@@ -438,7 +438,6 @@
 #define IDC_TINYEXTENDEDGROUP           1406

 #define IDC_RESETPROTOCOLDATA           1407

 #define IDC_BYCUSTOM                    1408

-#define IDC_PROTOCOLORDERWARNING        1409

 #define IDC_CHK_SUPPRESSSTATUS          1413

 #define IDC_RAD_UID                     1414

 #define IDC_RAD_DID                     1415

@@ -705,7 +704,7 @@
 // 

 #ifdef APSTUDIO_INVOKED

 #ifndef APSTUDIO_READONLY_SYMBOLS

-#define _APS_NEXT_RESOURCE_VALUE        335

+#define _APS_NEXT_RESOURCE_VALUE        336

 #define _APS_NEXT_COMMAND_VALUE         40018

 #define _APS_NEXT_CONTROL_VALUE         1755

 #define _APS_NEXT_SYMED_VALUE           101