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 6c92c94..9e3d8f4 100644 Binary files a/bin/application/MainWindowController.class and b/bin/application/MainWindowController.class differ diff --git a/bin/cloudControllerInstances/GoogleDriveController.class b/bin/cloudControllerInstances/GoogleDriveController.class index 1377bb6..35d9ff8 100644 Binary files a/bin/cloudControllerInstances/GoogleDriveController.class and b/bin/cloudControllerInstances/GoogleDriveController.class differ 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 ac376d0..0000000 Binary files a/src/recources/icons/ic_add_circle_black_24dp_1x.png and /dev/null differ 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 9121d99..0000000 Binary files a/src/recources/icons/ic_add_circle_white_24dp_1x.png and /dev/null differ diff --git a/src/recources/icons/ic_cached_black_24dp_1x.png b/src/recources/icons/ic_cached_black_24dp_1x.png deleted file mode 100644 index 83b946a..0000000 Binary files a/src/recources/icons/ic_cached_black_24dp_1x.png and /dev/null differ diff --git a/src/recources/icons/ic_cached_white_24dp_1x.png b/src/recources/icons/ic_cached_white_24dp_1x.png deleted file mode 100644 index 91dc808..0000000 Binary files a/src/recources/icons/ic_cached_white_24dp_1x.png and /dev/null differ 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 c2c845e..0000000 Binary files a/src/recources/icons/ic_get_app_black_24dp_1x.png and /dev/null differ 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 d400472..0000000 Binary files a/src/recources/icons/ic_get_app_white_24dp_1x.png and /dev/null differ 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 5ef3dc0..0000000 Binary files a/src/recources/icons/ic_info_black_24dp_1x.png and /dev/null differ diff --git a/src/recources/icons/ic_info_white_24dp_1x.png b/src/recources/icons/ic_info_white_24dp_1x.png deleted file mode 100644 index 17faafb..0000000 Binary files a/src/recources/icons/ic_info_white_24dp_1x.png and /dev/null differ diff --git a/src/recources/icons/ic_settings_black_24dp_1x.png b/src/recources/icons/ic_settings_black_24dp_1x.png deleted file mode 100644 index c59419c..0000000 Binary files a/src/recources/icons/ic_settings_black_24dp_1x.png and /dev/null differ diff --git a/src/recources/icons/ic_settings_white_24dp_1x.png b/src/recources/icons/ic_settings_white_24dp_1x.png deleted file mode 100644 index 8909c35..0000000 Binary files a/src/recources/icons/ic_settings_white_24dp_1x.png and /dev/null differ diff --git a/bin/recources/icons/ic_add_circle_black_24dp_1x.png b/src/resources/icons/ic_add_circle_black_24dp_1x.png similarity index 100% rename from bin/recources/icons/ic_add_circle_black_24dp_1x.png rename to src/resources/icons/ic_add_circle_black_24dp_1x.png diff --git a/bin/recources/icons/ic_add_circle_white_24dp_1x.png b/src/resources/icons/ic_add_circle_white_24dp_1x.png similarity index 100% rename from bin/recources/icons/ic_add_circle_white_24dp_1x.png rename to src/resources/icons/ic_add_circle_white_24dp_1x.png diff --git a/bin/recources/icons/ic_cached_black_24dp_1x.png b/src/resources/icons/ic_cached_black_24dp_1x.png similarity index 100% rename from bin/recources/icons/ic_cached_black_24dp_1x.png rename to src/resources/icons/ic_cached_black_24dp_1x.png diff --git a/bin/recources/icons/ic_cached_white_24dp_1x.png b/src/resources/icons/ic_cached_white_24dp_1x.png similarity index 100% rename from bin/recources/icons/ic_cached_white_24dp_1x.png rename to src/resources/icons/ic_cached_white_24dp_1x.png diff --git a/bin/recources/icons/ic_get_app_black_24dp_1x.png b/src/resources/icons/ic_get_app_black_24dp_1x.png similarity index 100% rename from bin/recources/icons/ic_get_app_black_24dp_1x.png rename to src/resources/icons/ic_get_app_black_24dp_1x.png diff --git a/bin/recources/icons/ic_get_app_white_24dp_1x.png b/src/resources/icons/ic_get_app_white_24dp_1x.png similarity index 100% rename from bin/recources/icons/ic_get_app_white_24dp_1x.png rename to src/resources/icons/ic_get_app_white_24dp_1x.png diff --git a/bin/recources/icons/ic_info_black_24dp_1x.png b/src/resources/icons/ic_info_black_24dp_1x.png similarity index 100% rename from bin/recources/icons/ic_info_black_24dp_1x.png rename to src/resources/icons/ic_info_black_24dp_1x.png diff --git a/bin/recources/icons/ic_info_white_24dp_1x.png b/src/resources/icons/ic_info_white_24dp_1x.png similarity index 100% rename from bin/recources/icons/ic_info_white_24dp_1x.png rename to src/resources/icons/ic_info_white_24dp_1x.png diff --git a/bin/recources/icons/ic_settings_black_24dp_1x.png b/src/resources/icons/ic_settings_black_24dp_1x.png similarity index 100% rename from bin/recources/icons/ic_settings_black_24dp_1x.png rename to src/resources/icons/ic_settings_black_24dp_1x.png diff --git a/bin/recources/icons/ic_settings_white_24dp_1x.png b/src/resources/icons/ic_settings_white_24dp_1x.png similarity index 100% rename from bin/recources/icons/ic_settings_white_24dp_1x.png rename to src/resources/icons/ic_settings_white_24dp_1x.png