Skip to content

Commit 489cb23

Browse files
pryrtpryrt
committed
starting to rework the main dialog
1 parent e9e4bc1 commit 489cb23

File tree

4 files changed

+25
-38
lines changed

4 files changed

+25
-38
lines changed

‎src/Dialogs/CollectionInterfaceDialog.rc‎

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,16 @@
2525
// Dialog resources
2626
//
2727
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
28-
IDD_COLLECTIONINTERFACEDLG DIALOGEX 0, 0, 300, 135
29-
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_BORDER | WS_SYSMENU
28+
IDD_COLLECTIONINTERFACEDLG DIALOGEX 0, 0, 311, 218
29+
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
30+
CAPTION "Collection Interface: Download"
3031
FONT 8, "MS Shell Dlg", 0, 0, 0x1
31-
{
32-
LTEXT "Download from UDL Collection or Themes Collection", IDC_STATIC, 10, 5, 280, 9, SS_LEFT, WS_EX_LEFT
33-
PUSHBUTTON "&Download", IDC_CI_BTN_DOWNLOAD, 10, 115, 60, 14
34-
PUSHBUTTON "&Restart N++", IDC_CI_BTN_RESTART, 80, 115, 90, 14
35-
PUSHBUTTON "&Close", IDC_CI_BTN_DONE, 230, 115, 60, 14
36-
37-
LTEXT "Category:", IDC_STATIC, 10, 23, 30, 9, SS_LEFT, WS_EX_LEFT
38-
COMBOBOX IDC_CI_COMBO_CATEGORY, 50, 20, 240, 52, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP
39-
40-
LTEXT "File:", IDC_STATIC, 10, 41, 30, 9, SS_LEFT, WS_EX_LEFT
41-
//COMBOBOX IDC_CI_COMBO_FILE, 50, 40, 240, 55, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP
42-
LISTBOX IDC_CI_COMBO_FILE, 50, 40, 240, 70, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP
43-
44-
LTEXT "Need RESTART for Notepad++ to see new UDL/AutoCompletion/FunctionList/Themes", IDC_STATIC, 10, 105, 280, 9, SS_LEFT, WS_EX_LEFT
45-
}
32+
BEGIN
33+
LTEXT "Download files from UDL Collection or Themes Collection", IDC_STATIC, 10, 5, 280, 9, SS_LEFT, WS_EX_LEFT
34+
35+
COMBOBOX IDC_CI_COMBO_CATEGORY, 50, 20, 240, 52, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP
36+
LISTBOX IDC_CI_COMBO_FILE, 50, 40, 240, 110, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP
37+
CONTROL "",IDC_CI_PROGRESSBAR,"msctls_progress32",WS_BORDER,10,160,280,11
38+
PUSHBUTTON "&Download", IDC_CI_BTN_DOWNLOAD, 120, 140, 60, 14
39+
PUSHBUTTON "&Close", IDC_CI_BTN_DONE, 230, 175, 60, 14
40+
END

‎src/Dialogs/delme.rc‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,16 @@ END
5050
// Dialog
5151
//
5252

53-
IDD_DIALOG1 DIALOGEX 0, 0, 311, 177
53+
IDD_DIALOG1 DIALOGEX 0, 0, 311, 203
5454
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
55-
CAPTION "ThisIsTheCaption"
55+
CAPTION "Collection Interface: Download"
5656
FONT 8, "MS Shell Dlg", 400, 0, 0x1
5757
BEGIN
58-
DEFPUSHBUTTON "OK",IDOK,198,156,50,14
59-
PUSHBUTTON "Cancel",IDCANCEL,254,156,50,14
60-
CONTROL "",IDC_TAB1,"SysTabControl32",0x0,7,7,297,127
61-
CONTROL "",IDC_PROGRESS1,"msctls_progress32",WS_BORDER,7,139,297,11
62-
LISTBOX IDC_LIST1,12,25,285,106,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
58+
CONTROL "",IDC_TAB1,"SysTabControl32",0x0,7,7,297,160
59+
CONTROL "",IDC_PROGRESS1,"msctls_progress32",WS_BORDER,7,169,297,11
60+
LISTBOX IDC_LIST1,12,25,285,120,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
61+
DEFPUSHBUTTON "Download",IDOK,127,149,50,14
62+
PUSHBUTTON "Close",IDCANCEL,254,182,50,14
6363
END
6464

6565

@@ -76,7 +76,7 @@ BEGIN
7676
LEFTMARGIN, 7
7777
RIGHTMARGIN, 304
7878
TOPMARGIN, 7
79-
BOTTOMMARGIN, 170
79+
BOTTOMMARGIN, 196
8080
END
8181
END
8282
#endif // APSTUDIO_INVOKED

‎src/Dialogs/delmeDialog.cpp‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ INT_PTR CALLBACK delDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
2626
int y = center.y - (dlgRect.bottom - dlgRect.top) / 2;
2727
::SetWindowPos(hwndDlg, HWND_TOP, x, y, (dlgRect.right - dlgRect.left), (dlgRect.bottom - dlgRect.top), SWP_SHOWWINDOW|SWP_NOSIZE); // the SWP_NOSIZE will prevent resizing, so it just centers
2828

29-
// populate tab bar
29+
// populate tab bar: "INSERTITEM" means RightToLeft, because it inserts it before the earlier tab.
3030
std::wstring ws;
3131
TCITEM pop;
3232
pop.mask = TCIF_TEXT;
33-
ws = L"TAB"; pop.cchTextMax = static_cast<int>(ws.size()); pop.pszText = const_cast<LPWSTR>(ws.data());
33+
ws = L"SOMETHING WITHOUT SUGAR"; pop.cchTextMax = static_cast<int>(ws.size()); pop.pszText = const_cast<LPWSTR>(ws.data());
3434
::SendDlgItemMessage(hwndDlg, IDC_TAB1, TCM_INSERTITEM, 0, reinterpret_cast<LPARAM>(&pop));
3535
ws = L"PEPSI FREE"; pop.cchTextMax = static_cast<int>(ws.size()); pop.pszText = const_cast<LPWSTR>(ws.data());
3636
::SendDlgItemMessage(hwndDlg, IDC_TAB1, TCM_INSERTITEM, 0, reinterpret_cast<LPARAM>(&pop));
37-
ws = L"WATER"; pop.cchTextMax = static_cast<int>(ws.size()); pop.pszText = const_cast<LPWSTR>(ws.data());
37+
ws = L"TAB"; pop.cchTextMax = static_cast<int>(ws.size()); pop.pszText = const_cast<LPWSTR>(ws.data());
3838
::SendDlgItemMessage(hwndDlg, IDC_TAB1, TCM_INSERTITEM, 0, reinterpret_cast<LPARAM>(&pop));
3939
::SendDlgItemMessage(hwndDlg, IDC_TAB1, TCM_SETCURSEL, 0, 0);
4040

@@ -48,16 +48,6 @@ INT_PTR CALLBACK delDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
4848
// set progress bar
4949
::SendDlgItemMessage(hwndDlg, IDC_PROGRESS1, PBM_SETPOS, 55, 0);
5050

51-
#if 0
52-
// populate Category list
53-
::SendDlgItemMessage(hwndDlg, IDC_CI_COMBO_CATEGORY, CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"UDL"));
54-
::SendDlgItemMessage(hwndDlg, IDC_CI_COMBO_CATEGORY, CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"AutoCompletion"));
55-
::SendDlgItemMessage(hwndDlg, IDC_CI_COMBO_CATEGORY, CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"FunctionList"));
56-
::SendDlgItemMessage(hwndDlg, IDC_CI_COMBO_CATEGORY, CB_ADDSTRING, 0, reinterpret_cast<LPARAM>(L"Theme"));
57-
const int index2Begin = 0; // start with UDL selected
58-
::SendDlgItemMessage(hwndDlg, IDC_CI_COMBO_CATEGORY, CB_SETCURSEL, index2Begin, 0);
59-
#endif
60-
6151
}
6252
return true;
6353
case WM_COMMAND:

‎src/Dialogs/resource.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,5 @@
3434
#define IDC_CI_BTN_RESTART 1003
3535
#define IDC_CI_COMBO_CATEGORY 1004
3636
#define IDC_CI_COMBO_FILE 1005
37+
#define IDC_CI_TABCTRL 1006
38+
#define IDC_CI_PROGRESSBAR 1007

0 commit comments

Comments
 (0)