diff --git a/src/main/java/NTNU/IDATT1002/controllers/Main.java b/src/main/java/NTNU/IDATT1002/controllers/Main.java
index e074f8d6aa7e029d57fbf348a9e6c2ccd455ee63..de2e9ca4543aa9fb892fc19da5be428e92a6554c 100644
--- a/src/main/java/NTNU/IDATT1002/controllers/Main.java
+++ b/src/main/java/NTNU/IDATT1002/controllers/Main.java
@@ -2,6 +2,7 @@ package NTNU.IDATT1002.controllers;
import NTNU.IDATT1002.App;
import javafx.scene.control.Button;
+import javafx.scene.input.KeyEvent;
/**
* Controls the buttons and changeable elements on main.fxml,
@@ -19,4 +20,5 @@ public class Main extends NavBarController {
public Main(){
App.ex.newPage("main");
}
+
}
\ No newline at end of file
diff --git a/src/main/java/NTNU/IDATT1002/controllers/NavBarController.java b/src/main/java/NTNU/IDATT1002/controllers/NavBarController.java
index 4b6b96cb5afd486f793a259036d848c56a879dad..265a5632ca980296e1c724081a68a03320313ced 100644
--- a/src/main/java/NTNU/IDATT1002/controllers/NavBarController.java
+++ b/src/main/java/NTNU/IDATT1002/controllers/NavBarController.java
@@ -6,6 +6,8 @@ import javafx.event.ActionEvent;
import javafx.scene.control.Button;
import javafx.scene.control.TextField;
import javafx.scene.image.ImageView;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
import javafx.scene.input.MouseEvent;
import java.io.IOException;
@@ -13,7 +15,7 @@ import java.io.IOException;
/**
* Class for controlling actions in the navigation bar
*
- * @version 1.0 20.04.2020
+ * @version 1.0.1 24.04.2020
*/
public class NavBarController {
@@ -54,13 +56,7 @@ public class NavBarController {
}
- /**
- * Method that changes scene to Search page. It reads the value of the search
- * field and if not empty it is passed to {@link DataExchange}
- * @param actionEvent
- * @throws IOException
- */
- public void switchToSearch(ActionEvent actionEvent) throws IOException {
+ public void search() throws IOException {
doBeforePageExit();
if (!navBarSearch.getText().isEmpty())
@@ -71,6 +67,22 @@ public class NavBarController {
App.setRoot("search");
}
+ /**
+ * Method that changes scene to Search page. It reads the value of the search
+ * field and if not empty it is passed to {@link DataExchange}
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToSearch(ActionEvent actionEvent) throws IOException {
+ search();
+ }
+
+ public void enterSearch(KeyEvent keyEvent) throws IOException {
+ if(keyEvent.getCode().equals(KeyCode.ENTER)){
+ search();
+ }
+ }
+
/**
* Method that changes scene to Explore page
* @param actionEvent
diff --git a/src/main/java/NTNU/IDATT1002/controllers/components/exploreAlbums/StyledImageView.java b/src/main/java/NTNU/IDATT1002/controllers/components/exploreAlbums/StyledImageView.java
index 49f607f7fc70e4d54bbd621aee169aaa5f42da12..c94a18e0b46994bf0d58205e634f13e188055edd 100644
--- a/src/main/java/NTNU/IDATT1002/controllers/components/exploreAlbums/StyledImageView.java
+++ b/src/main/java/NTNU/IDATT1002/controllers/components/exploreAlbums/StyledImageView.java
@@ -12,6 +12,8 @@ public class StyledImageView extends ImageView {
*/
public StyledImageView() {
this.applyStyling();
+ this.getStyleClass().add("exploreImages");
+ this.setFocusTraversable(true);
}
/**
diff --git a/src/main/resources/Images/PlaceholderLogo_black.png b/src/main/resources/Images/PlaceholderLogo_black.png
new file mode 100644
index 0000000000000000000000000000000000000000..57372e038eb05833ee90004bfa9e969f2557b4bf
Binary files /dev/null and b/src/main/resources/Images/PlaceholderLogo_black.png differ
diff --git a/src/main/resources/NTNU/IDATT1002/create_album.fxml b/src/main/resources/NTNU/IDATT1002/create_album.fxml
index 3dcd6be05aeeeaf7a2e59c046b3bdd353a499211..e66b7bbbab976f0e2e67407b63da79b3b5d2d315 100644
--- a/src/main/resources/NTNU/IDATT1002/create_album.fxml
+++ b/src/main/resources/NTNU/IDATT1002/create_album.fxml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0.1" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
@@ -40,7 +40,7 @@
</HBox>
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="430.0">
<children>
- <TextField fx:id="navBarSearch" minWidth="200.0" prefHeight="45.0" prefWidth="400.0" promptText="Search: Tags, Albums, Metadata, etc..." styleClass="searchField" stylesheets="@style.css">
+ <TextField fx:id="navBarSearch" onKeyPressed="#enterSearch" minWidth="200.0" prefHeight="45.0" prefWidth="400.0" promptText="Search: Tags, Albums, Metadata, etc..." styleClass="searchField" stylesheets="@style.css">
<HBox.margin>
<Insets />
</HBox.margin>
diff --git a/src/main/resources/NTNU/IDATT1002/explore.fxml b/src/main/resources/NTNU/IDATT1002/explore.fxml
index 255f0094948f93882753a52b74635d8e59d49b4e..ed7bda38fc45e49c03bd3b3b919d9d6d33fa0273 100644
--- a/src/main/resources/NTNU/IDATT1002/explore.fxml
+++ b/src/main/resources/NTNU/IDATT1002/explore.fxml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0.1" encoding="UTF-8"?>
<?import java.lang.String?>
<?import javafx.collections.FXCollections?>
@@ -43,7 +43,7 @@
</HBox>
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="430.0">
<children>
- <TextField fx:id="navBarSearch" minWidth="200.0" prefHeight="45.0" prefWidth="400.0" promptText="Search: Tags, Albums, Metadata, etc..." styleClass="searchField" stylesheets="@style.css">
+ <TextField fx:id="navBarSearch" onKeyPressed="#enterSearch" minWidth="200.0" prefHeight="45.0" prefWidth="400.0" promptText="Search: Tags, Albums, Metadata, etc..." styleClass="searchField" stylesheets="@style.css">
<HBox.margin>
<Insets />
</HBox.margin>
diff --git a/src/main/resources/NTNU/IDATT1002/explore_albums.fxml b/src/main/resources/NTNU/IDATT1002/explore_albums.fxml
index 8c0a44ee16d686dda9bd0cab377772678aa8c062..0e11b34c9d7775fd95e071985933510e58f99e71 100644
--- a/src/main/resources/NTNU/IDATT1002/explore_albums.fxml
+++ b/src/main/resources/NTNU/IDATT1002/explore_albums.fxml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0.1" encoding="UTF-8"?>
<?import java.lang.String?>
<?import javafx.collections.FXCollections?>
@@ -43,7 +43,7 @@
</HBox>
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="430.0">
<children>
- <TextField fx:id="navBarSearch" minWidth="200.0" prefHeight="45.0" prefWidth="400.0" promptText="Search: Tags, Albums, Metadata, etc..." styleClass="searchField" stylesheets="@style.css">
+ <TextField fx:id="navBarSearch" onKeyPressed="#enterSearch" minWidth="200.0" prefHeight="45.0" prefWidth="400.0" promptText="Search: Tags, Albums, Metadata, etc..." styleClass="searchField" stylesheets="@style.css">
<HBox.margin>
<Insets />
</HBox.margin>
diff --git a/src/main/resources/NTNU/IDATT1002/login.fxml b/src/main/resources/NTNU/IDATT1002/login.fxml
index 7106dc311b758ae14729cb3af44ff5b223cd1ed8..78fa3d635065e6aa39910ff9e1c90614cc06dd11 100644
--- a/src/main/resources/NTNU/IDATT1002/login.fxml
+++ b/src/main/resources/NTNU/IDATT1002/login.fxml
@@ -41,7 +41,7 @@
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
- <TextField fx:id="Username" minHeight="45.0" prefWidth="157.0" promptText="Username" GridPane.rowIndex="1">
+ <TextField fx:id="Username" minHeight="45.0" onKeyPressed="#enterLogin" prefWidth="157.0" promptText="Username" GridPane.rowIndex="1">
<font>
<Font size="14.0" />
</font></TextField>
diff --git a/src/main/resources/NTNU/IDATT1002/main.fxml b/src/main/resources/NTNU/IDATT1002/main.fxml
index 807fc283648ce9c23ffe6c669fac65647a335923..17b685c799c5ee4b615b42f8016f4f419bc798e3 100644
--- a/src/main/resources/NTNU/IDATT1002/main.fxml
+++ b/src/main/resources/NTNU/IDATT1002/main.fxml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0.1" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
@@ -37,7 +37,7 @@
</HBox>
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="430.0">
<children>
- <TextField fx:id="navBarSearch" minWidth="200.0" prefHeight="45.0" prefWidth="400.0" promptText="Search: Tags, Albums, Metadata, etc..." styleClass="searchField" stylesheets="@style.css">
+ <TextField fx:id="navBarSearch" minWidth="200.0" onKeyPressed="#enterSearch" prefHeight="45.0" prefWidth="400.0" promptText="Search: Tags, Albums, Metadata, etc..." styleClass="searchField" stylesheets="@style.css">
<HBox.margin>
<Insets />
</HBox.margin>
diff --git a/src/main/resources/NTNU/IDATT1002/map.fxml b/src/main/resources/NTNU/IDATT1002/map.fxml
index c199ec235beadb40d96acc45fba09f27fe968870..1355f18ff45b3e842bfe9ffde7976292d11141b1 100644
--- a/src/main/resources/NTNU/IDATT1002/map.fxml
+++ b/src/main/resources/NTNU/IDATT1002/map.fxml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0.1" encoding="UTF-8"?>
<?import com.lynden.gmapsfx.GoogleMapView?>
@@ -43,7 +43,7 @@
</HBox>
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="430.0">
<children>
- <TextField fx:id="navBarSearch" minWidth="200.0" prefHeight="45.0" prefWidth="400.0" promptText="Search: Tags, Albums, Metadata, etc..." styleClass="searchField" stylesheets="@style.css">
+ <TextField fx:id="navBarSearch" onKeyPressed="#enterSearch" minWidth="200.0" prefHeight="45.0" prefWidth="400.0" promptText="Search: Tags, Albums, Metadata, etc..." styleClass="searchField" stylesheets="@style.css">
<HBox.margin>
<Insets />
</HBox.margin>
diff --git a/src/main/resources/NTNU/IDATT1002/search.fxml b/src/main/resources/NTNU/IDATT1002/search.fxml
index f90a5e81837ece88f80ac18d29bd07d2b639cfae..cdcdf5ebdf65095ff42edab7561b78356b14ca6f 100644
--- a/src/main/resources/NTNU/IDATT1002/search.fxml
+++ b/src/main/resources/NTNU/IDATT1002/search.fxml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0.1" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
@@ -47,7 +47,7 @@
</HBox>
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="430.0">
<children>
- <TextField fx:id="navBarSearch" minWidth="200.0" prefHeight="45.0" prefWidth="400.0" promptText="Search: Tags, Albums, Metadata, etc..." styleClass="searchField" stylesheets="@style.css">
+ <TextField fx:id="navBarSearch" onKeyPressed="#enterSearch" minWidth="200.0" prefHeight="45.0" prefWidth="400.0" promptText="Search: Tags, Albums, Metadata, etc..." styleClass="searchField" stylesheets="@style.css">
<HBox.margin>
<Insets />
</HBox.margin>
diff --git a/src/main/resources/NTNU/IDATT1002/upload.fxml b/src/main/resources/NTNU/IDATT1002/upload.fxml
index 6e31aa07d6feb3440e75091aa3335a4ab23e2887..fd0d8d725daf836dae0081df39efac25142f5483 100644
--- a/src/main/resources/NTNU/IDATT1002/upload.fxml
+++ b/src/main/resources/NTNU/IDATT1002/upload.fxml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0.1" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
@@ -39,7 +39,7 @@
</HBox>
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="430.0">
<children>
- <TextField fx:id="navBarSearch" minWidth="200.0" prefHeight="45.0" prefWidth="400.0" promptText="Search: Tags, Albums, Metadata, etc..." styleClass="searchField" stylesheets="@style.css">
+ <TextField fx:id="navBarSearch" onKeyPressed="#enterSearch" minWidth="200.0" prefHeight="45.0" prefWidth="400.0" promptText="Search: Tags, Albums, Metadata, etc..." styleClass="searchField" stylesheets="@style.css">
<HBox.margin>
<Insets />
</HBox.margin>
diff --git a/src/main/resources/NTNU/IDATT1002/upload_images.fxml b/src/main/resources/NTNU/IDATT1002/upload_images.fxml
index df9999aa6ea3aaea3d4148540d32140f72a8bbfd..7238745e79813a6313f81668c1c9ab9ad72fd259 100644
--- a/src/main/resources/NTNU/IDATT1002/upload_images.fxml
+++ b/src/main/resources/NTNU/IDATT1002/upload_images.fxml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0.1" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
@@ -38,7 +38,7 @@
</HBox>
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="430.0">
<children>
- <TextField fx:id="navBarSearch" minWidth="200.0" prefHeight="45.0" prefWidth="400.0" promptText="Search: Tags, Albums, Metadata, etc..." styleClass="searchField" stylesheets="@style.css">
+ <TextField fx:id="navBarSearch" onKeyPressed="#enterSearch" minWidth="200.0" prefHeight="45.0" prefWidth="400.0" promptText="Search: Tags, Albums, Metadata, etc..." styleClass="searchField" stylesheets="@style.css">
<HBox.margin>
<Insets />
</HBox.margin>
diff --git a/src/main/resources/NTNU/IDATT1002/view_album.fxml b/src/main/resources/NTNU/IDATT1002/view_album.fxml
index b99b2ee732ac00965b1866978980d6d83fd8fee8..4d55a4ad5361f6d9ffb10f462859b39322463a02 100644
--- a/src/main/resources/NTNU/IDATT1002/view_album.fxml
+++ b/src/main/resources/NTNU/IDATT1002/view_album.fxml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0.1" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
@@ -39,7 +39,7 @@
</HBox>
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="430.0">
<children>
- <TextField fx:id="navBarSearch" minWidth="200.0" prefHeight="45.0" prefWidth="400.0" promptText="Search: Tags, Albums, Metadata, etc..." styleClass="searchField" stylesheets="@style.css">
+ <TextField fx:id="navBarSearch" onKeyPressed="#enterSearch" minWidth="200.0" prefHeight="45.0" prefWidth="400.0" promptText="Search: Tags, Albums, Metadata, etc..." styleClass="searchField" stylesheets="@style.css">
<HBox.margin>
<Insets />
</HBox.margin>
diff --git a/src/main/resources/NTNU/IDATT1002/view_image.fxml b/src/main/resources/NTNU/IDATT1002/view_image.fxml
index 5fa5269c7749fe24d6ac8b76aab8a14f323c9004..9067e568a393b8e886e5b9465ee13bd09ff55db2 100644
--- a/src/main/resources/NTNU/IDATT1002/view_image.fxml
+++ b/src/main/resources/NTNU/IDATT1002/view_image.fxml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0.1" encoding="UTF-8"?>
<?import javafx.geometry.*?>
<?import javafx.scene.control.*?>
@@ -34,7 +34,7 @@
</HBox>
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="430.0">
<children>
- <TextField fx:id="navBarSearch" minWidth="200.0" prefHeight="45.0" prefWidth="400.0" promptText="Search: Tags, Albums, Metadata, etc..." styleClass="searchField" stylesheets="@style.css">
+ <TextField fx:id="navBarSearch" onKeyPressed="#enterSearch" minWidth="200.0" prefHeight="45.0" prefWidth="400.0" promptText="Search: Tags, Albums, Metadata, etc..." styleClass="searchField" stylesheets="@style.css">
<HBox.margin>
<Insets />
</HBox.margin>