Merge remote branch 'upstream/master' into soccer

8 files changed, 11 insertions, 8 deletions

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);
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.
-
diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index df15d72567..40ea52f478 100644
--- a/gui/themes/translations.dat
+++ b/gui/themes/translations.dat
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(); }
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) {