aboutsummaryrefslogtreecommitdiff
path: root/gui/themes/modern.ini
diff options
context:
space:
mode:
Diffstat (limited to 'gui/themes/modern.ini')
-rw-r--r--gui/themes/modern.ini67
1 files changed, 27 insertions, 40 deletions
diff --git a/gui/themes/modern.ini b/gui/themes/modern.ini
index c5c8d8c46c..25fd8da01d 100644
--- a/gui/themes/modern.ini
+++ b/gui/themes/modern.ini
@@ -1,7 +1,7 @@
# $URL$
# $Id$
[theme]
-version=21
+version=22
type=modern
name=Modern Style
@@ -223,7 +223,7 @@ Console.leftPadding=7
Console.rightPadding=5
Console.topPadding=5
Console.bottomPadding=5
-TabWidget.tabWidth=85
+TabWidget.tabWidth=75
TabWidget.tabHeight=27
TabWidget.titleVPad=8
TabWidget.navButtonRightPad=3
@@ -236,15 +236,7 @@ opHeight=insetH
useWithPrefix=chooser defaultChooser_
##### browser
-browser=insetX insetY insetW insetH
-set_parent=browser
-browser_headline=10 5 (parent.w - 2 * 10) kLineHeight
-browser_headline.align=kTextAlignCenter
-browser_path=10 (prev.y2 + 5) prev.w prev.h
-browser_list=10 prev.y2 prev.w (parent.h - 3 * kLineHeight - buttonHeight - 14)
-browser_up=10 (parent.h - buttonHeight - 8) buttonWidth buttonHeight
-browser_cancel=(parent.w - 2 * (buttonWidth + 10)) (parent.h - buttonHeight - 8) buttonWidth buttonHeight
-browser_choose=(prev.x2 + 10) prev.y prev.w prev.h
+use=browser
##### launcher
launcher_version=launcherVersionX launcherVersionY 247 kLineHeight
@@ -278,9 +270,12 @@ useWithPrefix=graphicsControls globaloptions_
# audio tab
opYoffset=vBorder
useWithPrefix=audioControls globaloptions_
-useWithPrefix=volumeControls globaloptions_
useWithPrefix=subtitleControls globaloptions_
+# volume tab
+opYoffset=vBorder
+useWithPrefix=volumeControls globaloptions_
+
# MIDI tab
opYoffset=vBorder
useWithPrefix=midiControls globaloptions_
@@ -359,9 +354,14 @@ opYoffset=vBorder
gameoptions_audioCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight
opYoffset=(opYoffset + buttonHeight + 6)
useWithPrefix=audioControls gameoptions_
-useWithPrefix=volumeControls gameoptions_
useWithPrefix=subtitleControls gameoptions_
+# volume tab
+opYoffset=vBorder
+gameoptions_volumeCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight
+opYoffset=(opYoffset + buttonHeight + 6)
+useWithPrefix=volumeControls gameoptions_
+
# midi tab
opYoffset=vBorder
gameoptions_midiCheckbox=gox opYoffset (kFontHeight + 10 + 174) buttonHeight
@@ -460,6 +460,17 @@ chooser_list=10 (6 + kLineHeight + 2) prev.w (opHeight - self.y - buttonHeight -
chooser_cancel=(chooserW - 2 * (buttonWidth + 10)) (opHeight - buttonHeight - 8) buttonWidth buttonHeight
chooser_ok=(prev.x2 + 10) prev.y prev.w prev.h
+[browser]
+browser=insetX insetY insetW insetH
+set_parent=browser
+browser_headline=10 5 (parent.w - 2 * 10) kLineHeight
+browser_headline.align=kTextAlignCenter
+browser_path=10 (prev.y2 + 5) prev.w prev.h
+browser_list=10 prev.y2 prev.w (parent.h - 3 * kLineHeight - buttonHeight - 14)
+browser_up=10 (parent.h - buttonHeight - 8) buttonWidth buttonHeight
+browser_cancel=(parent.w - 2 * (buttonWidth + 10)) (parent.h - buttonHeight - 8) buttonWidth buttonHeight
+browser_choose=(prev.x2 + 10) prev.y prev.w prev.h
+
[graphicsControls]
gcx=(opXoffset + 10)
gcw=(parent.w - gcx - 25)
@@ -566,7 +577,6 @@ use=extra
pix_checkbox_empty="checkbox_empty320.bmp"
pix_checkbox_checked="checkbox_checked320.bmp"
pix_cursor_image="cursor320.bmp"
-def_volumeControlsInAudio=false
# NES resoltuion
[256x240]
@@ -582,7 +592,6 @@ def_insetW=(w - buttonWidth - 17 * 2 - insetX)
def_insetH=(h - 13 - insetY)
def_launcherVersionX=50
def_launcherVersionY=5
-def_volumeControlsInAudio=false
def_midiControlsSpacing=2
def_gameOptionsOverrideVPad=10
def_aboutXOff=3
@@ -603,28 +612,6 @@ launcher_logo.visible=true
# Override extras
inactive_dialog_shading=kShadingNone
-# Override audio tab
-set_parent=gameoptions
-vBorder=10
-
-# audio tab
-opYoffset=vBorder
-useWithPrefix=audioControls globaloptions_
-useWithPrefix=subtitleControls globaloptions_
-
-# volume tab
-opYoffset=vBorder
-useWithPrefix=volumeControls globaloptions_
-
-# audio tab
-opYoffset=vBorder
-gameoptions_audioCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight
-opYoffset=(opYoffset + buttonHeight + 6)
-useWithPrefix=audioControls gameoptions_
-useWithPrefix=subtitleControls gameoptions_
-
-# volume tab
-opYoffset=vBorder
-gameoptions_volumeCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight
-opYoffset=(opYoffset + buttonHeight + 6)
-useWithPrefix=volumeControls gameoptions_
+# Override browser
+def_buttonWidth=90
+use=browser