thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BBVS: Implement file chooser for Air Guitar minigame

Browse source
This commit is contained in:
Eugene Sandulenko 2015-11-06 06:34:50 +01:00
parent 6f44d4f7e1
commit 81a4359eee
11 changed files with 411 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

19
engines/bbvs/minigames/bbairguitar.cpp
View file

@ -27,6 +27,7 @@
#include "gui/dialog.h"
#include "gui/message.h"
#include "gui/filebrowser-dialog.h"
namespace Bbvs {
@ -1204,15 +1205,25 @@ void MinigameBbAirGuitar::stopNote(int noteNum) {
}
bool MinigameBbAirGuitar::getLoadFilename(Common::String &filename) {
// TODO Run dialog and return actual filename
filename = "test.air";
GUI::FileBrowserDialog browser(0, "air", GUI::kFBModeLoad);
if (browser.runModal() > 0) {
filename = browser.getResult();
return true;
}
return false;
}
bool MinigameBbAirGuitar::getSaveFilename(Common::String &filename) {
// TODO Run dialog and return actual filename
filename = "test.air";
GUI::FileBrowserDialog browser(0, "air", GUI::kFBModeSave);
if (browser.runModal() > 0) {
filename = browser.getResult();
return true;
}
return false;
}
bool MinigameBbAirGuitar::querySaveModifiedDialog() {

160
gui/filebrowser-dialog.cpp Normal file
View file

@ -0,0 +1,160 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
#include "gui/filebrowser-dialog.h"
#include "common/system.h"
#include "common/algorithm.h"
#include "common/savefile.h"
#include "common/str-array.h"
#include "common/translation.h"
#include "gui/widgets/list.h"
#include "gui/message.h"
namespace GUI {
enum {
kChooseCmd = 'Chos'
};
FileBrowserDialog::FileBrowserDialog(const char *title, const char *fileExtension, int mode)
: Dialog("FileBrowser"), _mode(mode), _fileExt(fileExtension) {
_fileMask = "*.";
_fileMask += fileExtension;
_fileList = NULL;
new StaticTextWidget(this, "FileBrowser.Headline", title ? title :
mode == kFBModeLoad ? _("Choose file for loading") : _("Enter filename for saving"));
_fileName = new EditTextWidget(this, "FileBrowser.Filename", "");
if (mode == kFBModeLoad)
_fileName->setEnabled(false);
// Add file list
_fileList = new ListWidget(this, "FileBrowser.List");
_fileList->setNumberingMode(kListNumberingOff);
_fileList->setEditable(false);
_backgroundType = GUI::ThemeEngine::kDialogBackgroundPlain;
// Buttons
new ButtonWidget(this, "FileBrowser.Cancel", _("Cancel"), 0, kCloseCmd);
new ButtonWidget(this, "FileBrowser.Choose", _("Choose"), 0, kChooseCmd);
}
void FileBrowserDialog::open() {
// Call super implementation
Dialog::open();
updateListing();
}
void FileBrowserDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
switch (cmd) {
case kChooseCmd:
if (_fileName->getEditString().empty())
break;
normalieFileName();
if (!isProceedSave())
break;
setResult(1);
close();
break;
case kListSelectionChangedCmd:
_fileName->setEditString(_fileList->getList().operator[](_fileList->getSelected()).c_str());
_fileName->draw();
break;
case kListItemActivatedCmd:
case kListItemDoubleClickedCmd:
normalieFileName();
if (!isProceedSave())
break;
setResult(1);
close();
break;
default:
Dialog::handleCommand(sender, cmd, data);
}
}
void FileBrowserDialog::normalieFileName() {
Common::String filename = _fileName->getEditString();
if (filename.matchString(_fileMask))
return;
_fileName->setEditString(filename + "." + _fileExt);
}
bool FileBrowserDialog::isProceedSave() {
bool matched = false;
if (_mode == kFBModeLoad)
return true;
for (ListWidget::StringArray::const_iterator file = _fileList->getList().begin(); file != _fileList->getList().end(); ++file) {
if (*file == _fileName->getEditString()) {
matched = true;
break;
}
}
if (matched) {
GUI::MessageDialog alert(_("Do you really want to overwrite the file?"), _("Yes"), _("No"));
if (alert.runModal() != GUI::kMessageOK)
return false;
}
return true;
}
void FileBrowserDialog::updateListing() {
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
ListWidget::StringArray list;
Common::StringArray filenames = saveFileMan->listSavefiles(_fileMask);
Common::sort(filenames.begin(), filenames.end());
for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {
list.push_back(file->c_str());
}
_fileList->setList(list);
_fileList->scrollTo(0);
// Finally, redraw
draw();
}
} // End of namespace GUI

64
gui/filebrowser-dialog.h Normal file
View file

@ -0,0 +1,64 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
#ifndef FILEBROWSER_DIALOG_H
#define FILEBROWSER_DIALOG_H
#include "gui/dialog.h"
#include "gui/widgets/edittext.h"
namespace GUI {
class ListWidget;
class EditTextWidget;
class CommandSender;
enum {
kFBModeLoad = 0,
kFBModeSave
};
class FileBrowserDialog : public Dialog {
public:
FileBrowserDialog(const char *title, const char *fileExtension, int mode);
virtual void open();
virtual void handleCommand(CommandSender *sender, uint32 cmd, uint32 data);
const char *getResult() { return Dialog::getResult() ? _fileName->getEditString().c_str() : NULL; }
protected:
EditTextWidget *_fileName;
ListWidget *_fileList;
Common::String _fileMask;
Common::String _fileExt;
int _mode;
void updateListing();
void normalieFileName();
bool isProceedSave();
};
} // End of namespace GUI
#endif

1
gui/module.mk
View file

@ -8,6 +8,7 @@ MODULE_OBJS := \
dialog.o \
error.o \
EventRecorder.o \
filebrowser-dialog.o \
gui-manager.o \
launcher.o \
massadd.o \

44
gui/themes/default.inc
View file

@ -771,6 +771,28 @@
"</layout>"
"</layout>"
"</dialog>"
"<dialog name='FileBrowser' overlays='screen' inset='32' shading='dim'>"
"<layout type='vertical' padding='16,16,16,16'>"
"<widget name='Headline' "
"height='Globals.Line.Height' "
"/>"
"<widget name='Filename' "
"height='Globals.Line.Height' "
"/>"
"<space size='10' />"
"<widget name='List'/>"
"<layout type='vertical' padding='0,0,16,0'>"
"<layout type='horizontal' padding='0,0,0,0'>"
"<widget name='Cancel' "
"type='Button' "
"/>"
"<widget name='Choose' "
"type='Button' "
"/>"
"</layout>"
"</layout>"
"</layout>"
"</dialog>"
"<dialog name='GlobalOptions' overlays='Dialog.Launcher.GameList' shading='dim'>"
"<layout type='vertical' padding='0,0,0,0'>"
"<widget name='TabWidget'/>"
@ -2031,6 +2053,28 @@
"</layout>"
"</layout>"
"</dialog>"
"<dialog name='FileBrowser' overlays='screen' inset='16' shading='dim'>"
"<layout type='vertical' padding='16,16,16,16'>"
"<widget name='Headline' "
"height='Globals.Line.Height' "
"/>"
"<widget name='Filename' "
"height='Globals.Line.Height' "
"/>"
"<space size='5' />"
"<widget name='List'/>"
"<layout type='vertical' padding='0,0,16,0'>"
"<layout type='horizontal' padding='0,0,0,0'>"
"<widget name='Cancel' "
"type='Button' "
"/>"
"<widget name='Choose' "
"type='Button' "
"/>"
"</layout>"
"</layout>"
"</layout>"
"</dialog>"
"<dialog name='GlobalOptions' overlays='screen' inset='16' shading='dim'>"
"<layout type='vertical' padding='0,0,0,0'>"
"<widget name='TabWidget'/>"

BIN
gui/themes/scummclassic.zip
View file

Binary file not shown.

23
gui/themes/scummclassic/classic_layout.stx
View file

@ -196,6 +196,29 @@
</layout>
</dialog>
<dialog name = 'FileBrowser' overlays = 'screen' inset = '32' shading = 'dim'>
<layout type = 'vertical' padding = '16, 16, 16, 16'>
<widget name = 'Headline'
height = 'Globals.Line.Height'
/>
<widget name = 'Filename'
height = 'Globals.Line.Height'
/>
<space size = '10' />
<widget name = 'List'/>
<layout type = 'vertical' padding = '0, 0, 16, 0'>
<layout type = 'horizontal' padding = '0, 0, 0, 0'>
<widget name = 'Cancel'
type = 'Button'
/>
<widget name = 'Choose'
type = 'Button'
/>
</layout>
</layout>
</layout>
</dialog>
<dialog name = 'GlobalOptions' overlays = 'Dialog.Launcher.GameList' shading = 'dim'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
<widget name = 'TabWidget'/>

23
gui/themes/scummclassic/classic_layout_lowres.stx
View file

@ -193,6 +193,29 @@
</layout>
</dialog>
<dialog name = 'FileBrowser' overlays = 'screen' inset = '16' shading = 'dim'>
<layout type = 'vertical' padding = '16, 16, 16, 16'>
<widget name = 'Headline'
height = 'Globals.Line.Height'
/>
<widget name = 'Filename'
height = 'Globals.Line.Height'
/>
<space size = '5' />
<widget name = 'List'/>
<layout type = 'vertical' padding = '0, 0, 16, 0'>
<layout type = 'horizontal' padding = '0, 0, 0, 0'>
<widget name = 'Cancel'
type = 'Button'
/>
<widget name = 'Choose'
type = 'Button'
/>
</layout>
</layout>
</layout>
</dialog>
<dialog name = 'GlobalOptions' overlays = 'screen' inset = '16' shading = 'dim'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
<widget name = 'TabWidget'/>

BIN
gui/themes/scummmodern.zip
View file

Binary file not shown.

23
gui/themes/scummmodern/scummmodern_layout.stx
View file

@ -210,6 +210,29 @@
</layout>
</dialog>
<dialog name = 'FileBrowser' overlays = 'screen' inset = '32' shading = 'dim'>
<layout type = 'vertical' padding = '16, 16, 16, 16'>
<widget name = 'Headline'
height = 'Globals.Line.Height'
/>
<widget name = 'Filename'
height = 'Globals.Line.Height'
/>
<space size = '10' />
<widget name = 'List'/>
<layout type = 'vertical' padding = '0, 0, 16, 0'>
<layout type = 'horizontal' padding = '0, 0, 0, 0'>
<widget name = 'Cancel'
type = 'Button'
/>
<widget name = 'Choose'
type = 'Button'
/>
</layout>
</layout>
</layout>
</dialog>
<dialog name = 'GlobalOptions' overlays = 'Dialog.Launcher.GameList' shading = 'dim'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
<widget name = 'TabWidget'/>

23
gui/themes/scummmodern/scummmodern_layout_lowres.stx
View file

@ -191,6 +191,29 @@
</layout>
</dialog>
<dialog name = 'FileBrowser' overlays = 'screen' inset = '16' shading = 'dim'>
<layout type = 'vertical' padding = '16, 16, 16, 16'>
<widget name = 'Headline'
height = 'Globals.Line.Height'
/>
<widget name = 'Filename'
height = 'Globals.Line.Height'
/>
<space size = '5' />
<widget name = 'List'/>
<layout type = 'vertical' padding = '0, 0, 16, 0'>
<layout type = 'horizontal' padding = '0, 0, 0, 0'>
<widget name = 'Cancel'
type = 'Button'
/>
<widget name = 'Choose'
type = 'Button'
/>
</layout>
</layout>
</layout>
</dialog>
<dialog name = 'GlobalOptions' overlays = 'screen' inset = '16' shading = 'dim'>
<layout type = 'vertical' padding = '0, 0, 0, 0'>
<widget name = 'TabWidget'/>