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
f2d3615c
Commit
f2d3615c
authored
5 years ago
by
Nicolay Schiøll-Johansen
Committed by
Simon Jensen
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Searchpage update
parent
9980f074
No related branches found
No related tags found
1 merge request
!104
Weekly merge to Master
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/NTNU/IDATT1002/controllers/Search.java
+41
-0
41 additions, 0 deletions
src/main/java/NTNU/IDATT1002/controllers/Search.java
src/main/resources/NTNU/IDATT1002/search.fxml
+285
-255
285 additions, 255 deletions
src/main/resources/NTNU/IDATT1002/search.fxml
with
326 additions
and
255 deletions
src/main/java/NTNU/IDATT1002/controllers/Search.java
+
41
−
0
View file @
f2d3615c
...
...
@@ -9,6 +9,7 @@ import javafx.scene.control.ScrollPane;
import
javafx.scene.control.TextField
;
import
javafx.scene.image.ImageView
;
import
javafx.scene.input.MouseEvent
;
import
javafx.scene.layout.Pane
;
import
javafx.scene.text.Text
;
import
java.io.IOException
;
...
...
@@ -36,6 +37,36 @@ public class Search implements Initializable {
public
Button
footer_previousBtn
;
public
Button
footer_nextBtn
;
public
Button
tbar_albums
;
public
Pane
pane1
;
public
ImageView
picture
;
public
Text
tag_field
;
public
Text
title_field
;
public
Text
desc_field
;
public
Button
openPic_btn
;
public
Pane
pane11
;
public
ImageView
picture1
;
public
Text
tag_field1
;
public
Text
title_field1
;
public
Text
desc_field1
;
public
Button
openPic_btn1
;
public
Pane
pane12
;
public
ImageView
picture2
;
public
Text
tag_field2
;
public
Text
title_field2
;
public
Text
desc_field2
;
public
Button
openPic_btn2
;
public
Pane
pane13
;
public
ImageView
picture3
;
public
Text
tag_field3
;
public
Text
title_field3
;
public
Text
desc_field3
;
public
Button
openPic_btn3
;
public
Pane
pane14
;
public
ImageView
picture4
;
public
Text
tag_field4
;
public
Text
title_field4
;
public
Text
desc_field4
;
public
Button
openPic_btn4
;
/**
...
...
@@ -124,4 +155,14 @@ public class Search implements Initializable {
public
void
switchToNext
(
ActionEvent
actionEvent
)
throws
IOException
{
//TODO: Make method that updates content to next "page"
}
/**
* Method for opening the chosen picture
* @param actionEvent
* @throws IOException
*/
public
void
switchToPicture
(
ActionEvent
actionEvent
)
throws
IOException
{
//TODO: Make method that opens the chosen picture
App
.
setRoot
(
"view_picture"
);
}
}
This diff is collapsed.
Click to expand it.
src/main/resources/NTNU/IDATT1002/search.fxml
+
285
−
255
View file @
f2d3615c
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