From c2d03e62e7844d0725748d71f9adf8b1a3bf2f78 Mon Sep 17 00:00:00 2001 From: sigmabeta Date: Sat, 6 Feb 2016 18:46:37 -0500 Subject: [PATCH] Add Wiimote graphic --- .../dolphinemu/ui/main/MainPresenter.java | 3 +++ .../ui/settings/SettingsActivityView.java | 2 +- .../res/drawable-hdpi/ic_settings_wiimote.png | Bin 0 -> 470 bytes .../res/drawable-mdpi/ic_settings_wiimote.png | Bin 0 -> 308 bytes .../res/drawable-xhdpi/ic_settings_wiimote.png | Bin 0 -> 552 bytes .../res/drawable-xxhdpi/ic_settings_wiimote.png | Bin 0 -> 830 bytes .../res/drawable-xxxhdpi/ic_settings_wiimote.png | Bin 0 -> 1135 bytes .../main/res/drawable/ic_settings_wiimote.png | Bin 0 -> 1135 bytes .../Android/app/src/main/res/values/arrays.xml | 2 +- .../Android/app/src/main/res/values/strings.xml | 6 ++++-- 10 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 Source/Android/app/src/main/res/drawable-hdpi/ic_settings_wiimote.png create mode 100644 Source/Android/app/src/main/res/drawable-mdpi/ic_settings_wiimote.png create mode 100644 Source/Android/app/src/main/res/drawable-xhdpi/ic_settings_wiimote.png create mode 100644 Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings_wiimote.png create mode 100644 Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_wiimote.png create mode 100644 Source/Android/app/src/main/res/drawable/ic_settings_wiimote.png diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java index b0f9358852..ecffb14ac0 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java @@ -56,8 +56,11 @@ public final class MainPresenter case R.id.menu_settings_wiimote: mView.launchSettingsActivity(SettingsFile.FILE_NAME_WIIMOTE); + return true; case R.id.menu_refresh: + GameDatabase databaseHelper = DolphinApplication.databaseHelper; + databaseHelper.scanLibrary(databaseHelper.getWritableDatabase()); mView.refresh(); return true; diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityView.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityView.java index 8276077505..62bb51a9a2 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityView.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityView.java @@ -80,7 +80,7 @@ public interface SettingsActivityView void onGcPadSettingChanged(String key, int value); /** - * Called by a containing Fragment tell the containing Activity that a Wiimote's setting + * Called by a containing Fragment to tell the containing Activity that a Wiimote's setting * was modified. * * @param section Identifier for Wiimote that was modified; Wiimotes are identified by their section, diff --git a/Source/Android/app/src/main/res/drawable-hdpi/ic_settings_wiimote.png b/Source/Android/app/src/main/res/drawable-hdpi/ic_settings_wiimote.png new file mode 100644 index 0000000000000000000000000000000000000000..acd29054c7f9990c6dfc0767782773347a093515 GIT binary patch literal 470 zcmV;{0V)28P);(8^b^v(rM+MnQc6@d*^M5lg{NK?qhBwhAW1 z7{x-g6#wA*8<>M7tjXZ!87;(U*H8?fj!Pi z>fT=`c@!Lhcj0}J=ph)Xr%(zU2!HDv?1OHe#v#q|y_&#@90 z?8{X)=!tDJCEG&hpiPRkD}Loe6&n6!kh3NfQ^eyog;b;Im`$M^*Nq!X@HA<) z%kIGrQ*MN|Z@BNFNGKADgd(ATFQhZV7Qzss!F|ockWV=SfBtXK4`RD-IU_}m-2eap M07*qoM6N<$f<2GILjV8( literal 0 HcmV?d00001 diff --git a/Source/Android/app/src/main/res/drawable-mdpi/ic_settings_wiimote.png b/Source/Android/app/src/main/res/drawable-mdpi/ic_settings_wiimote.png new file mode 100644 index 0000000000000000000000000000000000000000..0f6d19efb132479b04ea7e3a92028c4df9086b09 GIT binary patch literal 308 zcmV-40n7f0P)~%K~T_>xE(<(EG?`Q#EV!c1VwKkq_A>5fOrDYLL~7Iyg-`F zOiTuw415q~`;+$|ie*^}g9<&^zzyE;fjewzO=aETwUC4fJT3ls!59*v0cAMTVH4KS zgaX7!5nA+RCha{!NhDxE2M$o-l+ad%6P@XcmZ(EzvY+!XgDdsGc7ZA6Xio~-etO{O za{BO~^7(GEV?-Ctp$>7_QUaP$;5rJ0}Mr3LEgIns4l!O$r{&b$|glQN^`0=+8xfI@nX4Yx_{+RDdCPHt3u^ z_X~7)8lVL72>aX!gRlq}2G?PI42uqs;B>|&=@PVBxczOg0w0`fCq)J5=5(+H)dDI> zE$ndm=oEDa=B(ag6Gq_WM?ce|=Ku?F1I?V@*|Xk3^WYFN@JZ5e0Q1mpP&QlOHrv5l zsX}Es-xa_(T$`viS1<IpKyUkK1gtFGCW zrfTJSfQ*eb;NA-X>^2#|i2$echd%^ih(XFP0odS+bdD?Lgz#K|sKK#uKLiN$pA8d3?Ku@05X6KAOpw%|2#n2 q#^CR~5I~_FHY-U@h literal 0 HcmV?d00001 diff --git a/Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings_wiimote.png b/Source/Android/app/src/main/res/drawable-xxhdpi/ic_settings_wiimote.png new file mode 100644 index 0000000000000000000000000000000000000000..6dfcad379783586d116359fda3b04e20fd138c1e GIT binary patch literal 830 zcmV-E1Ht@>P)º1$)5U7T$9n*az-wOl1<=V_Q&; zcaX673I=(EnBEMQ@W>jE(2rNVc~}udA2x_EVya+)g*=N!$0hJ9q)#6}x2+L$vPnmt zf^}`k&^Lh>P5M=^y#_UsRBd%pY!O=AubGl#Vi&7R`UVbaJU0Vu1*gG1@RFx(y%r02 zG|+3Oz!pvMN2g4=Lc8-I>cIAhzq=k><;7b!0wp>DyHH&SmBzW&ESj0+UqlyCC&&Mi14B41o0*~4Dx&$ zP_Mg0g&06d25$sjUj%+Bz?& z8e@r3NrRvuMnPj~5EOTaAQ2>jLXSO)d{vZX`uI|?=DQ%e@m$^H*)`yeuYx8*hBVq3_EAuc^PI5f*ZR86D^3D? zL*$J5nkY^kNoC&3JDEIBt4XQFq*xU}B1i;@AQ2>jM34v)K_W;5i69Xqf<%xA5iBV7~4T3sY(wO0qQ&K7UBDwr4f(Y`M-=wR(26tqr-~a#s07*qo IM6N<$g7_tMrvLx| literal 0 HcmV?d00001 diff --git a/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_wiimote.png b/Source/Android/app/src/main/res/drawable-xxxhdpi/ic_settings_wiimote.png new file mode 100644 index 0000000000000000000000000000000000000000..489f5f5eb6e274963e45b6c34506f899d507da5b GIT binary patch literal 1135 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 Disabled Emulated - "Real Wiimote (DolphinBar required)" + Real Wiimote (DolphinBar required) 0 diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml index 60acc28c70..40b6b5aa22 100644 --- a/Source/Android/app/src/main/res/values/strings.xml +++ b/Source/Android/app/src/main/res/values/strings.xml @@ -79,7 +79,8 @@ GameCube Controllers Wii Controllers (Wiimotes) - + GameCube Controller 1 GameCube Controller 2 GameCube Controller 3 @@ -96,7 +97,8 @@ Analog Radius (High value = High sensitivity) Analog Threshold (Low value = High sensitivity) - + Wiimote 1 Wiimote 2 Wiimote 3