Patch #1742050: "GUI: Enlarge some labels in the themes"

svn-id: r27701

3 files changed, 29 insertions, 29 deletions

diff --git a/gui/theme-config.cpp b/gui/theme-config.cpp
index 01adbc2d17..3bac51a8fe 100644
--- a/gui/theme-config.cpp
+++ b/gui/theme-config.cpp
@@ -73,14 +73,14 @@ const char *Theme::_defaultConfigINI =
 "\n"
 "# audio tab\n"
 "opYoffset=vBorder\n"
-"gameoptions_audioCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight\n"
+"gameoptions_audioCheckbox=gox opYoffset (parent.w - gox - 5) buttonHeight\n"
 "opYoffset=(opYoffset + buttonHeight + 6)\n"
 "useWithPrefix=audioControls gameoptions_\n"
 "useWithPrefix=subtitleControls gameoptions_\n"
 "\n"
 "# volume tab\n"
 "opYoffset=vBorder\n"
-"gameoptions_volumeCheckbox=gox opYoffset (kFontHeight + 10 + 190) buttonHeight\n"
+"gameoptions_volumeCheckbox=gox opYoffset (parent.w - gox - 5) buttonHeight\n"
 "opYoffset=(opYoffset + buttonHeight + 6)\n"
 "useWithPrefix=volumeControls gameoptions_\n"
 "\n"
@@ -268,26 +268,26 @@ const char *Theme::_defaultConfigINI =
 "# graphics tab\n"
 "opYoffset=vBorder\n"
 "opXoffset=gox\n"
-"gameoptions_graphicsCheckbox=gox opYoffset (kFontHeight + 10 + 192) buttonHeight\n"
+"gameoptions_graphicsCheckbox=gox opYoffset (parent.w - gox - 5) buttonHeight\n"
 "opYoffset=(opYoffset + buttonHeight)\n"
 "useWithPrefix=graphicsControls gameoptions_\n"
 "\n"
 "# audio tab\n"
 "opYoffset=vBorder\n"
-"gameoptions_audioCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight\n"
+"gameoptions_audioCheckbox=gox opYoffset (parent.w - gox - 5) buttonHeight\n"
 "opYoffset=(opYoffset + buttonHeight)\n"
 "useWithPrefix=audioControls gameoptions_\n"
 "useWithPrefix=subtitleControls gameoptions_\n"
 "\n"
 "# volume tab\n"
 "opYoffset=vBorder\n"
-"gameoptions_volumeCheckbox=gox opYoffset (kFontHeight + 10 + 190) buttonHeight\n"
+"gameoptions_volumeCheckbox=gox opYoffset (parent.w - gox - 5) buttonHeight\n"
 "opYoffset=(opYoffset + buttonHeight)\n"
 "useWithPrefix=volumeControls gameoptions_\n"
 "\n"
 "# midi tab\n"
 "opYoffset=vBorder\n"
-"gameoptions_midiCheckbox=gox opYoffset (kFontHeight + 10 + 174) buttonHeight\n"
+"gameoptions_midiCheckbox=gox opYoffset (parent.w - gox - 5) buttonHeight\n"
 "opYoffset=(opYoffset + buttonHeight)\n"
 "useWithPrefix=midiControls gameoptions_\n"
 "\n"
@@ -387,9 +387,9 @@ const char *Theme::_defaultConfigINI =
 "opYoffset=(opYoffset + kLineHeight + 4)\n"
 "grRenderPopup=prev.x (opYoffset - 1) prev.w prev.h\n"
 "opYoffset=(opYoffset + kLineHeight + 4)\n"
-"grFullscreenCheckbox=gcx opYoffset (kFontHeight + 10 + 96) buttonHeight\n"
+"grFullscreenCheckbox=gcx opYoffset (parent.w - gcx - 5) buttonHeight\n"
 "opYoffset=(opYoffset + buttonHeight)\n"
-"grAspectCheckbox=prev.x opYoffset (kFontHeight + 10 + 180) prev.h\n"
+"grAspectCheckbox=prev.x opYoffset prev.w prev.h\n"
 "opYoffset=(opYoffset + buttonHeight)\n"
 "\n"
 "[audioControls]\n"
@@ -426,11 +426,11 @@ const char *Theme::_defaultConfigINI =
 "mcFontPath=(prev.x2 + 20) (opYoffset + 3) (parent.w - (buttonWidth + 20) - 15 - kLineHeight - 10) kLineHeight\n"
 "mcFontClearButton=(prev.x2 + 10) (opYoffset + 2) kLineHeight kLineHeight\n"
 "opYoffset=(opYoffset + buttonHeight + 2 * midiControlsSpacing)\n"
-"mcMixedCheckbox=mcx opYoffset (kFontHeight + 10 + 135) buttonHeight\n"
+"mcMixedCheckbox=mcx opYoffset (parent.w - mcx - 5) buttonHeight\n"
 "opYoffset=(opYoffset + buttonHeight + midiControlsSpacing)\n"
-"mcMt32Checkbox=mcx opYoffset (kFontHeight + 10 + 256) buttonHeight\n"
+"mcMt32Checkbox=mcx opYoffset prev.w buttonHeight\n"
 "opYoffset=(opYoffset + buttonHeight + midiControlsSpacing)\n"
-"mcGSCheckbox=mcx opYoffset (kFontHeight + 10 + 142) buttonHeight\n"
+"mcGSCheckbox=mcx opYoffset prev.w buttonHeight\n"
 "opYoffset=(opYoffset + buttonHeight + midiControlsSpacing)\n"
 "mcMidiGainText=mcx (opYoffset + 2) 95 kLineHeight\n"
 "mcMidiGainText.align=kTextAlignRight\n"
diff --git a/gui/themes/classic080.ini b/gui/themes/classic080.ini
index 2e48dbc7e7..3a58ec60f7 100644
--- a/gui/themes/classic080.ini
+++ b/gui/themes/classic080.ini
@@ -187,26 +187,26 @@ opYoffset=(opYoffset + buttonHeight + 4)
 # graphics tab
 opYoffset=vBorder
 opXoffset=gox
-gameoptions_graphicsCheckbox=gox opYoffset (kFontHeight + 10 + 192) buttonHeight
+gameoptions_graphicsCheckbox=gox opYoffset (parent.w - gox - 5) buttonHeight
 opYoffset=(opYoffset + buttonHeight)
 useWithPrefix=graphicsControls gameoptions_
 
 # audio tab
 opYoffset=vBorder
-gameoptions_audioCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight
+gameoptions_audioCheckbox=gox opYoffset (parent.w - gox - 5) buttonHeight
 opYoffset=(opYoffset + buttonHeight)
 useWithPrefix=audioControls gameoptions_
 useWithPrefix=subtitleControls gameoptions_
 
 # volume tab
 opYoffset=vBorder
-gameoptions_volumeCheckbox=gox opYoffset (kFontHeight + 10 + 190) buttonHeight
+gameoptions_volumeCheckbox=gox opYoffset (parent.w - gox - 5) buttonHeight
 opYoffset=(opYoffset + buttonHeight)
 useWithPrefix=volumeControls gameoptions_
 
 # midi tab
 opYoffset=vBorder
-gameoptions_midiCheckbox=gox opYoffset (kFontHeight + 10 + 174) buttonHeight
+gameoptions_midiCheckbox=gox opYoffset (parent.w - gox - 5) buttonHeight
 opYoffset=(opYoffset + buttonHeight)
 useWithPrefix=midiControls gameoptions_
 
@@ -305,9 +305,9 @@ grModePopup=(gcx - 5) (opYoffset - 1) (gcw + 5) (kLineHeight + 2)
 opYoffset=(opYoffset + kLineHeight + 4)
 grRenderPopup=prev.x (opYoffset - 1) prev.w prev.h
 opYoffset=(opYoffset + kLineHeight + 4)
-grFullscreenCheckbox=gcx opYoffset (kFontHeight + 10 + 96) buttonHeight
+grFullscreenCheckbox=gcx opYoffset (parent.w - gcx - 5) buttonHeight
 opYoffset=(opYoffset + buttonHeight)
-grAspectCheckbox=prev.x opYoffset (kFontHeight + 10 + 180) prev.h
+grAspectCheckbox=prev.x opYoffset prev.w prev.h
 opYoffset=(opYoffset + buttonHeight)
 
 [audioControls]
@@ -344,11 +344,11 @@ mcFontButton=mcx opYoffset buttonWidth buttonHeight
 mcFontPath=(prev.x2 + 20) (opYoffset + 3) (parent.w - (buttonWidth + 20) - mcx - kLineHeight - 20) kLineHeight
 mcFontClearButton=(prev.x2 + 10) (opYoffset + 3) kLineHeight kLineHeight
 opYoffset=(opYoffset + buttonHeight + 2 * midiControlsSpacing)
-mcMixedCheckbox=mcx opYoffset (kFontHeight + 10 + 135) buttonHeight
+mcMixedCheckbox=mcx opYoffset (parent.w - mcx - 5) buttonHeight
 opYoffset=(opYoffset + buttonHeight + midiControlsSpacing)
-mcMt32Checkbox=mcx opYoffset (kFontHeight + 10 + 256) buttonHeight
+mcMt32Checkbox=mcx opYoffset prev.w buttonHeight
 opYoffset=(opYoffset + buttonHeight + midiControlsSpacing)
-mcGSCheckbox=mcx opYoffset (kFontHeight + 10 + 142) buttonHeight
+mcGSCheckbox=mcx opYoffset prev.w buttonHeight
 opYoffset=(opYoffset + buttonHeight + midiControlsSpacing)
 mcMidiGainText=mcx (opYoffset + 2) 95 kLineHeight
 mcMidiGainText.align=kTextAlignRight
diff --git a/gui/themes/modern.ini b/gui/themes/modern.ini
index 240da88bc1..ba928e0932 100644
--- a/gui/themes/modern.ini
+++ b/gui/themes/modern.ini
@@ -345,26 +345,26 @@ opYoffset=(opYoffset + buttonHeight + 8)
 # graphics tab
 opYoffset=vBorder
 opXoffset=gox
-gameoptions_graphicsCheckbox=gox opYoffset (kFontHeight + 10 + 192) buttonHeight
+gameoptions_graphicsCheckbox=gox opYoffset (parent.w - gox - 5) buttonHeight
 opYoffset=(opYoffset + buttonHeight + 6)
 useWithPrefix=graphicsControls gameoptions_
 
 # audio tab
 opYoffset=vBorder
-gameoptions_audioCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight
+gameoptions_audioCheckbox=gox opYoffset (parent.w - gox - 5) buttonHeight
 opYoffset=(opYoffset + buttonHeight + 6)
 useWithPrefix=audioControls gameoptions_
 useWithPrefix=subtitleControls gameoptions_
 
 # volume tab
 opYoffset=vBorder
-gameoptions_volumeCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight
+gameoptions_volumeCheckbox=gox opYoffset (parent.w - gox - 5) buttonHeight
 opYoffset=(opYoffset + buttonHeight + 6)
 useWithPrefix=volumeControls gameoptions_
 
 # midi tab
 opYoffset=vBorder
-gameoptions_midiCheckbox=gox opYoffset (kFontHeight + 10 + 174) buttonHeight
+gameoptions_midiCheckbox=gox opYoffset (parent.w - gox - 5) buttonHeight
 opYoffset=(opYoffset + buttonHeight + 6)
 useWithPrefix=midiControls gameoptions_
 
@@ -478,9 +478,9 @@ grModePopup=(gcx - 5) (opYoffset - 1) (gcw + 5) kPopUpHeight
 opYoffset=(opYoffset + kLineHeight + 12)
 grRenderPopup=prev.x (opYoffset - 1) prev.w prev.h
 opYoffset=(opYoffset + kLineHeight + 16)
-grFullscreenCheckbox=gcx opYoffset (kFontHeight + 10 + 96) buttonHeight
+grFullscreenCheckbox=gcx opYoffset (parent.w - gcx - 5) buttonHeight
 opYoffset=(opYoffset + buttonHeight + 4)
-grAspectCheckbox=prev.x opYoffset (kFontHeight + 10 + 136) prev.h
+grAspectCheckbox=prev.x opYoffset prev.w prev.h
 opYoffset=(opYoffset + buttonHeight + 4)
 
 [audioControls]
@@ -518,11 +518,11 @@ mcFontButton=mcx opYoffset buttonWidth buttonHeight
 mcFontPath=(prev.x2 + 20) (opYoffset + mcOff) (parent.w - (buttonWidth + 20) - mcx - kLineHeight - 20) kLineHeight
 mcFontClearButton=(prev.x2 + 10) (opYoffset + mcOff) kLineHeight kLineHeight
 opYoffset=(opYoffset + buttonHeight + 6 * midiControlsSpacing)
-mcMixedCheckbox=mcx opYoffset (kFontHeight + 10 + 135) buttonHeight
+mcMixedCheckbox=mcx opYoffset (parent.w - mcx - 5) buttonHeight
 opYoffset=(opYoffset + buttonHeight + midiControlsSpacing)
-mcMt32Checkbox=mcx opYoffset (kFontHeight + 10 + 256) buttonHeight
+mcMt32Checkbox=mcx opYoffset prev.w buttonHeight
 opYoffset=(opYoffset + buttonHeight + midiControlsSpacing)
-mcGSCheckbox=mcx opYoffset (kFontHeight + 10 + 142) buttonHeight
+mcGSCheckbox=mcx opYoffset prev.w buttonHeight
 opYoffset=(opYoffset + buttonHeight + midiControlsSpacing)
 mcMidiGainText=mcx (opYoffset + 2) 80 kLineHeight
 mcMidiGainText.align=kTextAlignRight