From 6c579fee385e85c9e62d818c0a019b30a57043c0 Mon Sep 17 00:00:00 2001
From: Kirill Volinsky <mataes2007@gmail.com>
Date: Sun, 28 Sep 2014 09:27:53 +0000
Subject: fixed Add to list button activation

git-svn-id: http://svn.miranda-ng.org/main/trunk@10618 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/miranda32_12.vcxproj         |  86 ++++++++++++++
 src/miranda32_12.vcxproj.filters | 250 +++++++++++++++++++++++++++++++++++++++
 src/modules/findadd/findadd.cpp  |   9 +-
 3 files changed, 343 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/miranda32_12.vcxproj b/src/miranda32_12.vcxproj
index a37070b3b8..aba0a38ee2 100644
--- a/src/miranda32_12.vcxproj
+++ b/src/miranda32_12.vcxproj
@@ -642,6 +642,92 @@
       <Project>{e2a369cd-eda3-414f-8ad0-e732cd7ee68c}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <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_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\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.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_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\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" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="res\cursor_drag_copy.cur" />
+    <None Include="res\cursor_drop_user.cur" />
+    <None Include="res\cursor_hyperlink.cur" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/src/miranda32_12.vcxproj.filters b/src/miranda32_12.vcxproj.filters
index 21b7bb2984..b7364b661c 100644
--- a/src/miranda32_12.vcxproj.filters
+++ b/src/miranda32_12.vcxproj.filters
@@ -645,4 +645,254 @@
       <Filter>Resources</Filter>
     </ResourceCompile>
   </ItemGroup>
+  <ItemGroup>
+    <Image Include="res\_blank.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\always_visible.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\auth_add.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\auth_grant.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\auth_request.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\auth_revoke.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\chat_channel.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\chat_join.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\chat_leave.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\check_off.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\check_on.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\contact_add.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\contact_delete.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\contact_groups.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\contact_rename.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\contact_view_details.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\female.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\group_closed.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\group_opened.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\icon_accmgr.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\icon_all.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\icon_ansi.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\icon_auth_request.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\icon_connecting.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\icon_down_arrow.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\icon_error.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\Icon_exit.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\icon_fatal.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\icon_file.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\icon_find_user.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\icon_frame.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\icon_help.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\icon_history.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\icon_loaded.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\icon_loaded_gray.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\icon_mail.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\icon_mainmenu.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\icon_message.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\icon_notify.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\icon_notloaded.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\icon_notloaded_gray.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\icon_options.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\icon_search_all.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\Icon_show_hide.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\icon_small_dot.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\icon_sms.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\icon_typing.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\icon_undo.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\icon_unicode.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\icon_url.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\icon_warning.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\icon_window.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\icon_windows.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\male.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\meta_add.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\meta_convert.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\meta_edit.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\meta_menu.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\meta_menuof.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\meta_remove2.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\meta_set_as_default.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\miranda_home.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\miranda_logo.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\miranda_manager.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\never_visible.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\Off.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\On.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\status_away.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\status_DND.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\status_free4chat.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\status_invisible.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\status_locked.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\status_NA.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\status_occupied.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\status_offline.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\status_on_the_phone.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\status_online.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\status_out2lunch.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+    <Image Include="res\status_user_online.ico">
+      <Filter>Resources\Icons</Filter>
+    </Image>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="res\cursor_hyperlink.cur">
+      <Filter>Resources\Icons</Filter>
+    </None>
+    <None Include="res\cursor_drop_user.cur">
+      <Filter>Resources\Icons</Filter>
+    </None>
+    <None Include="res\cursor_drag_copy.cur">
+      <Filter>Resources\Icons</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/modules/findadd/findadd.cpp b/src/modules/findadd/findadd.cpp
index 61ccfab2e3..99fda257b2 100644
--- a/src/modules/findadd/findadd.cpp
+++ b/src/modules/findadd/findadd.cpp
@@ -629,8 +629,13 @@ static INT_PTR CALLBACK DlgProcFindAdd(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 		case IDC_BYPROTOID:
 		case IDC_BYEMAIL:
 		case IDC_BYNAME:
-			EnableWindow(GetDlgItem(hwndDlg, IDC_ADD), ListView_GetSelectedCount(hwndList) > 0);
-			HideAdvancedSearchDlg(hwndDlg, dat);
+			{
+				int count = ListView_GetSelectedCount(hwndList);
+				if (dat->notSearchedYet)
+					count = 0;
+				EnableWindow(GetDlgItem(hwndDlg, IDC_ADD), count);
+				HideAdvancedSearchDlg(hwndDlg, dat);
+			}
 			break;
 
 		case IDC_PROTOID:
-- 
cgit v1.2.3