diff options
| author | Eugene Sandulenko | 2006-06-15 13:18:28 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2006-06-15 13:18:28 +0000 |
| commit | 6f844ae420e3a5722a1b580b1de95713a2b832a6 (patch) | |
| tree | 5380443b1f027727b0083eb7efa4f4ea87c8f091 /gui/theme-config.cpp | |
| parent | 65041ae239055e07b7f592f1cfcca01e1c89e159 (diff) | |
| download | scummvm-rg350-6f844ae420e3a5722a1b580b1de95713a2b832a6.tar.gz scummvm-rg350-6f844ae420e3a5722a1b580b1de95713a2b832a6.tar.bz2 scummvm-rg350-6f844ae420e3a5722a1b580b1de95713a2b832a6.zip | |
- Make tabs narrower so they all fit on screen. Now navigation buttons
appear only on PSP resolution
- Combined Audio/Volume tab in game options for consistency.
svn-id: r23130
Diffstat (limited to 'gui/theme-config.cpp')
| -rw-r--r-- | gui/theme-config.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/gui/theme-config.cpp b/gui/theme-config.cpp index 494ffc0a39..f0f7944093 100644 --- a/gui/theme-config.cpp +++ b/gui/theme-config.cpp @@ -51,6 +51,7 @@ const char *Theme::_defaultConfigINI = "def_scummhelpW=(w - 2 * 5)\n" "def_midiControlsSpacing=1\n" "def_vcAudioTabIndent=0\n" +"def_vcAudioTabSpacing=2\n" "use=XxY\n" "\n" "TabWidget.tabWidth=0\n" @@ -95,6 +96,7 @@ const char *Theme::_defaultConfigINI = "def_scummhelpX=((w - scummhelpW) / 2)\n" "def_midiControlsSpacing=2\n" "def_vcAudioTabIndent=10\n" +"def_vcAudioTabSpacing=4\n" "##### Widgets config\n" "ListWidget.leftPadding=4\n" "ListWidget.rightPadding=0\n" @@ -233,6 +235,7 @@ const char *Theme::_defaultConfigINI = "gameoptions_audioCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight\n" "opYoffset=(opYoffset + buttonHeight)\n" "useWithPrefix=audioControls gameoptions_\n" +"useWithPrefix=volumeControls gameoptions_\n" "useWithPrefix=subtitleControls gameoptions_\n" "\n" "# midi tab\n" @@ -241,12 +244,6 @@ const char *Theme::_defaultConfigINI = "opYoffset=(opYoffset + buttonHeight)\n" "useWithPrefix=midiControls gameoptions_\n" "\n" -"# volume tab\n" -"opYoffset=vBorder\n" -"gameoptions_volumeCheckbox=gox opYoffset (kFontHeight + 10 + 189) buttonHeight\n" -"opYoffset=(opYoffset + buttonHeight)\n" -"useWithPrefix=volumeControls gameoptions_\n" -"\n" "gameoptions_cancel=(parent.w - 2 * (buttonWidth + 10)) (parent.h - buttonHeight - 8) buttonWidth buttonHeight\n" "gameoptions_ok=(prev.x2 + 10) prev.y prev.w prev.h\n" "\n" @@ -350,17 +347,17 @@ const char *Theme::_defaultConfigINI = "vcMusicText.align=kTextAlignRight\n" "vcMusicSlider=vcxoff opYoffset sliderWidth sliderHeight\n" "vcMusicLabel=(vcxoff + prev.w + 10) (opYoffset + 2) 24 kLineHeight\n" -"opYoffset=(opYoffset + sliderHeight + 4)\n" +"opYoffset=(opYoffset + sliderHeight + vcAudioTabSpacing)\n" "vcSfxText=vcx (opYoffset + 2) vctextw kLineHeight\n" "vcSfxText.align=kTextAlignRight\n" "vcSfxSlider=vcxoff opYoffset sliderWidth sliderHeight\n" "vcSfxLabel=(vcxoff + prev.w + 10) (opYoffset + 2) 24 kLineHeight\n" -"opYoffset=(opYoffset + sliderHeight + 4)\n" +"opYoffset=(opYoffset + sliderHeight + vcAudioTabSpacing)\n" "vcSpeechText=vcx (opYoffset + 2) vctextw kLineHeight\n" "vcSpeechText.align=kTextAlignRight\n" "vcSpeechSlider=vcxoff opYoffset sliderWidth sliderHeight\n" "vcSpeechLabel=(vcxoff + prev.w + 10) (opYoffset + 2) 24 kLineHeight\n" -"opYoffset=(opYoffset + sliderHeight + 4)\n" +"opYoffset=(opYoffset + sliderHeight + vcAudioTabSpacing)\n" "\n" "[midiControls]\n" "mcx=10\n" |