Skip to content
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

Jump to bottom

Update GUI #67

Merged
merged 2 commits into from
Apr 4, 2024
Merged

Update GUI #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2368e4f
Change UI
leepoeaik Apr 4, 2024
ca41960
Improve GUI
leepoeaik Apr 4, 2024
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
36 changes: 35 additions & 1 deletion src/main/resources/view/LightTheme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,33 @@
-fx-font-family: "Segoe UI Semibold";
}

#scheduleListView .list-cell:filled:odd {
-fx-background-color: #6aa9bf;
-fx-background-insets : 10 0 10 0;
-fx-background-radius : 30px;
-fx-padding: 10 10 10 10;
-fx-border-width : 0px;
}

#scheduleListView .list-cell:filled:even {
-fx-background-color: #3e7b91;
-fx-background-insets : 10 0 10 0;
-fx-background-radius : 30px;
-fx-padding: 10 10 10 10;
-fx-border-width : 0px;
}

#scheduleListView .list-cell .label {
-fx-text-fill: white;
-fx-font-size: 13pt;
-fx-font-family: "Segoe UI Semibold";
}

#scheduleListView {
-fx-background-insets: 0;
-fx-padding: 0;
}

.scroll-bar {
-fx-background-color: #FFFFFF;
}
Expand Down Expand Up @@ -152,7 +179,7 @@

#lessons .label {
-fx-text-fill: white;
-fx-background-color: #3e7b91;
-fx-background-color: #6aa9bf;
-fx-padding: 1 3 1 3;
-fx-border-radius: 2;
-fx-background-radius: 2;
Expand All @@ -161,4 +188,11 @@

#studentListView {
-fx-padding : 0 20 0 20;
-fx-background-insets: 0;
}

#upcomingLessonLabel {
-fx-text-fill: black;
-fx-font-size: 20pt;
-fx-font-family: "Segoe UI Semibold";
}
155 changes: 80 additions & 75 deletions src/main/resources/view/MainWindow.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,82 +16,87 @@
<?import javafx.stage.Stage?>

<fx:root minHeight="600" minWidth="450" onCloseRequest="#handleExit" title="TutorTrack" type="javafx.stage.Stage" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1">
<icons>
<Image url="@/images/address_book_32.png" />
</icons>
<scene>
<Scene>
<icons>
<Image url="@/images/address_book_32.png" />
</icons>
<scene>
<Scene>

<VBox>
<MenuBar fx:id="menuBar" VBox.vgrow="NEVER">
<Menu mnemonicParsing="false" text="File">
<MenuItem mnemonicParsing="false" onAction="#handleExit" text="Exit" />
</Menu>
<Menu mnemonicParsing="false" text="Help">
<MenuItem fx:id="helpMenuItem" mnemonicParsing="false" onAction="#handleHelp" text="Help" />
</Menu>
</MenuBar>
<HBox fx:id="labelCommandHolder" prefHeight="18.0" prefWidth="340.0">
<children>
<HBox fx:id="titleLogoLabel" alignment="CENTER_LEFT" prefHeight="40.0" prefWidth="136.0">
<children>
<Label contentDisplay="CENTER" prefHeight="22.0" prefWidth="86.0" text="TutorTrack" textAlignment="RIGHT">
<font>
<Font name="System Bold" size="15.0" />
</font>
</Label>
<ImageView fitHeight="31.0" fitWidth="45.0" nodeOrientation="INHERIT" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@/images/book-logo.png" />
</image>
</ImageView>
</children>
</HBox>
<HBox fx:id="commandTextHBox" alignment="CENTER_RIGHT" minHeight="-Infinity" minWidth="-Infinity" HBox.hgrow="ALWAYS">
<children>
<StackPane fx:id="commandBoxPlaceholder" styleClass="pane-with-border" HBox.hgrow="ALWAYS">
<padding>
<Insets bottom="5" left="10" right="10" top="5" />
</padding>
</StackPane>
</children>
<padding>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</padding>
</HBox>
</children>
</HBox>
<VBox>
<MenuBar fx:id="menuBar" VBox.vgrow="NEVER">
<Menu mnemonicParsing="false" text="File">
<MenuItem mnemonicParsing="false" onAction="#handleExit" text="Exit" />
</Menu>
<Menu mnemonicParsing="false" text="Help">
<MenuItem fx:id="helpMenuItem" mnemonicParsing="false" onAction="#handleHelp" text="Help" />
</Menu>
</MenuBar>
<HBox fx:id="labelCommandHolder" prefHeight="18.0" prefWidth="340.0">
<children>
<HBox fx:id="titleLogoLabel" alignment="CENTER_LEFT" prefHeight="40.0" prefWidth="136.0">
<children>
<Label contentDisplay="CENTER" prefHeight="22.0" prefWidth="86.0" text="TutorTrack" textAlignment="RIGHT">
<font>
<Font name="System Bold" size="15.0" />
</font>
</Label>
<ImageView fitHeight="31.0" fitWidth="45.0" nodeOrientation="INHERIT" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@/images/book-logo.png" />
</image>
</ImageView>
</children>
</HBox>
<HBox fx:id="commandTextHBox" alignment="CENTER_RIGHT" minHeight="-Infinity" minWidth="-Infinity" HBox.hgrow="ALWAYS">
<children>
<StackPane fx:id="commandBoxPlaceholder" styleClass="pane-with-border" HBox.hgrow="ALWAYS">
<padding>
<Insets bottom="5" left="10" right="10" top="5" />
</padding>
</StackPane>
</children>
<padding>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</padding>
</HBox>
</children>
</HBox>

<StackPane fx:id="resultDisplayPlaceholder" maxHeight="100" minHeight="100" prefHeight="100" styleClass="pane-with-border" VBox.vgrow="NEVER">
<padding>
<Insets bottom="5" left="10" right="10" top="5" />
</padding>
</StackPane>
<HBox fx:id="studentListHBox" prefHeight="100.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
<children>
<VBox fx:id="scheduleBox" alignment="CENTER_RIGHT" minWidth="340" prefWidth="340" styleClass="pane-with-border">
<padding>
<Insets bottom="10" left="10" right="10" top="10" />
</padding>
<children>
<StackPane fx:id="scheduleListPanelPlaceholder" VBox.vgrow="ALWAYS" />
</children>
</VBox>
<VBox fx:id="studentList" alignment="CENTER_RIGHT" minWidth="340" prefWidth="340" styleClass="pane-with-border" HBox.hgrow="ALWAYS">
<padding>
<Insets bottom="10" left="10" right="10" top="10" />
</padding>
<StackPane fx:id="studentListPanelPlaceholder" VBox.vgrow="ALWAYS" />
</VBox>
</children>
</HBox>
<StackPane fx:id="resultDisplayPlaceholder" maxHeight="100" minHeight="100" prefHeight="100" styleClass="pane-with-border" VBox.vgrow="NEVER">
<padding>
<Insets bottom="5" left="10" right="10" top="5" />
</padding>
</StackPane>
<HBox fx:id="studentListHBox" prefHeight="100.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
<children>
<VBox fx:id="scheduleBox" alignment="CENTER" minWidth="340" prefWidth="340" styleClass="pane-with-border">
<padding>
<Insets bottom="10" left="10" right="10" top="10" />
</padding>
<children>
<Label fx:id="upcomingLessonLabel" text="Upcoming lessons">
<font>
<Font size="24.0" />
</font>
</Label>
<StackPane fx:id="scheduleListPanelPlaceholder" VBox.vgrow="ALWAYS" />
</children>
</VBox>
<VBox fx:id="studentList" alignment="CENTER_RIGHT" minWidth="340" prefWidth="340" styleClass="pane-with-border" HBox.hgrow="ALWAYS">
<padding>
<Insets bottom="10" left="10" right="10" top="10" />
</padding>
<StackPane fx:id="studentListPanelPlaceholder" VBox.vgrow="ALWAYS" />
</VBox>
</children>
</HBox>

<StackPane fx:id="statusbarPlaceholder" VBox.vgrow="NEVER" />
</VBox>
<stylesheets>
<URL value="@Extensions.css" />
<URL value="@LightTheme.css" />
</stylesheets>
</Scene>
</scene>
<StackPane fx:id="statusbarPlaceholder" VBox.vgrow="NEVER" />
</VBox>
<stylesheets>
<URL value="@Extensions.css" />
<URL value="@LightTheme.css" />
</stylesheets>
</Scene>
</scene>
</fx:root>
5 changes: 2 additions & 3 deletions src/main/resources/view/ResultDisplay.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<?import javafx.scene.control.TextArea?>
<?import javafx.scene.layout.StackPane?>

<StackPane fx:id="placeHolder" styleClass="pane-with-border" xmlns="http://javafx.com/javafx/17"
xmlns:fx="http://javafx.com/fxml/1">
<TextArea fx:id="resultDisplay" editable="false" styleClass="result-display"/>
<StackPane fx:id="placeHolder" styleClass="pane-with-border" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1">
<TextArea fx:id="resultDisplay" editable="false" />
</StackPane>
Loading