diff options
Diffstat (limited to 'plugins/NewsAggregator')
| -rw-r--r-- | plugins/NewsAggregator/Res/Resource.rc | 9 | ||||
| -rw-r--r-- | plugins/NewsAggregator/Src/ExportImport.cpp | 13 | ||||
| -rw-r--r-- | plugins/NewsAggregator/Src/resource.h | 6 |
3 files changed, 12 insertions, 16 deletions
diff --git a/plugins/NewsAggregator/Res/Resource.rc b/plugins/NewsAggregator/Res/Resource.rc index e8aeb072e2..bc2b977d46 100644 --- a/plugins/NewsAggregator/Res/Resource.rc +++ b/plugins/NewsAggregator/Res/Resource.rc @@ -101,7 +101,7 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,153,87,50,14
END
-IDD_FEEDEXPORT DIALOGEX 0, 0, 275, 162
+IDD_FEEDEXPORT DIALOGEX 0, 0, 275, 138
STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_ACCEPTFILES | WS_EX_CONTROLPARENT
CAPTION "Export"
@@ -113,11 +113,8 @@ BEGIN LISTBOX IDC_FEEDSEXPORTLIST,150,18,120,98,LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
PUSHBUTTON "->",IDC_ADDFEED,129,50,17,14
PUSHBUTTON "<-",IDC_REMOVEFEED,129,66,17,14
- LTEXT "Export to file:",IDC_STATIC,6,127,47,8
- EDITTEXT IDC_EXPORTFILEPATH,59,124,186,14,ES_AUTOHSCROLL,WS_EX_ACCEPTFILES
- PUSHBUTTON "...",IDC_BROWSEEXPORTFILE,248,124,22,14
- PUSHBUTTON "&Export",IDOK,164,144,50,14
- PUSHBUTTON "&Close",IDCANCEL,220,144,50,14
+ PUSHBUTTON "&Export",IDOK,164,120,50,14
+ PUSHBUTTON "&Close",IDCANCEL,220,120,50,14
END
IDD_FEEDIMPORT DIALOGEX 0, 0, 276, 183
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
|