Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
idatt1002_2023_9
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Andreas Kluge Svendsrud
idatt1002_2023_9
Commits
cc7b00cc
Commit
cc7b00cc
authored
1 year ago
by
Harry Linrui XU
Browse files
Options
Downloads
Patches
Plain Diff
Continued working on implementing several budgets
parent
28f63fa0
No related branches found
No related tags found
1 merge request
!43
Merging frontend-testing into master
Changes
22
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/resources/view/dualList.fxml
+4
-4
4 additions, 4 deletions
src/main/resources/view/dualList.fxml
src/main/resources/view/newBudgetBudgert.fxml
+12
-10
12 additions, 10 deletions
src/main/resources/view/newBudgetBudgert.fxml
with
16 additions
and
14 deletions
src/main/resources/view/dualList.fxml
+
4
−
4
View file @
cc7b00cc
...
...
@@ -142,15 +142,15 @@
</HBox>
<HBox
alignment=
"CENTER_LEFT"
prefWidth=
"410.0"
spacing=
"5.0"
>
<children>
<MenuButton
mnemonicParsing=
"false"
text=
"MenuButton
"
>
<MenuButton
mnemonicParsing=
"false"
prefHeight=
"42.0"
prefWidth=
"105.0"
text=
"Add
"
>
<items>
<MenuItem
fx:id=
"addIncome"
mnemonicParsing=
"false"
onAction=
"#handleAddBtn"
text=
"Income"
/>
<MenuItem
fx:id=
"addExpense"
mnemonicParsing=
"false"
onAction=
"#handleAddBtn"
text=
"Expense"
/>
</items>
<graphic>
<ImageView
fitHeight=
"
19
.0"
fitWidth=
"
16
.0"
pickOnBounds=
"true"
preserveRatio=
"true"
>
<ImageView
fitHeight=
"
30
.0"
fitWidth=
"
50
.0"
pickOnBounds=
"true"
preserveRatio=
"true"
>
<image>
<Image
url=
"@../Images/add
_image
.png"
/>
<Image
url=
"@../Images/add.png"
/>
</image>
</ImageView>
</graphic>
...
...
@@ -165,7 +165,7 @@
</HBox>
<VBox
alignment=
"CENTER_LEFT"
prefHeight=
"200.0"
prefWidth=
"100.0"
spacing=
"5.0"
GridPane.columnIndex=
"1"
>
<children>
<ComboBox
fx:id=
"filter"
prefWidth=
"1
50
.0"
promptText=
"Show"
>
<ComboBox
fx:id=
"filter"
prefHeight=
"39.0"
prefWidth=
"1
19
.0"
promptText=
"Show"
>
<opaqueInsets>
<Insets
/>
</opaqueInsets>
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/view/newBudgetBudgert.fxml
+
12
−
10
View file @
cc7b00cc
...
...
@@ -17,6 +17,7 @@
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.layout.StackPane?>
<?import javafx.scene.layout.VBox?>
...
...
@@ -106,9 +107,9 @@
<RowConstraints
minHeight=
"10.0"
vgrow=
"SOMETIMES"
/>
</rowConstraints>
<children>
<HBox
alignment=
"CENTER_LEFT"
prefHeight=
"
100
.0"
prefWidth=
"2
00
.0"
spacing=
"10.0"
>
<HBox
alignment=
"CENTER_LEFT"
prefHeight=
"
42
.0"
prefWidth=
"2
43
.0"
spacing=
"10.0"
>
<children>
<Button
fx:id=
"addBtn"
mnemonicParsing=
"false"
onAction=
"#handleAddBtn"
prefHeight=
"2
5
.0"
prefWidth=
"
60.0
"
>
<Button
fx:id=
"addBtn"
mnemonicParsing=
"false"
onAction=
"#handleAddBtn"
prefHeight=
"2
8
.0"
prefWidth=
"
38.0"
text=
"Add
"
>
<font>
<Font
name=
"Lucida Console"
size=
"12.0"
/>
</font>
...
...
@@ -120,7 +121,7 @@
</ImageView>
</graphic>
</Button>
<Button
fx:id=
"editBtn"
mnemonicParsing=
"false"
onAction=
"#handleEditBtn"
prefHeight=
"2
5
.0"
prefWidth=
"
60.0
"
>
<Button
fx:id=
"editBtn"
mnemonicParsing=
"false"
onAction=
"#handleEditBtn"
prefHeight=
"2
8
.0"
prefWidth=
"
86.0"
text=
"Edit
"
>
<font>
<Font
name=
"Lucida Console"
size=
"12.0"
/>
</font>
...
...
@@ -132,7 +133,7 @@
</ImageView>
</graphic>
</Button>
<Button
fx:id=
"deleteBtn"
mnemonicParsing=
"false"
onAction=
"#handleDeleteBtn"
prefHeight=
"2
5
.0"
prefWidth=
"
60.0
"
>
<Button
fx:id=
"deleteBtn"
mnemonicParsing=
"false"
onAction=
"#handleDeleteBtn"
prefHeight=
"2
8
.0"
prefWidth=
"
109.0"
text=
"Delete
"
>
<font>
<Font
name=
"Lucida Console"
size=
"12.0"
/>
</font>
...
...
@@ -146,9 +147,9 @@
</Button>
</children>
</HBox>
<HBox
alignment=
"CENTER_
LEFT
"
GridPane.columnIndex=
"1"
>
<HBox
alignment=
"CENTER_
RIGHT"
prefHeight=
"42.0"
prefWidth=
"106.0
"
GridPane.columnIndex=
"1"
>
<children>
<ComboBox
fx:id=
"filter"
prefHeight=
"2
0
.0"
prefWidth=
"
1
80.0"
promptText=
"Show"
>
<ComboBox
fx:id=
"filter"
prefHeight=
"2
5
.0"
prefWidth=
"80.0"
promptText=
"Show"
>
<opaqueInsets>
<Insets
/>
</opaqueInsets>
...
...
@@ -210,16 +211,17 @@
<Font
size=
"36.0"
/>
</font>
</Label>
<
Stack
Pane
GridPane.columnIndex=
"2"
>
<Pane
GridPane.columnIndex=
"2"
>
<children>
<
DatePicker
fx:id=
"date"
prefWidth=
"175.0"
/>
<Label
fx:id=
"daysLeftLbl"
text=
"Days left: 31"
>
<
StackPane
/>
<Label
fx:id=
"daysLeftLbl"
layoutX=
"33.0"
layoutY=
"62.0"
text=
"Days left: 31"
>
<font>
<Font
name=
"Lucida Console"
size=
"14.0"
/>
</font>
</Label>
<DatePicker
fx:id=
"date"
layoutX=
"3.0"
layoutY=
"32.0"
prefWidth=
"175.0"
/>
</children>
</
Stack
Pane>
</Pane>
</children>
</GridPane>
</children>
...
...
This diff is collapsed.
Click to expand it.
Prev
1
2
Next
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment