From cb496994e3718f1db196e8674a218f900291cb49 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Fri, 11 Sep 2015 16:13:18 +0200 Subject: [PATCH] DolphinQt: Bring pixmaps up to date with DolphinWX and themes Also removed PLUGIN from names because there aren't actually any plugins. --- Source/Core/DolphinQt/Utils/Resources.cpp | 6 ++---- Source/Core/DolphinQt/Utils/Resources.h | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Source/Core/DolphinQt/Utils/Resources.cpp b/Source/Core/DolphinQt/Utils/Resources.cpp index 25a9c4abfd..43981954cc 100644 --- a/Source/Core/DolphinQt/Utils/Resources.cpp +++ b/Source/Core/DolphinQt/Utils/Resources.cpp @@ -70,10 +70,8 @@ void Resources::UpdatePixmaps() m_pixmaps[TOOLBAR_FULLSCREEN].load(GIFN("fullscreen")); m_pixmaps[TOOLBAR_SCREENSHOT].load(GIFN("screenshot")); m_pixmaps[TOOLBAR_CONFIGURE].load(GIFN("config")); - m_pixmaps[TOOLBAR_PLUGIN_GFX].load(GIFN("graphics")); - m_pixmaps[TOOLBAR_PLUGIN_DSP].load(GIFN("dsp")); - m_pixmaps[TOOLBAR_PLUGIN_GCPAD].load(GIFN("gcpad")); - m_pixmaps[TOOLBAR_PLUGIN_WIIMOTE].load(GIFN("wiimote")); + m_pixmaps[TOOLBAR_GRAPHICS].load(GIFN("graphics")); + m_pixmaps[TOOLBAR_CONTROLLERS].load(GIFN("classic")); m_pixmaps[TOOLBAR_HELP].load(GIFN("nobanner")); // TODO // TODO: toolbar[MEMCARD]; // TODO: toolbar[HOTKEYS]; diff --git a/Source/Core/DolphinQt/Utils/Resources.h b/Source/Core/DolphinQt/Utils/Resources.h index 530f365e1f..e6c7852424 100644 --- a/Source/Core/DolphinQt/Utils/Resources.h +++ b/Source/Core/DolphinQt/Utils/Resources.h @@ -33,10 +33,8 @@ public: TOOLBAR_FULLSCREEN, TOOLBAR_SCREENSHOT, TOOLBAR_CONFIGURE, - TOOLBAR_PLUGIN_GFX, - TOOLBAR_PLUGIN_DSP, - TOOLBAR_PLUGIN_GCPAD, - TOOLBAR_PLUGIN_WIIMOTE, + TOOLBAR_GRAPHICS, + TOOLBAR_CONTROLLERS, TOOLBAR_HELP, MEMCARD, HOTKEYS,