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