From c4a5fa85069e2363e4e0e11f84d333b5fbd39caf Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Thu, 23 Jun 2011 11:40:19 +0300
Subject: CREDITS: Add real name of serga per his request
---
gui/credits.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'gui')
diff --git a/gui/credits.h b/gui/credits.h
index 5bc6d56ff4..91ed2cb26a 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -529,7 +529,7 @@ static const char *credits[] = {
"C2""Initial MI1 CD music support",
"C0""Quietust",
"C2""Sound support for Amiga SCUMM V2/V3 games, MM NES support",
-"C0""segra",
+"C0""Robert Crossfield",
"C2""Improved support for Apple II/C64 versions of MM",
"C0""Andreas R\366ver",
"C2""Broken Sword I & II MPEG2 cutscene support",
--
cgit v1.2.3
From bfdf12ad2f9f4bc07561ce386928e41ffa31af4f Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 26 Jun 2011 01:52:53 +0300
Subject: I18N: Update Russian translation
---
gui/themes/translations.dat | Bin 220969 -> 226329 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
mode change 100644 => 100755 gui/themes/translations.dat
(limited to 'gui')
diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
old mode 100644
new mode 100755
index f218747182..5ed267370c
Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ
--
cgit v1.2.3
From 2e81e05a12600056cb34a6318f524c1a86c7145c Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Tue, 28 Jun 2011 19:54:30 +0100
Subject: I18N: Regenerate translations data file
---
gui/themes/translations.dat | Bin 226329 -> 226564 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
mode change 100755 => 100644 gui/themes/translations.dat
(limited to 'gui')
diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
old mode 100755
new mode 100644
index 5ed267370c..df15d72567
Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ
--
cgit v1.2.3
From dde4cb1ff87f477ab5d98bc6a942c2918eab50da Mon Sep 17 00:00:00 2001
From: unknown
Date: Thu, 30 Jun 2011 00:29:22 +1000
Subject: CREDITS: Update my status to active again.
---
gui/credits.h | 4 ----
1 file changed, 4 deletions(-)
(limited to 'gui')
diff --git a/gui/credits.h b/gui/credits.h
index 91ed2cb26a..0ed7fa1e41 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -25,7 +25,6 @@ static const char *credits[] = {
"C0""Max Horn",
"C2""(retired)",
"C0""Travis Howell",
-"C2""(retired)",
"C0""Pawel Kolodziejski",
"C2""Codecs, iMUSE, Smush, etc.",
"C0""Gregory Montoir",
@@ -38,7 +37,6 @@ static const char *credits[] = {
"C0""Jonathan Gray",
"C2""(retired)",
"C0""Travis Howell",
-"C2""(retired)",
"C0""Gregory Montoir",
"C0""Eugene Sandulenko",
"",
@@ -57,7 +55,6 @@ static const char *credits[] = {
"C0""Torbj\366rn Andersson",
"C0""Paul Gilbert",
"C0""Travis Howell",
-"C2""(retired)",
"C0""Oliver Kiehl",
"C2""(retired)",
"C0""Ludvig Strigeus",
@@ -419,7 +416,6 @@ static const char *credits[] = {
"",
"C1""Win32",
"C0""Travis Howell",
-"C2""(retired)",
"",
"C1""Win64",
"C0""Chris Gray",
--
cgit v1.2.3
From aa0f307e06e5aae3b12f9f15b350dc81b30d61de Mon Sep 17 00:00:00 2001
From: Ori Avtalion
Date: Tue, 28 Jun 2011 02:06:23 +0300
Subject: ALL: Require DECLARE_SINGLETON to be used in the Common namepsace
Silences the clang warning:
static data member specialization of '_singleton' must
originally be declared in namespace 'Common'; accepted as a C++0x
extension [-Wc++0x-extensions]
Wrapping "namespace Common {}" around the macro assignment causes clang
to complain about a spurious semicolon, and removing the semicolon at
the end of the macro causes some editors to misbehave.
Changing the requirement of using the macro in one namespace (the
global) to another (Common) seems a small price to pay to
silence a warning.
---
gui/gui-manager.cpp | 2 ++
1 file changed, 2 insertions(+)
(limited to 'gui')
diff --git a/gui/gui-manager.cpp b/gui/gui-manager.cpp
index af1852d56d..212d68430c 100644
--- a/gui/gui-manager.cpp
+++ b/gui/gui-manager.cpp
@@ -39,7 +39,9 @@
#include "graphics/cursorman.h"
+namespace Common {
DECLARE_SINGLETON(GUI::GuiManager);
+}
namespace GUI {
--
cgit v1.2.3
From 8201df7bb6b7c5174b86599bcb3aa3130db30bf8 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Fri, 1 Jul 2011 21:10:25 +0200
Subject: GRAPHICS: Move NewFont code to a separate file.
---
gui/ThemeEngine.cpp | 1 +
1 file changed, 1 insertion(+)
(limited to 'gui')
diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index 73c1835c9e..3f2e127902 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -33,6 +33,7 @@
#include "graphics/imagedec.h"
#include "graphics/surface.h"
#include "graphics/VectorRenderer.h"
+#include "graphics/fonts/bdf.h"
#include "gui/widget.h"
#include "gui/ThemeEngine.h"
--
cgit v1.2.3
From fa5f8dc7031fb8d96a0faaafa817403a46634096 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Fri, 1 Jul 2011 21:53:01 +0200
Subject: GRAPHICS: Rename NewFont to BdfFont.
---
gui/ThemeEngine.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
(limited to 'gui')
diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index 3f2e127902..4a2e0a7ac5 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -1395,7 +1395,7 @@ const Graphics::Font *ThemeEngine::loadFontFromArchive(const Common::String &fil
if (_themeArchive)
stream = _themeArchive->createReadStreamForMember(filename);
if (stream) {
- font = Graphics::NewFont::loadFont(*stream);
+ font = Graphics::BdfFont::loadFont(*stream);
delete stream;
}
@@ -1409,7 +1409,7 @@ const Graphics::Font *ThemeEngine::loadCachedFontFromArchive(const Common::Strin
if (_themeArchive)
stream = _themeArchive->createReadStreamForMember(filename);
if (stream) {
- font = Graphics::NewFont::loadFromCache(*stream);
+ font = Graphics::BdfFont::loadFromCache(*stream);
delete stream;
}
@@ -1423,7 +1423,7 @@ const Graphics::Font *ThemeEngine::loadFont(const Common::String &filename) {
if (!cacheFilename.empty()) {
if (fontFile.open(cacheFilename)) {
- font = Graphics::NewFont::loadFromCache(fontFile);
+ font = Graphics::BdfFont::loadFromCache(fontFile);
}
if (font)
@@ -1435,7 +1435,7 @@ const Graphics::Font *ThemeEngine::loadFont(const Common::String &filename) {
// normal open
if (fontFile.open(filename)) {
- font = Graphics::NewFont::loadFont(fontFile);
+ font = Graphics::BdfFont::loadFont(fontFile);
}
if (!font) {
@@ -1444,7 +1444,7 @@ const Graphics::Font *ThemeEngine::loadFont(const Common::String &filename) {
if (font) {
if (!cacheFilename.empty()) {
- if (!Graphics::NewFont::cacheFontData(*(const Graphics::NewFont *)font, cacheFilename)) {
+ if (!Graphics::BdfFont::cacheFontData(*(const Graphics::BdfFont *)font, cacheFilename)) {
warning("Couldn't create cache file for font '%s'", filename.c_str());
}
}
--
cgit v1.2.3
From 09501be85bee9f686a7815fc0f47a1e16008f38d Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sat, 2 Jul 2011 20:25:32 +0200
Subject: ENGINES: Clean up SaveStateDescriptor.
Now SaveStateDescriptor no longer subclasses HashMap. Instead all possible
saved meta data is included directly into SaveStateDescriptor.
This is slightly less flexible, but we never needed that flexibility so far.
On the other hand it should reduce the memory usage. At least on my system
(Linux/amd64) the old SaveStateDescriptor had a size of 928 and the new
SaveStateDescriptor has a size of 200.
---
gui/saveload.cpp | 35 +++++++++++++++++++----------------
1 file changed, 19 insertions(+), 16 deletions(-)
(limited to 'gui')
diff --git a/gui/saveload.cpp b/gui/saveload.cpp
index 460246e5fc..02ddf814dc 100644
--- a/gui/saveload.cpp
+++ b/gui/saveload.cpp
@@ -131,7 +131,7 @@ void SaveLoadChooser::handleCommand(CommandSender *sender, uint32 cmd, uint32 da
if (_list->isEditable() || !_list->getSelectedString().empty()) {
_list->endEditMode();
if (!_saveList.empty()) {
- setResult(atoi(_saveList[selItem].save_slot().c_str()));
+ setResult(_saveList[selItem].getSaveSlot());
_resultString = _list->getSelectedString();
}
close();
@@ -141,7 +141,7 @@ void SaveLoadChooser::handleCommand(CommandSender *sender, uint32 cmd, uint32 da
case kChooseCmd:
_list->endEditMode();
if (!_saveList.empty()) {
- setResult(atoi(_saveList[selItem].save_slot().c_str()));
+ setResult(_saveList[selItem].getSaveSlot());
_resultString = _list->getSelectedString();
}
close();
@@ -154,7 +154,7 @@ void SaveLoadChooser::handleCommand(CommandSender *sender, uint32 cmd, uint32 da
MessageDialog alert(_("Do you really want to delete this savegame?"),
_("Delete"), _("Cancel"));
if (alert.runModal() == GUI::kMessageOK) {
- (*_plugin)->removeSaveState(_target.c_str(), atoi(_saveList[selItem].save_slot().c_str()));
+ (*_plugin)->removeSaveState(_target.c_str(), _saveList[selItem].getSaveSlot());
setResult(-1);
_list->setSelected(-1);
@@ -241,10 +241,10 @@ void SaveLoadChooser::updateSelection(bool redraw) {
_playtime->setLabel(_("No playtime saved"));
if (selItem >= 0 && !_list->getSelectedString().empty() && _metaInfoSupport) {
- SaveStateDescriptor desc = (*_plugin)->querySaveMetaInfos(_target.c_str(), atoi(_saveList[selItem].save_slot().c_str()));
+ SaveStateDescriptor desc = (*_plugin)->querySaveMetaInfos(_target.c_str(), _saveList[selItem].getSaveSlot());
- isDeletable = desc.getBool("is_deletable") && _delSupport;
- isWriteProtected = desc.getBool("is_write_protected");
+ isDeletable = desc.getDeletableFlag() && _delSupport;
+ isWriteProtected = desc.getWriteProtectedFlag();
// Don't allow the user to change the description of write protected games
if (isWriteProtected)
@@ -259,16 +259,19 @@ void SaveLoadChooser::updateSelection(bool redraw) {
}
if (_saveDateSupport) {
- if (desc.contains("save_date"))
- _date->setLabel(_("Date: ") + desc.getVal("save_date"));
+ const Common::String &saveDate = desc.getSaveDate();
+ if (!saveDate.empty())
+ _date->setLabel(_("Date: ") + saveDate);
- if (desc.contains("save_time"))
- _time->setLabel(_("Time: ") + desc.getVal("save_time"));
+ const Common::String &saveTime = desc.getSaveTime();
+ if (!saveTime.empty())
+ _time->setLabel(_("Time: ") + saveTime);
}
if (_playTimeSupport) {
- if (desc.contains("play_time"))
- _playtime->setLabel(_("Playtime: ") + desc.getVal("play_time"));
+ const Common::String &playTime = desc.getPlayTime();
+ if (!playTime.empty())
+ _playtime->setLabel(_("Playtime: ") + playTime);
}
}
@@ -326,25 +329,25 @@ void SaveLoadChooser::updateSaveList() {
ListWidget::ColorList colors;
for (SaveStateList::const_iterator x = _saveList.begin(); x != _saveList.end(); ++x) {
// Handle gaps in the list of save games
- saveSlot = atoi(x->save_slot().c_str());
+ saveSlot = x->getSaveSlot();
if (curSlot < saveSlot) {
while (curSlot < saveSlot) {
SaveStateDescriptor dummySave(curSlot, "");
_saveList.insert_at(curSlot, dummySave);
- saveNames.push_back(dummySave.description());
+ saveNames.push_back(dummySave.getDescription());
colors.push_back(ThemeEngine::kFontColorNormal);
curSlot++;
}
// Sync the save list iterator
for (x = _saveList.begin(); x != _saveList.end(); ++x) {
- if (atoi(x->save_slot().c_str()) == saveSlot)
+ if (x->getSaveSlot() == saveSlot)
break;
}
}
// Show "Untitled savestate" for empty/whitespace savegame descriptions
- Common::String description = x->description();
+ Common::String description = x->getDescription();
Common::String trimmedDescription = description;
trimmedDescription.trim();
if (trimmedDescription.empty()) {
--
cgit v1.2.3
From 7e4224e52a2202ba98dd93ffe209d231e5c1d35c Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 3 Jul 2011 00:15:30 +0200
Subject: COMMON: Fix compilation when USE_HASHMAP_MEMORY_POOL is not defined.
---
gui/debugger.h | 1 +
1 file changed, 1 insertion(+)
(limited to 'gui')
diff --git a/gui/debugger.h b/gui/debugger.h
index b74b0d6f0f..3a587d2723 100644
--- a/gui/debugger.h
+++ b/gui/debugger.h
@@ -26,6 +26,7 @@
#include "common/ptr.h"
#include "common/hashmap.h"
#include "common/hash-str.h"
+#include "common/array.h"
namespace GUI {
--
cgit v1.2.3
From 03d9b63bcc54bd1caaabf51cb01525cb4c8863fd Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Sun, 3 Jul 2011 17:17:39 -0400
Subject: CREDITS: Mark waltervn as retired
As requested by him
---
gui/credits.h | 2 ++
1 file changed, 2 insertions(+)
(limited to 'gui')
diff --git a/gui/credits.h b/gui/credits.h
index 0ed7fa1e41..cc9698195a 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -46,6 +46,7 @@ static const char *credits[] = {
"C0""Filippos Karapetis",
"C0""Pawel Kolodziejski",
"C0""Walter van Niftrik",
+"C2""(retired)",
"C0""Kari Salminen",
"C0""Eugene Sandulenko",
"C0""David Symonds",
@@ -158,6 +159,7 @@ static const char *credits[] = {
"C0""Filippos Karapetis",
"C0""Martin Kiewitz",
"C0""Walter van Niftrik",
+"C2""(retired)",
"C0""Willem Jan Palenstijn",
"C0""Jordi Vilalta Prat",
"C0""Lars Skovlund",
--
cgit v1.2.3
From 78f1ea769060cd631c210fc01020bb921afe3607 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Fri, 5 Aug 2011 10:15:20 +0100
Subject: OSYSTEM: extended installTimerProc() with timer ID parameter
---
gui/widgets/scrollbar.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'gui')
diff --git a/gui/widgets/scrollbar.cpp b/gui/widgets/scrollbar.cpp
index cc8e587668..e0dbcec59c 100644
--- a/gui/widgets/scrollbar.cpp
+++ b/gui/widgets/scrollbar.cpp
@@ -55,7 +55,7 @@ static void upArrowRepeater(void *ref) {
sb->checkBounds(old_pos);
g_system->getTimerManager()->removeTimerProc(&upArrowRepeater);
- g_system->getTimerManager()->installTimerProc(&upArrowRepeater, 1000000/10, ref);
+ g_system->getTimerManager()->installTimerProc(&upArrowRepeater, 1000000/10, ref, "guiScrollBarUp");
}
static void downArrowRepeater(void *ref) {
@@ -66,7 +66,7 @@ static void downArrowRepeater(void *ref) {
sb->checkBounds(old_pos);
g_system->getTimerManager()->removeTimerProc(&downArrowRepeater);
- g_system->getTimerManager()->installTimerProc(&downArrowRepeater, 1000000/10, ref);
+ g_system->getTimerManager()->installTimerProc(&downArrowRepeater, 1000000/10, ref, "guiScrollBarDown");
}
void ScrollBarWidget::handleMouseDown(int x, int y, int button, int clickCount) {
@@ -80,12 +80,12 @@ void ScrollBarWidget::handleMouseDown(int x, int y, int button, int clickCount)
// Up arrow
_currentPos--;
_draggingPart = kUpArrowPart;
- g_system->getTimerManager()->installTimerProc(&upArrowRepeater, 1000000/2, this);
+ g_system->getTimerManager()->installTimerProc(&upArrowRepeater, 1000000/2, this, "guiScrollBarUp");
} else if (y >= _h - UP_DOWN_BOX_HEIGHT) {
// Down arrow
_currentPos++;
_draggingPart = kDownArrowPart;
- g_system->getTimerManager()->installTimerProc(&downArrowRepeater, 1000000/2, this);
+ g_system->getTimerManager()->installTimerProc(&downArrowRepeater, 1000000/2, this, "guiScrollBarDown");
} else if (y < _sliderPos) {
_currentPos -= _entriesPerPage - 1;
} else if (y >= _sliderPos + _sliderHeight) {
--
cgit v1.2.3
From 9e0c1a38e1264715e00fba000777cf0b05dde8fb Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sat, 6 Aug 2011 10:12:34 +0100
Subject: GUI: Consistent behavior of ButtonWidget::setLabel()
---
gui/widget.cpp | 4 ++++
gui/widget.h | 2 ++
2 files changed, 6 insertions(+)
(limited to 'gui')
diff --git a/gui/widget.cpp b/gui/widget.cpp
index 8420391a3f..c4d288eb11 100644
--- a/gui/widget.cpp
+++ b/gui/widget.cpp
@@ -298,6 +298,10 @@ void ButtonWidget::drawWidget() {
g_gui.theme()->drawButton(Common::Rect(_x, _y, _x+_w, _y+_h), _label, _state, getFlags());
}
+void ButtonWidget::setLabel(const Common::String &label) {
+ StaticTextWidget::setLabel(cleanupHotkey(label));
+}
+
#pragma mark -
PicButtonWidget::PicButtonWidget(GuiObject *boss, int x, int y, int w, int h, const char *tooltip, uint32 cmd, uint8 hotkey)
diff --git a/gui/widget.h b/gui/widget.h
index 70f2da4c98..acd575a90b 100644
--- a/gui/widget.h
+++ b/gui/widget.h
@@ -186,6 +186,8 @@ public:
void setCmd(uint32 cmd) { _cmd = cmd; }
uint32 getCmd() const { return _cmd; }
+ void setLabel(const Common::String &label);
+
void handleMouseUp(int x, int y, int button, int clickCount);
void handleMouseEntered(int button) { setFlags(WIDGET_HILITED); draw(); }
void handleMouseLeft(int button) { clearFlags(WIDGET_HILITED); draw(); }
--
cgit v1.2.3
From ae028607841b528a543870db5cba15bd24aec406 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sat, 6 Aug 2011 10:13:21 +0100
Subject: GUI: Removed redundant button label
---
gui/launcher.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'gui')
diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index 6920e0ccd2..5fafcfbad4 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -1052,7 +1052,7 @@ void LauncherDialog::updateButtons() {
const char *newAddButtonLabel = massAdd
? (lowRes ? _c("Mass Add...", "lowres") : _("Mass Add..."))
- : (lowRes ? _c("Add Game...", "lowres") : _("Add Game..."));
+ : (lowRes ? _c("~A~dd Game...", "lowres") : _("~A~dd Game..."));
if (_addButton->getLabel() != newAddButtonLabel)
_addButton->setLabel(newAddButtonLabel);
--
cgit v1.2.3
From 1e45c32558a75f285fbc568df0107d4dce6d6efa Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sat, 6 Aug 2011 11:18:59 +0100
Subject: I18N: Regenerate translations.dat
---
gui/themes/translations.dat | Bin 226564 -> 231759 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
(limited to 'gui')
diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index df15d72567..40ea52f478 100644
Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ
--
cgit v1.2.3
From 23a0f5318c50cdf3dce19e4de0c98fb5ae1c2618 Mon Sep 17 00:00:00 2001
From: Christoph Mallon
Date: Sun, 7 Aug 2011 11:39:54 +0200
Subject: JANITORIAL: Remove trailing empty lines.
---
gui/themebrowser.cpp | 1 -
gui/themebrowser.h | 1 -
gui/themes/fonts/topaz/README.ScummVM | 1 -
3 files changed, 3 deletions(-)
(limited to 'gui')
diff --git a/gui/themebrowser.cpp b/gui/themebrowser.cpp
index 831cee1996..c22603b822 100644
--- a/gui/themebrowser.cpp
+++ b/gui/themebrowser.cpp
@@ -117,4 +117,3 @@ void ThemeBrowser::updateListing() {
}
} // End of namespace GUI
-
diff --git a/gui/themebrowser.h b/gui/themebrowser.h
index 9da57622db..daea3836fc 100644
--- a/gui/themebrowser.h
+++ b/gui/themebrowser.h
@@ -54,4 +54,3 @@ private:
} // End of namespace GUI
#endif
-
diff --git a/gui/themes/fonts/topaz/README.ScummVM b/gui/themes/fonts/topaz/README.ScummVM
index 3beea8a048..55b0b16856 100644
--- a/gui/themes/fonts/topaz/README.ScummVM
+++ b/gui/themes/fonts/topaz/README.ScummVM
@@ -3,4 +3,3 @@ You will find detailed information in topazLT.readme.
The Parallaction engine in ScummVM uses this font's bitmap, namely file topazlt/8.
Data has been extracted and placed in the array named _amigaTopazFont which can be found in engines/parallaction/staticres.cpp.
-
--
cgit v1.2.3
From f92b21b37719d1d24ec92a2fdaa0959fcc5a8341 Mon Sep 17 00:00:00 2001
From: Jordi Vilalta Prat
Date: Thu, 18 Aug 2011 11:59:53 +0200
Subject: I18N: Update the catalan and spanish translations.
---
gui/themes/translations.dat | Bin 231759 -> 241286 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
(limited to 'gui')
diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index 40ea52f478..625c614363 100644
Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ
--
cgit v1.2.3
From 4a7616c36634464ff7378df787137ecf2d44d9c4 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sat, 20 Aug 2011 11:40:33 +0100
Subject: I18N: Regenerate translations.dat
---
gui/themes/translations.dat | Bin 241286 -> 244275 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
(limited to 'gui')
diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index 625c614363..1550bdb695 100644
Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ
--
cgit v1.2.3
From 51fbc7200c3758e526195260d4c705de87f56733 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sat, 20 Aug 2011 13:12:18 +0100
Subject: CREDITS: Reflect new team structure
---
gui/credits.h | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
(limited to 'gui')
diff --git a/gui/credits.h b/gui/credits.h
index cc9698195a..d303dfd843 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -2,9 +2,20 @@
static const char *credits[] = {
"C1""ScummVM Team",
"",
-"C1""Project Leaders",
+"C1""Project Leader",
"C0""Eugene Sandulenko",
"",
+"C1""PR Office",
+"C0""Arnaud Boutonn\351",
+"C2""Public Relations Officer, Project Administrator",
+"C0""Eugene Sandulenko",
+"C2""Project Leader",
+"",
+"C1""Core Team",
+"C0""Willem Jan Palenstijn",
+"C0""Eugene Sandulenko",
+"C0""Johannes Schickel",
+"",
"C1""Retired Project Leaders",
"C0""James Brown",
"C0""Vincent Hamm",
@@ -85,6 +96,7 @@ static const char *credits[] = {
"C1""DreamWeb",
"C0""Vladimir Menshakov",
"C0""Torbj\366rn Andersson",
+"C0""Bertrand Augereau",
"",
"C1""Gob",
"C0""Torbj\366rn Andersson",
@@ -249,6 +261,8 @@ static const char *credits[] = {
"",
"C1""Nintendo DS",
"C0""Neil Millstone",
+"C0""Bertrand Augereau",
+"C2""HQ software scaler",
"",
"C1""OpenPandora",
"C0""John Willis",
--
cgit v1.2.3
From 8022c87060193fe618f2e093e2e3337f063788ef Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sat, 20 Aug 2011 15:13:23 +0100
Subject: I18N: Regenerated .pot, .po and translations.dat
---
gui/themes/translations.dat | Bin 244275 -> 244275 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
(limited to 'gui')
diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index 1550bdb695..a9f51c6ddd 100644
Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ
--
cgit v1.2.3
From 6d47a6d93556cab9275cbb1ecd399c3acb072aa7 Mon Sep 17 00:00:00 2001
From: Chris Warren-Smith
Date: Mon, 8 Aug 2011 19:59:31 +1000
Subject: BADA: Updated credit.pl to include BADA port information
---
gui/credits.h | 3 +++
1 file changed, 3 insertions(+)
(limited to 'gui')
diff --git a/gui/credits.h b/gui/credits.h
index d303dfd843..13898e03a0 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -241,6 +241,9 @@ static const char *credits[] = {
"C0""Andre Heider",
"C0""Angus Lees",
"",
+"C1""BADA",
+"C0""Chris Warren-Smith",
+"",
"C1""Dreamcast",
"C0""Marcus Comstedt",
"",
--
cgit v1.2.3
From 8935c7cd64cf7809a0f0fc1e3b5ef9f651f5d392 Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Mon, 22 Aug 2011 22:40:46 +0100
Subject: I18N: Regenerate translations.dat file
---
gui/themes/translations.dat | Bin 244275 -> 252466 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
(limited to 'gui')
diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index a9f51c6ddd..696610c7bc 100644
Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ
--
cgit v1.2.3
From aad960f095d947a110c37a11c4e7be2485b399f0 Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Tue, 23 Aug 2011 21:42:42 +0100
Subject: I18N: Regenerate translation.dat file
---
gui/themes/translations.dat | Bin 252466 -> 254203 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
(limited to 'gui')
diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index 696610c7bc..c5ae3d49bc 100644
Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ
--
cgit v1.2.3
From 9796890cce47e43d06b5459459150d44b39b1883 Mon Sep 17 00:00:00 2001
From: Littleboy
Date: Mon, 19 Sep 2011 09:21:36 -0400
Subject: GUI: Replace ConsoleDialog use of vsnprintf by
Common::String::vformat()
---
gui/console.cpp | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
(limited to 'gui')
diff --git a/gui/console.cpp b/gui/console.cpp
index b656d23a09..bfce04cbf6 100644
--- a/gui/console.cpp
+++ b/gui/console.cpp
@@ -665,12 +665,11 @@ int ConsoleDialog::printFormat(int dummy, const char *format, ...) {
}
int ConsoleDialog::vprintFormat(int dummy, const char *format, va_list argptr) {
- char buf[2048];
+ Common::String buffer = Common::String::vformat(format, argptr);
- int count = vsnprintf(buf, sizeof(buf), format, argptr);
- buf[sizeof(buf)-1] = 0; // ensure termination
- print(buf);
- return count;
+ print(buffer.c_str());
+
+ return buffer.size();
}
void ConsoleDialog::printChar(int c) {
--
cgit v1.2.3
From 642e0baacbe0ec24dff1871350d808b5c7beba16 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Mon, 19 Sep 2011 20:10:46 +0200
Subject: GUI: Silence GCC warning
Rename local variable 'buffer' to keep it from clashing with the
buffer() method.
---
gui/console.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'gui')
diff --git a/gui/console.cpp b/gui/console.cpp
index bfce04cbf6..dc2c5c4f33 100644
--- a/gui/console.cpp
+++ b/gui/console.cpp
@@ -665,11 +665,11 @@ int ConsoleDialog::printFormat(int dummy, const char *format, ...) {
}
int ConsoleDialog::vprintFormat(int dummy, const char *format, va_list argptr) {
- Common::String buffer = Common::String::vformat(format, argptr);
+ Common::String buf = Common::String::vformat(format, argptr);
- print(buffer.c_str());
+ print(buf.c_str());
- return buffer.size();
+ return buf.size();
}
void ConsoleDialog::printChar(int c) {
--
cgit v1.2.3
From 3542dc2c44cf3f404b6cd1eb4b4f800a192b04ad Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 22 Sep 2011 18:52:18 +0200
Subject: CGE: Add credits
---
gui/credits.h | 4 ++++
1 file changed, 4 insertions(+)
(limited to 'gui')
diff --git a/gui/credits.h b/gui/credits.h
index 13898e03a0..ca2c10ca52 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -72,6 +72,10 @@ static const char *credits[] = {
"C0""Ludvig Strigeus",
"C2""(retired)",
"",
+"C1""CGE",
+"C0""Arnaud Boutonn\351",
+"C0""Paul Gilbert",
+"",
"C1""Cine",
"C0""Vincent Hamm",
"C2""(retired)",
--
cgit v1.2.3
From d01d228ee89d2e5c671dec825bbec50c3b6cf50c Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 25 Sep 2011 15:01:23 +0300
Subject: AGI/COMMON: Fixed bug #3407308 - "AGI: SQ2: Saving allowed in
autosave slot 0 from scummvmmenu"
The save/load dialog code was not polling for meta info for empty slots
---
gui/saveload.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'gui')
diff --git a/gui/saveload.cpp b/gui/saveload.cpp
index 02ddf814dc..ae950a21fb 100644
--- a/gui/saveload.cpp
+++ b/gui/saveload.cpp
@@ -240,7 +240,7 @@ void SaveLoadChooser::updateSelection(bool redraw) {
_time->setLabel(_("No time saved"));
_playtime->setLabel(_("No playtime saved"));
- if (selItem >= 0 && !_list->getSelectedString().empty() && _metaInfoSupport) {
+ if (selItem >= 0 && _metaInfoSupport) {
SaveStateDescriptor desc = (*_plugin)->querySaveMetaInfos(_target.c_str(), _saveList[selItem].getSaveSlot());
isDeletable = desc.getDeletableFlag() && _delSupport;
--
cgit v1.2.3
From 26d4e4bdb6a879c841702a3b2daa7efc7a166eb6 Mon Sep 17 00:00:00 2001
From: Tarek Soliman
Date: Wed, 28 Sep 2011 15:11:58 -0500
Subject: CREDITS: properly retire fanoush and add myself
---
gui/credits.h | 2 ++
1 file changed, 2 insertions(+)
(limited to 'gui')
diff --git a/gui/credits.h b/gui/credits.h
index ca2c10ca52..47336c4900 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -262,6 +262,8 @@ static const char *credits[] = {
"",
"C1""Maemo",
"C0""Frantisek Dufka",
+"C2""(retired)",
+"C0""Tarek Soliman",
"",
"C1""Nintendo 64",
"C0""Fabio Battaglia",
--
cgit v1.2.3
From 9b03f260459deb6f9ae1adc60204b1a64a587ac5 Mon Sep 17 00:00:00 2001
From: Jordi Vilalta Prat
Date: Wed, 5 Oct 2011 10:50:28 +0200
Subject: I18N: Update the translation template.
---
gui/themes/translations.dat | Bin 254203 -> 254500 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
(limited to 'gui')
diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index c5ae3d49bc..ae162136bc 100644
Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ
--
cgit v1.2.3
From 22db5dda42c98ef14aa527a8e54838453509487c Mon Sep 17 00:00:00 2001
From: Jordi Vilalta Prat
Date: Wed, 5 Oct 2011 11:32:58 +0200
Subject: I18N: Update the catalan and spanish translations.
---
gui/themes/translations.dat | Bin 254500 -> 256344 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
(limited to 'gui')
diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index ae162136bc..38db21ca01 100644
Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ
--
cgit v1.2.3
From 153e66318ea28650cf1badb80d2aeb6f5706007f Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Wed, 5 Oct 2011 19:56:37 +0100
Subject: I18N: Update Czech translation from patch #3419076
---
gui/themes/translations.dat | Bin 256344 -> 256496 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
(limited to 'gui')
diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index 38db21ca01..4420ff224d 100644
Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ
--
cgit v1.2.3
From 790b10bc2b2f0d36de7c2d5b49ecdab6b395307c Mon Sep 17 00:00:00 2001
From: Tarek Soliman
Date: Sat, 8 Oct 2011 11:58:34 -0500
Subject: CREDITS: Sort some sections by last name
---
gui/credits.h | 132 +++++++++++++++++++++++++++++-----------------------------
1 file changed, 66 insertions(+), 66 deletions(-)
(limited to 'gui')
diff --git a/gui/credits.h b/gui/credits.h
index 47336c4900..3a7e77c146 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -98,9 +98,9 @@ static const char *credits[] = {
"C0""Pawel Kolodziejski",
"",
"C1""DreamWeb",
-"C0""Vladimir Menshakov",
"C0""Torbj\366rn Andersson",
"C0""Bertrand Augereau",
+"C0""Vladimir Menshakov",
"",
"C1""Gob",
"C0""Torbj\366rn Andersson",
@@ -203,12 +203,12 @@ static const char *credits[] = {
"C2""(retired)",
"",
"C1""Sword25",
-"C0""Eugene Sandulenko",
-"C0""Filippos Karapetis",
+"C0""Torbj\366rn Andersson",
+"C0""Paul Gilbert",
"C0""Max Horn",
"C2""(retired)",
-"C0""Paul Gilbert",
-"C0""Torbj\366rn Andersson",
+"C0""Filippos Karapetis",
+"C0""Eugene Sandulenko",
"",
"C1""TeenAgent",
"C0""Robert Megone",
@@ -233,8 +233,8 @@ static const char *credits[] = {
"C0""Gregory Montoir",
"",
"C1""TsAGE",
-"C0""Paul Gilbert",
"C0""Arnaud Boutonn\351",
+"C0""Paul Gilbert",
"",
"C1""Tucker",
"C0""Gregory Montoir",
@@ -269,9 +269,9 @@ static const char *credits[] = {
"C0""Fabio Battaglia",
"",
"C1""Nintendo DS",
-"C0""Neil Millstone",
"C0""Bertrand Augereau",
"C2""HQ software scaler",
+"C0""Neil Millstone",
"",
"C1""OpenPandora",
"C0""John Willis",
@@ -289,8 +289,8 @@ static const char *credits[] = {
"C0""Max Lingua",
"",
"C1""PSP (PlayStation Portable)",
-"C0""Joost Peters",
"C0""Yotam Barnoy",
+"C0""Joost Peters",
"",
"C1""SDL (Win/Linux/OS X/etc.)",
"C0""Max Horn",
@@ -502,16 +502,16 @@ static const char *credits[] = {
"C1""Websites (design)",
"C0""Dob\363 Bal\341zs",
"C2""Website design",
+"C0""William Claydon",
+"C2""Skins for doxygen, buildbot and wiki",
"C0""Yaroslav Fedevych",
"C2""HTML/CSS for the website",
-"C0""David Jensen",
-"C2""SVG logo conversion",
"C0""Jean Marc Gimenez",
"C2""ScummVM logo",
+"C0""David Jensen",
+"C2""SVG logo conversion",
"C0""Raina",
"C2""ScummVM forum buttons",
-"C0""William Claydon",
-"C2""Skins for doxygen, buildbot and wiki",
"",
"C1""Code contributions",
"C0""Ori Avtalion",
@@ -562,76 +562,76 @@ static const char *credits[] = {
"C2""SDL-based OpenGL renderer",
"",
"C1""FreeSCI Contributors",
-"C0""Anders Baden Nielsen",
-"C2""PPC testing",
-"C0""Bas Zoetekouw",
-"C2""Man pages, debian package management, CVS maintenance",
-"C0""Carl Muckenhoupt",
-"C2""Sources to the SCI resource viewer tools that started it all",
+"C0""Francois-R Boyer",
+"C2""MT-32 information and mapping code",
+"C0""Rainer Canavan",
+"C2""IRIX MIDI driver and bug fixes",
+"C0""Xiaojun Chen",
+"C0""Paul David Doherty",
+"C2""Game version information",
+"C0""Vyacheslav Dikonov",
+"C2""Config script improvements",
+"C0""Ruediger Hanke",
+"C2""Port to the MorphOS platform",
+"C0""Matt Hargett",
+"C2""Clean-ups, bugfixes, Hardcore QA, Win32",
+"C0""Max Horn",
+"C2""SetJump implementation",
+"C0""Ravi I.",
+"C2""SCI0 sound resource specification",
+"C0""Emmanuel Jeandel",
+"C2""Bugfixes and bug reports",
+"C0""Dmitry Jemerov",
+"C2""Port to the Win32 platform, numerous bugfixes",
"C0""Chris Kehler",
"C2""Makefile enhancements",
-"C0""Christoph Reichenbach",
-"C2""UN*X code, VM/Graphics/Sound/other infrastructure",
"C0""Christopher T. Lansdown",
"C2""Original CVS maintainer, Alpha compatibility fixes",
+"C0""Sergey Lapin",
+"C2""Port of Carl's type 2 decompression code",
+"C0""Rickard Lind",
+"C2""MT-32->GM MIDI mapping magic, sound research",
+"C0""Hubert Maier",
+"C2""AmigaOS 4 port",
+"C0""Johannes Manhave",
+"C2""Document format translation",
"C0""Claudio Matsuoka",
"C2""CVS snapshots, daily builds, BeOS and cygwin ports",
"C0""Dark Minister",
"C2""SCI research (bytecode and parser)",
-"C0""Dmitry Jemerov",
-"C2""Port to the Win32 platform, numerous bugfixes",
-"C0""Emmanuel Jeandel",
-"C2""Bugfixes and bug reports",
-"C0""Francois-R Boyer",
-"C2""MT-32 information and mapping code",
+"C0""Carl Muckenhoupt",
+"C2""Sources to the SCI resource viewer tools that started it all",
+"C0""Anders Baden Nielsen",
+"C2""PPC testing",
+"C0""Walter van Niftrik",
+"C2""Ports to the Dreamcast and GP32 platforms",
+"C0""Rune Orsval",
+"C2""Configuration file editor",
+"C0""Solomon Peachy",
+"C2""SDL ports and much of the sound subsystem",
+"C0""Robey Pointer",
+"C2""Bug tracking system hosting",
+"C0""Magnus Reftel",
+"C2""Heap implementation, Python class viewer, bugfixes",
+"C0""Christoph Reichenbach",
+"C2""UN*X code, VM/Graphics/Sound/other infrastructure",
"C0""George Reid",
"C2""FreeBSD package management",
-"C0""Hubert Maier",
-"C2""AmigaOS 4 port",
+"C0""Lars Skovlund",
+"C2""Project maintenance, most documentation, bugfixes, SCI1 support",
+"C0""Rink Springer",
+"C2""Port to the DOS platform, several bug fixes",
+"C0""Rainer De Temple",
+"C2""SCI research",
+"C0""Sean Terrell",
"C0""Hugues Valois",
"C2""Game selection menu",
-"C0""Johannes Manhave",
-"C2""Document format translation",
"C0""Jordi Vilalta",
"C2""Numerous code and website clean-up patches",
-"C0""Lars Skovlund",
-"C2""Project maintenance, most documentation, bugfixes, SCI1 support",
-"C0""Magnus Reftel",
-"C2""Heap implementation, Python class viewer, bugfixes",
-"C0""Matt Hargett",
-"C2""Clean-ups, bugfixes, Hardcore QA, Win32",
-"C0""Max Horn",
-"C2""SetJump implementation",
-"C0""Paul David Doherty",
-"C2""Game version information",
"C0""Petr Vyhnak",
"C2""The DCL-INFLATE algorithm, many Win32 improvements",
-"C0""Rainer Canavan",
-"C2""IRIX MIDI driver and bug fixes",
-"C0""Rainer De Temple",
-"C2""SCI research",
-"C0""Ravi I.",
-"C2""SCI0 sound resource specification",
-"C0""Ruediger Hanke",
-"C2""Port to the MorphOS platform",
-"C0""Rune Orsval",
-"C2""Configuration file editor",
-"C0""Rickard Lind",
-"C2""MT-32->GM MIDI mapping magic, sound research",
-"C0""Rink Springer",
-"C2""Port to the DOS platform, several bug fixes",
-"C0""Robey Pointer",
-"C2""Bug tracking system hosting",
-"C0""Sergey Lapin",
-"C2""Port of Carl's type 2 decompression code",
-"C0""Solomon Peachy",
-"C2""SDL ports and much of the sound subsystem",
-"C0""Vyacheslav Dikonov",
-"C2""Config script improvements",
-"C0""Walter van Niftrik",
-"C2""Ports to the Dreamcast and GP32 platforms",
-"C0""Xiaojun Chen",
-"C0""Sean Terrell",
+"C0""Bas Zoetekouw",
+"C2""Man pages, debian package management, CVS maintenance",
"C0""Special thanks to Prof. Dr. Gary Nutt for allowing the FreeSCI VM extension as a course project in his Advanced OS course.",
"C0""",
"C0""Special thanks to Bob Heitman and Corey Cole for their support of FreeSCI.",
--
cgit v1.2.3
From f525ff7d01e181cf1fbc0cad6c5d71265b574520 Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Sat, 8 Oct 2011 22:42:07 +0100
Subject: I18N: Update Hungarian translation from patch #3419482
---
gui/themes/translations.dat | Bin 256496 -> 256641 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
(limited to 'gui')
diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index 4420ff224d..05629892b2 100644
Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ
--
cgit v1.2.3
From 9ca17c4e95512102863d29684301a513bc59d9a5 Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Sun, 16 Oct 2011 14:11:08 +0100
Subject: I18N: Regenerate translations data file
---
gui/themes/translations.dat | Bin 256641 -> 259232 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
(limited to 'gui')
diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index 05629892b2..cc801c567a 100644
Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ
--
cgit v1.2.3
From 90598bd4e2754e00a233c5670862b314d2c3ccf4 Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Mon, 17 Oct 2011 00:03:44 +0100
Subject: I18N: Regenerate translations data file
---
gui/themes/translations.dat | Bin 259232 -> 265395 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
(limited to 'gui')
diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index cc801c567a..583293bd1e 100644
Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ
--
cgit v1.2.3
From ed07b99b22c2cf092f207dc15b26801c502534ac Mon Sep 17 00:00:00 2001
From: Chris Warren-Smith
Date: Mon, 17 Oct 2011 22:35:48 +1000
Subject: BADA: Misc changes merged from appstore release
---
gui/ThemeEngine.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'gui')
diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index 4a2e0a7ac5..16e693b373 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -590,7 +590,7 @@ bool ThemeEngine::addFont(TextData textId, const Common::String &file) {
#ifdef USE_TRANSLATION
TransMan.setLanguage("C");
#endif
- warning("Failed to load localized font '%s'. Using non-localized font and default GUI language instead", file.c_str());
+ warning("Failed to load localized font '%s'. Using non-localized font and default GUI language instead", localized.c_str());
}
}
}
--
cgit v1.2.3
From ed2cb9a6b31c230e105af39d9c3608fa7234b24d Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Mon, 17 Oct 2011 17:13:50 +0100
Subject: GUI: Added debug ouput for determining loaded theme
---
gui/ThemeEngine.cpp | 2 ++
1 file changed, 2 insertions(+)
(limited to 'gui')
diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index 16e693b373..cf16eec238 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -660,6 +660,8 @@ bool ThemeEngine::addDrawData(const Common::String &data, bool cached) {
void ThemeEngine::loadTheme(const Common::String &themeId) {
unloadTheme();
+ debug(6, "Loading theme %s", themeId.c_str());
+
if (themeId == "builtin") {
_themeOk = loadDefaultXML();
} else {
--
cgit v1.2.3
From 2dea24a835e54cdb73b6533e256f7a725713b42d Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Wed, 19 Oct 2011 13:47:19 +0100
Subject: I18N: Regenerate translations.dat
---
gui/themes/translations.dat | Bin 265395 -> 265702 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
(limited to 'gui')
diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index 583293bd1e..0fef079c34 100644
Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ
--
cgit v1.2.3
From 2efcee52889c7ed1c46e669a3b3d4f0ab2aa1cd2 Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Sun, 23 Oct 2011 15:06:37 +0100
Subject: I18N: Regenerate translations data file
---
gui/themes/translations.dat | Bin 265702 -> 273189 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
(limited to 'gui')
diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index 0fef079c34..770f76ddf1 100644
Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ
--
cgit v1.2.3
From 77c65648b1db8f8b7b245510681eafd856798d26 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 23 Oct 2011 15:14:41 +0100
Subject: AD: Swtich GUI options to a char array.
This eliminates nasty limitation of caping number of flags to 31.
Current code has limitation of 255 flags, though.
Only SCUMM engine is converted, rest do not even compile.
Detection of fan talkie MI is broken as it has to be implemented
differently.
---
gui/launcher.cpp | 6 +++---
gui/options.cpp | 44 ++++++++++++++++++++++++++------------------
gui/options.h | 2 +-
3 files changed, 30 insertions(+), 22 deletions(-)
(limited to 'gui')
diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index 5fafcfbad4..8e94c140a4 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -252,7 +252,7 @@ EditGameDialog::EditGameDialog(const String &domain, const String &desc)
else
_globalMIDIOverride = new CheckboxWidget(tab, "GameOptions_MIDI.EnableTabCheckbox", _c("Override global MIDI settings", "lowres"), 0, kCmdGlobalMIDIOverride);
- if (_guioptions & Common::GUIO_NOMIDI)
+ if (_guioptions.contains(GUIO_NOMIDI))
_globalMIDIOverride->setEnabled(false);
addMIDIControls(tab, "GameOptions_MIDI.");
@@ -267,7 +267,7 @@ EditGameDialog::EditGameDialog(const String &domain, const String &desc)
else
_globalMT32Override = new CheckboxWidget(tab, "GameOptions_MT32.EnableTabCheckbox", _c("Override global MT-32 settings", "lowres"), 0, kCmdGlobalMT32Override);
- //if (_guioptions & Common::GUIO_NOMIDI)
+ //if (_guioptions.contains(GUIO_NOMIDI))
// _globalMT32Override->setEnabled(false);
addMT32Controls(tab, "GameOptions_MT32.");
@@ -1038,7 +1038,7 @@ void LauncherDialog::updateButtons() {
bool en = enable;
if (item >= 0)
- en = !(Common::checkGameGUIOption(Common::GUIO_NOLAUNCHLOAD, ConfMan.get("guioptions", _domains[item])));
+ en = !(Common::checkGameGUIOption(GUIO_NOLAUNCHLOAD, ConfMan.get("guioptions", _domains[item])));
if (en != _loadButton->isEnabled()) {
_loadButton->setEnabled(en);
diff --git a/gui/options.cpp b/gui/options.cpp
index 3cc2eea6b9..67204fc343 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -141,7 +141,7 @@ void OptionsDialog::init() {
_oldTheme = g_gui.theme()->getThemeId();
// Retrieve game GUI options
- _guioptions = 0;
+ _guioptions = "";
if (ConfMan.hasKey("guioptions", _domain)) {
_guioptionsString = ConfMan.get("guioptions", _domain);
_guioptions = parseGameGUIOptions(_guioptionsString);
@@ -155,7 +155,7 @@ void OptionsDialog::open() {
setResult(0);
// Retrieve game GUI options
- _guioptions = 0;
+ _guioptions = "";
if (ConfMan.hasKey("guioptions", _domain)) {
_guioptionsString = ConfMan.get("guioptions", _domain);
_guioptions = parseGameGUIOptions(_guioptionsString);
@@ -595,11 +595,15 @@ void OptionsDialog::setAudioSettingsState(bool enabled) {
_midiPopUpDesc->setEnabled(enabled);
_midiPopUp->setEnabled(enabled);
- uint32 allFlags = MidiDriver::musicType2GUIO((uint32)-1);
+ Common::String allFlags = MidiDriver::musicType2GUIO((uint32)-1);
+ char opt[256];
+
+ strncpy(opt, _guioptions.c_str(), 256);
+ bool hasMidiDefined = (strtok(opt, allFlags.c_str()) != NULL);
if (_domain != Common::ConfigManager::kApplicationDomain && // global dialog
- (_guioptions & allFlags) && // No flags are specified
- !(_guioptions & Common::GUIO_MIDIADLIB)) {
+ hasMidiDefined && // No flags are specified
+ !(_guioptions.contains(GUIO_MIDIADLIB))) {
_oplPopUpDesc->setEnabled(false);
_oplPopUp->setEnabled(false);
} else {
@@ -611,7 +615,7 @@ void OptionsDialog::setAudioSettingsState(bool enabled) {
}
void OptionsDialog::setMIDISettingsState(bool enabled) {
- if (_guioptions & Common::GUIO_NOMIDI)
+ if (_guioptions.contains(GUIO_NOMIDI))
enabled = false;
_gmDevicePopUpDesc->setEnabled(_domain.equals(Common::ConfigManager::kApplicationDomain) ? enabled : false);
@@ -649,7 +653,7 @@ void OptionsDialog::setVolumeSettingsState(bool enabled) {
_enableVolumeSettings = enabled;
ena = enabled && !_muteCheckbox->getState();
- if (_guioptions & Common::GUIO_NOMUSIC)
+ if (_guioptions.contains(GUIO_NOMUSIC))
ena = false;
_musicVolumeDesc->setEnabled(ena);
@@ -657,7 +661,7 @@ void OptionsDialog::setVolumeSettingsState(bool enabled) {
_musicVolumeLabel->setEnabled(ena);
ena = enabled && !_muteCheckbox->getState();
- if (_guioptions & Common::GUIO_NOSFX)
+ if (_guioptions.contains(GUIO_NOSFX))
ena = false;
_sfxVolumeDesc->setEnabled(ena);
@@ -665,7 +669,7 @@ void OptionsDialog::setVolumeSettingsState(bool enabled) {
_sfxVolumeLabel->setEnabled(ena);
ena = enabled && !_muteCheckbox->getState();
- if (_guioptions & Common::GUIO_NOSPEECH)
+ if (_guioptions.contains(GUIO_NOSPEECH))
ena = false;
_speechVolumeDesc->setEnabled(ena);
@@ -680,14 +684,14 @@ void OptionsDialog::setSubtitleSettingsState(bool enabled) {
_enableSubtitleSettings = enabled;
ena = enabled;
- if ((_guioptions & Common::GUIO_NOSUBTITLES) || (_guioptions & Common::GUIO_NOSPEECH))
+ if ((_guioptions.contains(GUIO_NOSUBTITLES)) || (_guioptions.contains(GUIO_NOSPEECH)))
ena = false;
_subToggleGroup->setEnabled(ena);
_subToggleDesc->setEnabled(ena);
ena = enabled;
- if (_guioptions & Common::GUIO_NOSUBTITLES)
+ if (_guioptions.contains(GUIO_NOSUBTITLES))
ena = false;
_subSpeedDesc->setEnabled(ena);
@@ -741,22 +745,26 @@ void OptionsDialog::addAudioControls(GuiObject *boss, const Common::String &pref
_midiPopUp = new PopUpWidget(boss, prefix + "auMidiPopup", _("Specifies output sound device or sound card emulator"));
// Populate it
- uint32 allFlags = MidiDriver::musicType2GUIO((uint32)-1);
+ Common::String allFlags = MidiDriver::musicType2GUIO((uint32)-1);
+ char opt[256];
+
+ strncpy(opt, _guioptions.c_str(), 256);
+ bool hasMidiDefined = (strtok(opt, allFlags.c_str()) != NULL);
const MusicPlugin::List p = MusicMan.getPlugins();
for (MusicPlugin::List::const_iterator m = p.begin(); m != p.end(); ++m) {
MusicDevices i = (**m)->getDevices();
for (MusicDevices::iterator d = i.begin(); d != i.end(); ++d) {
- const uint32 deviceGuiOption = MidiDriver::musicType2GUIO(d->getMusicType());
+ Common::String deviceGuiOption = MidiDriver::musicType2GUIO(d->getMusicType());
if ((_domain == Common::ConfigManager::kApplicationDomain && d->getMusicType() != MT_TOWNS // global dialog - skip useless FM-Towns, C64, Amiga, AppleIIGS options there
&& d->getMusicType() != MT_C64 && d->getMusicType() != MT_AMIGA && d->getMusicType() != MT_APPLEIIGS && d->getMusicType() != MT_PC98)
- || (_domain != Common::ConfigManager::kApplicationDomain && !(_guioptions & allFlags)) // No flags are specified
- || (_guioptions & deviceGuiOption) // flag is present
+ || (_domain != Common::ConfigManager::kApplicationDomain && !hasMidiDefined) // No flags are specified
+ || (_guioptions.contains(deviceGuiOption)) // flag is present
// HACK/FIXME: For now we have to show GM devices, even when the game only has GUIO_MIDIMT32 set,
// else we would not show for example external devices connected via ALSA, since they are always
// marked as General MIDI device.
- || (deviceGuiOption == Common::GUIO_MIDIGM && (_guioptions & Common::GUIO_MIDIMT32))
+ || (deviceGuiOption.contains(GUIO_MIDIGM) && (_guioptions.contains(GUIO_MIDIMT32)))
|| d->getMusicDriverId() == "auto" || d->getMusicDriverId() == "null") // always add default and null device
_midiPopUp->appendEntry(d->getCompleteName(), d->getHandle());
}
@@ -997,9 +1005,9 @@ void OptionsDialog::saveMusicDeviceSetting(PopUpWidget *popup, Common::String se
}
int OptionsDialog::getSubtitleMode(bool subtitles, bool speech_mute) {
- if (_guioptions & Common::GUIO_NOSUBTITLES)
+ if (_guioptions.contains(GUIO_NOSUBTITLES))
return kSubtitlesSpeech; // Speech only
- if (_guioptions & Common::GUIO_NOSPEECH)
+ if (_guioptions.contains(GUIO_NOSPEECH))
return kSubtitlesSubs; // Subtitles only
if (!subtitles && !speech_mute) // Speech only
diff --git a/gui/options.h b/gui/options.h
index f17669a3cc..c6b1d328c1 100644
--- a/gui/options.h
+++ b/gui/options.h
@@ -172,7 +172,7 @@ protected:
//
// Game GUI options
//
- uint32 _guioptions;
+ Common::String _guioptions;
Common::String _guioptionsString;
//
--
cgit v1.2.3