Skip to content
Snippets Groups Projects
Commit 5a44604f authored by Eirik Steira's avatar Eirik Steira
Browse files

Merge branch 'map_redesign' into 'dev' 

Map redesign

See merge request !131
parents 7379ffb2 fcb35d53
No related branches found
No related tags found
2 merge requests!165Weekly merge to Master,!131Map redesign
Pipeline #79299 passed
Stage: build
Stage: test
Hide whitespace changes
Inline Side-by-side
src/main/resources/NTNU/IDATT1002/map.fxml
+ 62
− 40
View file @ 5a44604f
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import com.lynden.gmapsfx.GoogleMapView?> <?import com.lynden.gmapsfx.GoogleMapView?>
<?import javafx.scene.control.*?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.image.Image?> <?import javafx.scene.image.Image?>
<?import javafx.scene.image.ImageView?> <?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?> <?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?> <?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.Map"> <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">
<children> <children>
<VBox prefHeight="1080.0" prefWidth="1920.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> <VBox prefHeight="1080.0" prefWidth="1920.0" styleClass="viewbg" stylesheets="@style.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<children> <children>
<HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;"> <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" styleClass="tbarbg" stylesheets="@style.css">
<children>
<HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0">
<children>
<HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="250.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>
<HBox.margin>
<Insets />
</HBox.margin>
</ImageView>
</children>
<opaqueInsets>
<Insets />
</opaqueInsets>
</HBox>
<TextField fx:id="tbar_search" focusTraversable="false" minWidth="200.0" prefHeight="35.0" prefWidth="400.0" promptText="Search: Tags, Albums, Metadata, etc...">
<HBox.margin>
<Insets />
</HBox.margin>
</TextField>
<Button fx:id="tbar_searchBtn" minWidth="70" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" textFill="white" />
<Button fx:id="tbar_explore" minWidth="70" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" textFill="white" />
<Button fx:id="tbar_albums" minWidth="70" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" textFill="white" />
<Button fx:id="tbar_map" minWidth="50" mnemonicParsing="false" onAction="#switchToMap" text="MAP" textFill="white" />
<HBox alignment="CENTER_RIGHT" prefHeight="100.0" prefWidth="250.0">
<children>
<Button fx:id="tbar_upload" minWidth="70" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" textFill="white" />
</children>
</HBox>
</children>
</HBox>
</children>
</HBox>
<HBox alignment="CENTER" prefHeight="183.0" prefWidth="1920.0" spacing="20.0">
<children> <children>
<ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true"> <Text fill="WHITE" strokeType="OUTSIDE" strokeWidth="0.0" text="SEARCH:">
<image> <font>
<Image url="@../../Images/PlaceholderLogo.png" /> <Font name="System Bold" size="24.0" />
</image> </font>
</ImageView> </Text>
<Pane prefHeight="100.0" prefWidth="343.0" /> <TextField fx:id="search" prefHeight="44.0" prefWidth="664.0" promptText="Search for your location">
<TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." /> <font>
<Button fx:id="tbar_searchBtn" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" /> <Font size="18.0" />
<Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" /> </font>
<Button fx:id="tbar_albums" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" /> </TextField>
<Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" /> <Button fx:id="searchBtn" mnemonicParsing="false" onAction="#MapSearch" prefHeight="44.0" prefWidth="99.0" text="SEARCH">
<Pane prefHeight="100.0" prefWidth="174.0" /> <font>
<Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" /> <Font size="18.0" />
</font>
</Button>
</children> </children>
</HBox> </HBox>
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="183.0" prefWidth="1918.0" style="-fx-background-color: #888888;">
<children>
<HBox alignment="CENTER" prefHeight="183.0" prefWidth="1920.0" spacing="20.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
<children>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="SEARCH:">
<font>
<Font name="System Bold" size="24.0" />
</font>
</Text>
<TextField fx:id="search" prefHeight="44.0" prefWidth="664.0" promptText="Search for your location">
<font>
<Font size="18.0" />
</font>
</TextField>
<Button fx:id="searchBtn" mnemonicParsing="false" onAction="#MapSearch" prefHeight="44.0" prefWidth="99.0" text="SEARCH">
<font>
<Font size="18.0" />
</font>
</Button>
</children>
</HBox>
</children>
</AnchorPane>
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="797.0" prefWidth="1920.0" style="-fx-background-color: #888888;" VBox.vgrow="ALWAYS"> <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="797.0" prefWidth="1920.0" style="-fx-background-color: #888888;" VBox.vgrow="ALWAYS">
<children> <children>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment