diff options
-rw-r--r-- | gui/ThemeEngine.h | 2 | ||||
-rw-r--r-- | gui/saveload-dialog.cpp | 12 | ||||
-rw-r--r-- | gui/saveload-dialog.h | 2 | ||||
-rw-r--r-- | gui/themes/default.inc | 9 | ||||
-rw-r--r-- | gui/themes/scummclassic.zip | bin | 93928 -> 94215 bytes | |||
-rw-r--r-- | gui/themes/scummclassic/THEMERC | 2 | ||||
-rw-r--r-- | gui/themes/scummclassic/classic_layout.stx | 15 | ||||
-rw-r--r-- | gui/themes/scummclassic/classic_layout_lowres.stx | 2 | ||||
-rw-r--r-- | gui/themes/scummmodern.zip | bin | 1452236 -> 1452523 bytes | |||
-rw-r--r-- | gui/themes/scummmodern/THEMERC | 2 | ||||
-rw-r--r-- | gui/themes/scummmodern/scummmodern_layout.stx | 15 | ||||
-rw-r--r-- | gui/themes/scummmodern/scummmodern_layout_lowres.stx | 2 |
12 files changed, 54 insertions, 9 deletions
diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h index cd388b7f65..de4a92be16 100644 --- a/gui/ThemeEngine.h +++ b/gui/ThemeEngine.h @@ -35,7 +35,7 @@ #include "graphics/pixelformat.h" -#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.8.14" +#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.8.15" class OSystem; diff --git a/gui/saveload-dialog.cpp b/gui/saveload-dialog.cpp index dce09aaec8..3d542b1dc8 100644 --- a/gui/saveload-dialog.cpp +++ b/gui/saveload-dialog.cpp @@ -496,6 +496,10 @@ LoadChooserThumbnailed::LoadChooserThumbnailed(const Common::String &title) _prevButton = new GUI::ButtonWidget(this, "SaveLoadChooser.Cancel", _("Prev"), 0, kPrevCmd); _prevButton->setEnabled(false); + + // Page display + _pageDisplay = new GUI::StaticTextWidget(this, "SaveLoadChooser.PageDisplay", Common::String()); + _pageDisplay->setAlign(Graphics::kTextAlignRight); } const Common::String &LoadChooserThumbnailed::getResultString() const { @@ -555,6 +559,11 @@ void LoadChooserThumbnailed::open() { } void LoadChooserThumbnailed::reflowLayout() { + removeWidget(_pageDisplay); + if (g_gui.xmlEval()->getVar("Globals.ShowChooserPageDisplay") == 1) { + _pageDisplay->init(); + } + SaveLoadChooserDialog::reflowLayout(); destroyButtons(); @@ -690,6 +699,9 @@ void LoadChooserThumbnailed::updateSaves() { curButton.button->setTooltip(tooltip); } + const uint numPages = _saveList.size() / _entriesPerPage + 1; + _pageDisplay->setLabel(Common::String::format("%u/%u", _curPage + 1, numPages)); + if (_curPage > 0) _prevButton->setEnabled(true); else diff --git a/gui/saveload-dialog.h b/gui/saveload-dialog.h index 68512ad9a5..63dbf4182e 100644 --- a/gui/saveload-dialog.h +++ b/gui/saveload-dialog.h @@ -136,6 +136,8 @@ private: GUI::ButtonWidget *_nextButton; GUI::ButtonWidget *_prevButton; + GUI::StaticTextWidget *_pageDisplay; + struct SlotButton { SlotButton() : container(0), button(0), description(0) {} SlotButton(ContainerWidget *c, PicButtonWidget *b, StaticTextWidget *d) : container(c), button(b), description(d) {} diff --git a/gui/themes/default.inc b/gui/themes/default.inc index 331289ddf7..dc8d5c1a0e 100644 --- a/gui/themes/default.inc +++ b/gui/themes/default.inc @@ -620,6 +620,7 @@ "<def var='ShowGlobalMenuLogo' value='0'/> " "<def var='ShowSearchPic' value='0'/> " "<def var='ShowChooserPics' value='0'/> " +"<def var='ShowChooserPageDisplay' value='0'/> " "<def var='SaveLoadChooser.ExtInfo.Visible' value='0'/> " "<def var='KeyMapper.Spacing' value='5'/> " "<def var='KeyMapper.LabelWidth' value='80'/> " @@ -1574,6 +1575,7 @@ "<def var='ShowGlobalMenuLogo' value='0'/> " "<def var='ShowSearchPic' value='0'/> " "<def var='ShowChooserPics' value='0'/> " +"<def var='ShowChooserPageDisplay' value='1'/> " "<def var='SaveLoadChooser.ExtInfo.Visible' value='1'/> " "<def var='KeyMapper.Spacing' value='10'/> " "<def var='KeyMapper.LabelWidth' value='100'/> " @@ -2304,9 +2306,16 @@ "</dialog> " "<dialog name='SaveLoadChooser' overlays='screen' inset='8' shading='dim'> " "<layout type='vertical' padding='8,8,8,32' center='true'> " +"<layout type='horizontal' padding='0,0,0,0'> " "<widget name='Title' " "height='Globals.Line.Height' " "/> " +"<space/> " +"<widget name='PageDisplay' " +"width='200' " +"height='Globals.Line.Height' " +"/> " +"</layout> " "<layout type='horizontal' padding='0,0,0,16' spacing='16'> " "<widget name='List' /> " "<widget name='Thumbnail' " diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip Binary files differindex 5e23f91dce..f4227c1115 100644 --- a/gui/themes/scummclassic.zip +++ b/gui/themes/scummclassic.zip diff --git a/gui/themes/scummclassic/THEMERC b/gui/themes/scummclassic/THEMERC index b87adb9bd8..f4ca766db6 100644 --- a/gui/themes/scummclassic/THEMERC +++ b/gui/themes/scummclassic/THEMERC @@ -1 +1 @@ -[SCUMMVM_STX0.8.14:ScummVM Classic Theme:No Author] +[SCUMMVM_STX0.8.15:ScummVM Classic Theme:No Author] diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx index 2bb586521f..72efc84173 100644 --- a/gui/themes/scummclassic/classic_layout.stx +++ b/gui/themes/scummclassic/classic_layout.stx @@ -31,7 +31,9 @@ <def var = 'ShowLauncherLogo' value = '0'/> <def var = 'ShowGlobalMenuLogo' value = '0'/> <def var = 'ShowSearchPic' value = '0'/> + <def var = 'ShowChooserPics' value = '0'/> + <def var = 'ShowChooserPageDisplay' value = '1'/> <def var = 'SaveLoadChooser.ExtInfo.Visible' value = '1'/> @@ -794,9 +796,16 @@ <dialog name = 'SaveLoadChooser' overlays = 'screen' inset = '8' shading = 'dim'> <layout type = 'vertical' padding = '8, 8, 8, 32' center = 'true'> - <widget name = 'Title' - height = 'Globals.Line.Height' - /> + <layout type = 'horizontal' padding = '0, 0, 0, 0'> + <widget name = 'Title' + height = 'Globals.Line.Height' + /> + <space/> + <widget name = 'PageDisplay' + width = '200' + height = 'Globals.Line.Height' + /> + </layout> <layout type = 'horizontal' padding = '0, 0, 0, 16' spacing = '16'> <widget name = 'List' /> <widget name = 'Thumbnail' diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx index fe39e6b2e4..0bdf049581 100644 --- a/gui/themes/scummclassic/classic_layout_lowres.stx +++ b/gui/themes/scummclassic/classic_layout_lowres.stx @@ -32,7 +32,9 @@ <def var = 'ShowLauncherLogo' value = '0'/> <def var = 'ShowGlobalMenuLogo' value = '0'/> <def var = 'ShowSearchPic' value = '0'/> + <def var = 'ShowChooserPics' value = '0'/> + <def var = 'ShowChooserPageDisplay' value = '0'/> <def var = 'SaveLoadChooser.ExtInfo.Visible' value = '0'/> diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip Binary files differindex 977a6960e6..a861e8e0df 100644 --- a/gui/themes/scummmodern.zip +++ b/gui/themes/scummmodern.zip diff --git a/gui/themes/scummmodern/THEMERC b/gui/themes/scummmodern/THEMERC index e9a2d542c4..c4381c2061 100644 --- a/gui/themes/scummmodern/THEMERC +++ b/gui/themes/scummmodern/THEMERC @@ -1 +1 @@ -[SCUMMVM_STX0.8.14:ScummVM Modern Theme:No Author] +[SCUMMVM_STX0.8.15:ScummVM Modern Theme:No Author] diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx index 30f8f3c323..e27de3fe9b 100644 --- a/gui/themes/scummmodern/scummmodern_layout.stx +++ b/gui/themes/scummmodern/scummmodern_layout.stx @@ -38,7 +38,9 @@ <def var = 'ShowLauncherLogo' value = '1'/> <def var = 'ShowGlobalMenuLogo' value = '1'/> <def var = 'ShowSearchPic' value = '1'/> + <def var = 'ShowChooserPics' value = '1'/> + <def var = 'ShowChooserPageDisplay' value = '1'/> <def var = 'SaveLoadChooser.ExtInfo.Visible' value = '1'/> @@ -808,9 +810,16 @@ <dialog name = 'SaveLoadChooser' overlays = 'screen' inset = '8' shading = 'dim'> <layout type = 'vertical' padding = '8, 8, 8, 32' center = 'true'> - <widget name = 'Title' - height = 'Globals.Line.Height' - /> + <layout type = 'horizontal' padding = '0, 0, 0, 0'> + <widget name = 'Title' + height = 'Globals.Line.Height' + /> + <space/> + <widget name = 'PageDisplay' + width = '200' + height = 'Globals.Line.Height' + /> + </layout> <layout type = 'horizontal' padding = '0, 0, 0, 16' spacing = '16'> <widget name = 'List' /> <widget name = 'Thumbnail' diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx index 990bf2be0a..64ef3f29d2 100644 --- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx +++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx @@ -30,7 +30,9 @@ <def var = 'ShowLauncherLogo' value = '0'/> <def var = 'ShowGlobalMenuLogo' value = '0'/> <def var = 'ShowSearchPic' value = '0'/> + <def var = 'ShowChooserPics' value = '0'/> + <def var = 'ShowChooserPageDisplay' value = '0'/> <def var = 'SaveLoadChooser.ExtInfo.Visible' value = '0'/> |