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
b7bc52be
Commit
b7bc52be
authored
5 years ago
by
Nicolay Schiøll-Johansen
Browse files
Options
Downloads
Patches
Plain Diff
minor changes
parent
9e4d158c
No related branches found
No related tags found
1 merge request
!165
Weekly merge to Master
Pipeline
#78838
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/resources/NTNU/IDATT1002/explore.fxml
+35
-15
35 additions, 15 deletions
src/main/resources/NTNU/IDATT1002/explore.fxml
src/main/resources/NTNU/IDATT1002/style.css
+5
-0
5 additions, 0 deletions
src/main/resources/NTNU/IDATT1002/style.css
with
40 additions
and
15 deletions
src/main/resources/NTNU/IDATT1002/explore.fxml
+
35
−
15
View file @
b7bc52be
...
...
@@ -17,24 +17,44 @@
<VBox
maxHeight=
"-Infinity"
maxWidth=
"-Infinity"
minHeight=
"-Infinity"
minWidth=
"-Infinity"
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"
>
<children>
<HBox
alignment=
"CENTER"
minHeight=
"100.0"
prefHeight=
"100.0"
prefWidth=
"
19
20.0"
s
pacing=
"20.0"
style=
"-fx-background-color: #0c0c0c;
"
>
<HBox
alignment=
"CENTER"
prefHeight=
"100.0"
prefWidth=
"2
0
0.0"
s
tyleClass=
"tbarbg"
stylesheets=
"@style.css
"
>
<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"
/>
<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>
<ScrollPane
fx:id=
"scrollPane"
fitToWidth=
"true"
hbarPolicy=
"NEVER"
prefHeight=
"980.0"
prefWidth=
"1920.0"
VBox.vgrow=
"ALWAYS"
>
<ScrollPane
fx:id=
"scrollPane"
fitToWidth=
"true"
hbarPolicy=
"NEVER"
prefHeight=
"980.0"
prefWidth=
"1920.0"
VBox.vgrow=
"ALWAYS"
styleClass=
"scroll-pane"
stylesheets=
"@style.css"
>
<content>
<BorderPane
prefHeight=
"2000.0"
prefWidth=
"1920.0"
styleClass=
"bodybg"
stylesheets=
"@style.css"
AnchorPane.leftAnchor=
"0.0"
AnchorPane.rightAnchor=
"0.0"
AnchorPane.topAnchor=
"0.0"
>
<top>
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/NTNU/IDATT1002/style.css
+
5
−
0
View file @
b7bc52be
...
...
@@ -36,4 +36,9 @@
.exploreGridPane
{
-fx-fit-to-width
:
true
;
}
.scroll-pane
{
-fx-background-color
:
none
;
-fx-border-width
:
0
;
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Nicolay Schiøll-Johansen
@nicolsc
mentioned in commit
d6ba6251
·
5 years ago
mentioned in commit
d6ba6251
mentioned in commit d6ba6251715a70f52d9e7c1de7f73504db3b1285
Toggle commit list
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