diff --git a/Launcher/runtime/dialog/dialog.js b/Launcher/runtime/dialog/dialog.js index 109112c2..acd7ba4b 100644 --- a/Launcher/runtime/dialog/dialog.js +++ b/Launcher/runtime/dialog/dialog.js @@ -5,7 +5,6 @@ var profilesList = []; var movePoint = null; var pingers = {}; var loginData; -// Variable which contains all types of auth. Appending data at line 255 var authTypes = {}; function initLauncher() { @@ -195,7 +194,6 @@ function goAuth(event) { return; } - // Get auth var auth = authOptions.getSelectionModel().getSelectedItem(); if (auth === null) { return; // No auth selected @@ -220,7 +218,7 @@ function goAuth(event) { } settings.login = login; - doAuth(/*auth, */login, rsaPassword, authTypes[auth]); + doAuth(login, rsaPassword, authTypes[auth]); } /* ======== Console ======== */ @@ -259,17 +257,14 @@ function verifyLauncher(e) { result.list.forEach(function(auth_type, i, arr) { var serverAuth = new com.jfoenix.controls.JFXComboBox(); serverAuth.getStyleClass().add("authOptions"); - // add display name to items and add name with iter to variable authTypes authOptions.getItems().add(auth_type.displayName); authTypes[auth_type.displayName] = auth_type.name; iter++; }); authOptions.getSelectionModel().select(0); var sm = authOptions.getSelectionModel().selectedIndexProperty(); - // add listener to authOptions select sm.addListener(new javafx.beans.value.ChangeListener({ changed: function (observableValue, oldSelection, newSelection) { - // get auth name from authTypes settings.auth = authTypes[authOptions.getSelectionModel().getSelectedItem()]; } })); @@ -423,8 +418,8 @@ var overlay = { dimPane.setVisible(true); dimPane.toFront(); - loginPaneLayout.setEffect(new javafx.scene.effect.GaussianBlur(55)); - serverPaneLayout.setEffect(new javafx.scene.effect.GaussianBlur(55)); + loginPaneLayout.setEffect(new javafx.scene.effect.GaussianBlur(10)); + serverPaneLayout.setEffect(new javafx.scene.effect.GaussianBlur(10)); fade(dimPane, 0.0, 0.0, 1.0, function(event) { dimPane.requestFocus(); dimPane.getChildren().add(newOverlay); diff --git a/Launcher/runtime/dialog/images/downloader/blured.jpg b/Launcher/runtime/dialog/images/downloader/blured.jpg new file mode 100644 index 00000000..b721d11c Binary files /dev/null and b/Launcher/runtime/dialog/images/downloader/blured.jpg differ diff --git a/Launcher/runtime/dialog/overlay/processing/processing.js b/Launcher/runtime/dialog/overlay/processing/processing.js index 568cc2ee..cfff7bc6 100644 --- a/Launcher/runtime/dialog/overlay/processing/processing.js +++ b/Launcher/runtime/dialog/overlay/processing/processing.js @@ -17,7 +17,6 @@ var processing = { setError: function(e) { LogHelper.error(e); processing.description.textProperty().unbind(); - //processing.errorImage.setImage(processing.errorImage); processing.description.getStyleClass().add("error"); processing.description.setText(e.toString()); }, @@ -48,8 +47,6 @@ function offlineAuthRequest(login) { Request.requestError("Имя пользователя некорректно"); return; } - - // Return offline profile and random access token return { pp: PlayerProfile.newOfflineProfile(login), accessToken: SecurityHelper.randomStringToken() @@ -57,18 +54,15 @@ function offlineAuthRequest(login) { }; } -/* Export functions */ function makeLauncherRequest(callback) { var task = settings.offline ? newTask(FunctionalBridge.offlineLauncherRequest) : newRequestTask(new LauncherRequest()); - // Set task properties and start processing.setTaskProperties(task, callback, function() { if (settings.offline) { return; } - // Repeat request, but in offline mode settings.offline = true; overlay.swap(2500, processing.overlay, function() makeLauncherRequest(callback)); }, false); @@ -78,13 +72,11 @@ function makeLauncherRequest(callback) { function makeProfilesRequest(callback) { var task = newRequestTask(new ProfilesRequest()); - // Set task properties and start processing.setTaskProperties(task, callback, function() { if (settings.offline) { return; } - // Repeat request, but in offline mode settings.offline = true; overlay.swap(2500, processing.overlay, function() makeProfilesRequest(callback)); }, false); @@ -94,7 +86,6 @@ function makeProfilesRequest(callback) { function makeAuthAvailabilityRequest(callback) { var task = newRequestTask(new GetAvailabilityAuthRequest()); - // Set task properties and start processing.setTaskProperties(task, callback, function() { if (settings.offline) { return; @@ -110,7 +101,6 @@ function makeAuthAvailabilityRequest(callback) { function makeSetProfileRequest(profile, callback) { var task = newRequestTask(new SetProfileRequest(profile)); - // Set task properties and start processing.setTaskProperties(task, callback, function() { if (settings.offline) { return; diff --git a/Launcher/runtime/dialog/overlay/update/update.css b/Launcher/runtime/dialog/overlay/update/update.css index dff8e234..4035391a 100644 --- a/Launcher/runtime/dialog/overlay/update/update.css +++ b/Launcher/runtime/dialog/overlay/update/update.css @@ -3,7 +3,7 @@ #overlay { -fx-background-color: transparent; -fx-background-size: cover; - -fx-background-image: url('../../images/background.jpg'); + -fx-background-image: url('../../images/downloader/blured.jpg'); } #overlay > #utitle { @@ -20,7 +20,7 @@ #overlay > #description.error { } .downloadPane { - -fx-background-color: rgba(0, 0, 0, 0.3); + -fx-background-color: rgba(0, 0, 0, 0.2); } /* Progress bar */ diff --git a/Launcher/runtime/dialog/overlay/update/update.fxml b/Launcher/runtime/dialog/overlay/update/update.fxml index 30ffcdb0..c44e8bc9 100644 --- a/Launcher/runtime/dialog/overlay/update/update.fxml +++ b/Launcher/runtime/dialog/overlay/update/update.fxml @@ -8,29 +8,27 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/Launcher/runtime/dialog/overlay/update/update.js b/Launcher/runtime/dialog/overlay/update/update.js index da013488..4996f7f8 100644 --- a/Launcher/runtime/dialog/overlay/update/update.js +++ b/Launcher/runtime/dialog/overlay/update/update.js @@ -4,6 +4,9 @@ var update = { initOverlay: function() { update.overlay = loadFXML("dialog/overlay/update/update.fxml"); + //var updateLayout = update.overlay.lookup("#overlay"); + //serverPaneLayout = updateLayout; + update.title = update.overlay.lookup("#utitle"); update.description = update.overlay.lookup("#description"); update.progress = update.overlay.lookup("#progress"); diff --git a/Launcher/runtime/dialog/scenes/login/login.fxml b/Launcher/runtime/dialog/scenes/login/login.fxml index 4d1bfe05..a2db6ff7 100644 --- a/Launcher/runtime/dialog/scenes/login/login.fxml +++ b/Launcher/runtime/dialog/scenes/login/login.fxml @@ -15,62 +15,51 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Launcher/runtime/dialog/scenes/mainmenu/mainmenu.fxml b/Launcher/runtime/dialog/scenes/mainmenu/mainmenu.fxml index f48cca8f..70e6b20c 100644 --- a/Launcher/runtime/dialog/scenes/mainmenu/mainmenu.fxml +++ b/Launcher/runtime/dialog/scenes/mainmenu/mainmenu.fxml @@ -13,127 +13,98 @@ - + - + - + - + - + - - - + + - + - + - + - + - + - - + - + - + - - - - + - - + - + - + - + - + - + - + - + - + - + - + - + - - + + diff --git a/Launcher/runtime/dialog/scenes/options/options.fxml b/Launcher/runtime/dialog/scenes/options/options.fxml index 90eebc82..c0b42259 100644 --- a/Launcher/runtime/dialog/scenes/options/options.fxml +++ b/Launcher/runtime/dialog/scenes/options/options.fxml @@ -1,7 +1,6 @@ - @@ -9,59 +8,55 @@ + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Launcher/runtime/dialog/styles.css b/Launcher/runtime/dialog/styles.css index 574e979a..d26cc8e4 100644 --- a/Launcher/runtime/dialog/styles.css +++ b/Launcher/runtime/dialog/styles.css @@ -34,8 +34,6 @@ #serverStatus{ /* Mask */ #mask { -fx-effect: DropShadow( gaussian , rgba(255,255,255,0.5) , 0,0,0,1 ); - -fx-pref-width: 692px; - -fx-pref-height: 450px; } /** Errors **/ @@ -194,7 +192,7 @@ .combologin-popup .list-view { .combologin .list-cell:filled:selected .text, .combologin .list-cell:filled:selected .text { - -fx-fill: #909090; + -fx-fill: #323232; } .combologin .arrow, @@ -211,13 +209,13 @@ .combologin-popup .list-view .list-cell:filled:selected, .combologin-popup .list { -fx-background: -fx-accent; -fx-background-color: -fx-selection-bar; - -fx-text-fill: -fx-selection-bar-text; + -fx-text-fill: #909090; } .combologin-popup .list-view .list-cell:filled:hover { -fx-background-color: white; - -fx-text-fill: -fx-text-inner-color; + -fx-text-fill: #909090; } /** web**/