Further tweak formatting in resource files

In particular, translation-toolkit's .rc file parser can't currently
handle seeing arithmetic rather just than an integer.

diff --git a/res.rc b/res.rc
index 402e2ec11813d34c6ff460117c8ef437667a49c2..5aefbc0a03b763f8f0cf9175a2fc9bc591f4e650 100644 (file)
--- a/res.rc
+++ b/res.rc
@@ -35,6 +35,8 @@
 #define SETUP_SEARCHTEXT_W     (60)
 #define SETUP_CLEAR_X          (SETUP_SEARCHTEXT_X + SETUP_SEARCHTEXT_W + 2)
 #define SETUP_CLEAR_W          (30)
+#define SETUP_CHOOSE_X          (7)
+#define SETUP_CHOOSE_W          (SETUP_STANDARD_DIALOG_W - 2*SETUP_CHOOSE_X)
 
 /////////////////////////////////////////////////////////////////////////////
 //

diff --git a/res/en/res.rc b/res/en/res.rc
index 5c38a5cfd13588b5e10a955a7037c2b711e1b409..3f1e5d6158c5d33f64485314a9c5c527b34373af 100644 (file)
--- a/res/en/res.rc
+++ b/res/en/res.rc
@@ -331,7 +331,7 @@ BEGIN
     CONTROL         "", IDC_HEADSEPARATOR, "Static", SS_BLACKFRAME | SS_SUNKEN,
                     0, 28, SETUP_STANDARD_DIALOG_W, 1
     CONTROL         "", IDC_CHOOSE_LIST, WC_LISTVIEW, LVS_NOSORTHEADER | LVS_REPORT | LVS_SINGLESEL | WS_TABSTOP,
-                    7, 47, SETUP_STANDARD_DIALOG_W - 14, 120, WS_EX_CLIENTEDGE
+                    SETUP_CHOOSE_X, 47, SETUP_CHOOSE_W, 120, WS_EX_CLIENTEDGE
     CONTROL         "&Hide obsolete packages", IDC_CHOOSE_HIDE,
                     "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 167, 160, 14
     ICON            IDI_CYGWIN, IDC_HEADICON, SETUP_HEADICON_X, 0, 21, 20

diff --git a/res/fr/res.rc b/res/fr/res.rc
index 5cd2a9fa2e9a63e14bd500a1071cc9a6d7a1d7bb..666d3d4d1534607fd462c9de5b1a3aac0ef39f9d 100644 (file)
--- a/res/fr/res.rc
+++ b/res/fr/res.rc
@@ -319,7 +319,7 @@ BEGIN
     CONTROL         "", IDC_HEADSEPARATOR, "Static", SS_BLACKFRAME | SS_SUNKEN,
                     0, 28, SETUP_STANDARD_DIALOG_W, 1
     CONTROL         "", IDC_CHOOSE_LIST, WC_LISTVIEW, LVS_NOSORTHEADER | LVS_REPORT | LVS_SINGLESEL | WS_TABSTOP,
-                     7, 47, SETUP_STANDARD_DIALOG_W - 14, 120, WS_EX_CLIENTEDGE
+                    SETUP_CHOOSE_X, 47, SETUP_CHOOSE_W, 120, WS_EX_CLIENTEDGE
     CONTROL         "&Cacher les paquets obsolètes", IDC_CHOOSE_HIDE,
                     "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 7, 167, 160, 14
     ICON            IDI_CYGWIN, IDC_HEADICON, SETUP_HEADICON_X, 0, 21, 20