Adopt changes for the new libgui

- Needs a new SelectBox wrapper with default values. - Removed the scale parameter from the default chechbox/Switch - Removed unneeded values from the common.h
Maschell · Oct 29, 2017 · 1719033 · 1719033
1 parent c94d182
commit 1719033
Show file tree

Hide file tree

Showing 15 changed files with 167 additions and 78 deletions.
diff --git a/languages/BR_Portuguese.lang b/languages/BR_Portuguese.lang
@@ -248,27 +248,27 @@ msgstr "É de código aberto e pode encontrar aquí:"
 msgid "https://github.com/QuarkTheAwesome/HIDtoVPADNetworkClient"
 msgstr ""
 
-#: src/menu/drc/content/ContentSettings.cpp:46
-#: src/menu/drc/content/ContentSettings.cpp:51
+#: src/menu/drc/content/ContentSettings.cpp:50
+#: src/menu/drc/content/ContentSettings.cpp:55
 msgid "Language"
 msgstr ""
 
-#: src/menu/drc/content/ContentSettings.cpp:47
-#: src/menu/drc/content/ContentSettings.cpp:52
+#: src/menu/drc/content/ContentSettings.cpp:51
+#: src/menu/drc/content/ContentSettings.cpp:56
 msgid "Rumble"
 msgstr ""
 
-#: src/menu/drc/content/ContentSettings.cpp:48
-#: src/menu/drc/content/ContentSettings.cpp:53
+#: src/menu/drc/content/ContentSettings.cpp:52
+#: src/menu/drc/content/ContentSettings.cpp:57
 msgid "Music"
 msgstr ""
 
-#: src/menu/drc/content/ContentSettings.cpp:49
-#: src/menu/drc/content/ContentSettings.cpp:54
+#: src/menu/drc/content/ContentSettings.cpp:53
+#: src/menu/drc/content/ContentSettings.cpp:58
 msgid "Network Controller"
 msgstr ""
 
-#: src/menu/drc/content/ContentSettings.cpp:75
+#: src/menu/drc/content/ContentSettings.cpp:79
 msgid "<Default>"
 msgstr ""
 

diff --git a/languages/english.lang b/languages/english.lang
@@ -246,27 +246,27 @@ msgstr ""
 msgid "https://github.com/QuarkTheAwesome/HIDtoVPADNetworkClient"
 msgstr ""
 
-#: src/menu/drc/content/ContentSettings.cpp:46
-#: src/menu/drc/content/ContentSettings.cpp:51
+#: src/menu/drc/content/ContentSettings.cpp:50
+#: src/menu/drc/content/ContentSettings.cpp:55
 msgid "Language"
 msgstr ""
 
-#: src/menu/drc/content/ContentSettings.cpp:47
-#: src/menu/drc/content/ContentSettings.cpp:52
+#: src/menu/drc/content/ContentSettings.cpp:51
+#: src/menu/drc/content/ContentSettings.cpp:56
 msgid "Rumble"
 msgstr ""
 
-#: src/menu/drc/content/ContentSettings.cpp:48
-#: src/menu/drc/content/ContentSettings.cpp:53
+#: src/menu/drc/content/ContentSettings.cpp:52
+#: src/menu/drc/content/ContentSettings.cpp:57
 msgid "Music"
 msgstr ""
 
-#: src/menu/drc/content/ContentSettings.cpp:49
-#: src/menu/drc/content/ContentSettings.cpp:54
+#: src/menu/drc/content/ContentSettings.cpp:53
+#: src/menu/drc/content/ContentSettings.cpp:58
 msgid "Network Controller"
 msgstr ""
 
-#: src/menu/drc/content/ContentSettings.cpp:75
+#: src/menu/drc/content/ContentSettings.cpp:79
 msgid "<Default>"
 msgstr ""
 

diff --git a/languages/french.lang b/languages/french.lang
@@ -247,27 +247,27 @@ msgstr "Il est Open source et peut être trouvé ici: "
 msgid "https://github.com/QuarkTheAwesome/HIDtoVPADNetworkClient"
 msgstr "https://github.com/QuarkTheAwesome/HIDtoVPADNetworkClient"
 
-#: src/menu/drc/content/ContentSettings.cpp:46
-#: src/menu/drc/content/ContentSettings.cpp:51
+#: src/menu/drc/content/ContentSettings.cpp:50
+#: src/menu/drc/content/ContentSettings.cpp:55
 msgid "Language"
 msgstr "Langue"
 
-#: src/menu/drc/content/ContentSettings.cpp:47
-#: src/menu/drc/content/ContentSettings.cpp:52
+#: src/menu/drc/content/ContentSettings.cpp:51
+#: src/menu/drc/content/ContentSettings.cpp:56
 msgid "Rumble"
 msgstr "Vibration"
 
-#: src/menu/drc/content/ContentSettings.cpp:48
-#: src/menu/drc/content/ContentSettings.cpp:53
+#: src/menu/drc/content/ContentSettings.cpp:52
+#: src/menu/drc/content/ContentSettings.cpp:57
 msgid "Music"
 msgstr "Musique"
 
-#: src/menu/drc/content/ContentSettings.cpp:49
-#: src/menu/drc/content/ContentSettings.cpp:54
+#: src/menu/drc/content/ContentSettings.cpp:53
+#: src/menu/drc/content/ContentSettings.cpp:58
 msgid "Network Controller"
 msgstr ""
 
-#: src/menu/drc/content/ContentSettings.cpp:75
+#: src/menu/drc/content/ContentSettings.cpp:79
 msgid "<Default>"
 msgstr "<Défaut>"
 

diff --git a/languages/german.lang b/languages/german.lang
@@ -248,27 +248,27 @@ msgstr "Es ist Open-Source und kann hier geladen werden:"
 msgid "https://github.com/QuarkTheAwesome/HIDtoVPADNetworkClient"
 msgstr ""
 
-#: src/menu/drc/content/ContentSettings.cpp:46
-#: src/menu/drc/content/ContentSettings.cpp:51
+#: src/menu/drc/content/ContentSettings.cpp:50
+#: src/menu/drc/content/ContentSettings.cpp:55
 msgid "Language"
 msgstr "Sprache"
 
-#: src/menu/drc/content/ContentSettings.cpp:47
-#: src/menu/drc/content/ContentSettings.cpp:52
+#: src/menu/drc/content/ContentSettings.cpp:51
+#: src/menu/drc/content/ContentSettings.cpp:56
 msgid "Rumble"
 msgstr ""
 
-#: src/menu/drc/content/ContentSettings.cpp:48
-#: src/menu/drc/content/ContentSettings.cpp:53
+#: src/menu/drc/content/ContentSettings.cpp:52
+#: src/menu/drc/content/ContentSettings.cpp:57
 msgid "Music"
 msgstr "Musik"
 
-#: src/menu/drc/content/ContentSettings.cpp:49
-#: src/menu/drc/content/ContentSettings.cpp:54
+#: src/menu/drc/content/ContentSettings.cpp:53
+#: src/menu/drc/content/ContentSettings.cpp:58
 msgid "Network Controller"
 msgstr ""
 
-#: src/menu/drc/content/ContentSettings.cpp:75
+#: src/menu/drc/content/ContentSettings.cpp:79
 msgid "<Default>"
 msgstr ""
 

diff --git a/languages/italian.lang b/languages/italian.lang
@@ -247,27 +247,27 @@ msgstr "È open source e puoi trovarlo qui:"
 msgid "https://github.com/QuarkTheAwesome/HIDtoVPADNetworkClient"
 msgstr "https://github.com/QuarkTheAwesome/HIDtoVPADNetworkClient"
 
-#: src/menu/drc/content/ContentSettings.cpp:46
-#: src/menu/drc/content/ContentSettings.cpp:51
+#: src/menu/drc/content/ContentSettings.cpp:50
+#: src/menu/drc/content/ContentSettings.cpp:55
 msgid "Language"
 msgstr "Lingua"
 
-#: src/menu/drc/content/ContentSettings.cpp:47
-#: src/menu/drc/content/ContentSettings.cpp:52
+#: src/menu/drc/content/ContentSettings.cpp:51
+#: src/menu/drc/content/ContentSettings.cpp:56
 msgid "Rumble"
 msgstr "Vibrazione"
 
-#: src/menu/drc/content/ContentSettings.cpp:48
-#: src/menu/drc/content/ContentSettings.cpp:53
+#: src/menu/drc/content/ContentSettings.cpp:52
+#: src/menu/drc/content/ContentSettings.cpp:57
 msgid "Music"
 msgstr "Musica"
 
-#: src/menu/drc/content/ContentSettings.cpp:49
-#: src/menu/drc/content/ContentSettings.cpp:54
+#: src/menu/drc/content/ContentSettings.cpp:53
+#: src/menu/drc/content/ContentSettings.cpp:58
 msgid "Network Controller"
 msgstr ""
 
-#: src/menu/drc/content/ContentSettings.cpp:75
+#: src/menu/drc/content/ContentSettings.cpp:79
 msgid "<Default>"
 msgstr "<Default>"
 

diff --git a/languages/spanish.lang b/languages/spanish.lang
@@ -248,27 +248,27 @@ msgstr "Es de código abierto y puedes encontrarlo aquí:"
 msgid "https://github.com/QuarkTheAwesome/HIDtoVPADNetworkClient"
 msgstr ""
 
-#: src/menu/drc/content/ContentSettings.cpp:46
-#: src/menu/drc/content/ContentSettings.cpp:51
+#: src/menu/drc/content/ContentSettings.cpp:50
+#: src/menu/drc/content/ContentSettings.cpp:55
 msgid "Language"
 msgstr ""
 
-#: src/menu/drc/content/ContentSettings.cpp:47
-#: src/menu/drc/content/ContentSettings.cpp:52
+#: src/menu/drc/content/ContentSettings.cpp:51
+#: src/menu/drc/content/ContentSettings.cpp:56
 msgid "Rumble"
 msgstr ""
 
-#: src/menu/drc/content/ContentSettings.cpp:48
-#: src/menu/drc/content/ContentSettings.cpp:53
+#: src/menu/drc/content/ContentSettings.cpp:52
+#: src/menu/drc/content/ContentSettings.cpp:57
 msgid "Music"
 msgstr ""
 
-#: src/menu/drc/content/ContentSettings.cpp:49
-#: src/menu/drc/content/ContentSettings.cpp:54
+#: src/menu/drc/content/ContentSettings.cpp:53
+#: src/menu/drc/content/ContentSettings.cpp:58
 msgid "Network Controller"
 msgstr ""
 
-#: src/menu/drc/content/ContentSettings.cpp:75
+#: src/menu/drc/content/ContentSettings.cpp:79
 msgid "<Default>"
 msgstr ""
 

diff --git a/src/common/common.h b/src/common/common.h
@@ -11,20 +11,11 @@ extern "C" {
 #define SD_PATH                     "sd:"
 #define WIIU_PATH                   "/wiiu"
 
-// none dynamic libs
-#define LIB_LOADER              0x1001
-
-#ifndef MEM_BASE
-#define MEM_BASE                    (0x00800000)
-#endif
-
 #define ELF_DATA_ADDR               (*(volatile u32*)(MEM_BASE + 0x1300 + 0x00))
 #define ELF_DATA_SIZE               (*(volatile u32*)(MEM_BASE + 0x1300 + 0x04))
 #define MAIN_ENTRY_ADDR             (*(volatile u32*)(MEM_BASE + 0x1400 + 0x00))
 #define OS_FIRMWARE                 (*(volatile u32*)(MEM_BASE + 0x1400 + 0x04))
 
-#define OS_SPECIFICS                ((OsSpecifics*)(MEM_BASE + 0x1500))
-
 #ifndef EXIT_SUCCESS
 #define EXIT_SUCCESS                0
 #endif

diff --git a/src/menu/drc/content/ContentSettings.cpp b/src/menu/drc/content/ContentSettings.cpp
@@ -26,9 +26,9 @@ ContentSettings::ContentSettings():ContentTemplate()
     , touchTrigger(GuiTrigger::CHANNEL_1, GuiTrigger::VPAD_TOUCH)
     , wpadTouchTrigger(GuiTrigger::CHANNEL_2 | GuiTrigger::CHANNEL_3 | GuiTrigger::CHANNEL_4 | GuiTrigger::CHANNEL_5, GuiTrigger::BUTTON_A)
     , languageSelectBox("",NULL)
-    , rumbleSwitch(CSettings::instance()->getValueAsBool(CSettings::RumbleActivated),2.0f)
-    , musicSwitch(CSettings::instance()->getValueAsBool(CSettings::MusicActivated),2.0f)
-    , networkControllerSwitch(CSettings::instance()->getValueAsBool(CSettings::NetworkControllerActivated),4.0f)
+    , rumbleSwitch(CSettings::instance()->getValueAsBool(CSettings::RumbleActivated))
+    , musicSwitch(CSettings::instance()->getValueAsBool(CSettings::MusicActivated))
+    , networkControllerSwitch(CSettings::instance()->getValueAsBool(CSettings::NetworkControllerActivated))
     , buttonClickSound(Resources::GetSound("settings_click_2.mp3"))
     {
     headLine.setText(gettext("Settings"));
@@ -43,6 +43,10 @@ ContentSettings::ContentSettings():ContentTemplate()
     settingsFrame.setSize(getWidth(),getHeight());
     append(&settingsFrame);
 
+    rumbleSwitch.setScale(2.0f);
+    musicSwitch.setScale(2.0f);
+    networkControllerSwitch.setScale(2.0f);
+
     settings[gettext("Language")] = &languageSelectBox;
     settings[gettext("Rumble")] = &rumbleSwitch;
     settings[gettext("Music")] = &musicSwitch;

diff --git a/src/menu/drc/content/ContentSettings.h b/src/menu/drc/content/ContentSettings.h
@@ -24,6 +24,7 @@
 
 #include "mygui/DefaultGuiCheckBox.h"
 #include "mygui/DefaultGuiSwitch.h"
+#include "mygui/DefaultSelectBox.h"
 #include "ContentTemplate.h"
 
 class ContentSettings : public ContentTemplate{
@@ -34,7 +35,7 @@ class ContentSettings : public ContentTemplate{
 private:
     GuiTrigger touchTrigger;
     GuiTrigger wpadTouchTrigger;
-    GuiSelectBox languageSelectBox;
+    DefaultSelectBox languageSelectBox;
 
     std::map<std::string,std::string> languagesNames;
 
@@ -44,7 +45,7 @@ class ContentSettings : public ContentTemplate{
 
     DefaultGuiSwitch rumbleSwitch;
     DefaultGuiSwitch musicSwitch;
-    DefaultGuiCheckBox networkControllerSwitch;
+    DefaultGuiSwitch networkControllerSwitch;
 
     GuiSound *buttonClickSound;
 

diff --git a/src/mygui/DefaultGuiCheckBox.cpp b/src/mygui/DefaultGuiCheckBox.cpp
@@ -19,7 +19,7 @@
  * Constructor for the DefaultGuiCheckBox class.
  */
 
-DefaultGuiCheckBox::DefaultGuiCheckBox(bool checked,f32 scale)
+DefaultGuiCheckBox::DefaultGuiCheckBox(bool checked)
  : GuiCheckBox(checked)
  ,checkbox_imgdata(Resources::GetImageData("checkbox.png"))
  ,checkbox_img(checkbox_imgdata)
@@ -28,9 +28,7 @@ DefaultGuiCheckBox::DefaultGuiCheckBox(bool checked,f32 scale)
  ,highlighted_imgdata(Resources::GetImageData("checkbox_highlighted.png"))
  ,highlighted_img(highlighted_imgdata)
 {
-    setScale(scale);
-    setSize(checkbox_img.getWidth(),
-            checkbox_img.getHeight());
+    setSize(checkbox_img.getWidth(),checkbox_img.getHeight());
     this->setImageBackground(&checkbox_img);
     this->setImageSelected(&checkbox_selected_img);
     this->setImageHighlighted(&highlighted_img);

diff --git a/src/mygui/DefaultGuiCheckBox.h b/src/mygui/DefaultGuiCheckBox.h
@@ -24,7 +24,7 @@ class DefaultGuiCheckBox : public GuiCheckBox{
 	public:
 		//!Constructor
 		//!\param checked Checked
-		DefaultGuiCheckBox(bool checked,f32 scale = 1.0f);
+		DefaultGuiCheckBox(bool checked);
 		//!Destructor
 		virtual ~DefaultGuiCheckBox();
 	protected:

diff --git a/src/mygui/DefaultGuiSwitch.cpp b/src/mygui/DefaultGuiSwitch.cpp
@@ -19,7 +19,7 @@
  * Constructor for the DefaultGuiSwitch class.
  */
 
-DefaultGuiSwitch::DefaultGuiSwitch(bool checked,f32 scale)
+DefaultGuiSwitch::DefaultGuiSwitch(bool checked)
  : GuiSwitch(checked)
  ,switchbase_imgdata(Resources::GetImageData("switchIconBase.png"))
  ,switchbase_img(switchbase_imgdata)
@@ -30,9 +30,7 @@ DefaultGuiSwitch::DefaultGuiSwitch(bool checked,f32 scale)
  ,switchOff_imgdata(Resources::GetImageData("switchIconOff.png"))
  ,switchOff_img(switchOff_imgdata)
 {
-    setScale(scale);
-    setSize(switchbase_img.getWidth(),
-        switchbase_img.getHeight());
+    setSize(switchbase_img.getWidth(),switchbase_img.getHeight());
     this->setImageBackground(&switchbase_img);
     this->setImageHighlighted(&switchbase_highlighted_img);
     this->setImageOn(&switchOn_img);

diff --git a/src/mygui/DefaultGuiSwitch.h b/src/mygui/DefaultGuiSwitch.h
@@ -25,7 +25,7 @@ class DefaultGuiSwitch : public GuiSwitch
 	public:
 		//!Constructor
 		//!\param checked Checked
-		DefaultGuiSwitch(bool checked,f32 scale = 1.0f);
+		DefaultGuiSwitch(bool checked);
 		//!Destructor
 		virtual ~DefaultGuiSwitch();