Skip to content

Commit

Permalink
GUI: Use "button" instead of "btn" in variable names.
Browse files Browse the repository at this point in the history
  • Loading branch information
Johannes Schickel committed Jan 24, 2016
1 parent 120164b commit 5a63ee5
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 37 deletions.
18 changes: 9 additions & 9 deletions gui/ThemeEngine.cpp
View file
Expand Up @@ -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;
Expand Down
18 changes: 9 additions & 9 deletions gui/ThemeEngine.h
View file
Expand Up @@ -228,17 +228,17 @@ class ThemeEngine {
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.
Expand Down
34 changes: 17 additions & 17 deletions gui/onscreendialog.cpp
View file
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions gui/predictivedialog.cpp
View file
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
}
Expand Down

0 comments on commit 5a63ee5

Please sign in to comment.