From 1ed7400a0258e4095261a1c3c8ab9686982c7f13 Mon Sep 17 00:00:00 2001 From: Jannik Date: Thu, 1 Jun 2017 16:21:24 +0200 Subject: [PATCH] fixed typo error and error during first installation *cloud service is set to "" to prevent NullPointerException --- bin/.gitignore | 3 ++- bin/application/MainWindowController.class | Bin 29334 -> 29342 bytes .../GoogleDriveController.class | Bin 14485 -> 14485 bytes src/application/Main.java | 2 +- src/application/MainWindowController.java | 22 +++++++++--------- .../GoogleDriveController.java | 2 +- .../icons/ic_add_circle_black_24dp_1x.png | Bin 222 -> 0 bytes .../icons/ic_add_circle_white_24dp_1x.png | Bin 233 -> 0 bytes .../icons/ic_cached_black_24dp_1x.png | Bin 235 -> 0 bytes .../icons/ic_cached_white_24dp_1x.png | Bin 245 -> 0 bytes .../icons/ic_get_app_black_24dp_1x.png | Bin 114 -> 0 bytes .../icons/ic_get_app_white_24dp_1x.png | Bin 116 -> 0 bytes src/recources/icons/ic_info_black_24dp_1x.png | Bin 222 -> 0 bytes src/recources/icons/ic_info_white_24dp_1x.png | Bin 232 -> 0 bytes .../icons/ic_settings_black_24dp_1x.png | Bin 322 -> 0 bytes .../icons/ic_settings_white_24dp_1x.png | Bin 326 -> 0 bytes .../icons/ic_add_circle_black_24dp_1x.png | Bin .../icons/ic_add_circle_white_24dp_1x.png | Bin .../icons/ic_cached_black_24dp_1x.png | Bin .../icons/ic_cached_white_24dp_1x.png | Bin .../icons/ic_get_app_black_24dp_1x.png | Bin .../icons/ic_get_app_white_24dp_1x.png | Bin .../icons/ic_info_black_24dp_1x.png | Bin .../icons/ic_info_white_24dp_1x.png | Bin .../icons/ic_settings_black_24dp_1x.png | Bin .../icons/ic_settings_white_24dp_1x.png | Bin 26 files changed, 15 insertions(+), 14 deletions(-) delete mode 100644 src/recources/icons/ic_add_circle_black_24dp_1x.png delete mode 100644 src/recources/icons/ic_add_circle_white_24dp_1x.png delete mode 100644 src/recources/icons/ic_cached_black_24dp_1x.png delete mode 100644 src/recources/icons/ic_cached_white_24dp_1x.png delete mode 100644 src/recources/icons/ic_get_app_black_24dp_1x.png delete mode 100644 src/recources/icons/ic_get_app_white_24dp_1x.png delete mode 100644 src/recources/icons/ic_info_black_24dp_1x.png delete mode 100644 src/recources/icons/ic_info_white_24dp_1x.png delete mode 100644 src/recources/icons/ic_settings_black_24dp_1x.png delete mode 100644 src/recources/icons/ic_settings_white_24dp_1x.png rename {bin/recources => src/resources}/icons/ic_add_circle_black_24dp_1x.png (100%) rename {bin/recources => src/resources}/icons/ic_add_circle_white_24dp_1x.png (100%) rename {bin/recources => src/resources}/icons/ic_cached_black_24dp_1x.png (100%) rename {bin/recources => src/resources}/icons/ic_cached_white_24dp_1x.png (100%) rename {bin/recources => src/resources}/icons/ic_get_app_black_24dp_1x.png (100%) rename {bin/recources => src/resources}/icons/ic_get_app_white_24dp_1x.png (100%) rename {bin/recources => src/resources}/icons/ic_info_black_24dp_1x.png (100%) rename {bin/recources => src/resources}/icons/ic_info_white_24dp_1x.png (100%) rename {bin/recources => src/resources}/icons/ic_settings_black_24dp_1x.png (100%) rename {bin/recources => src/resources}/icons/ic_settings_white_24dp_1x.png (100%) diff --git a/bin/.gitignore b/bin/.gitignore index 3f9dc07..2126dd2 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,2 +1,3 @@ -/cloudControllerInstances/ /application/ +/cloudControllerInstances/ +/resources/ diff --git a/bin/application/MainWindowController.class b/bin/application/MainWindowController.class index 6c92c94adb5ec3f9ec7d42e33e450e6e123269d3..9e3d8f4ab5a73ba83fe75f6b6f7a7c3c9744d18d 100644 GIT binary patch delta 11247 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 DBP#Qa delta 10980 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 diff --git a/bin/cloudControllerInstances/GoogleDriveController.class b/bin/cloudControllerInstances/GoogleDriveController.class index 1377bb6c5037c72e8285f4498d9badcca0497d60..35d9ff8fe2eb50dbc1b07ccb8c8516f0cac3efca 100644 GIT binary patch delta 14 VcmbPQIJIy?I0s|#<_Hd30{|>h1rPuL delta 14 VcmbPQIJIy?I0s|$<_Hd30{|=W1poj5 diff --git a/src/application/Main.java b/src/application/Main.java index 8cc889a..546de6a 100644 --- a/src/application/Main.java +++ b/src/application/Main.java @@ -61,7 +61,7 @@ public class Main extends Application { AnchorPane pane = loader.load(); primaryStage.setResizable(false); primaryStage.setTitle("cemu_UI"); -// primaryStage.getIcons().add(new Image(Main.class.getResourceAsStream("/recources/Homeflix_Icon_64x64.png"))); //adds application icon +// primaryStage.getIcons().add(new Image(Main.class.getResourceAsStream("/resources/Homeflix_Icon_64x64.png"))); //adds application icon mainWindowController = loader.getController(); //Link of FXMLController and controller class mainWindowController.setMain(this); //call setMain diff --git a/src/application/MainWindowController.java b/src/application/MainWindowController.java index 07fc1f0..d0755b0 100644 --- a/src/application/MainWindowController.java +++ b/src/application/MainWindowController.java @@ -146,7 +146,7 @@ public class MainWindowController { private boolean playTrue = false; private boolean fullscreen; private boolean cloudSync; - private String cloudService; //set cloud provider (at the moment only GoogleDrive, Dropbox is planed) + private String cloudService = ""; //set cloud provider (at the moment only GoogleDrive, Dropbox is planed) private String cemuPath; private String romPath; private String gameExecutePath; @@ -177,16 +177,16 @@ public class MainWindowController { private ContextMenu gameContextMenu = new ContextMenu(edit, remove, update, addDLC); private Label lastGameLabel = new Label(); - private ImageView add_circle_black = new ImageView(new Image("recources/icons/ic_add_circle_black_24dp_1x.png")); - private ImageView info_black = new ImageView(new Image("recources/icons/ic_info_black_24dp_1x.png")); - private ImageView settings_black = new ImageView(new Image("recources/icons/ic_settings_black_24dp_1x.png")); - private ImageView cached_black = new ImageView(new Image("recources/icons/ic_cached_black_24dp_1x.png")); - private ImageView smmdb_black = new ImageView(new Image("recources/icons/ic_get_app_black_24dp_1x.png")); - private ImageView add_circle_white = new ImageView(new Image("recources/icons/ic_add_circle_white_24dp_1x.png")); - private ImageView info_white = new ImageView(new Image("recources/icons/ic_info_white_24dp_1x.png")); - private ImageView settings_white = new ImageView(new Image("recources/icons/ic_settings_white_24dp_1x.png")); - private ImageView cached_white = new ImageView(new Image("recources/icons/ic_cached_white_24dp_1x.png")); - private ImageView smmdb_white = new ImageView(new Image("recources/icons/ic_get_app_white_24dp_1x.png")); + private ImageView add_circle_black = new ImageView(new Image("resources/icons/ic_add_circle_black_24dp_1x.png")); + private ImageView info_black = new ImageView(new Image("resources/icons/ic_info_black_24dp_1x.png")); + private ImageView settings_black = new ImageView(new Image("resources/icons/ic_settings_black_24dp_1x.png")); + private ImageView cached_black = new ImageView(new Image("resources/icons/ic_cached_black_24dp_1x.png")); + private ImageView smmdb_black = new ImageView(new Image("resources/icons/ic_get_app_black_24dp_1x.png")); + private ImageView add_circle_white = new ImageView(new Image("resources/icons/ic_add_circle_white_24dp_1x.png")); + private ImageView info_white = new ImageView(new Image("resources/icons/ic_info_white_24dp_1x.png")); + private ImageView settings_white = new ImageView(new Image("resources/icons/ic_settings_white_24dp_1x.png")); + private ImageView cached_white = new ImageView(new Image("resources/icons/ic_cached_white_24dp_1x.png")); + private ImageView smmdb_white = new ImageView(new Image("resources/icons/ic_get_app_white_24dp_1x.png")); public void setMain(Main main) { this.main = main; diff --git a/src/cloudControllerInstances/GoogleDriveController.java b/src/cloudControllerInstances/GoogleDriveController.java index 4a4d900..5c0058c 100644 --- a/src/cloudControllerInstances/GoogleDriveController.java +++ b/src/cloudControllerInstances/GoogleDriveController.java @@ -77,7 +77,7 @@ public class GoogleDriveController { */ public Credential authorize() throws IOException { // Load client secrets. - InputStream in = getClass().getClassLoader().getResourceAsStream("recources/client_secret.json"); + InputStream in = getClass().getClassLoader().getResourceAsStream("resources/client_secret.json"); GoogleClientSecrets clientSecrets = GoogleClientSecrets.load(JSON_FACTORY, new InputStreamReader(in)); // Build flow and trigger user authorization request. diff --git a/src/recources/icons/ic_add_circle_black_24dp_1x.png b/src/recources/icons/ic_add_circle_black_24dp_1x.png deleted file mode 100644 index ac376d05e3144898989d305f2adebbdfe5f7dfb1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+irJgR1Ar*{!&pDoIQIKhWC@x;L zf5DGMFMNyz&d7FI1u2@gujq}}X5|%StE#j9xnH3_xa3U6x$Ie;Vy;Kz<9oKx?TT*V zZ~Og~gXv!71eW=Rol`AVJb2&meUsuwD<2~RlZfIlgQS;h5{_EkO+3(goZs=@bg?y> z+7cUXtyyp^=*>w7<-!#PouU=LUi_Th(4nHwvfXRjgNR@O#Y~Av%XPXuS3Kmt@ptYJ WIlAVJ(_Ns089ZJ6T-G@yGywpV!dJKe diff --git a/src/recources/icons/ic_add_circle_white_24dp_1x.png b/src/recources/icons/ic_add_circle_white_24dp_1x.png deleted file mode 100644 index 9121d99bfc56e57e6893461ec734b9038d1b0a43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+i4W2HJAr*{!FF9tl8i=?(e4ubM z-Z4<*`WG&z?+ac`nzA6a#m{f=cU>)cK|x{>L!S zRqE{ZvOm2yk0vz^VsO6PPURoM$=X74qx0-unS=1-L8VSO74nspk-e}kVWBeD%d~pR@4V;x z3*iZ+Z=n($RKE4{aB1mQYwaBVi=DB7LQCJL*IfT4wmQvsXP3r}jOxV&#&>YkA}S2- z;`NA#B7MdW#J<_svpdA9*ZZIj{*PG>dGqB%p)@oR@l*fa v1%I)*`PtDdgNG1;uDL(a-paJ`?hmCCipAgL0Gkm|00000NkvXXu0mjfX}xgm diff --git a/src/recources/icons/ic_get_app_black_24dp_1x.png b/src/recources/icons/ic_get_app_black_24dp_1x.png deleted file mode 100644 index c2c845e8494bcc13406458c6ed3b1f9fd8618a1d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1OHUWakP60R38@G6Onq4g7bP0l+XkK5V;_b diff --git a/src/recources/icons/ic_get_app_white_24dp_1x.png b/src/recources/icons/ic_get_app_white_24dp_1x.png deleted file mode 100644 index d400472fd64b0a90998ce6c5eab813b7c8eeec12..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 116 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1Yfl%)5R22v2@+fn?1dz*HZ0um z&|dF?!>nm+mvS-{o;0&fnzA@EQ^BmzWWo}eRZ9~msAiWq$nrXiF)+AFy^vQr>(2u; OhQZU-&t;ucLK6V({vp)> diff --git a/src/recources/icons/ic_info_black_24dp_1x.png b/src/recources/icons/ic_info_black_24dp_1x.png deleted file mode 100644 index 5ef3dc0809e2030ac573605e4d50a1b15be283f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+irJgR1Ar*{!&pBo_7znsMbQe4M zmu2aqie+Lg_Z%-OYdThQ-1WK3yF`&wq~^cgljetCWtg?+{hpb=@c6_R&GITYJe^Gr zn+wS+w{7@Qu3Fze@l2LUOog?>hoS^g9uF~&xlN*)H`W{wZ;U+{TXN|u|AX!W%Mvu1 zCO7Tl*uo`~E>@u<#XBj|^}>ul|6C>19PJEUR$ER;nAhbpt#9Vs*Ef&3bU%Gs$9S4s WW8+=f3r;`>GkCiCxvXP)OAoLE39!Uw>L+Iu;o04g?CLr|vTR#{u>fe!2GoabbG(8mw zN=_k{^TKT*I|dO?e$^1|f%~~bT#(}{l_1&OuFSrhi7lwX3!t=MAf(O$O-PdkThK}C z1)zh#Xh9zYS_`TmP{<#*c!3r_&Md>%&3$|gXFU#{_X)Yn=Pj2qMBk5xfCCJ%}fHzV<>iUk{yCv=|P(yFM9CIKrv6;vdj!^e)OQ=oM~3L z3Hov zYMc*TMS6^4Y*s#v8YK}AT(ig&XB4{J=afm7xZ$2C{CQWp)PoCx)G7YcXPY7T1DnU) UWG_v5V*mgE07*qoM6N<$f<$+V!T>O6 zS70QgNAU8v+(?*#6#o9*V@~mgC;x#Rf^DRK!rxsIH1Y+{1W$v50*~CV#54`Q2vW|N zVwqbWh7Wvdgwql&RGT?0V4Y7)9ZgCcW4f$baDbN(6Vt-m zvtW!jvUC`+K-kE98fAa!h