diff --git a/fmframework/src/sarsoo/fmframework/drive/Driver.java b/fmframework/src/sarsoo/fmframework/drive/Driver.java index a99af90..a9c1b2f 100644 --- a/fmframework/src/sarsoo/fmframework/drive/Driver.java +++ b/fmframework/src/sarsoo/fmframework/drive/Driver.java @@ -2,7 +2,7 @@ package sarsoo.fmframework.drive; import javax.swing.JOptionPane; -import sarsoo.fmframework.gui.MainMenu; +import sarsoo.fmframework.jframe.MainMenu; import sarsoo.fmframework.util.Getter; import sarsoo.fmframework.util.Reference; diff --git a/fmframework/src/sarsoo/fmframework/fx/FmFramework.java b/fmframework/src/sarsoo/fmframework/fx/FmFramework.java new file mode 100644 index 0000000..cc46a2f --- /dev/null +++ b/fmframework/src/sarsoo/fmframework/fx/FmFramework.java @@ -0,0 +1,28 @@ +package sarsoo.fmframework.fx; + +import javafx.application.Application; +import javafx.fxml.FXMLLoader; +import javafx.scene.Parent; +import javafx.scene.Scene; +import javafx.stage.Stage; + +public class FmFramework extends Application { + + @Override + public void start(Stage stage) throws Exception { + Parent root = FXMLLoader.load(getClass().getResource("ui/main.fxml")); + + Scene scene = new Scene(root, 800, 400); +// scene.getStylesheets().add("styles/style.css"); + + stage.setTitle("FM Framework"); + stage.setScene(scene); + stage.show(); + + } + + public static void main(String[] args) { + launch(args); + } + +} diff --git a/fmframework/src/sarsoo/fmframework/fx/controller/ControllerMain.java b/fmframework/src/sarsoo/fmframework/fx/controller/ControllerMain.java new file mode 100644 index 0000000..20babbc --- /dev/null +++ b/fmframework/src/sarsoo/fmframework/fx/controller/ControllerMain.java @@ -0,0 +1,21 @@ +package sarsoo.fmframework.fx.controller; + +import javax.swing.JOptionPane; + +import javafx.event.ActionEvent; +import javafx.fxml.FXML; +import javafx.scene.text.Text; +import javafx.scene.control.Button; + +public class ControllerMain { + + @FXML + private Button changeScene; + + private int clicked = 0; + + @FXML + protected void handleButtonClick(ActionEvent event) { + JOptionPane.showMessageDialog(null, "Changed"); + } +} diff --git a/fmframework/src/sarsoo/fmframework/fx/ui/main.fxml b/fmframework/src/sarsoo/fmframework/fx/ui/main.fxml new file mode 100644 index 0000000..db9c375 --- /dev/null +++ b/fmframework/src/sarsoo/fmframework/fx/ui/main.fxml @@ -0,0 +1,25 @@ + + + + + + + + +
+ + + + + + + + + + + +
+
diff --git a/fmframework/src/sarsoo/fmframework/gui/AlbumView.java b/fmframework/src/sarsoo/fmframework/jframe/AlbumView.java similarity index 96% rename from fmframework/src/sarsoo/fmframework/gui/AlbumView.java rename to fmframework/src/sarsoo/fmframework/jframe/AlbumView.java index d3f844c..729d6b6 100644 --- a/fmframework/src/sarsoo/fmframework/gui/AlbumView.java +++ b/fmframework/src/sarsoo/fmframework/jframe/AlbumView.java @@ -1,4 +1,4 @@ -package sarsoo.fmframework.gui; +package sarsoo.fmframework.jframe; import java.awt.FlowLayout; import java.awt.Font; diff --git a/fmframework/src/sarsoo/fmframework/gui/FMObjListView.java b/fmframework/src/sarsoo/fmframework/jframe/FMObjListView.java similarity index 95% rename from fmframework/src/sarsoo/fmframework/gui/FMObjListView.java rename to fmframework/src/sarsoo/fmframework/jframe/FMObjListView.java index 0137016..f180b39 100644 --- a/fmframework/src/sarsoo/fmframework/gui/FMObjListView.java +++ b/fmframework/src/sarsoo/fmframework/jframe/FMObjListView.java @@ -1,4 +1,4 @@ -package sarsoo.fmframework.gui; +package sarsoo.fmframework.jframe; import java.awt.Font; import java.awt.GridLayout; diff --git a/fmframework/src/sarsoo/fmframework/gui/FMObjView.java b/fmframework/src/sarsoo/fmframework/jframe/FMObjView.java similarity index 95% rename from fmframework/src/sarsoo/fmframework/gui/FMObjView.java rename to fmframework/src/sarsoo/fmframework/jframe/FMObjView.java index ff5533f..82d871c 100644 --- a/fmframework/src/sarsoo/fmframework/gui/FMObjView.java +++ b/fmframework/src/sarsoo/fmframework/jframe/FMObjView.java @@ -1,4 +1,4 @@ -package sarsoo.fmframework.gui; +package sarsoo.fmframework.jframe; import java.awt.FlowLayout; import java.awt.Font; diff --git a/fmframework/src/sarsoo/fmframework/gui/MainMenu.java b/fmframework/src/sarsoo/fmframework/jframe/MainMenu.java similarity index 95% rename from fmframework/src/sarsoo/fmframework/gui/MainMenu.java rename to fmframework/src/sarsoo/fmframework/jframe/MainMenu.java index 99d8c21..976a10d 100644 --- a/fmframework/src/sarsoo/fmframework/gui/MainMenu.java +++ b/fmframework/src/sarsoo/fmframework/jframe/MainMenu.java @@ -1,4 +1,4 @@ -package sarsoo.fmframework.gui; +package sarsoo.fmframework.jframe; import java.awt.GridLayout; import java.awt.event.ActionEvent; diff --git a/fmframework/src/sarsoo/fmframework/gui/RefListsView.java b/fmframework/src/sarsoo/fmframework/jframe/RefListsView.java similarity index 95% rename from fmframework/src/sarsoo/fmframework/gui/RefListsView.java rename to fmframework/src/sarsoo/fmframework/jframe/RefListsView.java index 3ea1157..b478e55 100644 --- a/fmframework/src/sarsoo/fmframework/gui/RefListsView.java +++ b/fmframework/src/sarsoo/fmframework/jframe/RefListsView.java @@ -1,4 +1,4 @@ -package sarsoo.fmframework.gui; +package sarsoo.fmframework.jframe; import java.awt.GridLayout; import java.awt.event.ActionEvent; diff --git a/fmframework/src/sarsoo/fmframework/gui/TagMenuView.java b/fmframework/src/sarsoo/fmframework/jframe/TagMenuView.java similarity index 93% rename from fmframework/src/sarsoo/fmframework/gui/TagMenuView.java rename to fmframework/src/sarsoo/fmframework/jframe/TagMenuView.java index a15a75d..da6171a 100644 --- a/fmframework/src/sarsoo/fmframework/gui/TagMenuView.java +++ b/fmframework/src/sarsoo/fmframework/jframe/TagMenuView.java @@ -1,4 +1,4 @@ -package sarsoo.fmframework.gui; +package sarsoo.fmframework.jframe; import java.awt.GridLayout; import java.awt.event.ActionEvent; diff --git a/fmframework/src/sarsoo/fmframework/gui/TrackView.java b/fmframework/src/sarsoo/fmframework/jframe/TrackView.java similarity index 96% rename from fmframework/src/sarsoo/fmframework/gui/TrackView.java rename to fmframework/src/sarsoo/fmframework/jframe/TrackView.java index 8a48382..263caae 100644 --- a/fmframework/src/sarsoo/fmframework/gui/TrackView.java +++ b/fmframework/src/sarsoo/fmframework/jframe/TrackView.java @@ -1,4 +1,4 @@ -package sarsoo.fmframework.gui; +package sarsoo.fmframework.jframe; import java.awt.FlowLayout; import java.awt.Font; diff --git a/fmframework/src/sarsoo/fmframework/gui/WikiView.java b/fmframework/src/sarsoo/fmframework/jframe/WikiView.java similarity index 93% rename from fmframework/src/sarsoo/fmframework/gui/WikiView.java rename to fmframework/src/sarsoo/fmframework/jframe/WikiView.java index 74ef25c..b6b4286 100644 --- a/fmframework/src/sarsoo/fmframework/gui/WikiView.java +++ b/fmframework/src/sarsoo/fmframework/jframe/WikiView.java @@ -1,4 +1,4 @@ -package sarsoo.fmframework.gui; +package sarsoo.fmframework.jframe; import java.awt.FlowLayout; import java.awt.GridLayout; diff --git a/fmframework/src/sarsoo/fmframework/music/Album.java b/fmframework/src/sarsoo/fmframework/music/Album.java index a2d2eb8..0da4f7c 100644 --- a/fmframework/src/sarsoo/fmframework/music/Album.java +++ b/fmframework/src/sarsoo/fmframework/music/Album.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import org.w3c.dom.Document; -import sarsoo.fmframework.gui.AlbumView; +import sarsoo.fmframework.jframe.AlbumView; import sarsoo.fmframework.net.Network; import sarsoo.fmframework.net.URLBuilder; import sarsoo.fmframework.parser.Parser; diff --git a/fmframework/src/sarsoo/fmframework/music/FMObj.java b/fmframework/src/sarsoo/fmframework/music/FMObj.java index c397dec..1ee0cb6 100644 --- a/fmframework/src/sarsoo/fmframework/music/FMObj.java +++ b/fmframework/src/sarsoo/fmframework/music/FMObj.java @@ -1,6 +1,6 @@ package sarsoo.fmframework.music; -import sarsoo.fmframework.gui.FMObjView; +import sarsoo.fmframework.jframe.FMObjView; import sarsoo.fmframework.util.Maths; public abstract class FMObj implements Comparable{ diff --git a/fmframework/src/sarsoo/fmframework/music/Track.java b/fmframework/src/sarsoo/fmframework/music/Track.java index 48adf0c..229869f 100644 --- a/fmframework/src/sarsoo/fmframework/music/Track.java +++ b/fmframework/src/sarsoo/fmframework/music/Track.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import org.w3c.dom.Document; -import sarsoo.fmframework.gui.TrackView; +import sarsoo.fmframework.jframe.TrackView; import sarsoo.fmframework.net.Network; import sarsoo.fmframework.net.URLBuilder; //import sarsoo.fmframework.net.TestCall; diff --git a/fmframework/src/sarsoo/fmframework/music/Wiki.java b/fmframework/src/sarsoo/fmframework/music/Wiki.java index d95bd5f..98eb3f6 100644 --- a/fmframework/src/sarsoo/fmframework/music/Wiki.java +++ b/fmframework/src/sarsoo/fmframework/music/Wiki.java @@ -1,6 +1,6 @@ package sarsoo.fmframework.music; -import sarsoo.fmframework.gui.WikiView; +import sarsoo.fmframework.jframe.WikiView; public class Wiki { private String date; diff --git a/fmframework/src/sarsoo/fmframework/util/FMObjList.java b/fmframework/src/sarsoo/fmframework/util/FMObjList.java index 9f3f497..ec1a15b 100644 --- a/fmframework/src/sarsoo/fmframework/util/FMObjList.java +++ b/fmframework/src/sarsoo/fmframework/util/FMObjList.java @@ -2,7 +2,7 @@ package sarsoo.fmframework.util; import java.util.ArrayList; -import sarsoo.fmframework.gui.FMObjListView; +import sarsoo.fmframework.jframe.FMObjListView; import sarsoo.fmframework.music.Album; import sarsoo.fmframework.music.Artist; import sarsoo.fmframework.music.FMObj;