diff --git a/source/Settings.cpp b/source/Settings.cpp index 2b526ba9..713c6738 100644 --- a/source/Settings.cpp +++ b/source/Settings.cpp @@ -51,6 +51,13 @@ int MenuSettings() GuiSound btnClick1(button_click_pcm, button_click_pcm_size, SOUND_PCM, Settings.sfxvolume); char imgPath[100]; + + snprintf(imgPath, sizeof(imgPath), "%ssettings_top.png", CFG.theme_path); + GuiImageData settingsTop(imgPath, settings_top_png); + + snprintf(imgPath, sizeof(imgPath), "%ssettings_bottom.png", CFG.theme_path); + GuiImageData settingsBottom(imgPath, settings_bottom_png); + snprintf(imgPath, sizeof(imgPath), "%sbutton_dialogue_box.png", CFG.theme_path); GuiImageData btnOutline(imgPath, button_dialogue_box_png); @@ -80,6 +87,14 @@ int MenuSettings() GuiImage creditsImg(&creditsImgData); GuiImage creditsImgOver(&creditsOver); + + GuiImage settingsTopImg(&settingsTop); + settingsTopImg.SetAlignment(ALIGN_LEFT, ALIGN_TOP); + settingsTopImg.SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_IN, 35); + + GuiImage settingsBottomImg(&settingsBottom); + settingsBottomImg.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM); + settingsBottomImg.SetEffect(EFFECT_SLIDE_BOTTOM | EFFECT_SLIDE_IN, 35); GuiTrigger trigA; trigA.SetSimpleTrigger(-1, WPAD_BUTTON_A | WPAD_CLASSIC_BUTTON_A, PAD_BUTTON_A); @@ -99,6 +114,7 @@ int MenuSettings() GuiText titleTxt(LANGUAGE.settings, 28, (GXColor){0, 0, 0, 255}); titleTxt.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); titleTxt.SetPosition(0,40); + titleTxt.SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_IN, 35); GuiImage settingsbackground(&settingsbg); @@ -112,6 +128,7 @@ int MenuSettings() GuiButton backBtn(&backBtnImg,&backBtnImg, 2, 3, -180, 400, &trigA, &btnSoundOver, &btnClick,1); backBtn.SetLabel(&backBtnTxt); backBtn.SetTrigger(&trigB); + backBtn.SetEffect(EFFECT_SLIDE_BOTTOM | EFFECT_SLIDE_IN, 35); GuiButton homo(1,1); homo.SetTrigger(&trigHome); @@ -279,6 +296,8 @@ int MenuSettings() mainWindow->Append(&w); w.RemoveAll(); w.Append(&settingsbackground); + w.Append(&settingsTopImg); + w.Append(&settingsBottomImg); w.Append(&PageIndicatorBtn1); w.Append(&PageIndicatorBtn2); w.Append(&titleTxt); @@ -378,6 +397,8 @@ int MenuSettings() mainWindow->Append(&w); w.RemoveAll(); w.Append(&settingsbackground); + w.Append(&settingsTopImg); + w.Append(&settingsBottomImg); w.Append(&PageIndicatorBtn1); w.Append(&PageIndicatorBtn2); w.Append(&titleTxt); diff --git a/source/cfg.c b/source/cfg.c index 2083cc8c..4dec0568 100644 --- a/source/cfg.c +++ b/source/cfg.c @@ -299,9 +299,9 @@ void CFG_Default(int widescreen) // -1 = non forced Mode THEME.battery3_y = 425; THEME.battery4_x = 335; THEME.battery4_y = 425; - THEME.info_r = 63; - THEME.info_g = 154; - THEME.info_b = 192; + THEME.info_r = 55; + THEME.info_g = 190; + THEME.info_b = 237; THEME.prompttxt_r = 0; THEME.prompttxt_g = 0; THEME.prompttxt_b = 0; diff --git a/source/filelist.h b/source/filelist.h index 4b057c8e..9a64b92d 100644 --- a/source/filelist.h +++ b/source/filelist.h @@ -11,6 +11,12 @@ #include +extern const u8 settings_top_png[]; +extern const u32 settings_top_png_size; + +extern const u8 settings_bottom_png[]; +extern const u32 settings_bottom_png_size; + extern const u8 font_ttf[]; extern const u32 font_ttf_size; diff --git a/source/images/arrangeGrid.png b/source/images/arrangeGrid.png index 3fe33e3b..44d74c42 100644 Binary files a/source/images/arrangeGrid.png and b/source/images/arrangeGrid.png differ diff --git a/source/images/arrangeGrid_gray.png b/source/images/arrangeGrid_gray.png index fdae2bb9..2da58f39 100644 Binary files a/source/images/arrangeGrid_gray.png and b/source/images/arrangeGrid_gray.png differ diff --git a/source/images/background.png b/source/images/background.png index 9ecc365b..1a482c7c 100644 Binary files a/source/images/background.png and b/source/images/background.png differ diff --git a/source/images/bg_options.png b/source/images/bg_options.png index c8749908..389cfa1d 100644 Binary files a/source/images/bg_options.png and b/source/images/bg_options.png differ diff --git a/source/images/bg_options_settings.png b/source/images/bg_options_settings.png index 0e5e0a62..49ca299a 100644 Binary files a/source/images/bg_options_settings.png and b/source/images/bg_options_settings.png differ diff --git a/source/images/button_dialogue_box.png b/source/images/button_dialogue_box.png index a7523b83..23d2b2e6 100644 Binary files a/source/images/button_dialogue_box.png and b/source/images/button_dialogue_box.png differ diff --git a/source/images/button_install.png b/source/images/button_install.png index 4af67f51..69737337 100644 Binary files a/source/images/button_install.png and b/source/images/button_install.png differ diff --git a/source/images/button_install_over.png b/source/images/button_install_over.png index d8ad727b..9ffc0f55 100644 Binary files a/source/images/button_install_over.png and b/source/images/button_install_over.png differ diff --git a/source/images/credits_button.png b/source/images/credits_button.png index 3a8381be..510df769 100644 Binary files a/source/images/credits_button.png and b/source/images/credits_button.png differ diff --git a/source/images/credits_button_over.png b/source/images/credits_button_over.png index d244671f..92bb0b79 100644 Binary files a/source/images/credits_button_over.png and b/source/images/credits_button_over.png differ diff --git a/source/images/exit_bottom_over.png b/source/images/exit_bottom_over.png index 03b1d296..38992823 100644 Binary files a/source/images/exit_bottom_over.png and b/source/images/exit_bottom_over.png differ diff --git a/source/images/exit_button.png b/source/images/exit_button.png index 4fbce7eb..1c9fb09b 100644 Binary files a/source/images/exit_button.png and b/source/images/exit_button.png differ diff --git a/source/images/exit_top_over.png b/source/images/exit_top_over.png index 1548916f..4f60dbcd 100644 Binary files a/source/images/exit_top_over.png and b/source/images/exit_top_over.png differ diff --git a/source/images/menu_button.png b/source/images/menu_button.png index a455091f..2418de88 100644 Binary files a/source/images/menu_button.png and b/source/images/menu_button.png differ diff --git a/source/images/menu_button_over.png b/source/images/menu_button_over.png index ee6c5e31..65b3e2d3 100644 Binary files a/source/images/menu_button_over.png and b/source/images/menu_button_over.png differ diff --git a/source/images/nocoverFlat.png b/source/images/nocoverFlat.png index 4f6d3696..d44936a6 100644 Binary files a/source/images/nocoverFlat.png and b/source/images/nocoverFlat.png differ diff --git a/source/images/sdcard.png b/source/images/sdcard.png index 1bd2203e..ef508f35 100644 Binary files a/source/images/sdcard.png and b/source/images/sdcard.png differ diff --git a/source/images/settings_background.png b/source/images/settings_background.png index 02ed90db..b59eaf92 100644 Binary files a/source/images/settings_background.png and b/source/images/settings_background.png differ diff --git a/source/images/settings_bottom.png b/source/images/settings_bottom.png new file mode 100644 index 00000000..77f21950 Binary files /dev/null and b/source/images/settings_bottom.png differ diff --git a/source/images/settings_button.png b/source/images/settings_button.png index 849a9d21..3c7e6500 100644 Binary files a/source/images/settings_button.png and b/source/images/settings_button.png differ diff --git a/source/images/settings_button_over.png b/source/images/settings_button_over.png index f29a269f..79c2c8c1 100644 Binary files a/source/images/settings_button_over.png and b/source/images/settings_button_over.png differ diff --git a/source/images/settings_title.png b/source/images/settings_title.png index c0e7c144..48de5083 100644 Binary files a/source/images/settings_title.png and b/source/images/settings_title.png differ diff --git a/source/images/settings_title_over.png b/source/images/settings_title_over.png index 2c58d3b2..2111ad28 100644 Binary files a/source/images/settings_title_over.png and b/source/images/settings_title_over.png differ diff --git a/source/images/settings_top.png b/source/images/settings_top.png new file mode 100644 index 00000000..b71b2ff4 Binary files /dev/null and b/source/images/settings_top.png differ diff --git a/source/images/wbackground.png b/source/images/wbackground.png index 841e57c6..4035f47b 100644 Binary files a/source/images/wbackground.png and b/source/images/wbackground.png differ diff --git a/source/images/wiimote_poweroff.png b/source/images/wiimote_poweroff.png index 50c2d9c6..81f34462 100644 Binary files a/source/images/wiimote_poweroff.png and b/source/images/wiimote_poweroff.png differ diff --git a/source/images/wiimote_poweroff_over.png b/source/images/wiimote_poweroff_over.png index dce26baf..037dd7fe 100644 Binary files a/source/images/wiimote_poweroff_over.png and b/source/images/wiimote_poweroff_over.png differ