diff options
author | Alexander Tkachev | 2016-07-25 16:37:44 +0600 |
---|---|---|
committer | Alexander Tkachev | 2016-08-24 16:07:55 +0600 |
commit | c74ba4652d497ddbdec4342029d94bc77387a705 (patch) | |
tree | f38167dd6081180b75ef6f8ac515a43ff472bc48 /gui/themes | |
parent | b665fc933d7d1c9e32820e5a3f24d0e3456a0ff7 (diff) | |
download | scummvm-rg350-c74ba4652d497ddbdec4342029d94bc77387a705.tar.gz scummvm-rg350-c74ba4652d497ddbdec4342029d94bc77387a705.tar.bz2 scummvm-rg350-c74ba4652d497ddbdec4342029d94bc77387a705.zip |
GUI: Add "Paste" button in StorageWizardDialog
It pastes clipboard contents as code into 8 fields of that dialog.
(Clipboard support works with SDL2 only.)
"Open URL" and "Paste" buttons are placed in the left column under the
picture (because there is no room for 4 buttons in the bottom row).
Commit also adds "dropbox.bmp", which is just a square 115x115 picture.
Such pictures are would be used as Storages logos in that dialog.
In lowres there is no left column, so all 4 buttons are in the same row.
None of them are visible, because they are overflowed. Container has to
be added to continue working on them.
Diffstat (limited to 'gui/themes')
-rw-r--r-- | gui/themes/scummclassic.zip | bin | 124903 -> 129092 bytes | |||
-rw-r--r-- | gui/themes/scummclassic/classic_layout.stx | 19 | ||||
-rw-r--r-- | gui/themes/scummclassic/classic_layout_lowres.stx | 4 | ||||
-rw-r--r-- | gui/themes/scummmodern.zip | bin | 1500676 -> 1545339 bytes | |||
-rw-r--r-- | gui/themes/scummmodern/dropbox.bmp | bin | 0 -> 40074 bytes | |||
-rw-r--r-- | gui/themes/scummmodern/scummmodern_gfx.stx | 1 | ||||
-rw-r--r-- | gui/themes/scummmodern/scummmodern_layout.stx | 19 | ||||
-rw-r--r-- | gui/themes/scummmodern/scummmodern_layout_lowres.stx | 4 |
8 files changed, 35 insertions, 12 deletions
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip Binary files differindex 4a36e7db99..42c6b10b73 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 2e37b00c91..3284f7d565 100644 --- a/gui/themes/scummclassic/classic_layout.stx +++ b/gui/themes/scummclassic/classic_layout.stx @@ -637,9 +637,18 @@ <dialog name = 'GlobalOptions_Cloud_ConnectionWizard' overlays = 'Dialog.GlobalOptions'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> - <widget name = 'Picture' - type = 'OptionsLabel' - /> + <layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '6'> + <widget name = 'Picture' + width = '115' + height = '115' + /> + <widget name = 'OpenUrlButton' + type = 'Button' + /> + <widget name = 'PasteCodeButton' + type = 'Button' + /> + </layout> <layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '6'> <widget name = 'Headline' height = 'Globals.Line.Height' @@ -704,9 +713,7 @@ <widget name = 'CancelButton' type = 'Button' /> - <widget name = 'OpenUrlButton' - type = 'Button' - /> + <space /> <widget name = 'ConnectButton' type = 'Button' /> diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx index 06ce6f6003..7666aeb585 100644 --- a/gui/themes/scummclassic/classic_layout_lowres.stx +++ b/gui/themes/scummclassic/classic_layout_lowres.stx @@ -709,6 +709,7 @@ height = 'Globals.Line.Height' /> <space size = '4' /> + <widget name = 'Picture' width = '1' height = '1' /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> <widget name = 'CancelButton' @@ -717,6 +718,9 @@ <widget name = 'OpenUrlButton' type = 'Button' /> + <widget name = 'PasteCodeButton' + type = 'Button' + /> <widget name = 'ConnectButton' type = 'Button' /> diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip Binary files differindex fcf35d97e2..b433aaae7a 100644 --- a/gui/themes/scummmodern.zip +++ b/gui/themes/scummmodern.zip diff --git a/gui/themes/scummmodern/dropbox.bmp b/gui/themes/scummmodern/dropbox.bmp Binary files differnew file mode 100644 index 0000000000..bfb9e90792 --- /dev/null +++ b/gui/themes/scummmodern/dropbox.bmp diff --git a/gui/themes/scummmodern/scummmodern_gfx.stx b/gui/themes/scummmodern/scummmodern_gfx.stx index 31b194d174..d7b35b10b9 100644 --- a/gui/themes/scummmodern/scummmodern_gfx.stx +++ b/gui/themes/scummmodern/scummmodern_gfx.stx @@ -119,6 +119,7 @@ <bitmap filename = 'editbtn_small.bmp'/> <bitmap filename = 'switchbtn_small.bmp'/> <bitmap filename = 'fastreplay_small.bmp'/> + <bitmap filename = 'dropbox.bmp'/> </bitmaps> <fonts> diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx index 49876be18b..a242229dff 100644 --- a/gui/themes/scummmodern/scummmodern_layout.stx +++ b/gui/themes/scummmodern/scummmodern_layout.stx @@ -651,9 +651,18 @@ <dialog name = 'GlobalOptions_Cloud_ConnectionWizard' overlays = 'Dialog.GlobalOptions'> <layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'> - <widget name = 'Picture' - type = 'OptionsLabel' - /> + <layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '6'> + <widget name = 'Picture' + width = '115' + height = '115' + /> + <widget name = 'OpenUrlButton' + type = 'Button' + /> + <widget name = 'PasteCodeButton' + type = 'Button' + /> + </layout> <layout type = 'vertical' padding = '0, 0, 0, 0' spacing = '6'> <widget name = 'Headline' height = 'Globals.Line.Height' @@ -718,9 +727,7 @@ <widget name = 'CancelButton' type = 'Button' /> - <widget name = 'OpenUrlButton' - type = 'Button' - /> + <space /> <widget name = 'ConnectButton' type = 'Button' /> diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx index e10ce4a6c2..26f7fab465 100644 --- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx +++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx @@ -707,6 +707,7 @@ height = 'Globals.Line.Height' /> <space size = '4' /> + <widget name = 'Picture' width = '1' height = '1' /> </layout> <layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '6' center = 'true'> <widget name = 'CancelButton' @@ -715,6 +716,9 @@ <widget name = 'OpenUrlButton' type = 'Button' /> + <widget name = 'PasteCodeButton' + type = 'Button' + /> <widget name = 'ConnectButton' type = 'Button' /> |