Seil0
/
cemu_UI
1
0
Fork 0
Code Issues 2 Pull Requests Releases 4 Wiki Activity

ui fixes 

* the spinner backgri´ound is not clear anymore
* code clean up
* added a better description of issue #10
This commit is contained in:
Jannik 2017-11-28 13:55:07 +01:00
parent b9b7b143e5
commit 2e200e5a88
2 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/com/cemu_UI/application/MainWindowController.java
View File

@ -67,8 +67,6 @@ import com.jfoenix.controls.JFXTreeTableColumn;
import com.jfoenix.controls.JFXTreeTableView; import com.jfoenix.controls.JFXTreeTableView;
import com.jfoenix.transitions.hamburger.HamburgerBackArrowBasicTransition; import com.jfoenix.transitions.hamburger.HamburgerBackArrowBasicTransition;
import javafx.animation.FadeTransition;
import javafx.animation.ParallelTransition;
import javafx.animation.TranslateTransition; import javafx.animation.TranslateTransition;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.beans.value.ChangeListener; import javafx.beans.value.ChangeListener;
@ -735,6 +733,7 @@ public class MainWindowController {
JFXSpinner spinner = new JFXSpinner(); JFXSpinner spinner = new JFXSpinner();
spinner.setPrefSize(30, 30); spinner.setPrefSize(30, 30);
spinner.setStyle(" -fx-background-color: #f4f4f4;");
main.pane.getChildren().add(spinner); main.pane.getChildren().add(spinner);
AnchorPane.setTopAnchor(spinner, (main.pane.getHeight()-spinner.getPrefHeight())/2); AnchorPane.setTopAnchor(spinner, (main.pane.getHeight()-spinner.getPrefHeight())/2);
AnchorPane.setLeftAnchor(spinner, (main.pane.getWidth()-spinner.getPrefWidth())/2); AnchorPane.setLeftAnchor(spinner, (main.pane.getWidth()-spinner.getPrefWidth())/2);
@ -1571,34 +1570,19 @@ public class MainWindowController {
private void sideMenuSlideIn(){ private void sideMenuSlideIn(){
sideMenuVBox.setVisible(true); sideMenuVBox.setVisible(true);
//fade in from 40% to 100% opacity in 400ms
FadeTransition fadeTransition = new FadeTransition(Duration.millis(400), sideMenuVBox);
fadeTransition.setFromValue(0.4);
fadeTransition.setToValue(1.0);
//slide in in 400ms //slide in in 400ms
TranslateTransition translateTransition = new TranslateTransition(Duration.millis(400), sideMenuVBox); TranslateTransition translateTransition = new TranslateTransition(Duration.millis(400), sideMenuVBox);
translateTransition.setFromX(-175); translateTransition.setFromX(-175);
translateTransition.setToX(0); translateTransition.setToX(0);
//in case both animations are used (add (fadeTransition, translateTransition) in the second line under this command) translateTransition.play();
ParallelTransition parallelTransition = new ParallelTransition();
parallelTransition.getChildren().addAll(translateTransition);//(fadeTransition, translateTransition);
parallelTransition.play();
} }
private void sideMenuSlideOut(){ private void sideMenuSlideOut(){
// sideMenuVBox.setVisible(false);
//fade out from 100% to 40% opacity in 400ms
FadeTransition fadeTransition = new FadeTransition(Duration.millis(400), sideMenuVBox);
fadeTransition.setFromValue(1.0);
fadeTransition.setToValue(0.4);
//slide out in 400ms //slide out in 400ms
TranslateTransition translateTransition = new TranslateTransition(Duration.millis(400), sideMenuVBox); TranslateTransition translateTransition = new TranslateTransition(Duration.millis(400), sideMenuVBox);
translateTransition.setFromX(0); translateTransition.setFromX(0);
translateTransition.setToX(-175); translateTransition.setToX(-175);
//in case both animations are used (add (fadeTransition, translateTransition) in the second line under this command) translateTransition.play();
ParallelTransition parallelTransition = new ParallelTransition();
parallelTransition.getChildren().addAll(translateTransition);//(fadeTransition, translateTransition);
parallelTransition.play();
} }
private void playBtnSlideIn(){ private void playBtnSlideIn(){
@ -1608,17 +1592,17 @@ public class MainWindowController {
playTrue = true; playTrue = true;
TranslateTransition playBtnTransition = new TranslateTransition(Duration.millis(300), playBtn); TranslateTransition playBtnTransition = new TranslateTransition(Duration.millis(300), playBtn);
playBtnTransition.setFromY(55); playBtnTransition.setFromY(56);
playBtnTransition.setToY(0); playBtnTransition.setToY(0);
playBtnTransition.play(); playBtnTransition.play();
TranslateTransition lastTimePlayedBtnTransition = new TranslateTransition(Duration.millis(300), lastTimePlayedBtn); TranslateTransition lastTimePlayedBtnTransition = new TranslateTransition(Duration.millis(300), lastTimePlayedBtn);
lastTimePlayedBtnTransition.setFromY(55); lastTimePlayedBtnTransition.setFromY(56);
lastTimePlayedBtnTransition.setToY(0); lastTimePlayedBtnTransition.setToY(0);
lastTimePlayedBtnTransition.play(); lastTimePlayedBtnTransition.play();
TranslateTransition timePlayedBtnTransition = new TranslateTransition(Duration.millis(300), totalPlaytimeBtn); TranslateTransition timePlayedBtnTransition = new TranslateTransition(Duration.millis(300), totalPlaytimeBtn);
timePlayedBtnTransition.setFromY(55); timePlayedBtnTransition.setFromY(56);
timePlayedBtnTransition.setToY(0); timePlayedBtnTransition.setToY(0);
timePlayedBtnTransition.play(); timePlayedBtnTransition.play();
} }

6
src/main/java/com/cemu_UI/vendorCloudController/GoogleDriveController.java
View File

@ -104,12 +104,14 @@ public class GoogleDriveController {
InputStream in = getClass().getClassLoader().getResourceAsStream("client_secret.json"); InputStream in = getClass().getClassLoader().getResourceAsStream("client_secret.json");
GoogleClientSecrets clientSecrets = GoogleClientSecrets.load(JSON_FACTORY, new InputStreamReader(in)); GoogleClientSecrets clientSecrets = GoogleClientSecrets.load(JSON_FACTORY, new InputStreamReader(in));
//FIXME Linux fails to open a new browser window, application crashes, maybe a kde only bug //FIXME Linux fails to open a new browser window, application crashes
// Build flow and trigger user authorization request. // see: https://github.com/Seil0/cemu_UI/issues/10
// Build flow and trigger user authorization request.
GoogleAuthorizationCodeFlow flow = new GoogleAuthorizationCodeFlow.Builder(HTTP_TRANSPORT, JSON_FACTORY, clientSecrets, SCOPES) GoogleAuthorizationCodeFlow flow = new GoogleAuthorizationCodeFlow.Builder(HTTP_TRANSPORT, JSON_FACTORY, clientSecrets, SCOPES)
.setDataStoreFactory(DATA_STORE_FACTORY) .setDataStoreFactory(DATA_STORE_FACTORY)
.setAccessType("offline") .setAccessType("offline")
.build(); .build();
Credential credential = new AuthorizationCodeInstalledApp(flow, new LocalServerReceiver()).authorize("user"); Credential credential = new AuthorizationCodeInstalledApp(flow, new LocalServerReceiver()).authorize("user");
LOGGER.info("Credentials saved to " + DATA_STORE_DIR.getAbsolutePath()); LOGGER.info("Credentials saved to " + DATA_STORE_DIR.getAbsolutePath());
return credential; return credential;