Mirror
/
pbatard-rufus
mirror of https://github.com/pbatard/rufus.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

[ui] minor cosmetic improvements 

* Fix label control being reduced in size when a translation modifies it
* Minute adjustments to make the application look better on Windows 8
* Closes #356
pull/395/head
Pete Batard 11 years ago
parent
0c9c7a9569
commit
1934ee7598
3 changed files with 45 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 59
      res/localization/rufus.loc
  2. 24
      src/rufus.rc
  3. 7
      src/stdlg.c

59
res/localization/rufus.loc
View File

@ -844,7 +844,7 @@ s IDC_DEVICE +15,0
s IDC_PARTITION_TYPE +15,0
s IDC_FILESYSTEM +15,0
s IDC_CLUSTERSIZE +15,0
s IDC_LABEL +20,0
s IDC_LABEL +15,0
s IDC_PROGRESS +15,0
s IDS_ADVANCED_OPTIONS_GRP +15,0
m IDC_NBPASSES +3,0
@ -2783,7 +2783,7 @@ s IDC_FILESYSTEM 40,0
t IDS_CLUSTERSIZE_TXT "Clustergrootte"
s IDC_CLUSTERSIZE 40,0
t IDS_LABEL_TXT "Nieuw volume naam"
s IDC_LABEL 45,0
s IDC_LABEL 40,0
t IDS_FORMAT_OPTIONS_GRP "Formatteer Opties "
t IDC_BADBLOCKS "Controleer op slechte blokken:"
s IDC_BADBLOCKS 10,0
@ -3943,7 +3943,7 @@ s IDC_DEVICE +28,0
s IDC_PARTITION_TYPE +28,0
s IDC_FILESYSTEM +28,0
s IDC_CLUSTERSIZE +28,0
s IDC_LABEL +34,0
s IDC_LABEL +28,0
m IDC_ADVANCED +58,0
s IDS_ADVANCED_OPTIONS_GRP +29,0
s IDC_ENABLE_FIXED_DISKS +30,0
@ -4338,9 +4338,9 @@ s IDC_FILESYSTEM +158,0
t IDS_CLUSTERSIZE_TXT "Μέγεθος μονάδας εκχώρησης"
s IDC_CLUSTERSIZE +158,0
t IDS_LABEL_TXT "Ετικέτα τόμου"
s IDC_LABEL +162,0
s IDC_LABEL +158,0
t IDS_FORMAT_OPTIONS_GRP "Επιλογές διαμόρφωσης "
s IDS_FORMAT_OPTIONS_GRP +155,0
s IDS_FORMAT_OPTIONS_GRP +157,0
t IDC_BADBLOCKS "Ελέγξτε τη συσκευή για κατεστραμμένους τομείς:"
s IDC_BADBLOCKS +134,0
m IDC_NBPASSES +149,0
@ -4361,7 +4361,7 @@ m IDCANCEL 158,0
t IDC_START "Εκκίνηση"
m IDC_START 158,0
t IDS_ADVANCED_OPTIONS_GRP "Επιλογές για προχωρημένους"
s IDS_ADVANCED_OPTIONS_GRP +155,0
s IDS_ADVANCED_OPTIONS_GRP +157,0
m IDC_ADVANCED +36,0
t IDC_ENABLE_FIXED_DISKS "Εμφάνιση σκληρών δίσκων USB"
s IDC_ENABLE_FIXED_DISKS +40,0
@ -5127,7 +5127,7 @@ s IDC_EXTRA_PARTITION +10,0
s IDC_EXTRA_PARTITION +62,0
s IDC_FILESYSTEM +62,0
s IDS_FORMAT_OPTIONS_GRP +62,0
s IDC_LABEL +67,0
s IDC_LABEL +62,0
s IDC_NBPASSES +0,0
s IDC_PARTITION_TYPE +62,0
s IDC_PROGRESS +62,0
@ -5899,9 +5899,9 @@ s IDC_DEVICE +35,0
s IDC_PARTITION_TYPE +35,0
s IDC_FILESYSTEM +35,0
s IDC_CLUSTERSIZE +35,0
s IDC_LABEL +40,0
s IDS_FORMAT_OPTIONS_GRP +32,0
s IDS_ADVANCED_OPTIONS_GRP +32,0
s IDC_LABEL +35,0
s IDS_FORMAT_OPTIONS_GRP +34,0
s IDS_ADVANCED_OPTIONS_GRP +34,0
s IDC_ENABLE_FIXED_DISKS +35,0
s IDC_EXTRA_PARTITION +35,0
m IDC_NBPASSES +10,0
@ -6710,7 +6710,7 @@ s IDC_DEVICE 20,0
s IDC_PARTITION_TYPE 20,0
s IDC_FILESYSTEM 20,0
s IDC_CLUSTERSIZE 20,0
s IDC_LABEL 25,0
s IDC_LABEL 20,0
s IDC_PROGRESS 20,0
t IDS_DEVICE_TXT "Ierīce"
t IDS_PARTITION_TYPE_TXT "Partīcijas veids un sistēmas tips"
@ -7130,7 +7130,7 @@ s IDC_DEVICE +12,0
s IDC_PARTITION_TYPE +12,0
s IDC_FILESYSTEM +12.0
s IDC_CLUSTERSIZE +12,0
s IDC_LABEL +16,0
s IDC_LABEL +12,0
s IDC_PROGRESS +12,0
t IDS_DEVICE_TXT "Įrenginys"
t IDS_PARTITION_TYPE_TXT "Skaidinių schema ir paskirties sistemos tipas"
@ -7551,7 +7551,7 @@ s IDC_DEVICE +18,0
s IDC_PARTITION_TYPE +18,0
s IDC_FILESYSTEM +18,0
s IDC_CLUSTERSIZE +18,0
s IDC_LABEL +24,0
s IDC_LABEL +18,0
m IDC_ADVANCED -9,0
t IDS_DEVICE_TXT "Peranti"
t IDS_PARTITION_TYPE_TXT "Skema partition dan jenis sistem sasaran"
@ -7977,7 +7977,7 @@ s IDC_DEVICE +48,0
s IDC_PARTITION_TYPE +48,0
s IDC_FILESYSTEM +48,0
s IDC_CLUSTERSIZE +48,0
s IDC_LABEL +54,0
s IDC_LABEL +48,0
m IDC_ADVANCED +25,0
s IDS_ADVANCED_OPTIONS_GRP +49,0
s IDC_ENABLE_FIXED_DISKS +40,0
@ -8562,7 +8562,7 @@ m IDC_LANG +5,0
s IDC_PARTITION_TYPE +5,0
s IDC_FILESYSTEM +5,0
s IDC_CLUSTERSIZE +5,0
s IDC_LABEL +10,0
s IDC_LABEL +5,0
s IDC_PROGRESS +7,0
t IDS_DEVICE_TXT "Dispositivo"
t IDS_PARTITION_TYPE_TXT "Tipo de partição e do sistema de destino"
@ -9373,7 +9373,7 @@ s IDC_FILESYSTEM +22,0
t IDS_CLUSTERSIZE_TXT "Размер кластера"
s IDC_CLUSTERSIZE +22,0
t IDS_LABEL_TXT "Новая метка тома"
s IDC_LABEL +27,0
s IDC_LABEL +22,0
t IDS_FORMAT_OPTIONS_GRP "Параметры форматирования "
t IDC_BADBLOCKS "Проверить на плохие блоки:"
t IDC_QUICKFORMAT "Быстрое форматирование"
@ -10544,7 +10544,7 @@ m IDC_LANG +5,0
s IDC_PARTITION_TYPE +5,0
s IDC_FILESYSTEM +5,0
s IDC_CLUSTERSIZE +5,0
s IDC_LABEL +10,0
s IDC_LABEL +5,0
s IDC_PROGRESS +7,0
t IDS_DEVICE_TXT "Dispositivo"
t IDS_PARTITION_TYPE_TXT "Tipo de la partición y del sistema destino"
@ -10970,7 +10970,7 @@ s IDC_DEVICE 60,0
s IDC_PARTITION_TYPE 60,0
s IDC_FILESYSTEM 60,0
s IDC_CLUSTERSIZE 60,0
s IDC_LABEL 64,0
s IDC_LABEL 60,0
s IDC_BOOT 60,0
s IDC_PROGRESS 60,0
m IDCANCEL 60,0
@ -11788,12 +11788,13 @@ s IDCANCEL -10,0
m IDC_PROGRESS -1,0
s IDC_PROGRESS +24,0
m IDC_NBPASSES +17,0
s IDC_NBPASSES +44,0
m IDC_BOOTTYPE +25,0
m IDC_SELECT_ISO +25,0
m IDC_NBPASSES +18,0
s IDC_NBPASSES +41,0
m IDC_BOOTTYPE +18,0
s IDC_BOOTTYPE +5,0
m IDC_SELECT_ISO +23,0
s IDC_BADBLOCKS +10,0
m IDC_DISK_ID +23,0
m IDC_DISK_ID +21,0
s IDC_DISK_ID +2,0
t IDS_DEVICE_TXT "Пристрій"
@ -11805,12 +11806,12 @@ s IDC_FILESYSTEM +22,0
t IDS_CLUSTERSIZE_TXT "Розмір кластеру"
s IDC_CLUSTERSIZE +22,0
t IDS_LABEL_TXT "Нова мітка тому"
s IDC_LABEL +27,0
t IDS_FORMAT_OPTIONS_GRP "Параметри форматування "
t IDC_BADBLOCKS "Перевірити на погані блоки:"
s IDC_LABEL +22,0
t IDS_FORMAT_OPTIONS_GRP "Параметри форматування "
t IDC_BADBLOCKS "Перевірити на погані блоки"
t IDC_QUICKFORMAT "Швидке форматування"
t IDC_BOOT "Створити завантажувал. диск:"
s IDC_BOOT +27,0
t IDC_BOOT "Створити завантажувал. диск"
s IDC_BOOT +20,0
t IDC_SET_ICON "Створити розширену мітку та значок пристрою"
t IDC_ABOUT "Про програму..."
t IDC_LOG "Журнал"
@ -11820,7 +11821,7 @@ m IDC_ADVANCED +60,0
t IDS_ADVANCED_OPTIONS_GRP "Додаткові параметри"
t IDC_ENABLE_FIXED_DISKS "Показувати зовнішні USB накопичувачі"
t IDC_EXTRA_PARTITION "Додати виправлення для старих BIOS"
t IDC_RUFUS_MBR "Використовувати MBR з BIOS ID:"
t IDC_RUFUS_MBR "Використовувати MBR з BIOS ID"
s IDC_RUFUS_MBR +20,0
# About dialog

24
src/rufus.rc
View File

@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 206, 329
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Rufus 1.4.11.519"
CAPTION "Rufus 1.4.11.520"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
DEFPUSHBUTTON "Start",IDC_START,94,291,50,14
@ -48,9 +48,9 @@ BEGIN
LTEXT "Partition scheme and target system type",IDS_PARTITION_TYPE_TXT,9,35,186,8
COMBOBOX IDC_CLUSTERSIZE,8,104,190,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Cluster size",IDS_CLUSTERSIZE_TXT,9,93,186,10
GROUPBOX "Format Options ",IDS_FORMAT_OPTIONS_GRP,7,149,192,66
GROUPBOX "Format Options ",IDS_FORMAT_OPTIONS_GRP,7,149,191,66
LTEXT "New volume label",IDS_LABEL_TXT,9,121,186,10
EDITTEXT IDC_LABEL,7,131,190,13,ES_AUTOHSCROLL
EDITTEXT IDC_LABEL,8,131,190,13,ES_AUTOHSCROLL
CONTROL "Check device for bad blocks",IDC_BADBLOCKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,161,101,10
CONTROL "Quick format",IDC_QUICKFORMAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,173,106,10
CONTROL "Create a bootable disk using",IDC_BOOT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,185,104,10
@ -62,7 +62,7 @@ BEGIN
PUSHBUTTON "...",IDC_SELECT_ISO,171,182,22,14,BS_ICON
CONTROL "Use Rufus MBR with BIOS ID",IDC_RUFUS_MBR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,248,106,10
PUSHBUTTON "",IDC_ADVANCED,63,148,14,10,BS_TOP | BS_FLAT
GROUPBOX "Advanced Options",IDS_ADVANCED_OPTIONS_GRP,7,210,192,54
GROUPBOX "Advanced Options",IDS_ADVANCED_OPTIONS_GRP,7,210,191,54
COMBOBOX IDC_DISK_ID,119,246,73,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "Add fixes for old BIOSes (extra partition, align, etc.)",IDC_EXTRA_PARTITION,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,235,181,10
@ -165,7 +165,7 @@ END
RTL_IDD_DIALOG DIALOGEX 12, 12, 206, 329
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
CAPTION "Rufus 1.4.11.519"
CAPTION "Rufus 1.4.11.520"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
DEFPUSHBUTTON "Start",IDC_START,94,291,50,14
@ -181,9 +181,9 @@ BEGIN
LTEXT "Partition scheme and target system type",IDS_PARTITION_TYPE_TXT,9,35,186,8
COMBOBOX IDC_CLUSTERSIZE,8,104,190,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Cluster size",IDS_CLUSTERSIZE_TXT,9,93,186,10
GROUPBOX "Format Options ",IDS_FORMAT_OPTIONS_GRP,7,149,192,66
GROUPBOX "Format Options ",IDS_FORMAT_OPTIONS_GRP,7,149,191,66
LTEXT "New volume label",IDS_LABEL_TXT,9,121,186,10
EDITTEXT IDC_LABEL,7,131,190,13,ES_AUTOHSCROLL
EDITTEXT IDC_LABEL,8,131,190,13,ES_AUTOHSCROLL
CONTROL "Check device for bad blocks",IDC_BADBLOCKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,161,101,10
CONTROL "Quick format",IDC_QUICKFORMAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,173,106,10
CONTROL "Create a bootable disk using",IDC_BOOT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,185,104,10
@ -195,7 +195,7 @@ BEGIN
PUSHBUTTON "...",IDC_SELECT_ISO,171,182,22,14,BS_ICON
CONTROL "Use Rufus MBR with BIOS ID",IDC_RUFUS_MBR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,248,106,10
PUSHBUTTON "",IDC_ADVANCED,63,148,14,10,BS_TOP | BS_FLAT
GROUPBOX "Advanced Options",IDS_ADVANCED_OPTIONS_GRP,7,210,192,54
GROUPBOX "Advanced Options",IDS_ADVANCED_OPTIONS_GRP,7,210,191,54
COMBOBOX IDC_DISK_ID,119,246,73,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "Add fixes for old BIOSes (extra partition, align, etc.)",IDC_EXTRA_PARTITION,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,235,181,10
@ -428,8 +428,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,4,11,519
PRODUCTVERSION 1,4,11,519
FILEVERSION 1,4,11,520
PRODUCTVERSION 1,4,11,520
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -446,13 +446,13 @@ BEGIN
BEGIN
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "1.4.11.519"
VALUE "FileVersion", "1.4.11.520"
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.4.11.519"
VALUE "ProductVersion", "1.4.11.520"
END
END
BLOCK "VarFileInfo"

7
src/stdlg.c
View File

@ -459,7 +459,7 @@ void ResizeMoveCtrl(HWND hDlg, HWND hCtrl, int dx, int dy, int dw, int dh)
{
RECT rect;
POINT point;
SIZE border = {0, 0};
SIZE border;
GetWindowRect(hCtrl, &rect);
point.x = right_to_left_mode?rect.right:rect.left;
@ -467,9 +467,8 @@ void ResizeMoveCtrl(HWND hDlg, HWND hCtrl, int dx, int dy, int dw, int dh)
ScreenToClient(hDlg, &point);
GetClientRect(hCtrl, &rect);
// If we're dealing with a dialog, we must take the border into account
if ((hCtrl == hDlg) || (hDlg == NULL))
border = GetBorderSize(hCtrl);
// If the control has any borders (dialog, edit box), take them into account
border = GetBorderSize(hCtrl);
MoveWindow(hCtrl, point.x + (int)(fScale*(float)dx), point.y + (int)(fScale*(float)dy),
(rect.right - rect.left) + (int)(fScale*(float)dw + border.cx),
(rect.bottom - rect.top) + (int)(fScale*(float)dh + border.cy), TRUE);

Write Preview
Loading…
Cancel
Save