mirror of
https://github.com/pbatard/rufus.git
synced 2025-06-02 07:39:54 -04:00
[ui] more UI improvements
* Automatically position the advanced button * Improve UI display for some locales * Small Windows 7 improvements
This commit is contained in:
Pete Batard
parent
4c8b022042
commit
8e8a2bc827
5 changed files with 171 additions and 167 deletions
23
src/rufus.c
23
src/rufus.c
|
|
@ -1345,21 +1345,18 @@ void InitDialog(HWND hDlg)
|
|||
{
|
||||
HINSTANCE hDllInst;
|
||||
DWORD len;
|
||||
SIZE sz;
|
||||
HWND hCtrl;
|
||||
HDC hDC;
|
||||
int i, i16, s16;
|
||||
char tmp[128], *token, *buf, *ext;
|
||||
wchar_t wtmp[128] = {0};
|
||||
static char* resource[2] = { MAKEINTRESOURCEA(IDR_SL_LDLINUX_V4_SYS), MAKEINTRESOURCEA(IDR_SL_LDLINUX_V6_SYS) };
|
||||
|
||||
#ifdef RUFUS_TEST
|
||||
ShowWindow(GetDlgItem(hDlg, IDC_TEST), SW_SHOW);
|
||||
#endif
|
||||
|
||||
// Position of the advanced button needs to be adjusted for XP
|
||||
// (and we don't want to have to remember to keep in sync in the RC)
|
||||
// TODO: Ideally, we'd get the metrics of the font and compute our position and addon spaces accordingly
|
||||
if (nWindowsVersion <= WINDOWS_XP)
|
||||
ResizeMoveCtrl(hDlg, GetDlgItem(hDlg, IDC_ADVANCED), -5, 0, 0, 0);
|
||||
|
||||
// Quite a burden to carry around as parameters
|
||||
hMainDialog = hDlg;
|
||||
hDeviceList = GetDlgItem(hDlg, IDC_DEVICE);
|
||||
|
|
@ -1473,6 +1470,20 @@ void InitDialog(HWND hDlg)
|
|||
hIconUp = (HICON)LoadImage(hMainInstance, MAKEINTRESOURCE(IDI_UP), IMAGE_ICON, 16, 16, 0);
|
||||
}
|
||||
|
||||
// Reposition the Advanced button
|
||||
hCtrl = GetDlgItem(hDlg, IDS_FORMAT_OPTIONS_GRP);
|
||||
sz = GetTextSize(hCtrl);
|
||||
ResizeMoveCtrl(hDlg, GetDlgItem(hDlg, IDC_ADVANCED), sz.cx, 0, 0, 0);
|
||||
// Add a space to the "Format Options" text
|
||||
GetWindowTextW(hCtrl, wtmp, ARRAYSIZE(wtmp));
|
||||
wtmp[wcslen(wtmp)] = ' ';
|
||||
SetWindowTextW(hCtrl, wtmp);
|
||||
// The things one needs to do to keep things looking good...
|
||||
if (nWindowsVersion == WINDOWS_7) {
|
||||
ResizeMoveCtrl(hDlg, GetDlgItem(hMainDialog, IDS_ADVANCED_OPTIONS_GRP), 0, -1, 0, 2);
|
||||
ResizeMoveCtrl(hDlg, hProgress, 0, 1, 0, 0);
|
||||
}
|
||||
|
||||
// Set the icons on the the buttons
|
||||
PF_INIT(ImageList_Create, Comctl32);
|
||||
PF_INIT(ImageList_ReplaceIcon, Comctl32);
|
||||
|
|
|
|||
|
|
@ -372,6 +372,7 @@ extern void DestroyTooltip(HWND hWnd);
|
|||
extern void DestroyAllTooltips(void);
|
||||
extern BOOL Notification(int type, const notification_info* more_info, char* title, char* format, ...);
|
||||
extern BOOL Question(char* title, char* format, ...);
|
||||
extern SIZE GetTextSize(HWND hCtrl);
|
||||
extern BOOL ExtractDOS(const char* path);
|
||||
extern BOOL ExtractISO(const char* src_iso, const char* dest_dir, BOOL scan);
|
||||
extern int64_t ExtractISOFile(const char* iso, const char* iso_file, const char* dest_file, DWORD attributes);
|
||||
|
|
|
|||
88
src/rufus.rc
88
src/rufus.rc
|
|
@ -31,8 +31,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
|
|||
//
|
||||
|
||||
IDD_DIALOG DIALOGEX 12, 12, 242, 329
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "Rufus 1.5.0.551"
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "Rufus 1.5.0.552"
|
||||
FONT 8, "Segoe UI", 400, 0, 0x1
|
||||
BEGIN
|
||||
DEFPUSHBUTTON "Start",IDC_START,127,291,50,14
|
||||
|
|
@ -48,8 +48,8 @@ BEGIN
|
|||
COMBOBOX IDC_CLUSTERSIZE,8,104,226,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
LTEXT "New volume label",IDS_LABEL_TXT,9,121,222,10
|
||||
EDITTEXT IDC_LABEL,8,131,226,13,ES_AUTOHSCROLL
|
||||
GROUPBOX "Format Options ",IDS_FORMAT_OPTIONS_GRP,7,149,227,65
|
||||
PUSHBUTTON "",IDC_ADVANCED,69,148,14,10,BS_TOP | BS_FLAT
|
||||
GROUPBOX "Format Options",IDS_FORMAT_OPTIONS_GRP,7,149,227,65
|
||||
PUSHBUTTON "",IDC_ADVANCED,15,148,14,10,BS_TOP | BS_FLAT
|
||||
CONTROL "Check device for bad blocks",IDC_BADBLOCKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,161,112,10
|
||||
COMBOBOX IDC_NBPASSES,128,159,100,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
CONTROL "Quick format",IDC_QUICKFORMAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,173,121,10
|
||||
|
|
@ -71,7 +71,7 @@ BEGIN
|
|||
END
|
||||
|
||||
IDD_ABOUTBOX DIALOGEX 0, 0, 319, 237
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "About Rufus"
|
||||
FONT 8, "Segoe UI", 400, 0, 0x0
|
||||
BEGIN
|
||||
|
|
@ -84,7 +84,7 @@ BEGIN
|
|||
END
|
||||
|
||||
IDD_ISO_EXTRACT DIALOGEX 0, 0, 300, 66
|
||||
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
|
||||
STYLE DS_SETFONT | WS_POPUP | WS_CAPTION
|
||||
CAPTION "Copying ISO files..."
|
||||
FONT 8, "Segoe UI", 400, 0, 0x1
|
||||
BEGIN
|
||||
|
|
@ -94,7 +94,7 @@ BEGIN
|
|||
END
|
||||
|
||||
IDD_LICENSE DIALOGEX 0, 0, 335, 205
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "Rufus License"
|
||||
FONT 8, "Segoe UI", 400, 0, 0x1
|
||||
BEGIN
|
||||
|
|
@ -103,7 +103,7 @@ BEGIN
|
|||
END
|
||||
|
||||
IDD_LOG DIALOGEX 0, 0, 366, 329
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
|
||||
CAPTION "Log"
|
||||
FONT 8, "Segoe UI", 400, 0, 0x1
|
||||
BEGIN
|
||||
|
|
@ -114,7 +114,7 @@ BEGIN
|
|||
END
|
||||
|
||||
IDD_NOTIFICATION DIALOGEX 0, 0, 263, 63
|
||||
STYLE DS_SETFONT | DS_FIXEDSYS | DS_NOFAILCREATE | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_THICKFRAME
|
||||
STYLE DS_SETFONT | DS_NOFAILCREATE | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_THICKFRAME
|
||||
CAPTION "Rufus"
|
||||
FONT 8, "Segoe UI", 400, 0, 0x1
|
||||
BEGIN
|
||||
|
|
@ -145,7 +145,7 @@ BEGIN
|
|||
END
|
||||
|
||||
IDD_NEW_VERSION DIALOGEX 0, 0, 384, 268
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "Check For Updates - Rufus"
|
||||
FONT 8, "Segoe UI", 400, 0, 0x0
|
||||
BEGIN
|
||||
|
|
@ -163,8 +163,8 @@ BEGIN
|
|||
END
|
||||
|
||||
IDD_DIALOG_XP DIALOGEX 12, 12, 242, 329
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "Rufus 1.5.0.551"
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "Rufus 1.5.0.552"
|
||||
FONT 8, "MS Shell Dlg", 400, 0, 0x1
|
||||
BEGIN
|
||||
DEFPUSHBUTTON "Start",IDC_START,127,291,50,14
|
||||
|
|
@ -180,8 +180,8 @@ BEGIN
|
|||
COMBOBOX IDC_CLUSTERSIZE,8,104,226,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
LTEXT "New volume label",IDS_LABEL_TXT,9,121,222,10
|
||||
EDITTEXT IDC_LABEL,8,131,226,13,ES_AUTOHSCROLL
|
||||
GROUPBOX "Format Options ",IDS_FORMAT_OPTIONS_GRP,7,149,227,65
|
||||
PUSHBUTTON "",IDC_ADVANCED,69,148,14,10,BS_TOP | BS_FLAT
|
||||
GROUPBOX "Format Options",IDS_FORMAT_OPTIONS_GRP,7,149,227,65
|
||||
PUSHBUTTON "",IDC_ADVANCED,15,148,14,10,BS_TOP | BS_FLAT
|
||||
CONTROL "Check device for bad blocks",IDC_BADBLOCKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,161,112,10
|
||||
COMBOBOX IDC_NBPASSES,128,159,100,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
CONTROL "Quick format",IDC_QUICKFORMAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,173,121,10
|
||||
|
|
@ -203,7 +203,7 @@ BEGIN
|
|||
END
|
||||
|
||||
IDD_ABOUTBOX_XP DIALOGEX 0, 0, 319, 237
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "About Rufus"
|
||||
FONT 8, "MS Shell Dlg", 400, 0, 0x0
|
||||
BEGIN
|
||||
|
|
@ -216,7 +216,7 @@ BEGIN
|
|||
END
|
||||
|
||||
IDD_ISO_EXTRACT_XP DIALOGEX 0, 0, 300, 66
|
||||
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
|
||||
STYLE DS_SETFONT | WS_POPUP | WS_CAPTION
|
||||
CAPTION "Copying ISO files..."
|
||||
FONT 8, "MS Shell Dlg", 400, 0, 0x1
|
||||
BEGIN
|
||||
|
|
@ -226,7 +226,7 @@ BEGIN
|
|||
END
|
||||
|
||||
IDD_LICENSE_XP DIALOGEX 0, 0, 335, 205
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "Rufus License"
|
||||
FONT 8, "MS Shell Dlg", 400, 0, 0x1
|
||||
BEGIN
|
||||
|
|
@ -235,7 +235,7 @@ BEGIN
|
|||
END
|
||||
|
||||
IDD_LOG_XP DIALOGEX 0, 0, 366, 329
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
|
||||
CAPTION "Log"
|
||||
FONT 8, "MS Shell Dlg", 400, 0, 0x1
|
||||
BEGIN
|
||||
|
|
@ -246,7 +246,7 @@ BEGIN
|
|||
END
|
||||
|
||||
IDD_NOTIFICATION_XP DIALOGEX 0, 0, 263, 63
|
||||
STYLE DS_SETFONT | DS_FIXEDSYS | DS_NOFAILCREATE | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_THICKFRAME
|
||||
STYLE DS_SETFONT | DS_NOFAILCREATE | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_THICKFRAME
|
||||
CAPTION "Rufus"
|
||||
FONT 8, "MS Shell Dlg", 400, 0, 0x1
|
||||
BEGIN
|
||||
|
|
@ -277,7 +277,7 @@ BEGIN
|
|||
END
|
||||
|
||||
IDD_NEW_VERSION_XP DIALOGEX 0, 0, 384, 268
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "Check For Updates - Rufus"
|
||||
FONT 8, "MS Shell Dlg", 400, 0, 0x0
|
||||
BEGIN
|
||||
|
|
@ -295,9 +295,9 @@ BEGIN
|
|||
END
|
||||
|
||||
IDD_DIALOG_RTL DIALOGEX 12, 12, 242, 329
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
|
||||
CAPTION "Rufus 1.5.0.551"
|
||||
CAPTION "Rufus 1.5.0.552"
|
||||
FONT 8, "Segoe UI", 400, 0, 0x1
|
||||
BEGIN
|
||||
DEFPUSHBUTTON "Start",IDC_START,127,291,50,14
|
||||
|
|
@ -313,8 +313,8 @@ BEGIN
|
|||
COMBOBOX IDC_CLUSTERSIZE,8,104,226,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
LTEXT "New volume label",IDS_LABEL_TXT,9,121,222,10
|
||||
EDITTEXT IDC_LABEL,8,131,226,13,ES_AUTOHSCROLL
|
||||
GROUPBOX "Format Options ",IDS_FORMAT_OPTIONS_GRP,7,149,227,65
|
||||
PUSHBUTTON "",IDC_ADVANCED,69,148,14,10,BS_TOP | BS_FLAT
|
||||
GROUPBOX "Format Options",IDS_FORMAT_OPTIONS_GRP,7,149,227,65
|
||||
PUSHBUTTON "",IDC_ADVANCED,15,148,14,10,BS_TOP | BS_FLAT
|
||||
CONTROL "Check device for bad blocks",IDC_BADBLOCKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,161,112,10
|
||||
COMBOBOX IDC_NBPASSES,128,159,100,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
CONTROL "Quick format",IDC_QUICKFORMAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,173,121,10
|
||||
|
|
@ -336,7 +336,7 @@ BEGIN
|
|||
END
|
||||
|
||||
IDD_ABOUTBOX_RTL DIALOGEX 0, 0, 319, 237
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
|
||||
CAPTION "About Rufus"
|
||||
FONT 8, "Segoe UI", 400, 0, 0x0
|
||||
|
|
@ -350,7 +350,7 @@ BEGIN
|
|||
END
|
||||
|
||||
IDD_ISO_EXTRACT_RTL DIALOGEX 0, 0, 300, 66
|
||||
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
|
||||
STYLE DS_SETFONT | WS_POPUP | WS_CAPTION
|
||||
EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
|
||||
CAPTION "Copying ISO files..."
|
||||
FONT 8, "Segoe UI", 400, 0, 0x1
|
||||
|
|
@ -361,7 +361,7 @@ BEGIN
|
|||
END
|
||||
|
||||
IDD_LICENSE_RTL DIALOGEX 0, 0, 335, 205
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
|
||||
CAPTION "Rufus License"
|
||||
FONT 8, "Segoe UI", 400, 0, 0x1
|
||||
|
|
@ -371,7 +371,7 @@ BEGIN
|
|||
END
|
||||
|
||||
IDD_LOG_RTL DIALOGEX 0, 0, 366, 329
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
|
||||
EXSTYLE WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
|
||||
CAPTION "Log"
|
||||
FONT 8, "Segoe UI", 400, 0, 0x1
|
||||
|
|
@ -383,7 +383,7 @@ BEGIN
|
|||
END
|
||||
|
||||
IDD_NOTIFICATION_RTL DIALOGEX 0, 0, 263, 63
|
||||
STYLE DS_SETFONT | DS_FIXEDSYS | DS_NOFAILCREATE | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_THICKFRAME
|
||||
STYLE DS_SETFONT | DS_NOFAILCREATE | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_THICKFRAME
|
||||
EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
|
||||
CAPTION "Rufus"
|
||||
FONT 8, "Segoe UI", 400, 0, 0x1
|
||||
|
|
@ -416,7 +416,7 @@ BEGIN
|
|||
END
|
||||
|
||||
IDD_NEW_VERSION_RTL DIALOGEX 0, 0, 384, 268
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
|
||||
CAPTION "Check For Updates - Rufus"
|
||||
FONT 8, "Segoe UI", 400, 0, 0x0
|
||||
|
|
@ -435,9 +435,9 @@ BEGIN
|
|||
END
|
||||
|
||||
IDD_DIALOG_RTL_XP DIALOGEX 12, 12, 242, 329
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
|
||||
CAPTION "Rufus 1.5.0.551"
|
||||
CAPTION "Rufus 1.5.0.552"
|
||||
FONT 8, "MS Shell Dlg", 400, 0, 0x1
|
||||
BEGIN
|
||||
DEFPUSHBUTTON "Start",IDC_START,127,291,50,14
|
||||
|
|
@ -453,8 +453,8 @@ BEGIN
|
|||
COMBOBOX IDC_CLUSTERSIZE,8,104,226,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
LTEXT "New volume label",IDS_LABEL_TXT,9,121,222,10
|
||||
EDITTEXT IDC_LABEL,8,131,226,13,ES_AUTOHSCROLL
|
||||
GROUPBOX "Format Options ",IDS_FORMAT_OPTIONS_GRP,7,149,227,65
|
||||
PUSHBUTTON "",IDC_ADVANCED,69,148,14,10,BS_TOP | BS_FLAT
|
||||
GROUPBOX "Format Options",IDS_FORMAT_OPTIONS_GRP,7,149,227,65
|
||||
PUSHBUTTON "",IDC_ADVANCED,15,148,14,10,BS_TOP | BS_FLAT
|
||||
CONTROL "Check device for bad blocks",IDC_BADBLOCKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,161,112,10
|
||||
COMBOBOX IDC_NBPASSES,128,159,100,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
CONTROL "Quick format",IDC_QUICKFORMAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,173,121,10
|
||||
|
|
@ -476,7 +476,7 @@ BEGIN
|
|||
END
|
||||
|
||||
IDD_ABOUTBOX_RTL_XP DIALOGEX 0, 0, 319, 237
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
|
||||
CAPTION "About Rufus"
|
||||
FONT 8, "MS Shell Dlg", 400, 0, 0x0
|
||||
|
|
@ -490,7 +490,7 @@ BEGIN
|
|||
END
|
||||
|
||||
IDD_ISO_EXTRACT_RTL_XP DIALOGEX 0, 0, 300, 66
|
||||
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
|
||||
STYLE DS_SETFONT | WS_POPUP | WS_CAPTION
|
||||
EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
|
||||
CAPTION "Copying ISO files..."
|
||||
FONT 8, "MS Shell Dlg", 400, 0, 0x1
|
||||
|
|
@ -501,7 +501,7 @@ BEGIN
|
|||
END
|
||||
|
||||
IDD_LICENSE_RTL_XP DIALOGEX 0, 0, 335, 205
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
|
||||
CAPTION "Rufus License"
|
||||
FONT 8, "MS Shell Dlg", 400, 0, 0x1
|
||||
|
|
@ -511,7 +511,7 @@ BEGIN
|
|||
END
|
||||
|
||||
IDD_LOG_RTL_XP DIALOGEX 0, 0, 366, 329
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION
|
||||
EXSTYLE WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
|
||||
CAPTION "Log"
|
||||
FONT 8, "MS Shell Dlg", 400, 0, 0x1
|
||||
|
|
@ -523,7 +523,7 @@ BEGIN
|
|||
END
|
||||
|
||||
IDD_NOTIFICATION_RTL_XP DIALOGEX 0, 0, 263, 63
|
||||
STYLE DS_SETFONT | DS_FIXEDSYS | DS_NOFAILCREATE | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_THICKFRAME
|
||||
STYLE DS_SETFONT | DS_NOFAILCREATE | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_THICKFRAME
|
||||
EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
|
||||
CAPTION "Rufus"
|
||||
FONT 8, "MS Shell Dlg", 400, 0, 0x1
|
||||
|
|
@ -556,7 +556,7 @@ BEGIN
|
|||
END
|
||||
|
||||
IDD_NEW_VERSION_RTL_XP DIALOGEX 0, 0, 384, 268
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
|
||||
CAPTION "Check For Updates - Rufus"
|
||||
FONT 8, "MS Shell Dlg", 400, 0, 0x0
|
||||
|
|
@ -702,8 +702,8 @@ END
|
|||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 1,5,0,551
|
||||
PRODUCTVERSION 1,5,0,551
|
||||
FILEVERSION 1,5,0,552
|
||||
PRODUCTVERSION 1,5,0,552
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
|
|
@ -720,13 +720,13 @@ BEGIN
|
|||
BEGIN
|
||||
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
|
||||
VALUE "FileDescription", "Rufus"
|
||||
VALUE "FileVersion", "1.5.0.551"
|
||||
VALUE "FileVersion", "1.5.0.552"
|
||||
VALUE "InternalName", "Rufus"
|
||||
VALUE "LegalCopyright", "© 2011-2014 Pete Batard (GPL v3)"
|
||||
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
|
||||
VALUE "OriginalFilename", "rufus.exe"
|
||||
VALUE "ProductName", "Rufus"
|
||||
VALUE "ProductVersion", "1.5.0.551"
|
||||
VALUE "ProductVersion", "1.5.0.552"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
|
|
|||
32
src/stdlg.c
32
src/stdlg.c
|
|
@ -1337,3 +1337,35 @@ void SetTitleBarIcon(HWND hDlg)
|
|||
hBigIcon = (HICON)LoadImage(hMainInstance, MAKEINTRESOURCE(IDI_ICON), IMAGE_ICON, s32, s32, 0);
|
||||
SendMessage (hDlg, WM_SETICON, ICON_BIG, (LPARAM)hBigIcon);
|
||||
}
|
||||
|
||||
// Return the onscreen size of the text displayed by a control
|
||||
SIZE GetTextSize(HWND hCtrl)
|
||||
{
|
||||
SIZE sz = {0, 0};
|
||||
HDC hDC;
|
||||
wchar_t *wstr;
|
||||
int len;
|
||||
HFONT hFont;
|
||||
|
||||
// Compute the size of the text of the format group
|
||||
hDC = GetDC(hCtrl);
|
||||
if (hDC == NULL)
|
||||
goto out;
|
||||
hFont = (HFONT)SendMessageA(hCtrl, WM_GETFONT, 0, 0);
|
||||
if (hFont == NULL)
|
||||
goto out;
|
||||
SelectObject(hDC, hFont);
|
||||
len = GetWindowTextLengthW(hCtrl);
|
||||
if (len <= 0)
|
||||
goto out;
|
||||
wstr = calloc(len + 1, sizeof(wchar_t));
|
||||
if (wstr == NULL)
|
||||
goto out;
|
||||
if (GetWindowTextW(hCtrl, wstr, len + 1) > 0)
|
||||
GetTextExtentPoint32W(hDC, wstr, len, &sz);
|
||||
out:
|
||||
safe_free(wstr);
|
||||
if (hDC != NULL)
|
||||
ReleaseDC(hCtrl, hDC);
|
||||
return sz;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue