diff options
author | Vicent Marti | 2008-10-14 17:53:52 +0000 |
---|---|---|
committer | Vicent Marti | 2008-10-14 17:53:52 +0000 |
commit | 1c374dcf35ad09c18554c18f57b3d449dac04b74 (patch) | |
tree | b8b7403b8f67c69c921eaf705381600dc5ff5156 /gui | |
parent | 820a45d8514be835daf204f54472cbb884fa0ac9 (diff) | |
download | scummvm-rg350-1c374dcf35ad09c18554c18f57b3d449dac04b74.tar.gz scummvm-rg350-1c374dcf35ad09c18554c18f57b3d449dac04b74.tar.bz2 scummvm-rg350-1c374dcf35ad09c18554c18f57b3d449dac04b74.zip |
Added "Mass Add" dialog.
svn-id: r34802
Diffstat (limited to 'gui')
-rw-r--r-- | gui/massadd.cpp | 25 | ||||
-rw-r--r-- | gui/themes/default.inc | 42 | ||||
-rw-r--r-- | gui/themes/scummclassic.zip | bin | 43805 -> 43279 bytes | |||
-rw-r--r-- | gui/themes/scummclassic/classic_layout.stx | 22 | ||||
-rw-r--r-- | gui/themes/scummclassic/classic_layout_320.stx | 22 | ||||
-rw-r--r-- | gui/themes/scummmodern.zip | bin | 144239 -> 143581 bytes | |||
-rw-r--r-- | gui/themes/scummmodern/scummodern_layout.stx | 22 | ||||
-rw-r--r-- | gui/themes/scummmodern/scummodern_layout_320.stx | 22 |
8 files changed, 140 insertions, 15 deletions
diff --git a/gui/massadd.cpp b/gui/massadd.cpp index 6d40c4e78b..db94d4308b 100644 --- a/gui/massadd.cpp +++ b/gui/massadd.cpp @@ -59,7 +59,7 @@ enum { MassAddDialog::MassAddDialog(const Common::FSNode &startDir) - : Dialog("massadddialog"), + : Dialog("MassAdd"), _dirsScanned(0), _okButton(0), _dirProgressText(0), @@ -68,27 +68,22 @@ MassAddDialog::MassAddDialog(const Common::FSNode &startDir) // The dir we start our scan at _scanStack.push(startDir); +// Removed for now... Why would you put a title on mass add dialog called "Mass Add Dialog"? +// new StaticTextWidget(this, "massadddialog_caption", "Mass Add Dialog"); - // Create dialog items - // We need: - // - "OK" button, only enabled after the scan has finished - // - "Cancel" / "Abort" button, always active - // - static text as headline for the dialog - // - static text displaying the progress text - // - (future) a listbox showing all the games we added/are going to add - - new StaticTextWidget(this, "massadddialog_caption", "Mass Add Dialog"); - - _dirProgressText = new StaticTextWidget(this, "massadddialog_dirprogress", + _dirProgressText = new StaticTextWidget(this, "MassAdd.DirProgressText", "... progress ..."); - _gameProgressText = new StaticTextWidget(this, "massadddialog_gameprogress", + _gameProgressText = new StaticTextWidget(this, "MassAdd.GameProgressText", "... progress ..."); + + _dirProgressText->setAlign(Graphics::kTextAlignCenter); + _gameProgressText->setAlign(Graphics::kTextAlignCenter); - _okButton = new ButtonWidget(this, "massadddialog_ok", "OK", kOkCmd, Common::ASCII_RETURN); + _okButton = new ButtonWidget(this, "MassAdd.Ok", "OK", kOkCmd, Common::ASCII_RETURN); _okButton->setEnabled(false); - new ButtonWidget(this, "massadddialog_cancel", "Cancel", kCancelCmd, Common::ASCII_ESCAPE); + new ButtonWidget(this, "MassAdd.Cancel", "Cancel", kCancelCmd, Common::ASCII_ESCAPE); // Build a map from all configured game paths to the targets using them const Common::ConfigManager::DomainMap &domains = ConfMan.getGameDomains(); diff --git a/gui/themes/default.inc b/gui/themes/default.inc index f2ef86d241..348d013141 100644 --- a/gui/themes/default.inc +++ b/gui/themes/default.inc @@ -885,6 +885,27 @@ "</layout> " "</layout> " "</dialog> " +"<dialog name = 'MassAdd' overlays = 'screen_center' shading = 'dim'> " +"<layout type = 'vertical' padding = '8, 8, 32, 8' center = 'true'> " +"<widget name = 'DirProgressText' " +"width = '250' " +"height = 'Globals.Line.Height' " +"/> " +"<widget name = 'GameProgressText' " +"width = '250' " +"height = 'Globals.Line.Height' " +"/> " +"<space size = '32' /> " +"<layout type = 'horizontal' padding = '8, 8, 8, 8'> " +"<widget name = 'Ok' " +"type = 'Button' " +"/> " +"<widget name = 'Cancel' " +"type = 'Button' " +"/> " +"</layout> " +"</layout> " +"</dialog> " "</layout_info> " "<layout_info resolution = '320xY, 256x240'> " "<globals> " @@ -1459,4 +1480,25 @@ "</layout> " "</layout> " "</dialog> " +"<dialog name = 'MassAdd' overlays = 'screen_center' shading = 'dim'> " +"<layout type = 'vertical' padding = '4, 4, 16, 4' center = 'true'> " +"<widget name = 'DirProgressText' " +"width = '240' " +"height = 'Globals.Line.Height' " +"/> " +"<widget name = 'GameProgressText' " +"width = '240' " +"height = 'Globals.Line.Height' " +"/> " +"<space size = '16' /> " +"<layout type = 'horizontal' padding = '4, 4, 4, 4'> " +"<widget name = 'Ok' " +"type = 'Button' " +"/> " +"<widget name = 'Cancel' " +"type = 'Button' " +"/> " +"</layout> " +"</layout> " +"</dialog> " "</layout_info> " diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip Binary files differindex e285958029..010e465fcc 100644 --- a/gui/themes/scummclassic.zip +++ b/gui/themes/scummclassic.zip diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx index 0704c8e91d..75e8448be7 100644 --- a/gui/themes/scummclassic/classic_layout.stx +++ b/gui/themes/scummclassic/classic_layout.stx @@ -632,4 +632,26 @@ </layout> </layout> </dialog> + + <dialog name = 'MassAdd' overlays = 'screen_center' shading = 'dim'> + <layout type = 'vertical' padding = '8, 8, 32, 8' center = 'true'> + <widget name = 'DirProgressText' + width = '250' + height = 'Globals.Line.Height' + /> + <widget name = 'GameProgressText' + width = '250' + height = 'Globals.Line.Height' + /> + <space size = '32' /> + <layout type = 'horizontal' padding = '8, 8, 8, 8'> + <widget name = 'Ok' + type = 'Button' + /> + <widget name = 'Cancel' + type = 'Button' + /> + </layout> + </layout> + </dialog> </layout_info>
\ No newline at end of file diff --git a/gui/themes/scummclassic/classic_layout_320.stx b/gui/themes/scummclassic/classic_layout_320.stx index 9c03d51e13..7870a0df78 100644 --- a/gui/themes/scummclassic/classic_layout_320.stx +++ b/gui/themes/scummclassic/classic_layout_320.stx @@ -625,4 +625,26 @@ </layout> </layout> </dialog> + + <dialog name = 'MassAdd' overlays = 'screen_center' shading = 'dim'> + <layout type = 'vertical' padding = '4, 4, 16, 4' center = 'true'> + <widget name = 'DirProgressText' + width = '240' + height = 'Globals.Line.Height' + /> + <widget name = 'GameProgressText' + width = '240' + height = 'Globals.Line.Height' + /> + <space size = '16' /> + <layout type = 'horizontal' padding = '4, 4, 4, 4'> + <widget name = 'Ok' + type = 'Button' + /> + <widget name = 'Cancel' + type = 'Button' + /> + </layout> + </layout> + </dialog> </layout_info>
\ No newline at end of file diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip Binary files differindex 70141bfce9..86222f5ca7 100644 --- a/gui/themes/scummmodern.zip +++ b/gui/themes/scummmodern.zip diff --git a/gui/themes/scummmodern/scummodern_layout.stx b/gui/themes/scummmodern/scummodern_layout.stx index 03d920ac05..656f828c48 100644 --- a/gui/themes/scummmodern/scummodern_layout.stx +++ b/gui/themes/scummmodern/scummodern_layout.stx @@ -644,4 +644,26 @@ </layout> </layout> </dialog> + + <dialog name = 'MassAdd' overlays = 'screen_center' shading = 'dim'> + <layout type = 'vertical' padding = '8, 8, 32, 8' center = 'true'> + <widget name = 'DirProgressText' + width = '250' + height = 'Globals.Line.Height' + /> + <widget name = 'GameProgressText' + width = '250' + height = 'Globals.Line.Height' + /> + <space size = '32' /> + <layout type = 'horizontal' padding = '8, 8, 8, 8'> + <widget name = 'Ok' + type = 'Button' + /> + <widget name = 'Cancel' + type = 'Button' + /> + </layout> + </layout> + </dialog> </layout_info>
\ No newline at end of file diff --git a/gui/themes/scummmodern/scummodern_layout_320.stx b/gui/themes/scummmodern/scummodern_layout_320.stx index b92ded6097..398fa59d31 100644 --- a/gui/themes/scummmodern/scummodern_layout_320.stx +++ b/gui/themes/scummmodern/scummodern_layout_320.stx @@ -622,4 +622,26 @@ </layout> </layout> </dialog> + + <dialog name = 'MassAdd' overlays = 'screen_center' shading = 'dim'> + <layout type = 'vertical' padding = '4, 4, 16, 4' center = 'true'> + <widget name = 'DirProgressText' + width = '240' + height = 'Globals.Line.Height' + /> + <widget name = 'GameProgressText' + width = '240' + height = 'Globals.Line.Height' + /> + <space size = '16' /> + <layout type = 'horizontal' padding = '4, 4, 4, 4'> + <widget name = 'Ok' + type = 'Button' + /> + <widget name = 'Cancel' + type = 'Button' + /> + </layout> + </layout> + </dialog> </layout_info> |