libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-04 07:41:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GUI: Add "Paste" button in StorageWizardDialog

Browse Source 
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.
This commit is contained in:
Alexander Tkachev 2016-07-25 16:37:44 +06:00
parent b665fc933d
commit c74ba4652d
12 changed files with 91 additions and 14 deletions

1
gui/ThemeEngine.cpp

@ -61,6 +61,7 @@ const char *const ThemeEngine::kImageStopSmallButton = "stopbtn_small.bmp";
const char *const ThemeEngine::kImageEditSmallButton = "editbtn_small.bmp";
const char *const ThemeEngine::kImageSwitchModeSmallButton = "switchbtn_small.bmp";
const char *const ThemeEngine::kImageFastReplaySmallButton = "fastreplay_small.bmp";
const char *const ThemeEngine::kImageDropboxLogo = "dropbox.bmp";
struct TextDrawData {
const Graphics::Font *_fontPtr;

1
gui/ThemeEngine.h

@ -250,6 +250,7 @@ public:
static const char *const kImageEditSmallButton; ///< Edit recording metadata in recorder onscreen dialog (for 320xY)
static const char *const kImageSwitchModeSmallButton; ///< Switch mode button in recorder onscreen dialog (for 320xY)
static const char *const kImageFastReplaySmallButton; ///< Fast playback mode button in recorder onscreen dialog (for 320xY)
static const char *const kImageDropboxLogo; ///< Dropbox logo used in the StorageWizardDialog
/**
* Graphics mode enumeration.

55
gui/storagewizarddialog.cpp

@ -20,6 +20,13 @@
*
*/
#ifdef USE_SDL2
#define FORBIDDEN_SYMBOL_ALLOW_ALL
#include <SDL2/SDL.h>
#include <SDL2/SDL_clipboard.h>
#endif
#include "gui/storagewizarddialog.h"
#include "gui/gui-manager.h"
#include "gui/message.h"
@ -37,7 +44,8 @@ namespace GUI {
enum {
kConnectCmd = 'Cnnt',
kCodeBoxCmd = 'CdBx',
kOpenUrlCmd = 'OpUr'
kOpenUrlCmd = 'OpUr',
kPasteCodeCmd = 'PsCd'
};
StorageWizardDialog::StorageWizardDialog(uint32 storageId):
@ -62,6 +70,7 @@ StorageWizardDialog::StorageWizardDialog(uint32 storageId):
// Buttons
new ButtonWidget(this, "GlobalOptions_Cloud_ConnectionWizard.CancelButton", _("Cancel"), 0, kCloseCmd);
new ButtonWidget(this, "GlobalOptions_Cloud_ConnectionWizard.OpenUrlButton", _("Open URL"), 0, kOpenUrlCmd);
_pasteCodeWidget = new ButtonWidget(this, "GlobalOptions_Cloud_ConnectionWizard.PasteCodeButton", _("Paste"), _("Pastes clipboard contents into fields"), kPasteCodeCmd);
_connectWidget = new ButtonWidget(this, "GlobalOptions_Cloud_ConnectionWizard.ConnectButton", _("Connect"), 0, kConnectCmd);
if (Cloud::CloudManager::couldUseLocalServer()) {
@ -72,7 +81,20 @@ StorageWizardDialog::StorageWizardDialog(uint32 storageId):
_codeWidget[i]->setVisible(false);
_messageWidget->setVisible(false);
_connectWidget->setVisible(false);
_pasteCodeWidget->setVisible(false);
}
#ifndef USE_SDL2
_pasteCodeWidget->setVisible(false);
#endif
#ifndef DISABLE_FANCY_THEMES
if (g_gui.theme()->supportsImages() && g_system->getOverlayWidth() > 320) { // picture only in high-res
GraphicsWidget *gfx = new GraphicsWidget(this, "GlobalOptions_Cloud_ConnectionWizard.Picture");
gfx->useThemeTransparency(true);
gfx->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageDropboxLogo));
}
#endif
}
void StorageWizardDialog::open() {
@ -162,7 +184,7 @@ void StorageWizardDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3
//the last 3 chars must be an encoded crc16
if (code.size() > 3) {
uint32 size = code.size();
uint32 gotcrc = decodeHashchar(code[size-3]) | (decodeHashchar(code[size-2]) << 6) | (decodeHashchar(code[size-1]) << 12);
uint32 gotcrc = decodeHashchar(code[size - 3]) | (decodeHashchar(code[size - 2]) << 6) | (decodeHashchar(code[size - 1]) << 12);
code.erase(size - 3);
uint32 crc = crc16(code);
ok = (crc == gotcrc);
@ -183,6 +205,35 @@ void StorageWizardDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3
}
break;
}
case kPasteCodeCmd: {
#ifdef USE_SDL2
if (SDL_HasClipboardText() == SDL_TRUE) {
char *text = SDL_GetClipboardText();
if (text != nullptr) {
Common::String message = text;
for (uint32 i = 0; i < CODE_FIELDS; ++i) {
if (message.empty()) break;
Common::String subcode = "";
for (uint32 j = 0; j < message.size(); ++j) {
if (message[j] == ' ') {
message.erase(0, j+1);
break;
}
subcode += message[j];
if (j+1 == message.size()) {
message = "";
break;
}
}
_codeWidget[i]->setEditString(subcode);
}
handleCommand(sender, kCodeBoxCmd, data);
draw();
}
}
#endif
break;
}
case kConnectCmd: {
Common::String code;
for (uint32 i = 0; i < CODE_FIELDS; ++i) {

1
gui/storagewizarddialog.h

@ -44,6 +44,7 @@ class StorageWizardDialog : public Dialog {
uint32 _storageId;
EditTextWidget *_codeWidget[CODE_FIELDS];
StaticTextWidget *_messageWidget;
ButtonWidget *_pasteCodeWidget;
ButtonWidget *_connectWidget;
bool _close;
#ifdef USE_SDL_NET

BIN
gui/themes/scummclassic.zip

Binary file not shown.

19
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'
/>

4
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'
/>

BIN
gui/themes/scummmodern.zip

Binary file not shown.

BIN
gui/themes/scummmodern/dropbox.bmp Normal file

Binary file not shown.
Side by Side

After

(image error) Size: 39 KiB

1
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>

19
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'
/>

4
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'
/>