mirror of
https://github.com/GravitLauncher/Launcher
synced 2024-11-15 11:39:11 +03:00
Merge pull request #264 from GravitLauncher/feature/design
Update styles, fix blur effect, fix combobox styles, remove pressed o…
This commit is contained in:
Gravit
GitHub
commit
17ede8b98f
10 changed files with 166 additions and 227 deletions
|
|
@ -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);
|
||||
|
|
|
|||
BIN
Launcher/runtime/dialog/images/downloader/blured.jpg
Normal file
BIN
Launcher/runtime/dialog/images/downloader/blured.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.8 KiB |
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 */
|
||||
|
|
|
|||
|
|
@ -8,26 +8,24 @@
|
|||
|
||||
<!-- DrLeonardo Design -->
|
||||
|
||||
<Pane fx:id="overlay" prefHeight="450.0" prefWidth="693.0" xmlns="http://javafx.com/javafx/8.0.201"
|
||||
xmlns:fx="http://javafx.com/fxml/1">
|
||||
<Pane fx:id="overlay" prefHeight="450.0" prefWidth="694.0" xmlns="http://javafx.com/javafx/8.0.201" xmlns:fx="http://javafx.com/fxml/1">
|
||||
<children>
|
||||
<Pane prefHeight="450.0" prefWidth="693.0" styleClass="downloadPane">
|
||||
<Pane prefHeight="450.0" prefWidth="694.0" styleClass="downloadPane">
|
||||
<children>
|
||||
<Label fx:id="utitle" alignment="CENTER" layoutX="100.0" layoutY="125.0" prefHeight="30.0"
|
||||
prefWidth="495.0" text="Загрузка обновления..." textFill="WHITE">
|
||||
<Label fx:id="utitle" alignment="CENTER" layoutX="100.0" layoutY="125.0" prefHeight="30.0" prefWidth="495.0" text="Загрузка обновления..." textFill="WHITE">
|
||||
<font>
|
||||
<Font name="System Bold" size="20.0" />
|
||||
</font>
|
||||
</Label>
|
||||
<JFXSpinner fx:id="progress" layoutX="98.0" layoutY="226.0" prefHeight="100.0" prefWidth="100.0" />
|
||||
<Label fx:id="description" layoutX="216.0" layoutY="226.0" prefHeight="100.0" prefWidth="380.0"
|
||||
text="..." textFill="WHITE">
|
||||
<Label fx:id="description" layoutX="216.0" layoutY="226.0" prefHeight="100.0" prefWidth="380.0" text="..." textFill="WHITE">
|
||||
<font>
|
||||
<Font name="System Bold" size="16.0" />
|
||||
</font>
|
||||
</Label>
|
||||
</children>
|
||||
</Pane>
|
||||
<Pane id="mask" layoutX="-1.0" opacity="0.0" prefHeight="450.0" prefWidth="694.0" visible="false" />
|
||||
</children>
|
||||
<stylesheets>
|
||||
<URL value="@update.css" />
|
||||
|
|
|
|||
|
|
@ -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");
|
||||
|
|
|
|||
|
|
@ -18,53 +18,42 @@
|
|||
<children>
|
||||
<Pane fx:id="layout" prefWidth="740.0">
|
||||
<children>
|
||||
<Pane fx:id="authPane" layoutX="422.0" prefHeight="411.0" prefWidth="286.0" styleClass="loginPane">
|
||||
<Pane fx:id="authPane" layoutX="424.0" prefHeight="411.0" prefWidth="286.0" styleClass="loginPane">
|
||||
<children>
|
||||
<Pane fx:id="logo" layoutX="72.0" layoutY="62.0" prefWidth="124.0" styleClass="logo">
|
||||
</Pane>
|
||||
<JFXTextField id="login" alignment="CENTER" focusColor="#5fd97a" layoutX="34.0" layoutY="196.0"
|
||||
promptText="Логин" unFocusColor="#dadada"/>
|
||||
<JFXPasswordField id="password" alignment="CENTER" focusColor="#5fd97a" layoutX="34.0"
|
||||
layoutY="249.0" promptText="Пароль" unFocusColor="#dadada"/>
|
||||
<JFXTextField id="login" alignment="CENTER" focusColor="#5fd97a" layoutX="34.0" layoutY="196.0" promptText="Логин" unFocusColor="#dadada" />
|
||||
<JFXPasswordField id="password" alignment="CENTER" focusColor="#5fd97a" layoutX="34.0" layoutY="249.0" promptText="Пароль" unFocusColor="#dadada" />
|
||||
<JFXButton id="goAuth" layoutX="34.0" layoutY="370.0" styleClass="auth" text="ВОЙТИ" />
|
||||
<JFXCheckBox id="rememberchb" fx:id="savePassword" checkedColor="#5fd97a"
|
||||
contentDisplay="CENTER" layoutX="63.0" layoutY="297.0" prefWidth="144.0"
|
||||
text="Сохранить пароль" textFill="#dadada" unCheckedColor="#909090"/>
|
||||
<JFXComboBox id="authOptions" fx:id="authOptions" focusColor="#5fd97a" layoutX="34.0"
|
||||
layoutY="341.0" prefHeight="25.0" prefWidth="200.0" promptText="Авторизация 1"
|
||||
unFocusColor="#70666600">
|
||||
<JFXCheckBox id="rememberchb" fx:id="savePassword" checkedColor="#5fd97a" contentDisplay="CENTER" layoutX="63.0" layoutY="297.0" prefWidth="144.0" text="Сохранить пароль" textFill="#dadada" unCheckedColor="#909090" />
|
||||
<JFXComboBox id="authOptions" fx:id="authOptions" focusColor="#5fd97a" layoutX="34.0" layoutY="341.0" prefHeight="25.0" prefWidth="200.0" promptText="Способ авторизации" unFocusColor="#70666600">
|
||||
<styleClass>
|
||||
<String fx:value="combologin" />
|
||||
<String fx:value="combologin-popup" />
|
||||
</styleClass>
|
||||
</JFXComboBox>
|
||||
<Hyperlink id="link" fx:id="link" layoutX="94.0" layoutY="422.0" prefHeight="19.0"
|
||||
prefWidth="81.0" textAlignment="CENTER"/>
|
||||
<Hyperlink id="link" fx:id="link" layoutX="94.0" layoutY="422.0" prefHeight="19.0" prefWidth="81.0" textAlignment="CENTER" />
|
||||
</children>
|
||||
</Pane>
|
||||
<JFXMasonryPane fx:id="news" prefHeight="432.0" prefWidth="423.0" styleClass="news" />
|
||||
</children>
|
||||
</Pane>
|
||||
<Pane id="mask" opacity="0.0" prefHeight="425.0" prefWidth="694.0" visible="false"/>
|
||||
<Pane fx:id="bar" layoutX="696.0" prefHeight="425.0" prefWidth="43.0" styleClass="bar">
|
||||
<Pane id="mask" opacity="0.0" prefHeight="450.0" prefWidth="694.0" visible="false" />
|
||||
<Pane fx:id="bar" layoutX="694.0" prefHeight="425.0" prefWidth="43.0" styleClass="bar">
|
||||
<children>
|
||||
<JFXButton id="hide" alignment="CENTER" contentDisplay="CENTER" layoutY="45.0" ripplerFill="#646464"
|
||||
text="" textAlignment="CENTER">
|
||||
<JFXButton id="hide" alignment="CENTER" contentDisplay="CENTER" layoutY="45.0" ripplerFill="#646464" text="" textAlignment="CENTER">
|
||||
<graphic>
|
||||
<MaterialDesignIconView fill="WHITE" glyphName="MINUS" size="30" textAlignment="CENTER" />
|
||||
</graphic>
|
||||
</JFXButton>
|
||||
<JFXButton id="close" alignment="CENTER" contentDisplay="CENTER" ripplerFill="#fb8c8c" text=""
|
||||
textAlignment="CENTER">
|
||||
<JFXButton id="close" alignment="CENTER" contentDisplay="CENTER" ripplerFill="#fb8c8c" text="" textAlignment="CENTER">
|
||||
<graphic>
|
||||
<MaterialDesignIconView fill="WHITE" glyphName="CLOSE" size="30" textAlignment="CENTER" />
|
||||
</graphic>
|
||||
</JFXButton>
|
||||
<JFXButton id="discord" alignment="CENTER" contentDisplay="CENTER" layoutY="370.0" ripplerFill="#646464"
|
||||
text="" textAlignment="CENTER">
|
||||
<JFXButton id="discord" alignment="CENTER" contentDisplay="CENTER" layoutY="370.0" ripplerFill="#646464" text="" textAlignment="CENTER">
|
||||
<graphic>
|
||||
<MaterialDesignIconView fill="#5fd97a" glyphName="MESSAGE_TEXT" size="20"
|
||||
textAlignment="CENTER"/>
|
||||
<MaterialDesignIconView fill="#5fd97a" glyphName="MESSAGE_TEXT" size="20" textAlignment="CENTER" />
|
||||
</graphic>
|
||||
</JFXButton>
|
||||
</children>
|
||||
|
|
|
|||
|
|
@ -13,124 +13,95 @@
|
|||
|
||||
<!-- DrLeonardo Design -->
|
||||
|
||||
<Pane fx:id="serverPaneLayout" maxHeight="-1.0" maxWidth="-1.0" prefWidth="740.0" visible="true"
|
||||
xmlns="http://javafx.com/javafx/8.0.201" xmlns:fx="http://javafx.com/fxml/1">
|
||||
<Pane fx:id="serverPaneLayout" maxHeight="-1.0" maxWidth="-1.0" prefWidth="740.0" visible="true" xmlns="http://javafx.com/javafx/8.0.201" xmlns:fx="http://javafx.com/fxml/1">
|
||||
<children>
|
||||
<Pane fx:id="layout" maxHeight="-1.0" maxWidth="-1.0" prefWidth="740.0" visible="true"
|
||||
xmlns="http://javafx.com/javafx/8.0.201" xmlns:fx="http://javafx.com/fxml/1">
|
||||
<Pane fx:id="layout" maxHeight="-1.0" maxWidth="-1.0" prefWidth="740.0" visible="true" xmlns="http://javafx.com/javafx/8.0.201" xmlns:fx="http://javafx.com/fxml/1">
|
||||
<children>
|
||||
<Pane id="serverPane" prefHeight="450.0" prefWidth="693.0">
|
||||
<Pane id="serverPane" prefHeight="450.0" prefWidth="694.0">
|
||||
<children>
|
||||
<ScrollPane id="serverlist" hbarPolicy="NEVER" layoutX="1.0" prefHeight="450.0"
|
||||
prefWidth="307.0" visible="true">
|
||||
<ScrollPane id="serverlist" hbarPolicy="NEVER" layoutX="1.0" prefHeight="450.0" prefWidth="307.0" visible="true">
|
||||
<content>
|
||||
<FlowPane focusTraversable="false" prefHeight="446.0" prefWidth="306.0"
|
||||
prefWrapLength="0.0" rowValignment="TOP" vgap="10.0" visible="true">
|
||||
<FlowPane focusTraversable="false" prefHeight="446.0" prefWidth="306.0" prefWrapLength="0.0" rowValignment="TOP" vgap="10.0" visible="true">
|
||||
<JFXButton id="servercontainer" ripplerFill="#ffffff80" text="">
|
||||
<FlowPane.margin>
|
||||
<Insets bottom="10.0" />
|
||||
</FlowPane.margin>
|
||||
</JFXButton>
|
||||
</FlowPane.margin></JFXButton>
|
||||
<padding>
|
||||
<Insets left="10.0" top="10.0" />
|
||||
</padding>
|
||||
</FlowPane>
|
||||
</content>
|
||||
</ScrollPane>
|
||||
<Pane id="serverentrance" layoutX="306.0" prefHeight="425.0" prefWidth="388.0"
|
||||
styleClass="serverentrance">
|
||||
<Pane id="serverentrance" layoutX="308.0" prefHeight="425.0" prefWidth="388.0" styleClass="serverentrance">
|
||||
<children>
|
||||
<ScrollPane id="serverinfo" hbarPolicy="NEVER" layoutX="4.0" layoutY="53.0"
|
||||
pannable="true" prefHeight="322.0" prefWidth="381.0" visible="true">
|
||||
<ScrollPane id="serverinfo" hbarPolicy="NEVER" layoutX="4.0" layoutY="53.0" pannable="true" prefHeight="322.0" prefWidth="381.0" visible="true">
|
||||
<content>
|
||||
<FlowPane id="" focusTraversable="false" orientation="HORIZONTAL"
|
||||
prefHeight="310.0" prefWidth="369.0" rowValignment="TOP"
|
||||
visible="true">
|
||||
<FlowPane id="" focusTraversable="false" orientation="HORIZONTAL" prefHeight="310.0" prefWidth="369.0" rowValignment="TOP" visible="true">
|
||||
<padding>
|
||||
<Insets bottom="10.0" left="15.0" top="7.0" />
|
||||
</padding>
|
||||
<children>
|
||||
<Label id="serverDescription" alignment="TOP_LEFT" contentDisplay="LEFT"
|
||||
nodeOrientation="LEFT_TO_RIGHT" prefHeight="274.0"
|
||||
prefWidth="349.0"
|
||||
text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla convallis magna tellus, in bibendum tortor dignissim non. Phasellus vel tincidunt nulla, eu convallis ligula. Suspendisse ut diam vestibulum, tincidunt neque ut, posuere risus. Pellentesque posuere molestie eros, quis laoreet ante ornare quis. Morbi eu tortor fermentum, iaculis risus sit amet, fringilla augue. Aenean nulla purus, rutrum non sapien et, convallis tincidunt purus. Vivamus a eros pulvinar, dignissim leo lacinia, sodales nulla. Aliquam tortor augue, cursus a rutrum viverra, consequat non tellus. Donec porta nisl sed quam dictum commodo. Sed et vulputate dolor. Morbi ultrices justo vitae convallis semper. Donec sodales velit vel velit faucibus, et scelerisque felis finibus. Sed rutrum lacinia mauris, porta cursus mauris tempor eu. Duis turpis nulla, dictum vitae commodo rhoncus, pretium in turpis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos."
|
||||
textAlignment="JUSTIFY" textFill="#141414" wrapText="true"/>
|
||||
<Label id="serverDescription" alignment="TOP_LEFT" contentDisplay="LEFT" nodeOrientation="LEFT_TO_RIGHT" prefHeight="274.0" prefWidth="349.0" text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla convallis magna tellus, in bibendum tortor dignissim non. Phasellus vel tincidunt nulla, eu convallis ligula. Suspendisse ut diam vestibulum, tincidunt neque ut, posuere risus. Pellentesque posuere molestie eros, quis laoreet ante ornare quis. Morbi eu tortor fermentum, iaculis risus sit amet, fringilla augue. Aenean nulla purus, rutrum non sapien et, convallis tincidunt purus. Vivamus a eros pulvinar, dignissim leo lacinia, sodales nulla. Aliquam tortor augue, cursus a rutrum viverra, consequat non tellus. Donec porta nisl sed quam dictum commodo. Sed et vulputate dolor. Morbi ultrices justo vitae convallis semper. Donec sodales velit vel velit faucibus, et scelerisque felis finibus. Sed rutrum lacinia mauris, porta cursus mauris tempor eu. Duis turpis nulla, dictum vitae commodo rhoncus, pretium in turpis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos." textAlignment="JUSTIFY" textFill="#141414" wrapText="true" />
|
||||
</children>
|
||||
</FlowPane>
|
||||
</content>
|
||||
</ScrollPane>
|
||||
<JFXButton id="clientLaunch" layoutX="19.0" layoutY="380.0" prefHeight="51.0"
|
||||
prefWidth="285.0" styleClass="clientLaunch" text="ИГРАТЬ">
|
||||
<JFXButton id="clientLaunch" layoutX="19.0" layoutY="380.0" prefHeight="51.0" prefWidth="285.0" styleClass="clientLaunch" text="ИГРАТЬ">
|
||||
<font>
|
||||
<Font size="22.0" />
|
||||
</font>
|
||||
</JFXButton>
|
||||
<JFXButton id="clientSettings" alignment="CENTER" centerShape="false"
|
||||
contentDisplay="CENTER" layoutX="305.0" layoutY="380.0" prefHeight="51.0"
|
||||
prefWidth="60.0" ripplerFill="#84da96" styleClass="clientSettings" text=""
|
||||
textAlignment="CENTER">
|
||||
<JFXButton id="clientSettings" alignment="CENTER" centerShape="false" contentDisplay="CENTER" layoutX="305.0" layoutY="380.0" prefHeight="51.0" prefWidth="60.0" ripplerFill="#84da96" styleClass="clientSettings" text="" textAlignment="CENTER">
|
||||
<graphic>
|
||||
<FontAwesomeIconView fill="WHITE" glyphName="SLIDERS" size="30.0" />
|
||||
</graphic>
|
||||
</JFXButton>
|
||||
<Label id="serverStatus" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="165.0"
|
||||
layoutY="12.0" prefHeight="25.0" prefWidth="97.0" text="12/100"
|
||||
textAlignment="RIGHT" textFill="WHITE">
|
||||
</graphic></JFXButton>
|
||||
<Label id="serverStatus" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="165.0" layoutY="12.0" prefHeight="25.0" prefWidth="97.0" text="12/100" textAlignment="RIGHT" textFill="WHITE">
|
||||
<font>
|
||||
<Font name="System Bold" size="16.0" />
|
||||
</font>
|
||||
</Label>
|
||||
<Label id="serverLabel" layoutX="20.0" layoutY="11.0" prefHeight="27.0"
|
||||
prefWidth="203.0" text="СЕРВЕР">
|
||||
<Label id="serverLabel" layoutX="20.0" layoutY="11.0" prefHeight="27.0" prefWidth="203.0" text="СЕРВЕР">
|
||||
<font>
|
||||
<Font name="System Bold" size="18.0" />
|
||||
</font>
|
||||
</Label>
|
||||
<JFXButton id="logout" alignment="CENTER" contentDisplay="CENTER" layoutX="295.0"
|
||||
layoutY="12.0" prefHeight="25.0" prefWidth="81.0" ripplerFill="#61616100"
|
||||
text="Выйти" textAlignment="CENTER"/>
|
||||
<JFXButton id="logout" alignment="CENTER" contentDisplay="CENTER" layoutX="295.0" layoutY="12.0" prefHeight="25.0" prefWidth="81.0" ripplerFill="#61616100" text="Выйти" textAlignment="CENTER" />
|
||||
</children>
|
||||
</Pane>
|
||||
</children>
|
||||
</Pane>
|
||||
</children>
|
||||
</Pane>
|
||||
<Pane fx:id="bar" layoutX="696.0" prefHeight="425.0" prefWidth="43.0" styleClass="bar">
|
||||
<Pane fx:id="bar" layoutX="694.0" prefHeight="425.0" prefWidth="43.0" styleClass="bar">
|
||||
<children>
|
||||
<JFXButton id="hide" alignment="CENTER" contentDisplay="CENTER" layoutY="45.0" ripplerFill="#646464"
|
||||
text="" textAlignment="CENTER">
|
||||
<JFXButton id="hide" alignment="CENTER" contentDisplay="CENTER" layoutY="45.0" ripplerFill="#646464" text="" textAlignment="CENTER">
|
||||
<graphic>
|
||||
<MaterialDesignIconView fill="WHITE" glyphName="MINUS" size="30" textAlignment="CENTER" />
|
||||
</graphic>
|
||||
</JFXButton>
|
||||
<JFXButton id="close" alignment="CENTER" contentDisplay="CENTER" ripplerFill="#fb8c8c" text=""
|
||||
textAlignment="CENTER">
|
||||
<JFXButton id="close" alignment="CENTER" contentDisplay="CENTER" ripplerFill="#fb8c8c" text="" textAlignment="CENTER">
|
||||
<graphic>
|
||||
<MaterialDesignIconView fill="WHITE" glyphName="CLOSE" size="30" textAlignment="CENTER" />
|
||||
</graphic>
|
||||
</JFXButton>
|
||||
<JFXButton id="discord" alignment="CENTER" contentDisplay="CENTER" layoutY="380.0" ripplerFill="#646464"
|
||||
text="" textAlignment="CENTER">
|
||||
<JFXButton id="discord" alignment="CENTER" contentDisplay="CENTER" layoutY="380.0" ripplerFill="#646464" text="" textAlignment="CENTER">
|
||||
<graphic>
|
||||
<MaterialDesignIconView fill="#5fd97a" glyphName="MESSAGE_TEXT" size="20" smooth="false"
|
||||
textAlignment="CENTER"/>
|
||||
<MaterialDesignIconView fill="#5fd97a" glyphName="MESSAGE_TEXT" size="20" smooth="false" textAlignment="CENTER" />
|
||||
</graphic>
|
||||
</JFXButton>
|
||||
<JFXButton id="settings" alignment="CENTER" contentDisplay="CENTER" layoutY="90.0" ripplerFill="#646464"
|
||||
text="" textAlignment="CENTER">
|
||||
<JFXButton id="settings" alignment="CENTER" contentDisplay="CENTER" layoutY="90.0" ripplerFill="#646464" text="" textAlignment="CENTER">
|
||||
<graphic>
|
||||
<MaterialDesignIconView fill="WHITE" glyphName="SETTINGS" size="20" textAlignment="CENTER" />
|
||||
</graphic>
|
||||
</JFXButton>
|
||||
<JFXButton id="goConsole" alignment="CENTER" contentDisplay="CENTER" layoutY="138.0"
|
||||
ripplerFill="#646464" text="" textAlignment="CENTER">
|
||||
<JFXButton id="goConsole" alignment="CENTER" contentDisplay="CENTER" layoutY="138.0" ripplerFill="#646464" text="" textAlignment="CENTER">
|
||||
<graphic>
|
||||
<MaterialDesignIconView fill="WHITE" glyphName="CONSOLE" size="20" textAlignment="CENTER" />
|
||||
</graphic>
|
||||
</JFXButton>
|
||||
</children>
|
||||
</Pane>
|
||||
<Pane id="mask" opacity="0.0" prefHeight="425.0" prefWidth="694.0" visible="false"/>
|
||||
<Pane id="mask" opacity="0.0" prefHeight="450.0" prefWidth="694.0" visible="false" />
|
||||
</children>
|
||||
<stylesheets>
|
||||
<URL value="@../../styles.css" />
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<?import com.jfoenix.controls.JFXButton?>
|
||||
<?import com.jfoenix.controls.JFXToggleButton?>
|
||||
<?import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIconView?>
|
||||
<?import java.net.URL?>
|
||||
<?import javafx.geometry.Insets?>
|
||||
|
|
@ -9,25 +8,19 @@
|
|||
<?import javafx.scene.layout.Pane?>
|
||||
<?import javafx.scene.layout.VBox?>
|
||||
<?import javafx.scene.shape.Line?>
|
||||
<?import javafx.scene.text.Font?>
|
||||
<?import javafx.scene.text.Text?>
|
||||
|
||||
<!-- DrLeonardo Design -->
|
||||
|
||||
<Pane fx:id="background" prefHeight="450.0" prefWidth="738.0" xmlns="http://javafx.com/javafx/8.0.201"
|
||||
xmlns:fx="http://javafx.com/fxml/1">
|
||||
<Pane fx:id="background" prefHeight="450.0" prefWidth="740.0" xmlns="http://javafx.com/javafx/8.0.201" xmlns:fx="http://javafx.com/fxml/1">
|
||||
<children>
|
||||
<Pane id="optionsPane" prefHeight="450.0" prefWidth="692.0" styleClass="optionsPane">
|
||||
<children>
|
||||
<JFXToggleButton fx:id="presset" layoutX="30.0" layoutY="10.0" opacity="0.21" styleClass="pressetLight"
|
||||
text="Presset 1"/>
|
||||
<JFXToggleButton fx:id="presset" layoutX="287.0" layoutY="10.0" opacity="0.21"
|
||||
styleClass="pressetMedium" text="Presset 2"/>
|
||||
<JFXToggleButton fx:id="isPresset" layoutX="528.0" layoutY="10.0" opacity="0.21" prefHeight="58.0"
|
||||
prefWidth="134.0" styleClass="pressetHigh" text="Presset 3" wrapText="true"/>
|
||||
<Line endX="595.0" layoutX="100.0" layoutY="80.0" startX="-100.0" stroke="#5b3636"
|
||||
styleClass="lineHead"/>
|
||||
<ScrollPane id="modlist" layoutY="84.0" prefHeight="364.0" prefWidth="693.0">
|
||||
<Line endX="595.0" layoutX="100.0" layoutY="46.0" startX="-100.0" stroke="#5b3636" styleClass="lineHead" />
|
||||
<ScrollPane id="modlist" layoutY="46.0" prefHeight="402.0" prefWidth="693.0">
|
||||
<content>
|
||||
<VBox prefHeight="360.0" prefWidth="678.0">
|
||||
<VBox prefHeight="397.0" prefWidth="678.0">
|
||||
<children>
|
||||
</children>
|
||||
<padding>
|
||||
|
|
@ -36,24 +29,26 @@
|
|||
</VBox>
|
||||
</content>
|
||||
</ScrollPane>
|
||||
<Text fill="#393939" layoutX="15.0" layoutY="28.0" strokeType="OUTSIDE" strokeWidth="0.0" text="ОПЦИОНАЛЬНЫЕ МОДИФИКАЦИИ" wrappingWidth="265.904296875">
|
||||
<font>
|
||||
<Font name="System Bold" size="13.0" />
|
||||
</font>
|
||||
</Text>
|
||||
</children>
|
||||
</Pane>
|
||||
<Pane fx:id="bar" layoutX="692.0" prefHeight="425.0" prefWidth="43.0" styleClass="bar">
|
||||
<Pane fx:id="bar" layoutX="694.0" prefHeight="425.0" prefWidth="43.0" styleClass="bar">
|
||||
<children>
|
||||
<JFXButton id="hide" alignment="CENTER" contentDisplay="CENTER" layoutY="45.0" ripplerFill="#646464"
|
||||
text="" textAlignment="CENTER">
|
||||
<JFXButton id="hide" alignment="CENTER" contentDisplay="CENTER" layoutY="45.0" ripplerFill="#646464" text="" textAlignment="CENTER">
|
||||
<graphic>
|
||||
<MaterialDesignIconView fill="WHITE" glyphName="MINUS" size="30" textAlignment="CENTER" />
|
||||
</graphic>
|
||||
</JFXButton>
|
||||
<JFXButton id="close" alignment="CENTER" contentDisplay="CENTER" ripplerFill="#fb8c8c" text=""
|
||||
textAlignment="CENTER">
|
||||
<JFXButton id="close" alignment="CENTER" contentDisplay="CENTER" ripplerFill="#fb8c8c" text="" textAlignment="CENTER">
|
||||
<graphic>
|
||||
<MaterialDesignIconView fill="WHITE" glyphName="CLOSE" size="30" textAlignment="CENTER" />
|
||||
</graphic>
|
||||
</JFXButton>
|
||||
<JFXButton id="back" alignment="CENTER" contentDisplay="CENTER" layoutY="405.0" ripplerFill="#646464"
|
||||
text="" textAlignment="CENTER">
|
||||
<JFXButton id="back" alignment="CENTER" contentDisplay="CENTER" layoutY="405.0" ripplerFill="#646464" text="" textAlignment="CENTER">
|
||||
<graphic>
|
||||
<MaterialDesignIconView fill="WHITE" glyphName="CHEVRON_LEFT" size="30" textAlignment="CENTER" />
|
||||
</graphic>
|
||||
|
|
|
|||
|
|
@ -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**/
|
||||
|
|
|
|||
Loading…
Reference in a new issue