Skip to content

fix of project 2 original pull-request #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BrendanMatteoli wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix of project 2 original pull-request #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2be7e8
fixing project2
Apr 15, 2020
912e7c1
fixing project2-classpathRevert
Apr 15, 2020
88f18e0
small test edit
Apr 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/JavaFX"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
</classpath>
Empty file added errorlog.txt
View file
Open in desktop
Empty file.
Empty file added history.txt
View file
Open in desktop
Empty file.
8 changes: 8 additions & 0 deletions src/wrestlingtournamentcli/DarkThemeChanges.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.root {
-fx-base: #3f474f;
-fx-accent: #e7eff7 ;
-fx-default-button: #7f878f ;
-fx-focus-color: #efefef;
-fx-focused-text-base-color : ladder(-fx-selection-bar, -fx-light-text-color 40%, -fx-dark-text-color 40%, -fx-dark-text-color 60%,
-fx-mid-text-color 60%);
}
18 changes: 16 additions & 2 deletions src/wrestlingtournamentcli/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import javafx.stage.FileChooser;
import javafx.stage.Stage;
import javafx.scene.control.Tooltip;
import javafx.scene.control.ToggleButton;
/**
* @author Jared Murphy
* @author Cody Francis
Expand Down Expand Up @@ -497,6 +498,7 @@ public void start(Stage stage) throws Exception {
GridPane introLayout = new GridPane();
Button wrestling = new Button();
Button soccer = new Button();
ToggleButton theme = new ToggleButton();
Label introMenu = new Label("Please select the sport you would like to manage:");
//UI elements for selection Screen

Expand Down Expand Up @@ -540,10 +542,13 @@ public void start(Stage stage) throws Exception {
wrestling.setPadding(new Insets(10,10,10,10));
soccer.setText("Soccer");
soccer.setPadding(new Insets(10,10,10,10));
theme.setText("Theme");
theme.setPadding(new Insets(10,10,10,10));
introLayout.setPadding(new Insets(300,100,100,100));
introLayout.add(introMenu, 0, 0);
introLayout.add(wrestling, 2,3 );
introLayout.add(soccer, 3, 3);
introLayout.add(theme, 2, 4);
introRoot.setCenter(introLayout);
//Initializing introduction UI elements

Expand Down Expand Up @@ -585,7 +590,7 @@ public void start(Stage stage) throws Exception {
layout.add(viewWrestlers, 0, 2);
layout.add(save, 0, 5);
layout.add(saveTournament, 1, 5);
layout.add(start, 0, 6);
//layout.add(start, 0, 6);


layout.add(compareWrestlers, 0, 7);
Expand Down Expand Up @@ -616,7 +621,16 @@ public void start(Stage stage) throws Exception {
stage.setScene(soccerScene);

});

theme.setOnAction(e -> {

if(theme.isSelected()) {
root.getStylesheets().add(getClass().getResource("DarkThemeChanges.css").toExternalForm());

} else {
root.getStylesheets().remove(getClass().getResource("DarkThemeChanges.css").toExternalForm());
}

});


viewTeams.setOnAction(e -> {
Expand Down