From 1a6b2c4ccd4fe1f6ea8430aa539ae62a03160c07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolay=20Schi=C3=B8ll-Johansen?=
<nicolayschiolljohansen@gmail.com>
Date: Sun, 22 Mar 2020 15:49:11 +0100
Subject: [PATCH] Updated all the toolbars to be uniform as well as linking
them up. Also removed the /11.0.1 at the end of xmlns and the /1 at xmlns:fx
which were causing error messages
---
.../controllers/CreateAlbumController.java | 24 +++++---
.../NTNU/IDATT1002/controllers/Explore.java | 5 ++
.../controllers/ExploreAlbumsController.java | 35 +++++------
.../java/NTNU/IDATT1002/controllers/Main.java | 5 ++
.../java/NTNU/IDATT1002/controllers/Map.java | 5 ++
.../NTNU/IDATT1002/controllers/Search.java | 5 ++
.../NTNU/IDATT1002/controllers/Upload.java | 5 ++
.../IDATT1002/controllers/UploadedAlbum.java | 5 ++
.../IDATT1002/controllers/UploadedPhoto.java | 5 ++
.../controllers/ViewAlbumController.java | 15 +++--
.../IDATT1002/controllers/ViewPicture.java | 14 ++++-
.../NTNU/IDATT1002/create_album_page.fxml | 34 ++++++-----
.../resources/NTNU/IDATT1002/explore.fxml | 19 +++---
.../NTNU/IDATT1002/explore_albums.fxml | 33 ++++++-----
src/main/resources/NTNU/IDATT1002/login.fxml | 2 +-
src/main/resources/NTNU/IDATT1002/main.fxml | 15 ++---
src/main/resources/NTNU/IDATT1002/map.fxml | 37 ++++++------
src/main/resources/NTNU/IDATT1002/search.fxml | 58 +++++++++++--------
src/main/resources/NTNU/IDATT1002/signup.fxml | 2 +-
src/main/resources/NTNU/IDATT1002/upload.fxml | 36 ++++++------
.../NTNU/IDATT1002/uploaded_album.fxml | 37 ++++++------
.../NTNU/IDATT1002/uploaded_photo.fxml | 37 ++++++------
.../resources/NTNU/IDATT1002/view_album.fxml | 35 +++++------
.../NTNU/IDATT1002/view_picture.fxml | 35 +++++------
24 files changed, 294 insertions(+), 209 deletions(-)
diff --git a/src/main/java/NTNU/IDATT1002/controllers/CreateAlbumController.java b/src/main/java/NTNU/IDATT1002/controllers/CreateAlbumController.java
index c84fb963..3d9ceec8 100644
--- a/src/main/java/NTNU/IDATT1002/controllers/CreateAlbumController.java
+++ b/src/main/java/NTNU/IDATT1002/controllers/CreateAlbumController.java
@@ -6,6 +6,7 @@ import javafx.scene.control.Button;
import javafx.scene.control.TextArea;
import javafx.scene.control.TextField;
import javafx.scene.image.ImageView;
+import javafx.scene.input.MouseEvent;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.Pane;
@@ -24,21 +25,30 @@ public class CreateAlbumController {
public GridPane image_grid;
public Button add_images_button;
public Button create_album_button;
+ public Button tbar_albums;
+ public Button tbar_searchBtn;
- public void switchToSearch(ActionEvent actionEvent) {
-
+ public void switchToSearch(ActionEvent actionEvent) throws IOException {
+ App.setRoot("search");
}
- public void switchToUpload(ActionEvent actionEvent) {
-
+ public void switchToUpload(ActionEvent actionEvent) throws IOException {
+ App.setRoot("upload");
}
- public void switchToMap(ActionEvent actionEvent) {
-
+ public void switchToMap(ActionEvent actionEvent) throws IOException {
+ App.setRoot("map");
}
- public void switchToExplore(ActionEvent actionEvent) {
+ public void switchToExplore(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore");
+ }
+ public void switchToMain(MouseEvent mouseEvent) throws IOException {
+ App.setRoot("main");
}
+ public void switchToAlbums(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore_albums");
+ }
}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/Explore.java b/src/main/java/NTNU/IDATT1002/controllers/Explore.java
index 7e0f351a..0dacfce3 100644
--- a/src/main/java/NTNU/IDATT1002/controllers/Explore.java
+++ b/src/main/java/NTNU/IDATT1002/controllers/Explore.java
@@ -21,6 +21,7 @@ public class Explore {
public ScrollPane scrollPane;
public Button footer_previousBtn;
public Button footer_nextBtn;
+ public Button tbar_albums;
/**
* Method that changes stage to Main page
@@ -88,4 +89,8 @@ public class Explore {
public void switchToNext(ActionEvent actionEvent) throws IOException {
//TODO: Make method that updates content to next "page"
}
+
+ public void switchToAlbums(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore_albums");
+ }
}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/ExploreAlbumsController.java b/src/main/java/NTNU/IDATT1002/controllers/ExploreAlbumsController.java
index b8713597..f7870483 100644
--- a/src/main/java/NTNU/IDATT1002/controllers/ExploreAlbumsController.java
+++ b/src/main/java/NTNU/IDATT1002/controllers/ExploreAlbumsController.java
@@ -20,11 +20,7 @@ public class ExploreAlbumsController {
public ScrollPane scrollpane;
public Button footer_previous_page;
public Button footer_next_page;
- public ImageView tbar_logo1;
- public TextField tbar_search1;
- public Button tbar_map1;
- public Button tbar_upload1;
- public Button tbar_searchButton;
+ public Button tbar_searchBtn;
public Button tbar_explore;
public Text album_amount;
public ChoiceBox sorted_by_choicebox;
@@ -54,21 +50,22 @@ public class ExploreAlbumsController {
public Text album_title5;
public Text album_desc5;
public Text album_tags5;
+ public Button tbar_albums;
- public void switchToSearch(ActionEvent actionEvent) {
-
+ public void switchToSearch(ActionEvent actionEvent) throws IOException {
+ App.setRoot("search");
}
- public void switchToMain(MouseEvent mouseEvent) {
-
+ public void switchToMain(MouseEvent mouseEvent) throws IOException {
+ App.setRoot("main");
}
- public void switchToMap(ActionEvent actionEvent) {
-
+ public void switchToMap(ActionEvent actionEvent) throws IOException {
+ App.setRoot("map");
}
- public void switchToUpload(ActionEvent actionEvent) {
-
+ public void switchToUpload(ActionEvent actionEvent) throws IOException {
+ App.setRoot("upload");
}
public void switchToPrevious(ActionEvent actionEvent) {
@@ -76,14 +73,18 @@ public class ExploreAlbumsController {
}
public void switchToNext(ActionEvent actionEvent) throws IOException {
- App.setRoot("search_page_2");
- }
- public void switchToCreateAlbum(ActionEvent actionEvent) {
+ }
+ public void switchToCreateAlbum(ActionEvent actionEvent) throws IOException {
+ App.setRoot("create_album_page");
}
- public void switchToExplore(ActionEvent actionEvent) {
+ public void switchToExplore(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore");
+ }
+ public void switchToAlbums(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore_albums");
}
}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/Main.java b/src/main/java/NTNU/IDATT1002/controllers/Main.java
index e55a25ab..831a4c67 100644
--- a/src/main/java/NTNU/IDATT1002/controllers/Main.java
+++ b/src/main/java/NTNU/IDATT1002/controllers/Main.java
@@ -19,6 +19,7 @@ public class Main {
public Button tbar_upload;
public Button uploadBtn;
+ public Button tbar_albums;
/**
* Method that changes stage to Main page
@@ -68,4 +69,8 @@ public class Main {
public void switchToUpload(ActionEvent actionEvent) throws IOException {
App.setRoot("upload");
}
+
+ public void switchToAlbums(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore_albums");
+ }
}
\ No newline at end of file
diff --git a/src/main/java/NTNU/IDATT1002/controllers/Map.java b/src/main/java/NTNU/IDATT1002/controllers/Map.java
index 78acd3b3..1b3e90d8 100644
--- a/src/main/java/NTNU/IDATT1002/controllers/Map.java
+++ b/src/main/java/NTNU/IDATT1002/controllers/Map.java
@@ -19,6 +19,7 @@ public class Map {
public TextField search;
public Button searchBtn;
+ public Button tbar_albums;
/**
* Method that changes stage to Main page
@@ -76,5 +77,9 @@ public class Map {
public void MapSearch(ActionEvent actionEvent) {
//TODO: Make method
}
+
+ public void switchToAlbums(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore_albums");
+ }
}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/Search.java b/src/main/java/NTNU/IDATT1002/controllers/Search.java
index f75a62a7..fbc7339c 100644
--- a/src/main/java/NTNU/IDATT1002/controllers/Search.java
+++ b/src/main/java/NTNU/IDATT1002/controllers/Search.java
@@ -31,6 +31,7 @@ public class Search implements Initializable {
public Button footer_previousBtn;
public Button footer_nextBtn;
+ public Button tbar_albums;
/**
@@ -110,4 +111,8 @@ public class Search implements Initializable {
public void switchToNext(ActionEvent actionEvent) throws IOException {
//TODO: Make method that updates content to next "page"
}
+
+ public void switchToAlbums(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore_albums");
+ }
}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/Upload.java b/src/main/java/NTNU/IDATT1002/controllers/Upload.java
index baeed8c2..edefc1c9 100644
--- a/src/main/java/NTNU/IDATT1002/controllers/Upload.java
+++ b/src/main/java/NTNU/IDATT1002/controllers/Upload.java
@@ -33,6 +33,7 @@ public class Upload {
public Button uploadBtn;
public Pane drag_drop;
+ public Button tbar_albums;
/**
* Method that changes stage to Main page
@@ -180,4 +181,8 @@ public class Upload {
private void switchToUploadedAlbum() throws IOException {
App.setRoot("uploaded_album");
}
+
+ public void switchToAlbums(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore_albums");
+ }
}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/UploadedAlbum.java b/src/main/java/NTNU/IDATT1002/controllers/UploadedAlbum.java
index ff595923..b6dc3486 100644
--- a/src/main/java/NTNU/IDATT1002/controllers/UploadedAlbum.java
+++ b/src/main/java/NTNU/IDATT1002/controllers/UploadedAlbum.java
@@ -41,6 +41,7 @@ public class UploadedAlbum {
public ImageView photo_image4;
public Button acceptBtn;
+ public Button tbar_albums;
/**
* Method that changes stage to Main page
@@ -101,4 +102,8 @@ public class UploadedAlbum {
//TODO: write method to accept and upload the photo with chosen settings, titles etc and then setRoot to main page
App.setRoot("main");
}
+
+ public void switchToAlbums(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore_albums");
+ }
}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/UploadedPhoto.java b/src/main/java/NTNU/IDATT1002/controllers/UploadedPhoto.java
index 10959e0a..a82af2e2 100644
--- a/src/main/java/NTNU/IDATT1002/controllers/UploadedPhoto.java
+++ b/src/main/java/NTNU/IDATT1002/controllers/UploadedPhoto.java
@@ -30,6 +30,7 @@ public class UploadedPhoto implements Initializable {
public ImageView photo_image;
public Button acceptBtn;
+ public Button tbar_albums;
/**
@@ -101,4 +102,8 @@ public class UploadedPhoto implements Initializable {
//TODO: write method to accept and upload the photo with chosen settings, titles etc and then setRoot to logged-in page
App.setRoot("main");
}
+
+ public void switchToAlbums(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore_albums");
+ }
}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/ViewAlbumController.java b/src/main/java/NTNU/IDATT1002/controllers/ViewAlbumController.java
index 36b24cdb..0942aea8 100644
--- a/src/main/java/NTNU/IDATT1002/controllers/ViewAlbumController.java
+++ b/src/main/java/NTNU/IDATT1002/controllers/ViewAlbumController.java
@@ -34,7 +34,8 @@ public class ViewAlbumController {
public Text picture_title_field;
public Text picture_tagsField;
public ImageView main_picture;
- public Button tbar_searchButton;
+ public Button tbar_searchBtn;
+ public Button tbar_albums;
public void switchToSearch(ActionEvent actionEvent) throws IOException {
App.setRoot("search_page");
@@ -52,10 +53,6 @@ public class ViewAlbumController {
App.setRoot("explore_page");
}
- public void uploadPhoto(ActionEvent actionEvent) throws IOException {
- App.setRoot("logged-in");
- }
-
public void openPopUpPicture(MouseEvent mouseEvent) {
//write method that opens a pop-up view of the main picture
}
@@ -95,4 +92,12 @@ public class ViewAlbumController {
public void createPdf(ActionEvent actionEvent) {
//write method that generates and downloads a PDF version of the album
}
+
+ public void switchToMain(MouseEvent mouseEvent) throws IOException {
+ App.setRoot("main");
+ }
+
+ public void switchToAlbums(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore_albums");
+ }
}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/ViewPicture.java b/src/main/java/NTNU/IDATT1002/controllers/ViewPicture.java
index 99adbda3..6b56ef48 100644
--- a/src/main/java/NTNU/IDATT1002/controllers/ViewPicture.java
+++ b/src/main/java/NTNU/IDATT1002/controllers/ViewPicture.java
@@ -1,5 +1,6 @@
package NTNU.IDATT1002.controllers;
+import NTNU.IDATT1002.App;
import javafx.event.ActionEvent;
import javafx.scene.control.Button;
import javafx.scene.control.TextField;
@@ -8,10 +9,11 @@ import javafx.scene.input.MouseEvent;
import javafx.scene.layout.Pane;
import javafx.scene.text.Text;
+import java.io.IOException;
+
public class ViewPicture {
public ImageView tbar_logo;
public TextField tbar_search;
- public Button tbar_searchButton;
public Button tbar_explore;
public Button tbar_map;
public Button tbar_upload;
@@ -20,6 +22,8 @@ public class ViewPicture {
public Text picture_title_field;
public Text desc_textField;
public Pane metadata_pane;
+ public Button tbar_searchBtn;
+ public Button tbar_albums;
public void switchToSearch(ActionEvent actionEvent) {
@@ -40,4 +44,12 @@ public class ViewPicture {
public void openPopUpPicture(MouseEvent mouseEvent) {
//method that opens pop-up of picture
}
+
+ public void switchToMain(MouseEvent mouseEvent) throws IOException {
+ App.setRoot("main");
+ }
+
+ public void switchToAlbums(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore_albums");
+ }
}
diff --git a/src/main/resources/NTNU/IDATT1002/create_album_page.fxml b/src/main/resources/NTNU/IDATT1002/create_album_page.fxml
index e4dab803..650c545f 100644
--- a/src/main/resources/NTNU/IDATT1002/create_album_page.fxml
+++ b/src/main/resources/NTNU/IDATT1002/create_album_page.fxml
@@ -15,25 +15,27 @@
<?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?>
-<AnchorPane 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.CreateAlbumController">
+<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.CreateAlbumController">
<children>
<VBox prefHeight="1080.0" prefWidth="1920.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<children>
- <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="200.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
- <children>
- <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" pickOnBounds="true" preserveRatio="true">
- <image>
- <Image url="@../../Images/PlaceholderLogo.png" />
- </image>
- </ImageView>
- <Pane prefHeight="100.0" prefWidth="343.0" />
- <TextField fx:id="tbar_search" onAction="#switchToSearch" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
- <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
- <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
- <Pane prefHeight="100.0" prefWidth="174.0" />
- <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
- </children>
- </HBox>
+ <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
+ <children>
+ <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true">
+ <image>
+ <Image url="@../../Images/PlaceholderLogo.png" />
+ </image>
+ </ImageView>
+ <Pane prefHeight="100.0" prefWidth="343.0" />
+ <TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
+ <Button fx:id="tbar_searchBtn" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
+ <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
+ <Button fx:id="tbar_albums" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" />
+ <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
+ <Pane prefHeight="100.0" prefWidth="174.0" />
+ <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+ </children>
+ </HBox>
<AnchorPane prefHeight="991.0" prefWidth="1920.0" style="-fx-background-color: #999999;">
<children>
<Text layoutX="275.0" layoutY="143.0" strokeType="OUTSIDE" strokeWidth="0.0" text="ALBUMTITLE:">
diff --git a/src/main/resources/NTNU/IDATT1002/explore.fxml b/src/main/resources/NTNU/IDATT1002/explore.fxml
index 45d8e8f1..a1f205c9 100644
--- a/src/main/resources/NTNU/IDATT1002/explore.fxml
+++ b/src/main/resources/NTNU/IDATT1002/explore.fxml
@@ -13,22 +13,23 @@
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.layout.RowConstraints?>
-<AnchorPane maxHeight="1080.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.Explore">
+<AnchorPane maxHeight="1080.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.Explore">
<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" AnchorPane.topAnchor="0.0">
+ <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
<children>
- <ImageView fx:id="tbar_logo" onMouseClicked="#switchToMain" fitHeight="69.0" fitWidth="153.0" pickOnBounds="true" preserveRatio="true">
+ <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../../Images/PlaceholderLogo.png" />
</image>
</ImageView>
<Pane prefHeight="100.0" prefWidth="343.0" />
<TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
- <Button fx:id="tbar_searchBtn" onAction="#switchToSearch" mnemonicParsing="false" text="SEARCH" />
- <Button fx:id="tbar_explore" onAction="#switchToExplore" mnemonicParsing="false" text="EXPLORE" />
- <Button fx:id="tbar_map" onAction="#switchToMap" mnemonicParsing="false" text="MAP" />
+ <Button fx:id="tbar_searchBtn" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
+ <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
+ <Button fx:id="tbar_albums" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" />
+ <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
<Pane prefHeight="100.0" prefWidth="174.0" />
- <Button fx:id="tbar_upload" onAction="#switchToUpload" mnemonicParsing="false" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+ <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
</children>
</HBox>
<ScrollPane fx:id="scrollPane" hbarPolicy="NEVER" layoutY="100.0" prefHeight="980.0" prefWidth="1920.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="100.0">
@@ -153,8 +154,8 @@
<children>
<HBox alignment="CENTER" layoutY="-2.0" prefHeight="84.0" prefWidth="1920.0" spacing="20.0">
<children>
- <Button fx:id="footer_previousBtn" onAction="#switchToPrevious" mnemonicParsing="false" text="PREVIOUS" />
- <Button fx:id="footer_nextBtn" onAction="#switchToNext" layoutX="944.0" layoutY="48.0" mnemonicParsing="false" text="NEXT" />
+ <Button fx:id="footer_previousBtn" mnemonicParsing="false" onAction="#switchToPrevious" text="PREVIOUS" />
+ <Button fx:id="footer_nextBtn" layoutX="944.0" layoutY="48.0" mnemonicParsing="false" onAction="#switchToNext" text="NEXT" />
</children>
</HBox>
</children></Pane>
diff --git a/src/main/resources/NTNU/IDATT1002/explore_albums.fxml b/src/main/resources/NTNU/IDATT1002/explore_albums.fxml
index ad771345..8dd54dda 100644
--- a/src/main/resources/NTNU/IDATT1002/explore_albums.fxml
+++ b/src/main/resources/NTNU/IDATT1002/explore_albums.fxml
@@ -18,24 +18,25 @@
<?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/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.ExploreAlbumsController">
+<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.ExploreAlbumsController">
<children>
- <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
- <children>
- <ImageView fx:id="tbar_logo1" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true">
- <image>
- <Image url="@../../Images/PlaceholderLogo.png" />
- </image>
- </ImageView>
- <Pane prefHeight="100.0" prefWidth="410.0" />
- <TextField fx:id="tbar_search1" onAction="#switchToSearch" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
- <Button fx:id="tbar_searchButton" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
+ <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>
+ <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true">
+ <image>
+ <Image url="@../../Images/PlaceholderLogo.png" />
+ </image>
+ </ImageView>
+ <Pane prefHeight="100.0" prefWidth="343.0" />
+ <TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
+ <Button fx:id="tbar_searchBtn" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
<Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
- <Button fx:id="tbar_map1" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
- <Pane prefHeight="100.0" prefWidth="174.0" />
- <Button fx:id="tbar_upload1" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="40.0" prefWidth="114.0" text="UPLOAD" />
- </children>
- </HBox>
+ <Button fx:id="tbar_albums" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" />
+ <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
+ <Pane prefHeight="100.0" prefWidth="174.0" />
+ <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+ </children>
+ </HBox>
<ScrollPane fx:id="scrollpane" hbarPolicy="NEVER" layoutY="100.0" prefHeight="980.0" prefWidth="1920.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="100.0">
<content>
<AnchorPane maxHeight="1920.0" minHeight="0.0" minWidth="0.0" prefHeight="2000.0" prefWidth="1920.0">
diff --git a/src/main/resources/NTNU/IDATT1002/login.fxml b/src/main/resources/NTNU/IDATT1002/login.fxml
index 9070e4a3..18d1dcc8 100644
--- a/src/main/resources/NTNU/IDATT1002/login.fxml
+++ b/src/main/resources/NTNU/IDATT1002/login.fxml
@@ -11,7 +11,7 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Text?>
-<VBox alignment="CENTER" prefHeight="1080.0" prefWidth="1920.0" spacing="20.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.Login">
+<VBox alignment="CENTER" prefHeight="1080.0" prefWidth="1920.0" spacing="20.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.Login">
<children>
<Label text="Login Page" />
<GridPane hgap="10.0" maxWidth="300.0" prefHeight="90.0" prefWidth="200.0" vgap="10.0">
diff --git a/src/main/resources/NTNU/IDATT1002/main.fxml b/src/main/resources/NTNU/IDATT1002/main.fxml
index 10aae0d4..90b751e0 100644
--- a/src/main/resources/NTNU/IDATT1002/main.fxml
+++ b/src/main/resources/NTNU/IDATT1002/main.fxml
@@ -10,29 +10,30 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>
-<AnchorPane 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.Main">
+<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.Main">
<children>
<VBox prefHeight="1080.0" prefWidth="1920.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<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" AnchorPane.topAnchor="0.0">
<children>
- <ImageView fx:id="tbar_logo" onMouseClicked="#switchToMain" fitHeight="69.0" fitWidth="153.0" pickOnBounds="true" preserveRatio="true">
+ <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../../Images/PlaceholderLogo.png" />
</image>
</ImageView>
<Pane prefHeight="100.0" prefWidth="343.0" />
<TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
- <Button fx:id="tbar_searchBtn" onAction="#switchToSearch" mnemonicParsing="false" text="SEARCH" />
- <Button fx:id="tbar_explore" onAction="#switchToExplore" mnemonicParsing="false" text="EXPLORE" />
- <Button fx:id="tbar_map" onAction="#switchToMap" mnemonicParsing="false" text="MAP" />
+ <Button fx:id="tbar_searchBtn" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
+ <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
+ <Button fx:id="tbar_albums" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" />
+ <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
<Pane prefHeight="100.0" prefWidth="174.0" />
- <Button fx:id="tbar_upload" onAction="#switchToUpload" mnemonicParsing="false" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+ <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
</children>
</HBox>
<HBox alignment="CENTER" prefHeight="982.0" prefWidth="1920.0">
<children>
- <Button fx:id="uploadBtn" onAction="#switchToUpload" mnemonicParsing="false" text="UPLOAD">
+ <Button fx:id="uploadBtn" mnemonicParsing="false" onAction="#switchToUpload" text="UPLOAD">
<font>
<Font size="60.0" />
</font>
diff --git a/src/main/resources/NTNU/IDATT1002/map.fxml b/src/main/resources/NTNU/IDATT1002/map.fxml
index 5a32ad66..513b898a 100644
--- a/src/main/resources/NTNU/IDATT1002/map.fxml
+++ b/src/main/resources/NTNU/IDATT1002/map.fxml
@@ -12,26 +12,27 @@
<?import javafx.scene.text.Text?>
<?import javafx.scene.web.WebView?>
-<AnchorPane 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.Map">
+<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.Map">
<children>
<VBox prefHeight="1080.0" prefWidth="1920.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<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" AnchorPane.topAnchor="0.0">
- <children>
- <ImageView fx:id="tbar_logo" onMouseClicked="#switchToMain" fitHeight="69.0" fitWidth="153.0" pickOnBounds="true" preserveRatio="true">
- <image>
- <Image url="@../../Images/PlaceholderLogo.png" />
- </image>
- </ImageView>
- <Pane prefHeight="100.0" prefWidth="343.0" />
- <TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
- <Button fx:id="tbar_searchBtn" onAction="#switchToSearch" mnemonicParsing="false" text="SEARCH" />
- <Button fx:id="tbar_explore" onAction="#switchToExplore" mnemonicParsing="false" text="EXPLORE" />
- <Button fx:id="tbar_map" onAction="#switchToMap" mnemonicParsing="false" text="MAP" />
- <Pane prefHeight="100.0" prefWidth="174.0" />
- <Button fx:id="tbar_upload" onAction="#switchToUpload" mnemonicParsing="false" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
- </children>
- </HBox>
+ <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
+ <children>
+ <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true">
+ <image>
+ <Image url="@../../Images/PlaceholderLogo.png" />
+ </image>
+ </ImageView>
+ <Pane prefHeight="100.0" prefWidth="343.0" />
+ <TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
+ <Button fx:id="tbar_searchBtn" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
+ <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
+ <Button fx:id="tbar_albums" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" />
+ <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
+ <Pane prefHeight="100.0" prefWidth="174.0" />
+ <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+ </children>
+ </HBox>
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="183.0" prefWidth="1918.0" style="-fx-background-color: #888888;">
<children>
<TextField fx:id="search" layoutX="626.0" layoutY="70.0" prefHeight="44.0" prefWidth="664.0" promptText="Search for your location">
@@ -44,7 +45,7 @@
<Font name="System Bold" size="24.0" />
</font>
</Text>
- <Button fx:id="searchBtn" onAction="#MapSearch" layoutX="1314.0" layoutY="70.0" mnemonicParsing="false" prefHeight="44.0" prefWidth="99.0" text="SEARCH">
+ <Button fx:id="searchBtn" layoutX="1314.0" layoutY="70.0" mnemonicParsing="false" onAction="#MapSearch" prefHeight="44.0" prefWidth="99.0" text="SEARCH">
<font>
<Font size="18.0" />
</font>
diff --git a/src/main/resources/NTNU/IDATT1002/search.fxml b/src/main/resources/NTNU/IDATT1002/search.fxml
index dfe471ec..3015aad0 100644
--- a/src/main/resources/NTNU/IDATT1002/search.fxml
+++ b/src/main/resources/NTNU/IDATT1002/search.fxml
@@ -1,30 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?import java.lang.*?>
-<?import javafx.collections.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.image.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
+<?import java.lang.String?>
+<?import javafx.collections.FXCollections?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ChoiceBox?>
+<?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.BorderPane?>
+<?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.text.Font?>
+<?import javafx.scene.text.Text?>
-<AnchorPane maxHeight="1080.0" maxWidth="1920.0" prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.Search">
+<AnchorPane maxHeight="1080.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.Search">
<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" AnchorPane.topAnchor="0.0">
- <children>
- <ImageView fx:id="tbar_logo" onMouseClicked="#switchToMain" fitHeight="69.0" fitWidth="153.0" pickOnBounds="true" preserveRatio="true">
- <image>
- <Image url="@../../Images/PlaceholderLogo.png" />
- </image>
- </ImageView>
- <Pane prefHeight="100.0" prefWidth="343.0" />
- <TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
- <Button fx:id="tbar_searchBtn" onAction="#switchToSearch" mnemonicParsing="false" text="SEARCH" />
- <Button fx:id="tbar_explore" onAction="#switchToExplore" mnemonicParsing="false" text="EXPLORE" />
- <Button fx:id="tbar_map" onAction="#switchToMap" mnemonicParsing="false" text="MAP" />
- <Pane prefHeight="100.0" prefWidth="174.0" />
- <Button fx:id="tbar_upload" onAction="#switchToUpload" mnemonicParsing="false" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
- </children>
- </HBox>
+ <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>
+ <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true">
+ <image>
+ <Image url="@../../Images/PlaceholderLogo.png" />
+ </image>
+ </ImageView>
+ <Pane prefHeight="100.0" prefWidth="343.0" />
+ <TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
+ <Button fx:id="tbar_searchBtn" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
+ <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
+ <Button fx:id="tbar_albums" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" />
+ <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
+ <Pane prefHeight="100.0" prefWidth="174.0" />
+ <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+ </children>
+ </HBox>
<ScrollPane fx:id="scrollpane" hbarPolicy="NEVER" layoutY="100.0" prefHeight="980.0" prefWidth="1920.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="100.0">
<content>
<AnchorPane maxHeight="1920.0" minHeight="0.0" minWidth="0.0" prefHeight="2000.0" prefWidth="1920.0">
diff --git a/src/main/resources/NTNU/IDATT1002/signup.fxml b/src/main/resources/NTNU/IDATT1002/signup.fxml
index c114b3c1..721a94e1 100644
--- a/src/main/resources/NTNU/IDATT1002/signup.fxml
+++ b/src/main/resources/NTNU/IDATT1002/signup.fxml
@@ -14,7 +14,7 @@
<?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?>
-<VBox alignment="CENTER" prefHeight="400.0" prefWidth="600.0" spacing="20.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.SignUp">
+<VBox alignment="CENTER" prefHeight="400.0" prefWidth="600.0" spacing="20.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.SignUp">
<children>
<Label text="Sign Up page">
<font>
diff --git a/src/main/resources/NTNU/IDATT1002/upload.fxml b/src/main/resources/NTNU/IDATT1002/upload.fxml
index c39f3fe3..829d5ee5 100644
--- a/src/main/resources/NTNU/IDATT1002/upload.fxml
+++ b/src/main/resources/NTNU/IDATT1002/upload.fxml
@@ -9,28 +9,28 @@
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>
-
<?import javafx.scene.text.Text?>
-<?import javafx.scene.Cursor?>
-<AnchorPane 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.Upload">
+
+<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.Upload">
<children>
<VBox prefHeight="1080.0" prefWidth="1920.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<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" AnchorPane.topAnchor="0.0">
- <children>
- <ImageView fx:id="tbar_logo" onMouseClicked="#switchToMain" fitHeight="69.0" fitWidth="153.0" pickOnBounds="true" preserveRatio="true">
- <image>
- <Image url="@../../Images/PlaceholderLogo.png" />
- </image>
- </ImageView>
- <Pane prefHeight="100.0" prefWidth="343.0" />
- <TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
- <Button fx:id="tbar_searchBtn" onAction="#switchToSearch" mnemonicParsing="false" text="SEARCH" />
- <Button fx:id="tbar_explore" onAction="#switchToExplore" mnemonicParsing="false" text="EXPLORE" />
- <Button fx:id="tbar_map" onAction="#switchToMap" mnemonicParsing="false" text="MAP" />
- <Pane prefHeight="100.0" prefWidth="174.0" />
- <Button fx:id="tbar_upload" onAction="#switchToUpload" mnemonicParsing="false" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
- </children>
+ <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
+ <children>
+ <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true">
+ <image>
+ <Image url="@../../Images/PlaceholderLogo.png" />
+ </image>
+ </ImageView>
+ <Pane prefHeight="100.0" prefWidth="343.0" />
+ <TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
+ <Button fx:id="tbar_searchBtn" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
+ <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
+ <Button fx:id="tbar_albums" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" />
+ <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
+ <Pane prefHeight="100.0" prefWidth="174.0" />
+ <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+ </children>
</HBox>
<HBox alignment="CENTER" prefHeight="883.0" prefWidth="1791.0">
<children>
diff --git a/src/main/resources/NTNU/IDATT1002/uploaded_album.fxml b/src/main/resources/NTNU/IDATT1002/uploaded_album.fxml
index 2c45808c..a82078b3 100644
--- a/src/main/resources/NTNU/IDATT1002/uploaded_album.fxml
+++ b/src/main/resources/NTNU/IDATT1002/uploaded_album.fxml
@@ -13,29 +13,30 @@
<?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?>
-<AnchorPane 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.UploadedAlbum">
+<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.UploadedAlbum">
<children>
<VBox prefHeight="1080.0" prefWidth="1920.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<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" AnchorPane.topAnchor="0.0">
- <children>
- <ImageView fx:id="tbar_logo" onMouseClicked="#switchToMain" fitHeight="69.0" fitWidth="153.0" pickOnBounds="true" preserveRatio="true">
- <image>
- <Image url="@../../Images/PlaceholderLogo.png" />
- </image>
- </ImageView>
- <Pane prefHeight="100.0" prefWidth="343.0" />
- <TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
- <Button fx:id="tbar_searchBtn" onAction="#switchToSearch" mnemonicParsing="false" text="SEARCH" />
- <Button fx:id="tbar_explore" onAction="#switchToExplore" mnemonicParsing="false" text="EXPLORE" />
- <Button fx:id="tbar_map" onAction="#switchToMap" mnemonicParsing="false" text="MAP" />
- <Pane prefHeight="100.0" prefWidth="174.0" />
- <Button fx:id="tbar_upload" onAction="#switchToUpload" mnemonicParsing="false" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
- </children>
- </HBox>
+ <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
+ <children>
+ <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true">
+ <image>
+ <Image url="@../../Images/PlaceholderLogo.png" />
+ </image>
+ </ImageView>
+ <Pane prefHeight="100.0" prefWidth="343.0" />
+ <TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
+ <Button fx:id="tbar_searchBtn" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
+ <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
+ <Button fx:id="tbar_albums" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" />
+ <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
+ <Pane prefHeight="100.0" prefWidth="174.0" />
+ <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+ </children>
+ </HBox>
<HBox alignment="CENTER" prefHeight="982.0" prefWidth="1920.0">
<children>
- <ScrollPane prefHeight="1080.0" prefWidth="1920.0">
+ <ScrollPane hbarPolicy="NEVER" prefHeight="1080.0" prefWidth="1920.0" HBox.hgrow="ALWAYS">
<content>
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="2100.0" prefWidth="1920.0" style="-fx-background-color: #999999;">
<children>
diff --git a/src/main/resources/NTNU/IDATT1002/uploaded_photo.fxml b/src/main/resources/NTNU/IDATT1002/uploaded_photo.fxml
index bfcdbad5..abcd3d16 100644
--- a/src/main/resources/NTNU/IDATT1002/uploaded_photo.fxml
+++ b/src/main/resources/NTNU/IDATT1002/uploaded_photo.fxml
@@ -12,26 +12,27 @@
<?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?>
-<AnchorPane 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.UploadedPhoto">
+<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.UploadedPhoto">
<children>
<VBox prefHeight="1080.0" prefWidth="1920.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<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" AnchorPane.topAnchor="0.0">
- <children>
- <ImageView fx:id="tbar_logo" onMouseClicked="#switchToMain" fitHeight="69.0" fitWidth="153.0" pickOnBounds="true" preserveRatio="true">
- <image>
- <Image url="@../../Images/PlaceholderLogo.png" />
- </image>
- </ImageView>
- <Pane prefHeight="100.0" prefWidth="343.0" />
- <TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
- <Button fx:id="tbar_searchBtn" onAction="#switchToSearch" mnemonicParsing="false" text="SEARCH" />
- <Button fx:id="tbar_explore" onAction="#switchToExplore" mnemonicParsing="false" text="EXPLORE" />
- <Button fx:id="tbar_map" onAction="#switchToMap" mnemonicParsing="false" text="MAP" />
- <Pane prefHeight="100.0" prefWidth="174.0" />
- <Button fx:id="tbar_upload" onAction="#switchToUpload" mnemonicParsing="false" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
- </children>
- </HBox>
+ <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
+ <children>
+ <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true">
+ <image>
+ <Image url="@../../Images/PlaceholderLogo.png" />
+ </image>
+ </ImageView>
+ <Pane prefHeight="100.0" prefWidth="343.0" />
+ <TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
+ <Button fx:id="tbar_searchBtn" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
+ <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
+ <Button fx:id="tbar_albums" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" />
+ <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
+ <Pane prefHeight="100.0" prefWidth="174.0" />
+ <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+ </children>
+ </HBox>
<HBox alignment="CENTER" prefHeight="982.0" prefWidth="1920.0">
<children>
<Pane prefHeight="981.0" prefWidth="851.0" style="-fx-background-color: #777777;">
@@ -77,7 +78,7 @@
</Text>
</children>
</Pane>
- <Button fx:id="acceptBtn" onAction="#uploadPhoto" layoutX="493.0" layoutY="870.0" mnemonicParsing="false" text="ACCEPT">
+ <Button fx:id="acceptBtn" layoutX="493.0" layoutY="870.0" mnemonicParsing="false" onAction="#uploadPhoto" text="ACCEPT">
<font>
<Font size="18.0" />
</font>
diff --git a/src/main/resources/NTNU/IDATT1002/view_album.fxml b/src/main/resources/NTNU/IDATT1002/view_album.fxml
index 627d3ae9..13b7c298 100644
--- a/src/main/resources/NTNU/IDATT1002/view_album.fxml
+++ b/src/main/resources/NTNU/IDATT1002/view_album.fxml
@@ -11,26 +11,27 @@
<?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?>
-<AnchorPane 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.ViewAlbumController">
+<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.ViewAlbumController">
<children>
<VBox prefHeight="1080.0" prefWidth="1920.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<children>
- <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="200.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
- <children>
- <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" pickOnBounds="true" preserveRatio="true">
- <image>
- <Image url="@../../Images/PlaceholderLogo.png" />
- </image>
- </ImageView>
- <Pane prefHeight="100.0" prefWidth="343.0" />
- <TextField fx:id="tbar_search" onAction="#switchToSearch" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
- <Button fx:id="tbar_searchButton" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
- <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
- <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
- <Pane prefHeight="100.0" prefWidth="174.0" />
- <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
- </children>
- </HBox>
+ <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
+ <children>
+ <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true">
+ <image>
+ <Image url="@../../Images/PlaceholderLogo.png" />
+ </image>
+ </ImageView>
+ <Pane prefHeight="100.0" prefWidth="343.0" />
+ <TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
+ <Button fx:id="tbar_searchBtn" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
+ <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
+ <Button fx:id="tbar_albums" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" />
+ <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
+ <Pane prefHeight="100.0" prefWidth="174.0" />
+ <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+ </children>
+ </HBox>
<HBox alignment="CENTER" prefHeight="982.0" prefWidth="1920.0">
<children>
<Pane prefHeight="981.0" prefWidth="949.0" style="-fx-background-color: #777777;">
diff --git a/src/main/resources/NTNU/IDATT1002/view_picture.fxml b/src/main/resources/NTNU/IDATT1002/view_picture.fxml
index ac6da0bc..9df19fea 100644
--- a/src/main/resources/NTNU/IDATT1002/view_picture.fxml
+++ b/src/main/resources/NTNU/IDATT1002/view_picture.fxml
@@ -11,26 +11,27 @@
<?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?>
-<AnchorPane 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.ViewPicture">
+<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.ViewPicture">
<children>
<VBox prefHeight="1080.0" prefWidth="1920.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<children>
- <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="200.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
- <children>
- <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" pickOnBounds="true" preserveRatio="true">
- <image>
- <Image url="@../../Images/PlaceholderLogo.png" />
- </image>
- </ImageView>
- <Pane prefHeight="100.0" prefWidth="343.0" />
- <TextField fx:id="tbar_search" onAction="#switchToSearch" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
- <Button fx:id="tbar_searchButton" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
- <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
- <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
- <Pane prefHeight="100.0" prefWidth="174.0" />
- <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
- </children>
- </HBox>
+ <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
+ <children>
+ <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true">
+ <image>
+ <Image url="@../../Images/PlaceholderLogo.png" />
+ </image>
+ </ImageView>
+ <Pane prefHeight="100.0" prefWidth="343.0" />
+ <TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
+ <Button fx:id="tbar_searchBtn" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
+ <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
+ <Button fx:id="tbar_albums" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" />
+ <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
+ <Pane prefHeight="100.0" prefWidth="174.0" />
+ <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+ </children>
+ </HBox>
<HBox alignment="CENTER" prefHeight="982.0" prefWidth="1920.0">
<children>
<Pane prefHeight="981.0" prefWidth="1082.0" style="-fx-background-color: #777777;">
--
GitLab