From 4c4bdd5c14793f4e354df37325e77f574ee1ea6a Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 19 Jul 2013 11:58:51 +0000 Subject: git-svn-id: http://svn.miranda-ng.org/main/trunk@5417 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/NewsAggregator/Src/ExportImport.cpp | 13 +++++++------ plugins/NewsAggregator/Src/resource.h | 6 ++---- 2 files changed, 9 insertions(+), 10 deletions(-) (limited to 'plugins/NewsAggregator/Src') diff --git a/plugins/NewsAggregator/Src/ExportImport.cpp b/plugins/NewsAggregator/Src/ExportImport.cpp index ee647c0b67..06555b3102 100644 --- a/plugins/NewsAggregator/Src/ExportImport.cpp +++ b/plugins/NewsAggregator/Src/ExportImport.cpp @@ -323,13 +323,9 @@ INT_PTR CALLBACK DlgProcExportOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM } } EnableWindow(GetDlgItem(hwndDlg, IDC_REMOVEFEED), FALSE); - if (SendMessage(FeedsList, LB_GETCURSEL, 0, 0)) - { + EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE); + if (!SendMessage(FeedsList, LB_GETCOUNT, 0, 0)) EnableWindow(GetDlgItem(hwndDlg, IDC_ADDFEED), FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_BROWSEEXPORTFILE), FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_EXPORTFILEPATH), FALSE); - } return TRUE; case WM_COMMAND: @@ -346,6 +342,8 @@ INT_PTR CALLBACK DlgProcExportOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM { if (!IsWindowEnabled(GetDlgItem(hwndDlg, IDC_REMOVEFEED))) EnableWindow(GetDlgItem(hwndDlg, IDC_REMOVEFEED), TRUE); + if (!IsWindowEnabled(GetDlgItem(hwndDlg, IDOK))) + EnableWindow(GetDlgItem(hwndDlg, IDOK), TRUE); int cursel = SendMessage(FeedsList, LB_GETCURSEL, 0, 0); TCHAR item[MAX_PATH]; SendMessage(FeedsList, LB_GETTEXT, cursel, (LPARAM)item); @@ -366,7 +364,10 @@ INT_PTR CALLBACK DlgProcExportOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM SendMessage(FeedsList, LB_ADDSTRING, 0, (LPARAM)item); SendMessage(FeedsExportList, LB_DELETESTRING, cursel, 0); if (!SendMessage(FeedsExportList, LB_GETCOUNT, 0, 0)) + { EnableWindow(GetDlgItem(hwndDlg, IDC_REMOVEFEED), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE); + } } break; } diff --git a/plugins/NewsAggregator/Src/resource.h b/plugins/NewsAggregator/Src/resource.h index 7966677bf4..e45b33deeb 100644 --- a/plugins/NewsAggregator/Src/resource.h +++ b/plugins/NewsAggregator/Src/resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. -// Used by C:\Temp\Myranda\plugins\NewsAggregator\res\Resource.rc +// Used by c:\Temp\Miranda NG\plugins\NewsAggregator\res\Resource.rc // #define IDD_OPTIONS 101 #define IDD_AUTHENTICATION 102 @@ -36,14 +36,12 @@ #define IDC_FEEDPASSWORD 1106 #define IDC_FEEDSLIST 1108 #define IDC_FEEDSEXPORTLIST 1109 -#define IDC_FEEDSIMPORTLIST 1117 #define IDC_ADDFEED 1110 #define IDC_REMOVEFEED 1111 -#define IDC_EXPORTFILEPATH 1112 -#define IDC_BROWSEEXPORTFILE 1113 #define IDC_IMPORTFILEPATH 1114 #define IDC_BROWSEIMPORTFILE 1115 #define IDC_LOADIMPORTFILE 1116 +#define IDC_FEEDSIMPORTLIST 1117 #define IDC_FEEDNAME 1124 // Next default values for new objects -- cgit v1.2.3