[Scummvm-cvs-logs] scummvm master -> e5e2a8d8cf9c4e52a4a40d9faf5a8c258e0284f3
lordhoto
lordhoto at gmail.com
Sun Jan 24 03:48:35 CET 2016
This automated email contains information about 12 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
4a092eeb64 GUI: Formatting fixes in predictivedialog.cpp.
83df1eb43b GUI: Only use image for delete when applicable in PredictiveDialog.
66a815a214 GUI: Set PredictiveDialog's debug output to level 5+.
144765827f GUI: Improve variable naming in PredictiveDialog.
c72d95cbcc GUI: Add constructor instead of duplicating initialization.
7c687a05c7 GUI: Make PredictiveDialog::_btns a fixed size array.
adbbe6b113 GUI: Improve naming of PredictiveDialog's members.
15012d1596 GUI: Fix typo in comment in predictivedialog.cpp.
120164ba07 GUI: Reduce scope of variable in PredictiveDialog::processButton.
5a63ee5375 GUI: Use "button" instead of "btn" in variable names.
a7dba17fec GUI: Fix pointer formatting in ThemeEngine.cpp.
e5e2a8d8cf GUI: Move PredicitveDialog enums inside class declaration.
Commit: 4a092eeb64fa23376327cea91350fb15028ed777
https://github.com/scummvm/scummvm/commit/4a092eeb64fa23376327cea91350fb15028ed777
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-24T02:37:35+01:00
Commit Message:
GUI: Formatting fixes in predictivedialog.cpp.
Changed paths:
gui/predictivedialog.cpp
diff --git a/gui/predictivedialog.cpp b/gui/predictivedialog.cpp
index a894b02..ee8973b 100644
--- a/gui/predictivedialog.cpp
+++ b/gui/predictivedialog.cpp
@@ -72,29 +72,29 @@ PredictiveDialog::PredictiveDialog() : Dialog("Predictive") {
_btns = (ButtonWidget **)calloc(16, sizeof(ButtonWidget *));
_btns[kCancelAct] = new ButtonWidget(this, "Predictive.Cancel", _("Cancel") , 0, kCancelCmd);
- _btns[kOkAct] = new ButtonWidget(this, "Predictive.OK", _("Ok") , 0, kOkCmd);
- _btns[kBtn1Act] = new ButtonWidget(this, "Predictive.Button1", "1 `-.&" , 0, kBut1Cmd);
- _btns[kBtn2Act] = new ButtonWidget(this, "Predictive.Button2", "2 abc" , 0, kBut2Cmd);
- _btns[kBtn3Act] = new ButtonWidget(this, "Predictive.Button3", "3 def" , 0, kBut3Cmd);
- _btns[kBtn4Act] = new ButtonWidget(this, "Predictive.Button4", "4 ghi" , 0, kBut4Cmd);
- _btns[kBtn5Act] = new ButtonWidget(this, "Predictive.Button5", "5 jkl" , 0, kBut5Cmd);
- _btns[kBtn6Act] = new ButtonWidget(this, "Predictive.Button6", "6 mno" , 0, kBut6Cmd);
- _btns[kBtn7Act] = new ButtonWidget(this, "Predictive.Button7", "7 pqrs" , 0, kBut7Cmd);
- _btns[kBtn8Act] = new ButtonWidget(this, "Predictive.Button8", "8 tuv" , 0, kBut8Cmd);
- _btns[kBtn9Act] = new ButtonWidget(this, "Predictive.Button9", "9 wxyz" , 0, kBut9Cmd);
- _btns[kBtn0Act] = new ButtonWidget(this, "Predictive.Button0", "0" , 0, kBut0Cmd);
- // I18N: You must leave "#" as is, only word 'next' is translatable
- _btns[kNextAct] = new ButtonWidget(this, "Predictive.Next", _("# next") , 0, kNextCmd);
- _btns[kAddAct] = new ButtonWidget(this, "Predictive.Add", _("add") , 0, kAddCmd);
+ _btns[kOkAct] = new ButtonWidget(this, "Predictive.OK", _("Ok") , 0, kOkCmd);
+ _btns[kBtn1Act] = new ButtonWidget(this, "Predictive.Button1", "1 `-.&" , 0, kBut1Cmd);
+ _btns[kBtn2Act] = new ButtonWidget(this, "Predictive.Button2", "2 abc" , 0, kBut2Cmd);
+ _btns[kBtn3Act] = new ButtonWidget(this, "Predictive.Button3", "3 def" , 0, kBut3Cmd);
+ _btns[kBtn4Act] = new ButtonWidget(this, "Predictive.Button4", "4 ghi" , 0, kBut4Cmd);
+ _btns[kBtn5Act] = new ButtonWidget(this, "Predictive.Button5", "5 jkl" , 0, kBut5Cmd);
+ _btns[kBtn6Act] = new ButtonWidget(this, "Predictive.Button6", "6 mno" , 0, kBut6Cmd);
+ _btns[kBtn7Act] = new ButtonWidget(this, "Predictive.Button7", "7 pqrs" , 0, kBut7Cmd);
+ _btns[kBtn8Act] = new ButtonWidget(this, "Predictive.Button8", "8 tuv" , 0, kBut8Cmd);
+ _btns[kBtn9Act] = new ButtonWidget(this, "Predictive.Button9", "9 wxyz" , 0, kBut9Cmd);
+ _btns[kBtn0Act] = new ButtonWidget(this, "Predictive.Button0", "0" , 0, kBut0Cmd);
+ // I18N: You must leave "#" as is, only word 'next' is translatable
+ _btns[kNextAct] = new ButtonWidget(this, "Predictive.Next", _("# next") , 0, kNextCmd);
+ _btns[kAddAct] = new ButtonWidget(this, "Predictive.Add", _("add") , 0, kAddCmd);
_btns[kAddAct]->setEnabled(false);
- #ifndef DISABLE_FANCY_THEMES
+#ifndef DISABLE_FANCY_THEMES
_btns[kDelAct] = new PicButtonWidget(this, "Predictive.Delete", _("Delete char"), kDelCmd);
((PicButtonWidget *)_btns[kDelAct])->useThemeTransparency(true);
((PicButtonWidget *)_btns[kDelAct])->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageDelbtn));
- #endif
+#endif
_btns[kDelAct] = new ButtonWidget(this, "Predictive.Delete" , _("<") , 0, kDelCmd);
- // I18N: Pre means 'Predictive', leave '*' as is
+ // I18N: Pre means 'Predictive', leave '*' as is
_btns[kModeAct] = new ButtonWidget(this, "Predictive.Pre", _("* Pre"), 0, kModeCmd);
_edittext = new EditTextWidget(this, "Predictive.Word", _search, 0, 0, 0);
@@ -598,10 +598,10 @@ void PredictiveDialog::processBtnActive(ButtonId button) {
if (button == kOkAct)
close();
- if (button == kCancelAct) {
- saveUserDictToFile();
- close();
- }
+ if (button == kCancelAct) {
+ saveUserDictToFile();
+ close();
+ }
}
void PredictiveDialog::handleTickle() {
Commit: 83df1eb43be7c4fa5cc14d743f91c507d905c564
https://github.com/scummvm/scummvm/commit/83df1eb43be7c4fa5cc14d743f91c507d905c564
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-24T03:06:47+01:00
Commit Message:
GUI: Only use image for delete when applicable in PredictiveDialog.
Changed paths:
gui/ThemeEngine.h
gui/predictivedialog.cpp
gui/predictivedialog.h
gui/themes/default.inc
gui/themes/scummclassic.zip
gui/themes/scummclassic/THEMERC
gui/themes/scummclassic/classic_layout.stx
gui/themes/scummclassic/classic_layout_lowres.stx
gui/themes/scummmodern.zip
gui/themes/scummmodern/THEMERC
gui/themes/scummmodern/scummmodern_layout.stx
gui/themes/scummmodern/scummmodern_layout_lowres.stx
diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h
index 68be2e0..7acf830 100644
--- a/gui/ThemeEngine.h
+++ b/gui/ThemeEngine.h
@@ -36,7 +36,7 @@
#include "graphics/pixelformat.h"
-#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.8.20"
+#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.8.21"
class OSystem;
diff --git a/gui/predictivedialog.cpp b/gui/predictivedialog.cpp
index ee8973b..402bf0c 100644
--- a/gui/predictivedialog.cpp
+++ b/gui/predictivedialog.cpp
@@ -24,6 +24,7 @@
#include "gui/widget.h"
#include "gui/widgets/edittext.h"
#include "gui/gui-manager.h"
+#include "gui/ThemeEval.h"
#include "common/config-manager.h"
#include "common/translation.h"
@@ -89,11 +90,13 @@ PredictiveDialog::PredictiveDialog() : Dialog("Predictive") {
_btns[kAddAct]->setEnabled(false);
#ifndef DISABLE_FANCY_THEMES
- _btns[kDelAct] = new PicButtonWidget(this, "Predictive.Delete", _("Delete char"), kDelCmd);
- ((PicButtonWidget *)_btns[kDelAct])->useThemeTransparency(true);
- ((PicButtonWidget *)_btns[kDelAct])->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageDelbtn));
+ if (g_gui.xmlEval()->getVar("Globals.Predictive.ShowDeletePic") == 1 && g_gui.theme()->supportsImages()) {
+ _btns[kDelAct] = new PicButtonWidget(this, "Predictive.Delete", _("Delete char"), kDelCmd);
+ ((PicButtonWidget *)_btns[kDelAct])->useThemeTransparency(true);
+ ((PicButtonWidget *)_btns[kDelAct])->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageDelbtn));
+ } else
#endif
- _btns[kDelAct] = new ButtonWidget(this, "Predictive.Delete" , _("<") , 0, kDelCmd);
+ _btns[kDelAct] = new ButtonWidget(this, "Predictive.Delete" , _("<") , 0, kDelCmd);
// I18N: Pre means 'Predictive', leave '*' as is
_btns[kModeAct] = new ButtonWidget(this, "Predictive.Pre", _("* Pre"), 0, kModeCmd);
_edittext = new EditTextWidget(this, "Predictive.Word", _search, 0, 0, 0);
@@ -171,6 +174,25 @@ PredictiveDialog::~PredictiveDialog() {
free(_btns);
}
+void PredictiveDialog::reflowLayout() {
+#ifndef DISABLE_FANCY_THEMES
+ removeWidget(_btns[kDelAct]);
+ _btns[kDelAct]->setNext(0);
+ delete _btns[kDelAct];
+ _btns[kDelAct] = nullptr;
+
+ if (g_gui.xmlEval()->getVar("Globals.Predictive.ShowDeletePic") == 1 && g_gui.theme()->supportsImages()) {
+ _btns[kDelAct] = new PicButtonWidget(this, "Predictive.Delete", _("Delete char"), kDelCmd);
+ ((PicButtonWidget *)_btns[kDelAct])->useThemeTransparency(true);
+ ((PicButtonWidget *)_btns[kDelAct])->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageDelbtn));
+ } else {
+ _btns[kDelAct] = new ButtonWidget(this, "Predictive.Delete" , _("<") , 0, kDelCmd);
+ }
+#endif
+
+ Dialog::reflowLayout();
+}
+
void PredictiveDialog::saveUserDictToFile() {
if (_userDictHasChanged) {
ConfMan.registerDefault("user_dictionary", "user.dic");
diff --git a/gui/predictivedialog.h b/gui/predictivedialog.h
index 32d769d..7f9b31e 100644
--- a/gui/predictivedialog.h
+++ b/gui/predictivedialog.h
@@ -68,6 +68,8 @@ public:
PredictiveDialog();
~PredictiveDialog();
+ virtual void reflowLayout();
+
virtual void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data);
virtual void handleKeyUp(Common::KeyState state);
virtual void handleKeyDown(Common::KeyState state);
diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index 90d7967..e367bcb 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -633,6 +633,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"<def var='Tooltip.XDelta' value='16'/> "
"<def var='Tooltip.YDelta' value='16'/>"
"<def var='Predictive.Button.Width' value='60' />"
+"<def var='Predictive.ShowDeletePic' value='0'/>"
"<widget name='OptionsLabel' "
"size='110,Globals.Line.Height' "
"textalign='right' "
@@ -1920,6 +1921,7 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
"<def var='Tooltip.YDelta' value='8'/>"
"<def var='Predictive.Button.Width' value='45' />"
"<def var='Predictive.Button.Height' value='15' />"
+"<def var='Predictive.ShowDeletePic' value='0'/>"
"<widget name='Button' "
"size='72,16' "
"/>"
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index d7016ca..1d8b8da 100644
Binary files a/gui/themes/scummclassic.zip and b/gui/themes/scummclassic.zip differ
diff --git a/gui/themes/scummclassic/THEMERC b/gui/themes/scummclassic/THEMERC
index 8f40cb2..7e58285 100644
--- a/gui/themes/scummclassic/THEMERC
+++ b/gui/themes/scummclassic/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.8.20:ScummVM Classic Theme:No Author]
+[SCUMMVM_STX0.8.21:ScummVM Classic Theme:No Author]
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index 26656de..18c2a1f 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -49,6 +49,7 @@
<def var = 'Tooltip.YDelta' value = '16'/>
<def var = 'Predictive.Button.Width' value = '60' />
+ <def var = 'Predictive.ShowDeletePic' value = '0'/>
<widget name = 'OptionsLabel'
size = '110, Globals.Line.Height'
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index 60057fa..6cc9eed 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -51,6 +51,7 @@
<def var = 'Predictive.Button.Width' value = '45' />
<def var = 'Predictive.Button.Height' value = '15' />
+ <def var = 'Predictive.ShowDeletePic' value = '0'/>
<widget name = 'Button'
size = '72, 16'
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 5bf1b8e..43826ab 100644
Binary files a/gui/themes/scummmodern.zip and b/gui/themes/scummmodern.zip differ
diff --git a/gui/themes/scummmodern/THEMERC b/gui/themes/scummmodern/THEMERC
index f430462..dc98bdc 100644
--- a/gui/themes/scummmodern/THEMERC
+++ b/gui/themes/scummmodern/THEMERC
@@ -1 +1 @@
-[SCUMMVM_STX0.8.20:ScummVM Modern Theme:No Author]
+[SCUMMVM_STX0.8.21:ScummVM Modern Theme:No Author]
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index 3254049..fd6a3c5 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -56,6 +56,7 @@
<def var = 'Tooltip.YDelta' value = '32'/>
<def var = 'Predictive.Button.Width' value = '60' />
+ <def var = 'Predictive.ShowDeletePic' value = '1'/>
<widget name = 'OptionsLabel'
size = '115, Globals.Line.Height'
diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
index 2b4dc09..9d8f797 100644
--- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx
+++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
@@ -41,6 +41,7 @@
<def var = 'Predictive.Button.Width' value = '45' />
<def var = 'Predictive.Button.Height' value = '15' />
+ <def var = 'Predictive.ShowDeletePic' value = '0'/>
<widget name = 'Button'
size = '72, 16'
Commit: 66a815a21433b72faaa403ae14d31cd57b80e492
https://github.com/scummvm/scummvm/commit/66a815a21433b72faaa403ae14d31cd57b80e492
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-24T03:10:13+01:00
Commit Message:
GUI: Set PredictiveDialog's debug output to level 5+.
Changed paths:
gui/predictivedialog.cpp
diff --git a/gui/predictivedialog.cpp b/gui/predictivedialog.cpp
index 402bf0c..ad363da 100644
--- a/gui/predictivedialog.cpp
+++ b/gui/predictivedialog.cpp
@@ -121,7 +121,7 @@ PredictiveDialog::PredictiveDialog() : Dialog("Predictive") {
if (!_predictiveDict.dictText) {
loadAllDictionary(_predictiveDict);
if (!_predictiveDict.dictText)
- debug("Predictive Dialog: pred.dic not loaded");
+ debug(5, "Predictive Dialog: pred.dic not loaded");
}
_userDict.dictLine = NULL;
@@ -132,7 +132,7 @@ PredictiveDialog::PredictiveDialog() : Dialog("Predictive") {
if (!_userDict.dictText) {
loadAllDictionary(_userDict);
if (!_userDict.dictText)
- debug("Predictive Dialog: user.dic not loaded");
+ debug(5, "Predictive Dialog: user.dic not loaded");
}
mergeDicts();
@@ -580,7 +580,7 @@ void PredictiveDialog::processBtnActive(ButtonId button) {
if (_mode == kModeAbc)
addWordToDict();
else
- debug("Predictive Dialog: button Add doesn't work in this mode");
+ debug(5, "Predictive Dialog: button Add doesn't work in this mode");
} else if (button == kOkAct) { // Ok
// bring MRU word at the top of the list when ok'ed out of the dialog
if (_mode == kModePre && _unitedDict.dictActLine && _numMatchingWords > 1 && _wordNumber != 0)
@@ -643,7 +643,7 @@ void PredictiveDialog::mergeDicts() {
_unitedDict.dictLine = (char **)calloc(_unitedDict.dictLineCount, sizeof(char *));
if (!_unitedDict.dictLine) {
- debug("Predictive Dialog: cannot allocate memory for united dic");
+ debug(5, "Predictive Dialog: cannot allocate memory for united dic");
return;
}
@@ -680,7 +680,7 @@ uint8 PredictiveDialog::countWordsInString(const char *const str) {
ptr = strchr(str, ' ');
if (!ptr) {
- debug("Predictive Dialog: Invalid dictionary line");
+ debug(5, "Predictive Dialog: Invalid dictionary line");
return 0;
}
@@ -706,7 +706,7 @@ void PredictiveDialog::bringWordtoTop(char *str, int wordnum) {
buf[kMaxLineLen - 1] = 0;
char *word = strtok(buf, " ");
if (!word) {
- debug("Predictive Dialog: Invalid dictionary line");
+ debug(5, "Predictive Dialog: Invalid dictionary line");
return;
}
@@ -951,7 +951,7 @@ void PredictiveDialog::loadDictionary(Common::SeekableReadStream *in, Dict &dict
in->read(dict.dictText, dict.dictTextSize);
dict.dictText[dict.dictTextSize] = 0;
uint32 time2 = g_system->getMillis();
- debug("Predictive Dialog: Time to read %s: %d bytes, %d ms", ConfMan.get(dict.nameDict).c_str(), dict.dictTextSize, time2 - time1);
+ debug(5, "Predictive Dialog: Time to read %s: %d bytes, %d ms", ConfMan.get(dict.nameDict).c_str(), dict.dictTextSize, time2 - time1);
delete in;
char *ptr = dict.dictText;
@@ -982,7 +982,7 @@ void PredictiveDialog::loadDictionary(Common::SeekableReadStream *in, Dict &dict
lines--;
dict.dictLineCount = lines;
- debug("Predictive Dialog: Loaded %d lines", dict.dictLineCount);
+ debug(5, "Predictive Dialog: Loaded %d lines", dict.dictLineCount);
// FIXME: We use binary search on _predictiveDict.dictLine, yet we make no at_tempt
// to ever sort this array (except for the DS port). That seems risky, doesn't it?
@@ -993,7 +993,7 @@ void PredictiveDialog::loadDictionary(Common::SeekableReadStream *in, Dict &dict
#endif
uint32 time3 = g_system->getMillis();
- debug("Predictive Dialog: Time to parse %s: %d, total: %d", ConfMan.get(dict.nameDict).c_str(), time3 - time2, time3 - time1);
+ debug(5, "Predictive Dialog: Time to parse %s: %d, total: %d", ConfMan.get(dict.nameDict).c_str(), time3 - time2, time3 - time1);
}
void PredictiveDialog::loadAllDictionary(Dict &dict) {
Commit: 144765827fdfe459bd82be34661a51ffec415944
https://github.com/scummvm/scummvm/commit/144765827fdfe459bd82be34661a51ffec415944
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-24T03:14:09+01:00
Commit Message:
GUI: Improve variable naming in PredictiveDialog.
Changed paths:
gui/predictivedialog.cpp
gui/predictivedialog.h
diff --git a/gui/predictivedialog.cpp b/gui/predictivedialog.cpp
index ad363da..06dcd67 100644
--- a/gui/predictivedialog.cpp
+++ b/gui/predictivedialog.cpp
@@ -104,15 +104,15 @@ PredictiveDialog::PredictiveDialog() : Dialog("Predictive") {
_userDictHasChanged = false;
_predictiveDict.nameDict = "predictive_dictionary";
- _predictiveDict.fnameDict = "pred.dic";
+ _predictiveDict.defaultFilename = "pred.dic";
_predictiveDict.dictActLine = NULL;
_userDict.nameDict = "user_dictionary";
- _userDict.fnameDict = "user.dic";
+ _userDict.defaultFilename = "user.dic";
_userDict.dictActLine = NULL;
_unitedDict.nameDict = "";
- _unitedDict.fnameDict = "";
+ _unitedDict.defaultFilename = "";
_predictiveDict.dictLine = NULL;
_predictiveDict.dictText = NULL;
@@ -997,19 +997,19 @@ void PredictiveDialog::loadDictionary(Common::SeekableReadStream *in, Dict &dict
}
void PredictiveDialog::loadAllDictionary(Dict &dict) {
- ConfMan.registerDefault(dict.nameDict, dict.fnameDict);
+ ConfMan.registerDefault(dict.nameDict, dict.defaultFilename);
if (dict.nameDict == "predictive_dictionary") {
Common::File *inFile = new Common::File();
if (!inFile->open(ConfMan.get(dict.nameDict))) {
- warning("Predictive Dialog: cannot read file: %s", dict.fnameDict.c_str());
+ warning("Predictive Dialog: cannot read file: %s", dict.defaultFilename.c_str());
return;
}
loadDictionary(inFile, dict);
} else {
Common::InSaveFile *inFile = g_system->getSavefileManager()->openForLoading(ConfMan.get(dict.nameDict));
if (!inFile) {
- warning("Predictive Dialog: cannot read file: %s", dict.fnameDict.c_str());
+ warning("Predictive Dialog: cannot read file: %s", dict.defaultFilename.c_str());
return;
}
loadDictionary(inFile, dict);
diff --git a/gui/predictivedialog.h b/gui/predictivedialog.h
index 7f9b31e..9074089 100644
--- a/gui/predictivedialog.h
+++ b/gui/predictivedialog.h
@@ -84,7 +84,7 @@ private:
int32 dictLineCount;
int32 dictTextSize;
Common::String nameDict;
- Common::String fnameDict;
+ Common::String defaultFilename;
};
uint8 countWordsInString(const char *const str);
Commit: c72d95cbcc81d4a9f2a51f7147e1d805c46e0d82
https://github.com/scummvm/scummvm/commit/c72d95cbcc81d4a9f2a51f7147e1d805c46e0d82
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-24T03:19:59+01:00
Commit Message:
GUI: Add constructor instead of duplicating initialization.
Changed paths:
gui/predictivedialog.cpp
gui/predictivedialog.h
diff --git a/gui/predictivedialog.cpp b/gui/predictivedialog.cpp
index 06dcd67..627e6c1 100644
--- a/gui/predictivedialog.cpp
+++ b/gui/predictivedialog.cpp
@@ -105,18 +105,9 @@ PredictiveDialog::PredictiveDialog() : Dialog("Predictive") {
_predictiveDict.nameDict = "predictive_dictionary";
_predictiveDict.defaultFilename = "pred.dic";
- _predictiveDict.dictActLine = NULL;
_userDict.nameDict = "user_dictionary";
_userDict.defaultFilename = "user.dic";
- _userDict.dictActLine = NULL;
-
- _unitedDict.nameDict = "";
- _unitedDict.defaultFilename = "";
-
- _predictiveDict.dictLine = NULL;
- _predictiveDict.dictText = NULL;
- _predictiveDict.dictLineCount = 0;
if (!_predictiveDict.dictText) {
loadAllDictionary(_predictiveDict);
@@ -124,11 +115,6 @@ PredictiveDialog::PredictiveDialog() : Dialog("Predictive") {
debug(5, "Predictive Dialog: pred.dic not loaded");
}
- _userDict.dictLine = NULL;
- _userDict.dictText = NULL;
- _userDict.dictTextSize = 0;
- _userDict.dictLineCount = 0;
-
if (!_userDict.dictText) {
loadAllDictionary(_userDict);
if (!_userDict.dictText)
@@ -137,9 +123,6 @@ PredictiveDialog::PredictiveDialog() : Dialog("Predictive") {
mergeDicts();
- _unitedDict.dictActLine = NULL;
- _unitedDict.dictText = NULL;
-
memset(_repeatcount, 0, sizeof(_repeatcount));
_prefix.clear();
diff --git a/gui/predictivedialog.h b/gui/predictivedialog.h
index 9074089..a7b7b99 100644
--- a/gui/predictivedialog.h
+++ b/gui/predictivedialog.h
@@ -78,6 +78,8 @@ public:
const char *getResult() const { return _predictiveResult; }
private:
struct Dict {
+ Dict() : dictLine(nullptr), dictText(nullptr), dictActLine(nullptr),
+ dictLineCount(0), dictTextSize(0) {}
char **dictLine;
char *dictText;
char *dictActLine; // using only for united dict...
Commit: 7c687a05c7e986d99f459f8efcb7bebcb53514d6
https://github.com/scummvm/scummvm/commit/7c687a05c7e986d99f459f8efcb7bebcb53514d6
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-24T03:22:26+01:00
Commit Message:
GUI: Make PredictiveDialog::_btns a fixed size array.
Changed paths:
gui/predictivedialog.cpp
gui/predictivedialog.h
diff --git a/gui/predictivedialog.cpp b/gui/predictivedialog.cpp
index 627e6c1..e7766de 100644
--- a/gui/predictivedialog.cpp
+++ b/gui/predictivedialog.cpp
@@ -70,8 +70,6 @@ enum {
PredictiveDialog::PredictiveDialog() : Dialog("Predictive") {
new StaticTextWidget(this, "Predictive.Headline", "Enter Text");
- _btns = (ButtonWidget **)calloc(16, sizeof(ButtonWidget *));
-
_btns[kCancelAct] = new ButtonWidget(this, "Predictive.Cancel", _("Cancel") , 0, kCancelCmd);
_btns[kOkAct] = new ButtonWidget(this, "Predictive.OK", _("Ok") , 0, kOkCmd);
_btns[kBtn1Act] = new ButtonWidget(this, "Predictive.Button1", "1 `-.&" , 0, kBut1Cmd);
@@ -153,8 +151,6 @@ PredictiveDialog::~PredictiveDialog() {
free(_userDict.dictLine);
free(_predictiveDict.dictLine);
free(_unitedDict.dictLine);
-
- free(_btns);
}
void PredictiveDialog::reflowLayout() {
diff --git a/gui/predictivedialog.h b/gui/predictivedialog.h
index a7b7b99..c64fcc8 100644
--- a/gui/predictivedialog.h
+++ b/gui/predictivedialog.h
@@ -54,6 +54,10 @@ enum ButtonId {
};
enum {
+ kButtonCount = kBtn0Act + 1
+};
+
+enum {
kRepeatDelay = 500
};
@@ -140,7 +144,7 @@ private:
bool _needRefresh;
private:
EditTextWidget *_edittext;
- ButtonWidget **_btns;
+ ButtonWidget *_btns[kButtonCount];
};
} // namespace GUI
Commit: adbbe6b1130e6a6b5b18a2430ace59af5fd72f71
https://github.com/scummvm/scummvm/commit/adbbe6b1130e6a6b5b18a2430ace59af5fd72f71
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-24T03:37:33+01:00
Commit Message:
GUI: Improve naming of PredictiveDialog's members.
Changed paths:
gui/predictivedialog.cpp
gui/predictivedialog.h
diff --git a/gui/predictivedialog.cpp b/gui/predictivedialog.cpp
index e7766de..a9f0605 100644
--- a/gui/predictivedialog.cpp
+++ b/gui/predictivedialog.cpp
@@ -70,34 +70,34 @@ enum {
PredictiveDialog::PredictiveDialog() : Dialog("Predictive") {
new StaticTextWidget(this, "Predictive.Headline", "Enter Text");
- _btns[kCancelAct] = new ButtonWidget(this, "Predictive.Cancel", _("Cancel") , 0, kCancelCmd);
- _btns[kOkAct] = new ButtonWidget(this, "Predictive.OK", _("Ok") , 0, kOkCmd);
- _btns[kBtn1Act] = new ButtonWidget(this, "Predictive.Button1", "1 `-.&" , 0, kBut1Cmd);
- _btns[kBtn2Act] = new ButtonWidget(this, "Predictive.Button2", "2 abc" , 0, kBut2Cmd);
- _btns[kBtn3Act] = new ButtonWidget(this, "Predictive.Button3", "3 def" , 0, kBut3Cmd);
- _btns[kBtn4Act] = new ButtonWidget(this, "Predictive.Button4", "4 ghi" , 0, kBut4Cmd);
- _btns[kBtn5Act] = new ButtonWidget(this, "Predictive.Button5", "5 jkl" , 0, kBut5Cmd);
- _btns[kBtn6Act] = new ButtonWidget(this, "Predictive.Button6", "6 mno" , 0, kBut6Cmd);
- _btns[kBtn7Act] = new ButtonWidget(this, "Predictive.Button7", "7 pqrs" , 0, kBut7Cmd);
- _btns[kBtn8Act] = new ButtonWidget(this, "Predictive.Button8", "8 tuv" , 0, kBut8Cmd);
- _btns[kBtn9Act] = new ButtonWidget(this, "Predictive.Button9", "9 wxyz" , 0, kBut9Cmd);
- _btns[kBtn0Act] = new ButtonWidget(this, "Predictive.Button0", "0" , 0, kBut0Cmd);
+ _button[kCancelAct] = new ButtonWidget(this, "Predictive.Cancel", _("Cancel") , 0, kCancelCmd);
+ _button[kOkAct] = new ButtonWidget(this, "Predictive.OK", _("Ok") , 0, kOkCmd);
+ _button[kButton1Act] = new ButtonWidget(this, "Predictive.Button1", "1 `-.&" , 0, kBut1Cmd);
+ _button[kButton2Act] = new ButtonWidget(this, "Predictive.Button2", "2 abc" , 0, kBut2Cmd);
+ _button[kButton3Act] = new ButtonWidget(this, "Predictive.Button3", "3 def" , 0, kBut3Cmd);
+ _button[kButton4Act] = new ButtonWidget(this, "Predictive.Button4", "4 ghi" , 0, kBut4Cmd);
+ _button[kButton5Act] = new ButtonWidget(this, "Predictive.Button5", "5 jkl" , 0, kBut5Cmd);
+ _button[kButton6Act] = new ButtonWidget(this, "Predictive.Button6", "6 mno" , 0, kBut6Cmd);
+ _button[kButton7Act] = new ButtonWidget(this, "Predictive.Button7", "7 pqrs" , 0, kBut7Cmd);
+ _button[kButton8Act] = new ButtonWidget(this, "Predictive.Button8", "8 tuv" , 0, kBut8Cmd);
+ _button[kButton9Act] = new ButtonWidget(this, "Predictive.Button9", "9 wxyz" , 0, kBut9Cmd);
+ _button[kButton0Act] = new ButtonWidget(this, "Predictive.Button0", "0" , 0, kBut0Cmd);
// I18N: You must leave "#" as is, only word 'next' is translatable
- _btns[kNextAct] = new ButtonWidget(this, "Predictive.Next", _("# next") , 0, kNextCmd);
- _btns[kAddAct] = new ButtonWidget(this, "Predictive.Add", _("add") , 0, kAddCmd);
- _btns[kAddAct]->setEnabled(false);
+ _button[kNextAct] = new ButtonWidget(this, "Predictive.Next", _("# next") , 0, kNextCmd);
+ _button[kAddAct] = new ButtonWidget(this, "Predictive.Add", _("add") , 0, kAddCmd);
+ _button[kAddAct]->setEnabled(false);
#ifndef DISABLE_FANCY_THEMES
if (g_gui.xmlEval()->getVar("Globals.Predictive.ShowDeletePic") == 1 && g_gui.theme()->supportsImages()) {
- _btns[kDelAct] = new PicButtonWidget(this, "Predictive.Delete", _("Delete char"), kDelCmd);
- ((PicButtonWidget *)_btns[kDelAct])->useThemeTransparency(true);
- ((PicButtonWidget *)_btns[kDelAct])->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageDelbtn));
+ _button[kDelAct] = new PicButtonWidget(this, "Predictive.Delete", _("Delete char"), kDelCmd);
+ ((PicButtonWidget *)_button[kDelAct])->useThemeTransparency(true);
+ ((PicButtonWidget *)_button[kDelAct])->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageDelbtn));
} else
#endif
- _btns[kDelAct] = new ButtonWidget(this, "Predictive.Delete" , _("<") , 0, kDelCmd);
+ _button[kDelAct] = new ButtonWidget(this, "Predictive.Delete" , _("<") , 0, kDelCmd);
// I18N: Pre means 'Predictive', leave '*' as is
- _btns[kModeAct] = new ButtonWidget(this, "Predictive.Pre", _("* Pre"), 0, kModeCmd);
- _edittext = new EditTextWidget(this, "Predictive.Word", _search, 0, 0, 0);
+ _button[kModeAct] = new ButtonWidget(this, "Predictive.Pre", _("* Pre"), 0, kModeCmd);
+ _editText = new EditTextWidget(this, "Predictive.Word", _search, 0, 0, 0);
_userDictHasChanged = false;
@@ -130,18 +130,18 @@ PredictiveDialog::PredictiveDialog() : Dialog("Predictive") {
_numMatchingWords = 0;
memset(_predictiveResult, 0, sizeof(_predictiveResult));
- _lastbutton = kNoAct;
+ _lastButton = kNoAct;
_mode = kModePre;
_lastTime = 0;
_curTime = 0;
- _lastPressBtn = kNoAct;
+ _lastPressedButton = kNoAct;
_memoryList[0] = _predictiveDict.dictText;
_memoryList[1] = _userDict.dictText;
_numMemory = 0;
- _navigationwithkeys = false;
+ _navigationWithKeys = false;
}
PredictiveDialog::~PredictiveDialog() {
@@ -155,17 +155,17 @@ PredictiveDialog::~PredictiveDialog() {
void PredictiveDialog::reflowLayout() {
#ifndef DISABLE_FANCY_THEMES
- removeWidget(_btns[kDelAct]);
- _btns[kDelAct]->setNext(0);
- delete _btns[kDelAct];
- _btns[kDelAct] = nullptr;
+ removeWidget(_button[kDelAct]);
+ _button[kDelAct]->setNext(0);
+ delete _button[kDelAct];
+ _button[kDelAct] = nullptr;
if (g_gui.xmlEval()->getVar("Globals.Predictive.ShowDeletePic") == 1 && g_gui.theme()->supportsImages()) {
- _btns[kDelAct] = new PicButtonWidget(this, "Predictive.Delete", _("Delete char"), kDelCmd);
- ((PicButtonWidget *)_btns[kDelAct])->useThemeTransparency(true);
- ((PicButtonWidget *)_btns[kDelAct])->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageDelbtn));
+ _button[kDelAct] = new PicButtonWidget(this, "Predictive.Delete", _("Delete char"), kDelCmd);
+ ((PicButtonWidget *)_button[kDelAct])->useThemeTransparency(true);
+ ((PicButtonWidget *)_button[kDelAct])->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageDelbtn));
} else {
- _btns[kDelAct] = new ButtonWidget(this, "Predictive.Delete" , _("<") , 0, kDelCmd);
+ _button[kDelAct] = new ButtonWidget(this, "Predictive.Delete" , _("<") , 0, kDelCmd);
}
#endif
@@ -189,22 +189,22 @@ void PredictiveDialog::saveUserDictToFile() {
}
void PredictiveDialog::handleKeyUp(Common::KeyState state) {
- if (_currBtn != kNoAct && !_needRefresh) {
- _btns[_currBtn]->startAnimatePressedState();
- processBtnActive(_currBtn);
+ if (_curPressedButton != kNoAct && !_needRefresh) {
+ _button[_curPressedButton]->startAnimatePressedState();
+ processButton(_curPressedButton);
}
}
void PredictiveDialog::handleKeyDown(Common::KeyState state) {
- _currBtn = kNoAct;
+ _curPressedButton = kNoAct;
_needRefresh = false;
- if (getFocusWidget() == _edittext) {
- setFocusWidget(_btns[kAddAct]);
+ if (getFocusWidget() == _editText) {
+ setFocusWidget(_button[kAddAct]);
}
- if (_lastbutton == kNoAct) {
- _lastbutton = kBtn5Act;
+ if (_lastButton == kNoAct) {
+ _lastButton = kButton5Act;
}
switch (state.keycode) {
@@ -213,128 +213,128 @@ void PredictiveDialog::handleKeyDown(Common::KeyState state) {
close();
return;
case Common::KEYCODE_LEFT:
- _navigationwithkeys = true;
- if (_lastbutton == kBtn1Act || _lastbutton == kBtn4Act || _lastbutton == kBtn7Act)
- _currBtn = ButtonId(_lastbutton + 2);
- else if (_lastbutton == kDelAct)
- _currBtn = kBtn1Act;
- else if (_lastbutton == kModeAct)
- _currBtn = kNextAct;
- else if (_lastbutton == kNextAct)
- _currBtn = kBtn0Act;
- else if (_lastbutton == kAddAct)
- _currBtn = kOkAct;
- else if (_lastbutton == kCancelAct)
- _currBtn = kAddAct;
+ _navigationWithKeys = true;
+ if (_lastButton == kButton1Act || _lastButton == kButton4Act || _lastButton == kButton7Act)
+ _curPressedButton = ButtonId(_lastButton + 2);
+ else if (_lastButton == kDelAct)
+ _curPressedButton = kButton1Act;
+ else if (_lastButton == kModeAct)
+ _curPressedButton = kNextAct;
+ else if (_lastButton == kNextAct)
+ _curPressedButton = kButton0Act;
+ else if (_lastButton == kAddAct)
+ _curPressedButton = kOkAct;
+ else if (_lastButton == kCancelAct)
+ _curPressedButton = kAddAct;
else
- _currBtn = ButtonId(_lastbutton - 1);
+ _curPressedButton = ButtonId(_lastButton - 1);
- if (_mode != kModeAbc && _lastbutton == kCancelAct)
- _currBtn = kOkAct;
+ if (_mode != kModeAbc && _lastButton == kCancelAct)
+ _curPressedButton = kOkAct;
_needRefresh = true;
break;
case Common::KEYCODE_RIGHT:
- _navigationwithkeys = true;
- if (_lastbutton == kBtn3Act || _lastbutton == kBtn6Act || _lastbutton == kBtn9Act || _lastbutton == kOkAct)
- _currBtn = ButtonId(_lastbutton - 2);
- else if (_lastbutton == kDelAct)
- _currBtn = kBtn3Act;
- else if (_lastbutton == kBtn0Act)
- _currBtn = kNextAct;
- else if (_lastbutton == kNextAct)
- _currBtn = kModeAct;
- else if (_lastbutton == kAddAct)
- _currBtn = kCancelAct;
- else if (_lastbutton == kOkAct)
- _currBtn = kAddAct;
+ _navigationWithKeys = true;
+ if (_lastButton == kButton3Act || _lastButton == kButton6Act || _lastButton == kButton9Act || _lastButton == kOkAct)
+ _curPressedButton = ButtonId(_lastButton - 2);
+ else if (_lastButton == kDelAct)
+ _curPressedButton = kButton3Act;
+ else if (_lastButton == kButton0Act)
+ _curPressedButton = kNextAct;
+ else if (_lastButton == kNextAct)
+ _curPressedButton = kModeAct;
+ else if (_lastButton == kAddAct)
+ _curPressedButton = kCancelAct;
+ else if (_lastButton == kOkAct)
+ _curPressedButton = kAddAct;
else
- _currBtn = ButtonId(_lastbutton + 1);
+ _curPressedButton = ButtonId(_lastButton + 1);
- if (_mode != kModeAbc && _lastbutton == kOkAct)
- _currBtn = kCancelAct;
+ if (_mode != kModeAbc && _lastButton == kOkAct)
+ _curPressedButton = kCancelAct;
_needRefresh = true;
break;
case Common::KEYCODE_UP:
- _navigationwithkeys = true;
- if (_lastbutton <= kBtn3Act)
- _currBtn = kDelAct;
- else if (_lastbutton == kDelAct)
- _currBtn = kOkAct;
- else if (_lastbutton == kModeAct)
- _currBtn = kBtn7Act;
- else if (_lastbutton == kBtn0Act)
- _currBtn = kBtn8Act;
- else if (_lastbutton == kNextAct)
- _currBtn = kBtn9Act;
- else if (_lastbutton == kAddAct)
- _currBtn = kModeAct;
- else if (_lastbutton == kCancelAct)
- _currBtn = kBtn0Act;
- else if (_lastbutton == kOkAct)
- _currBtn = kNextAct;
+ _navigationWithKeys = true;
+ if (_lastButton <= kButton3Act)
+ _curPressedButton = kDelAct;
+ else if (_lastButton == kDelAct)
+ _curPressedButton = kOkAct;
+ else if (_lastButton == kModeAct)
+ _curPressedButton = kButton7Act;
+ else if (_lastButton == kButton0Act)
+ _curPressedButton = kButton8Act;
+ else if (_lastButton == kNextAct)
+ _curPressedButton = kButton9Act;
+ else if (_lastButton == kAddAct)
+ _curPressedButton = kModeAct;
+ else if (_lastButton == kCancelAct)
+ _curPressedButton = kButton0Act;
+ else if (_lastButton == kOkAct)
+ _curPressedButton = kNextAct;
else
- _currBtn = ButtonId(_lastbutton - 3);
+ _curPressedButton = ButtonId(_lastButton - 3);
_needRefresh = true;
break;
case Common::KEYCODE_DOWN:
- _navigationwithkeys = true;
- if (_lastbutton == kDelAct)
- _currBtn = kBtn3Act;
- else if (_lastbutton == kBtn7Act)
- _currBtn = kModeAct;
- else if (_lastbutton == kBtn8Act)
- _currBtn = kBtn0Act;
- else if (_lastbutton == kBtn9Act)
- _currBtn = kNextAct;
- else if (_lastbutton == kModeAct)
- _currBtn = kAddAct;
- else if (_lastbutton == kBtn0Act)
- _currBtn = kCancelAct;
- else if (_lastbutton == kNextAct)
- _currBtn = kOkAct;
- else if (_lastbutton == kAddAct || _lastbutton == kCancelAct || _lastbutton == kOkAct)
- _currBtn = kDelAct;
+ _navigationWithKeys = true;
+ if (_lastButton == kDelAct)
+ _curPressedButton = kButton3Act;
+ else if (_lastButton == kButton7Act)
+ _curPressedButton = kModeAct;
+ else if (_lastButton == kButton8Act)
+ _curPressedButton = kButton0Act;
+ else if (_lastButton == kButton9Act)
+ _curPressedButton = kNextAct;
+ else if (_lastButton == kModeAct)
+ _curPressedButton = kAddAct;
+ else if (_lastButton == kButton0Act)
+ _curPressedButton = kCancelAct;
+ else if (_lastButton == kNextAct)
+ _curPressedButton = kOkAct;
+ else if (_lastButton == kAddAct || _lastButton == kCancelAct || _lastButton == kOkAct)
+ _curPressedButton = kDelAct;
else
- _currBtn = ButtonId(_lastbutton + 3);
+ _curPressedButton = ButtonId(_lastButton + 3);
- if (_mode != kModeAbc && _lastbutton == kModeAct)
- _currBtn = kCancelAct;
+ if (_mode != kModeAbc && _lastButton == kModeAct)
+ _curPressedButton = kCancelAct;
_needRefresh = true;
break;
case Common::KEYCODE_KP_ENTER:
case Common::KEYCODE_RETURN:
if (state.flags & Common::KBD_CTRL) {
- _currBtn = kOkAct;
+ _curPressedButton = kOkAct;
break;
}
- if (_navigationwithkeys) {
+ if (_navigationWithKeys) {
// when the user has utilized arrow key navigation,
- // interpret enter as 'click' on the _currBtn button
- _currBtn = _lastbutton;
+ // interpret enter as 'click' on the _curPressedButton button
+ _curPressedButton = _lastButton;
_needRefresh = false;
} else {
// else it is a shortcut for 'Ok'
- _currBtn = kOkAct;
+ _curPressedButton = kOkAct;
}
break;
case Common::KEYCODE_KP_PLUS:
- _currBtn = kAddAct;
+ _curPressedButton = kAddAct;
break;
case Common::KEYCODE_BACKSPACE:
case Common::KEYCODE_KP_MINUS:
- _currBtn = kDelAct;
+ _curPressedButton = kDelAct;
break;
case Common::KEYCODE_KP_DIVIDE:
- _currBtn = kNextAct;
+ _curPressedButton = kNextAct;
break;
case Common::KEYCODE_KP_MULTIPLY:
- _currBtn = kModeAct;
+ _curPressedButton = kModeAct;
break;
case Common::KEYCODE_KP0:
- _currBtn = kBtn0Act;
+ _curPressedButton = kButton0Act;
break;
case Common::KEYCODE_KP1:
case Common::KEYCODE_KP2:
@@ -345,79 +345,79 @@ void PredictiveDialog::handleKeyDown(Common::KeyState state) {
case Common::KEYCODE_KP7:
case Common::KEYCODE_KP8:
case Common::KEYCODE_KP9:
- _currBtn = ButtonId(state.keycode - Common::KEYCODE_KP1);
+ _curPressedButton = ButtonId(state.keycode - Common::KEYCODE_KP1);
break;
default:
Dialog::handleKeyDown(state);
}
- if (_lastbutton != _currBtn)
- _btns[_lastbutton]->stopAnimatePressedState();
+ if (_lastButton != _curPressedButton)
+ _button[_lastButton]->stopAnimatePressedState();
- if (_currBtn != kNoAct && !_needRefresh)
- _btns[_currBtn]->setPressedState();
+ if (_curPressedButton != kNoAct && !_needRefresh)
+ _button[_curPressedButton]->setPressedState();
else
- updateHighLightedButton(_currBtn);
+ updateHighLightedButton(_curPressedButton);
}
void PredictiveDialog::updateHighLightedButton(ButtonId act) {
- if (_currBtn != kNoAct) {
- _btns[_lastbutton]->setHighLighted(false);
- _lastbutton = act;
- _btns[_lastbutton]->setHighLighted(true);
+ if (_curPressedButton != kNoAct) {
+ _button[_lastButton]->setHighLighted(false);
+ _lastButton = act;
+ _button[_lastButton]->setHighLighted(true);
}
}
void PredictiveDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
- _currBtn = kNoAct;
+ _curPressedButton = kNoAct;
- _navigationwithkeys = false;
+ _navigationWithKeys = false;
- if (_lastbutton != kNoAct)
- _btns[_lastbutton]->setHighLighted(false);
+ if (_lastButton != kNoAct)
+ _button[_lastButton]->setHighLighted(false);
switch (cmd) {
case kDelCmd:
- _currBtn = kDelAct;
+ _curPressedButton = kDelAct;
break;
case kNextCmd:
- _currBtn = kNextAct;
+ _curPressedButton = kNextAct;
break;
case kAddCmd:
- _currBtn = kAddAct;
+ _curPressedButton = kAddAct;
break;
case kModeCmd:
- _currBtn = kModeAct;
+ _curPressedButton = kModeAct;
break;
case kBut1Cmd:
- _currBtn = kBtn1Act;
+ _curPressedButton = kButton1Act;
break;
case kBut2Cmd:
- _currBtn = kBtn2Act;
+ _curPressedButton = kButton2Act;
break;
case kBut3Cmd:
- _currBtn = kBtn3Act;
+ _curPressedButton = kButton3Act;
break;
case kBut4Cmd:
- _currBtn = kBtn4Act;
+ _curPressedButton = kButton4Act;
break;
case kBut5Cmd:
- _currBtn = kBtn5Act;
+ _curPressedButton = kButton5Act;
break;
case kBut6Cmd:
- _currBtn = kBtn6Act;
+ _curPressedButton = kButton6Act;
break;
case kBut7Cmd:
- _currBtn = kBtn7Act;
+ _curPressedButton = kButton7Act;
break;
case kBut8Cmd:
- _currBtn = kBtn8Act;
+ _curPressedButton = kButton8Act;
break;
case kBut9Cmd:
- _currBtn = kBtn9Act;
+ _curPressedButton = kButton9Act;
break;
case kBut0Cmd:
- _currBtn = kBtn0Act;
+ _curPressedButton = kButton0Act;
break;
case kCancelCmd:
saveUserDictToFile();
@@ -427,18 +427,18 @@ void PredictiveDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 d
_predictiveResult[0] = 0;
return;
case kOkCmd:
- _currBtn = kOkAct;
+ _curPressedButton = kOkAct;
break;
default:
Dialog::handleCommand(sender, cmd, data);
}
- if (_currBtn != kNoAct) {
- processBtnActive(_currBtn);
+ if (_curPressedButton != kNoAct) {
+ processButton(_curPressedButton);
}
}
-void PredictiveDialog::processBtnActive(ButtonId button) {
+void PredictiveDialog::processButton(ButtonId button) {
uint8 x;
static const char *const buttonStr[] = {
"1", "2", "3",
@@ -458,10 +458,10 @@ void PredictiveDialog::processBtnActive(ButtonId button) {
};
if (_mode == kModeAbc) {
- if (button >= kBtn1Act && button <= kBtn9Act) {
+ if (button >= kButton1Act && button <= kButton9Act) {
if (!_lastTime)
_lastTime = g_system->getMillis();
- if (_lastPressBtn == button) {
+ if (_lastPressedButton == button) {
_curTime = g_system->getMillis();
if ((_curTime - _lastTime) < kRepeatDelay) {
button = kNextAct;
@@ -470,15 +470,15 @@ void PredictiveDialog::processBtnActive(ButtonId button) {
_lastTime = 0;
}
} else {
- _lastPressBtn = button;
+ _lastPressedButton = button;
_lastTime = g_system->getMillis();
}
}
}
- if (button >= kBtn1Act) {
- _lastbutton = button;
- if (button == kBtn0Act && _mode != kModeNum) { // Space
+ if (button >= kButton1Act) {
+ _lastButton = button;
+ if (button == kButton0Act && _mode != kModeNum) { // Space
// bring MRU word at the top of the list when changing words
if (_mode == kModePre && _unitedDict.dictActLine && _numMatchingWords > 1 && _wordNumber != 0)
bringWordtoTop(_unitedDict.dictActLine, _wordNumber);
@@ -492,9 +492,9 @@ void PredictiveDialog::processBtnActive(ButtonId button) {
_numMatchingWords = 0;
memset(_repeatcount, 0, sizeof(_repeatcount));
_lastTime = 0;
- _lastPressBtn = kNoAct;
+ _lastPressedButton = kNoAct;
_curTime = 0;
- } else if (button < kNextAct || button == kDelAct || button == kBtn0Act) { // number or backspace
+ } else if (button < kNextAct || button == kDelAct || button == kButton0Act) { // number or backspace
if (button == kDelAct) { // backspace
if (_currentCode.size()) {
_repeatcount[_currentCode.size() - 1] = 0;
@@ -506,7 +506,7 @@ void PredictiveDialog::processBtnActive(ButtonId button) {
_prefix.deleteLastChar();
}
} else if (_prefix.size() + _currentCode.size() < kMaxWordLen - 1) { // don't overflow the dialog line
- if (button == kBtn0Act) { // zero
+ if (button == kButton0Act) { // zero
_currentCode += buttonStr[9];
} else {
_currentCode += buttonStr[button];
@@ -566,18 +566,18 @@ void PredictiveDialog::processBtnActive(ButtonId button) {
bringWordtoTop(_unitedDict.dictActLine, _wordNumber);
} else if (button == kModeAct) { // Mode
_mode++;
- _btns[kAddAct]->setEnabled(false);
+ _button[kAddAct]->setEnabled(false);
if (_mode > kModeAbc) {
_mode = kModePre;
// I18N: Pre means 'Predictive', leave '*' as is
- _btns[kModeAct]->setLabel("* Pre");
+ _button[kModeAct]->setLabel("* Pre");
} else if (_mode == kModeNum) {
// I18N: 'Num' means Numbers
- _btns[kModeAct]->setLabel("* Num");
+ _button[kModeAct]->setLabel("* Num");
} else {
// I18N: 'Abc' means Latin alphabet input
- _btns[kModeAct]->setLabel("* Abc");
- _btns[kAddAct]->setEnabled(true);
+ _button[kModeAct]->setLabel("* Abc");
+ _button[kAddAct]->setEnabled(true);
}
// truncate current input at mode change
@@ -589,7 +589,7 @@ void PredictiveDialog::processBtnActive(ButtonId button) {
memset(_repeatcount, 0, sizeof(_repeatcount));
_lastTime = 0;
- _lastPressBtn = kNoAct;
+ _lastPressedButton = kNoAct;
_curTime = 0;
}
}
@@ -735,7 +735,7 @@ bool PredictiveDialog::matchWord() {
// The entries in the dictionary consist of a code, a space, and then
// a space-separated list of words matching this code.
- // To ex_currBtnly match a code, we therefore match the code plus the trailing
+ // To ex_curPressedButtonly match a code, we therefore match the code plus the trailing
// space in the dictionary.
Common::String code = _currentCode + " ";
@@ -998,9 +998,9 @@ void PredictiveDialog::loadAllDictionary(Dict &dict) {
void PredictiveDialog::pressEditText() {
Common::strlcpy(_predictiveResult, _prefix.c_str(), sizeof(_predictiveResult));
Common::strlcat(_predictiveResult, _currentWord.c_str(), sizeof(_predictiveResult));
- _edittext->setEditString(_predictiveResult);
- //_edittext->setCaretPos(_prefix.size() + _currentWord.size());
- _edittext->draw();
+ _editText->setEditString(_predictiveResult);
+ //_editText->setCaretPos(_prefix.size() + _currentWord.size());
+ _editText->draw();
}
} // namespace GUI
diff --git a/gui/predictivedialog.h b/gui/predictivedialog.h
index c64fcc8..a1d85f6 100644
--- a/gui/predictivedialog.h
+++ b/gui/predictivedialog.h
@@ -34,27 +34,27 @@ class ButtonWidget;
class PicButtonWidget;
enum ButtonId {
- kBtn1Act = 0,
- kBtn2Act = 1,
- kBtn3Act = 2,
- kBtn4Act = 3,
- kBtn5Act = 4,
- kBtn6Act = 5,
- kBtn7Act = 6,
- kBtn8Act = 7,
- kBtn9Act = 8,
- kNextAct = 9,
- kAddAct = 10,
- kDelAct = 11,
- kCancelAct = 12,
- kOkAct = 13,
- kModeAct = 14,
- kBtn0Act = 15,
- kNoAct = -1
+ kButton1Act = 0,
+ kButton2Act = 1,
+ kButton3Act = 2,
+ kButton4Act = 3,
+ kButton5Act = 4,
+ kButton6Act = 5,
+ kButton7Act = 6,
+ kButton8Act = 7,
+ kButton9Act = 8,
+ kNextAct = 9,
+ kAddAct = 10,
+ kDelAct = 11,
+ kCancelAct = 12,
+ kOkAct = 13,
+ kModeAct = 14,
+ kButton0Act = 15,
+ kNoAct = -1
};
enum {
- kButtonCount = kBtn0Act + 1
+ kButtonCount = kButton0Act + 1
};
enum {
@@ -102,7 +102,7 @@ private:
bool searchWord(const char *const where, const Common::String &whatCode);
int binarySearch(const char *const *const dictLine, const Common::String &code, const int dictLineCount);
bool matchWord();
- void processBtnActive(ButtonId active);
+ void processButton(ButtonId active);
void pressEditText();
void saveUserDictToFile();
@@ -116,7 +116,7 @@ private:
Dict _userDict;
int _mode;
- ButtonId _lastbutton;
+ ButtonId _lastButton;
bool _userDictHasChanged;
@@ -129,8 +129,8 @@ private:
Common::String _prefix;
uint32 _curTime, _lastTime;
- ButtonId _lastPressBtn;
- ButtonId _currBtn;
+ ButtonId _lastPressedButton;
+ ButtonId _curPressedButton;
char _temp[kMaxWordLen + 1];
int _repeatcount[kMaxWordLen];
@@ -140,11 +140,11 @@ private:
Common::String _search;
- bool _navigationwithkeys;
+ bool _navigationWithKeys;
bool _needRefresh;
private:
- EditTextWidget *_edittext;
- ButtonWidget *_btns[kButtonCount];
+ EditTextWidget *_editText;
+ ButtonWidget *_button[kButtonCount];
};
} // namespace GUI
Commit: 15012d1596b2ed752722b2d56a328b798b218e66
https://github.com/scummvm/scummvm/commit/15012d1596b2ed752722b2d56a328b798b218e66
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-24T03:37:33+01:00
Commit Message:
GUI: Fix typo in comment in predictivedialog.cpp.
Changed paths:
gui/predictivedialog.cpp
diff --git a/gui/predictivedialog.cpp b/gui/predictivedialog.cpp
index a9f0605..63b1e1b 100644
--- a/gui/predictivedialog.cpp
+++ b/gui/predictivedialog.cpp
@@ -735,7 +735,7 @@ bool PredictiveDialog::matchWord() {
// The entries in the dictionary consist of a code, a space, and then
// a space-separated list of words matching this code.
- // To ex_curPressedButtonly match a code, we therefore match the code plus the trailing
+ // To exactly match a code, we therefore match the code plus the trailing
// space in the dictionary.
Common::String code = _currentCode + " ";
Commit: 120164ba074196f2c771661dbfb4296f09ed82e1
https://github.com/scummvm/scummvm/commit/120164ba074196f2c771661dbfb4296f09ed82e1
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-24T03:37:33+01:00
Commit Message:
GUI: Reduce scope of variable in PredictiveDialog::processButton.
Changed paths:
gui/predictivedialog.cpp
diff --git a/gui/predictivedialog.cpp b/gui/predictivedialog.cpp
index 63b1e1b..4e2ed0c 100644
--- a/gui/predictivedialog.cpp
+++ b/gui/predictivedialog.cpp
@@ -439,7 +439,6 @@ void PredictiveDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 d
}
void PredictiveDialog::processButton(ButtonId button) {
- uint8 x;
static const char *const buttonStr[] = {
"1", "2", "3",
"4", "5", "6",
@@ -525,7 +524,7 @@ void PredictiveDialog::processButton(ButtonId button) {
_numMatchingWords = countWordsInString(_unitedDict.dictActLine);
break;
case kModeAbc:
- for (x = 0; x < _currentCode.size(); x++)
+ for (uint x = 0; x < _currentCode.size(); x++)
if (_currentCode[x] >= '1')
_temp[x] = buttons[_currentCode[x] - '1'][_repeatcount[x]];
_temp[_currentCode.size()] = 0;
@@ -544,7 +543,7 @@ void PredictiveDialog::processButton(ButtonId button) {
_currentWord = Common::String(tok, _currentCode.size());
}
} else if (_mode == kModeAbc) {
- x = _currentCode.size();
+ uint x = _currentCode.size();
if (x) {
if (_currentCode.lastChar() == '1' || _currentCode.lastChar() == '7' || _currentCode.lastChar() == '9')
_repeatcount[x - 1] = (_repeatcount[x - 1] + 1) % 4;
Commit: 5a63ee537506c4a0e90a25ee9fe96cfef4a90519
https://github.com/scummvm/scummvm/commit/5a63ee537506c4a0e90a25ee9fe96cfef4a90519
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-24T03:41:29+01:00
Commit Message:
GUI: Use "button" instead of "btn" in variable names.
Changed paths:
gui/ThemeEngine.cpp
gui/ThemeEngine.h
gui/onscreendialog.cpp
gui/predictivedialog.cpp
diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index 536e519..c840816 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -48,17 +48,17 @@ const char * const ThemeEngine::kImageLogo = "logo.bmp";
const char * const ThemeEngine::kImageLogoSmall = "logo_small.bmp";
const char * const ThemeEngine::kImageSearch = "search.bmp";
const char * const ThemeEngine::kImageEraser = "eraser.bmp";
-const char * const ThemeEngine::kImageDelbtn = "delbtn.bmp";
+const char * const ThemeEngine::kImageDelButton = "delbtn.bmp";
const char * const ThemeEngine::kImageList = "list.bmp";
const char * const ThemeEngine::kImageGrid = "grid.bmp";
-const char * const ThemeEngine::kImageStopbtn = "stopbtn.bmp";
-const char * const ThemeEngine::kImageEditbtn = "editbtn.bmp";
-const char * const ThemeEngine::kImageSwitchModebtn = "switchbtn.bmp";
-const char * const ThemeEngine::kImageFastReplaybtn = "fastreplay.bmp";
-const char * const ThemeEngine::kImageStopSmallbtn = "stopbtn_small.bmp";
-const char * const ThemeEngine::kImageEditSmallbtn = "editbtn_small.bmp";
-const char * const ThemeEngine::kImageSwitchModeSmallbtn = "switchbtn_small.bmp";
-const char * const ThemeEngine::kImageFastReplaySmallbtn = "fastreplay_small.bmp";
+const char * const ThemeEngine::kImageStopButton = "stopbtn.bmp";
+const char * const ThemeEngine::kImageEditButton = "editbtn.bmp";
+const char * const ThemeEngine::kImageSwitchModeButton = "switchbtn.bmp";
+const char * const ThemeEngine::kImageFastReplayButton = "fastreplay.bmp";
+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";
struct TextDrawData {
const Graphics::Font *_fontPtr;
diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h
index 7acf830..a5ef49c 100644
--- a/gui/ThemeEngine.h
+++ b/gui/ThemeEngine.h
@@ -228,17 +228,17 @@ public:
static const char *const kImageLogoSmall; ///< ScummVM logo used in the GMM
static const char *const kImageSearch; ///< Search tool image used in the launcher
static const char *const kImageEraser; ///< Clear input image used in the launcher
- static const char *const kImageDelbtn; ///< Delete characters in the predictive dialog
+ static const char *const kImageDelButton; ///< Delete characters in the predictive dialog
static const char *const kImageList; ///< List image used in save/load chooser selection
static const char *const kImageGrid; ///< Grid image used in save/load chooser selection
- static const char *const kImageStopbtn; ///< Stop recording button in recorder onscreen dialog
- static const char *const kImageEditbtn; ///< Edit recording metadata in recorder onscreen dialog
- static const char *const kImageSwitchModebtn; ///< Switch mode button in recorder onscreen dialog
- static const char *const kImageFastReplaybtn; ///< Fast playback mode button in recorder onscreen dialog
- static const char *const kImageStopSmallbtn; ///< Stop recording button in recorder onscreen dialog (for 320xY)
- static const char *const kImageEditSmallbtn; ///< Edit recording metadata in recorder onscreen dialog (for 320xY)
- static const char *const kImageSwitchModeSmallbtn; ///< Switch mode button in recorder onscreen dialog (for 320xY)
- static const char *const kImageFastReplaySmallbtn; ///< Fast playback mode button in recorder onscreen dialog (for 320xY)
+ static const char *const kImageStopButton; ///< Stop recording button in recorder onscreen dialog
+ static const char *const kImageEditButton; ///< Edit recording metadata in recorder onscreen dialog
+ static const char *const kImageSwitchModeButton; ///< Switch mode button in recorder onscreen dialog
+ static const char *const kImageFastReplayButton; ///< Fast playback mode button in recorder onscreen dialog
+ static const char *const kImageStopSmallButton; ///< Stop recording button in recorder onscreen dialog (for 320xY)
+ 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)
/**
* Graphics mode enumeration.
diff --git a/gui/onscreendialog.cpp b/gui/onscreendialog.cpp
index 0e37834..8b338f5 100644
--- a/gui/onscreendialog.cpp
+++ b/gui/onscreendialog.cpp
@@ -62,37 +62,37 @@ OnScreenDialog::OnScreenDialog(bool isRecord) : Dialog("OnScreenDialog") {
#ifndef DISABLE_FANCY_THEMES
if (g_gui.xmlEval()->getVar("Globals.OnScreenDialog.ShowPics") == 1 && g_gui.theme()->supportsImages()) {
- GUI::PicButtonWidget *btn;
- btn = new PicButtonWidget(this, "OnScreenDialog.StopButton", 0, kStopCmd, 0);
- btn->useThemeTransparency(true);
+ GUI::PicButtonWidget *button;
+ button = new PicButtonWidget(this, "OnScreenDialog.StopButton", 0, kStopCmd, 0);
+ button->useThemeTransparency(true);
if (g_system->getOverlayWidth() > 320)
- btn->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageStopbtn));
+ button->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageStopButton));
else
- btn->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageStopSmallbtn));
+ button->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageStopSmallButton));
if (isRecord) {
- btn = new PicButtonWidget(this, "OnScreenDialog.EditButton", 0, kEditCmd, 0);
- btn->useThemeTransparency(true);
+ button = new PicButtonWidget(this, "OnScreenDialog.EditButton", 0, kEditCmd, 0);
+ button->useThemeTransparency(true);
if (g_system->getOverlayWidth() > 320)
- btn->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageEditbtn));
+ button->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageEditButton));
else
- btn->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageEditSmallbtn));
+ button->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageEditSmallButton));
} else {
- btn = new PicButtonWidget(this, "OnScreenDialog.SwitchModeButton", 0, kSwitchModeCmd, 0);
- btn->useThemeTransparency(true);
+ button = new PicButtonWidget(this, "OnScreenDialog.SwitchModeButton", 0, kSwitchModeCmd, 0);
+ button->useThemeTransparency(true);
if (g_system->getOverlayWidth() > 320)
- btn->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageSwitchModebtn));
+ button->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageSwitchModeButton));
else
- btn->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageSwitchModeSmallbtn));
+ button->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageSwitchModeSmallButton));
- btn = new PicButtonWidget(this, "OnScreenDialog.FastReplayButton", 0, kFastModeCmd, 0);
- btn->useThemeTransparency(true);
+ button = new PicButtonWidget(this, "OnScreenDialog.FastReplayButton", 0, kFastModeCmd, 0);
+ button->useThemeTransparency(true);
if (g_system->getOverlayWidth() > 320)
- btn->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageFastReplaybtn));
+ button->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageFastReplayButton));
else
- btn->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageFastReplaySmallbtn));
+ button->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageFastReplaySmallButton));
}
} else
#endif
diff --git a/gui/predictivedialog.cpp b/gui/predictivedialog.cpp
index 4e2ed0c..cc584a9 100644
--- a/gui/predictivedialog.cpp
+++ b/gui/predictivedialog.cpp
@@ -91,7 +91,7 @@ PredictiveDialog::PredictiveDialog() : Dialog("Predictive") {
if (g_gui.xmlEval()->getVar("Globals.Predictive.ShowDeletePic") == 1 && g_gui.theme()->supportsImages()) {
_button[kDelAct] = new PicButtonWidget(this, "Predictive.Delete", _("Delete char"), kDelCmd);
((PicButtonWidget *)_button[kDelAct])->useThemeTransparency(true);
- ((PicButtonWidget *)_button[kDelAct])->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageDelbtn));
+ ((PicButtonWidget *)_button[kDelAct])->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageDelButton));
} else
#endif
_button[kDelAct] = new ButtonWidget(this, "Predictive.Delete" , _("<") , 0, kDelCmd);
@@ -163,7 +163,7 @@ void PredictiveDialog::reflowLayout() {
if (g_gui.xmlEval()->getVar("Globals.Predictive.ShowDeletePic") == 1 && g_gui.theme()->supportsImages()) {
_button[kDelAct] = new PicButtonWidget(this, "Predictive.Delete", _("Delete char"), kDelCmd);
((PicButtonWidget *)_button[kDelAct])->useThemeTransparency(true);
- ((PicButtonWidget *)_button[kDelAct])->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageDelbtn));
+ ((PicButtonWidget *)_button[kDelAct])->setGfx(g_gui.theme()->getImageSurface(ThemeEngine::kImageDelButton));
} else {
_button[kDelAct] = new ButtonWidget(this, "Predictive.Delete" , _("<") , 0, kDelCmd);
}
Commit: a7dba17fece00548f52426a20a8c4948a6dd0870
https://github.com/scummvm/scummvm/commit/a7dba17fece00548f52426a20a8c4948a6dd0870
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-24T03:41:49+01:00
Commit Message:
GUI: Fix pointer formatting in ThemeEngine.cpp.
Changed paths:
gui/ThemeEngine.cpp
diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index c840816..1b95a11 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -44,21 +44,21 @@
namespace GUI {
-const char * const ThemeEngine::kImageLogo = "logo.bmp";
-const char * const ThemeEngine::kImageLogoSmall = "logo_small.bmp";
-const char * const ThemeEngine::kImageSearch = "search.bmp";
-const char * const ThemeEngine::kImageEraser = "eraser.bmp";
-const char * const ThemeEngine::kImageDelButton = "delbtn.bmp";
-const char * const ThemeEngine::kImageList = "list.bmp";
-const char * const ThemeEngine::kImageGrid = "grid.bmp";
-const char * const ThemeEngine::kImageStopButton = "stopbtn.bmp";
-const char * const ThemeEngine::kImageEditButton = "editbtn.bmp";
-const char * const ThemeEngine::kImageSwitchModeButton = "switchbtn.bmp";
-const char * const ThemeEngine::kImageFastReplayButton = "fastreplay.bmp";
-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::kImageLogo = "logo.bmp";
+const char *const ThemeEngine::kImageLogoSmall = "logo_small.bmp";
+const char *const ThemeEngine::kImageSearch = "search.bmp";
+const char *const ThemeEngine::kImageEraser = "eraser.bmp";
+const char *const ThemeEngine::kImageDelButton = "delbtn.bmp";
+const char *const ThemeEngine::kImageList = "list.bmp";
+const char *const ThemeEngine::kImageGrid = "grid.bmp";
+const char *const ThemeEngine::kImageStopButton = "stopbtn.bmp";
+const char *const ThemeEngine::kImageEditButton = "editbtn.bmp";
+const char *const ThemeEngine::kImageSwitchModeButton = "switchbtn.bmp";
+const char *const ThemeEngine::kImageFastReplayButton = "fastreplay.bmp";
+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";
struct TextDrawData {
const Graphics::Font *_fontPtr;
Commit: e5e2a8d8cf9c4e52a4a40d9faf5a8c258e0284f3
https://github.com/scummvm/scummvm/commit/e5e2a8d8cf9c4e52a4a40d9faf5a8c258e0284f3
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-24T03:43:13+01:00
Commit Message:
GUI: Move PredicitveDialog enums inside class declaration.
Changed paths:
gui/predictivedialog.h
diff --git a/gui/predictivedialog.h b/gui/predictivedialog.h
index a1d85f6..37c80a2 100644
--- a/gui/predictivedialog.h
+++ b/gui/predictivedialog.h
@@ -33,40 +33,6 @@ class EditTextWidget;
class ButtonWidget;
class PicButtonWidget;
-enum ButtonId {
- kButton1Act = 0,
- kButton2Act = 1,
- kButton3Act = 2,
- kButton4Act = 3,
- kButton5Act = 4,
- kButton6Act = 5,
- kButton7Act = 6,
- kButton8Act = 7,
- kButton9Act = 8,
- kNextAct = 9,
- kAddAct = 10,
- kDelAct = 11,
- kCancelAct = 12,
- kOkAct = 13,
- kModeAct = 14,
- kButton0Act = 15,
- kNoAct = -1
-};
-
-enum {
- kButtonCount = kButton0Act + 1
-};
-
-enum {
- kRepeatDelay = 500
-};
-
-enum {
- kMaxLineLen = 80,
- kMaxWordLen = 24,
- kMaxWord = 50
-};
-
class PredictiveDialog : public GUI::Dialog {
public:
PredictiveDialog();
@@ -80,7 +46,42 @@ public:
virtual void handleTickle();
const char *getResult() const { return _predictiveResult; }
+
private:
+ enum ButtonId {
+ kButton1Act = 0,
+ kButton2Act = 1,
+ kButton3Act = 2,
+ kButton4Act = 3,
+ kButton5Act = 4,
+ kButton6Act = 5,
+ kButton7Act = 6,
+ kButton8Act = 7,
+ kButton9Act = 8,
+ kNextAct = 9,
+ kAddAct = 10,
+ kDelAct = 11,
+ kCancelAct = 12,
+ kOkAct = 13,
+ kModeAct = 14,
+ kButton0Act = 15,
+ kNoAct = -1
+ };
+
+ enum {
+ kButtonCount = kButton0Act + 1
+ };
+
+ enum {
+ kRepeatDelay = 500
+ };
+
+ enum {
+ kMaxLineLen = 80,
+ kMaxWordLen = 24,
+ kMaxWord = 50
+ };
+
struct Dict {
Dict() : dictLine(nullptr), dictText(nullptr), dictActLine(nullptr),
dictLineCount(0), dictTextSize(0) {}
More information about the Scummvm-git-logs
mailing list