Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Team 14 - IDATT1002
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
Container Registry
Model registry
Operate
Environments
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
Eirik Steira
Team 14 - IDATT1002
Commits
61ea5a3f
Commit
61ea5a3f
authored
5 years ago
by
Nicolay Schiøll-Johansen
Browse files
Options
Downloads
Patches
Plain Diff
Added Open Album buttons
parent
9c66eb9e
No related branches found
No related tags found
2 merge requests
!104
Weekly merge to Master
,
!56
Added option to view albums
Pipeline
#76448
passed
5 years ago
Stage: build
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/NTNU/IDATT1002/controllers/ExploreAlbums.java
+15
-0
15 additions, 0 deletions
src/main/java/NTNU/IDATT1002/controllers/ExploreAlbums.java
src/main/resources/NTNU/IDATT1002/explore_albums.fxml
+26
-1
26 additions, 1 deletion
src/main/resources/NTNU/IDATT1002/explore_albums.fxml
with
41 additions
and
1 deletion
src/main/java/NTNU/IDATT1002/controllers/ExploreAlbums.java
+
15
−
0
View file @
61ea5a3f
...
...
@@ -51,6 +51,11 @@ public class ExploreAlbums {
public
Text
album_desc5
;
public
Text
album_tags5
;
public
Button
tbar_albums
;
public
Button
open_album4
;
public
Button
open_album3
;
public
Button
open_album2
;
public
Button
open_album1
;
public
Button
open_album
;
public
void
switchToSearch
(
ActionEvent
actionEvent
)
throws
IOException
{
App
.
setRoot
(
"search"
);
...
...
@@ -87,4 +92,14 @@ public class ExploreAlbums {
public
void
switchToAlbums
(
ActionEvent
actionEvent
)
throws
IOException
{
App
.
setRoot
(
"explore_albums"
);
}
/**
* Method to open specific albums using the "Open Album" button
* @param actionEvent
* @throws IOException
*/
public
void
switchToViewAlbum
(
ActionEvent
actionEvent
)
throws
IOException
{
//TODO: write method to open the specific album chosen
App
.
setRoot
(
"view_album"
);
}
}
This diff is collapsed.
Click to expand it.
src/main/resources/NTNU/IDATT1002/explore_albums.fxml
+
26
−
1
View file @
61ea5a3f
...
...
@@ -18,7 +18,7 @@
<?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?>
<AnchorPane
maxHeight=
"2148.0"
maxWidth=
"1920.0"
prefHeight=
"1080.0"
prefWidth=
"1920.0"
xmlns=
"http://javafx.com/javafx"
xmlns:fx=
"http://javafx.com/fxml"
fx:controller=
"NTNU.IDATT1002.controllers.ExploreAlbums"
>
<AnchorPane
maxHeight=
"2148.0"
maxWidth=
"1920.0"
prefHeight=
"1080.0"
prefWidth=
"1920.0"
xmlns=
"http://javafx.com/javafx
/11.0.1
"
xmlns:fx=
"http://javafx.com/fxml
/1
"
fx:controller=
"NTNU.IDATT1002.controllers.ExploreAlbums"
>
<children>
<HBox
alignment=
"CENTER"
minHeight=
"100.0"
prefHeight=
"100.0"
prefWidth=
"1920.0"
spacing=
"20.0"
style=
"-fx-background-color: #0c0c0c;"
AnchorPane.leftAnchor=
"0.0"
AnchorPane.rightAnchor=
"0.0"
>
<children>
...
...
@@ -142,6 +142,11 @@
<Font
name=
"System Bold"
size=
"24.0"
/>
</font>
</Text>
<Button
fx:id=
"open_album"
layoutX=
"551.0"
layoutY=
"250.0"
mnemonicParsing=
"false"
onAction=
"#switchToViewAlbum"
text=
"Open Album"
>
<font>
<Font
size=
"18.0"
/>
</font>
</Button>
</children>
</Pane>
<Pane
prefHeight=
"200.0"
prefWidth=
"200.0"
GridPane.rowIndex=
"1"
>
...
...
@@ -191,6 +196,11 @@
<Font
name=
"System Bold"
size=
"24.0"
/>
</font>
</Text>
<Button
fx:id=
"open_album1"
layoutX=
"551.0"
layoutY=
"250.0"
mnemonicParsing=
"false"
onAction=
"#switchToViewAlbum"
text=
"Open Album"
>
<font>
<Font
size=
"18.0"
/>
</font>
</Button>
</children>
</Pane>
<Pane
prefHeight=
"200.0"
prefWidth=
"200.0"
GridPane.rowIndex=
"2"
>
...
...
@@ -240,6 +250,11 @@
<Font
name=
"System Bold"
size=
"24.0"
/>
</font>
</Text>
<Button
fx:id=
"open_album2"
layoutX=
"551.0"
layoutY=
"250.0"
mnemonicParsing=
"false"
onAction=
"#switchToViewAlbum"
text=
"Open Album"
>
<font>
<Font
size=
"18.0"
/>
</font>
</Button>
</children>
</Pane>
<Pane
prefHeight=
"200.0"
prefWidth=
"200.0"
GridPane.rowIndex=
"3"
>
...
...
@@ -289,6 +304,11 @@
<Font
name=
"System Bold"
size=
"24.0"
/>
</font>
</Text>
<Button
fx:id=
"open_album3"
layoutX=
"551.0"
layoutY=
"250.0"
mnemonicParsing=
"false"
onAction=
"#switchToViewAlbum"
text=
"Open Album"
>
<font>
<Font
size=
"18.0"
/>
</font>
</Button>
</children>
</Pane>
<Pane
prefHeight=
"200.0"
prefWidth=
"200.0"
GridPane.rowIndex=
"4"
>
...
...
@@ -338,6 +358,11 @@
<Font
name=
"System Bold"
size=
"24.0"
/>
</font>
</Text>
<Button
fx:id=
"open_album4"
layoutX=
"551.0"
layoutY=
"250.0"
mnemonicParsing=
"false"
onAction=
"#switchToViewAlbum"
text=
"Open Album"
>
<font>
<Font
size=
"18.0"
/>
</font>
</Button>
</children>
</Pane>
</children>
...
...
This diff is collapsed.
Click to expand it.
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