Author: echatellier Date: 2012-05-16 22:17:18 +0200 (Wed, 16 May 2012) New Revision: 541 Url: http://nuiton.org/repositories/revision/sandbox/541 Log: Improve visual UI Added: textjfx/src/main/resources/img/ textjfx/src/main/resources/img/bell.png textjfx/src/main/resources/img/bookmark-new.png textjfx/src/main/resources/img/document-new.png textjfx/src/main/resources/img/go-next.png textjfx/src/main/resources/img/notes.png textjfx/src/main/resources/img/process-stop.png Modified: textjfx/src/main/java/org/codelutin/jfx/MainView.java textjfx/src/main/resources/MainView.fxml Modified: textjfx/src/main/java/org/codelutin/jfx/MainView.java =================================================================== --- textjfx/src/main/java/org/codelutin/jfx/MainView.java 2012-05-10 10:00:14 UTC (rev 540) +++ textjfx/src/main/java/org/codelutin/jfx/MainView.java 2012-05-16 20:17:18 UTC (rev 541) @@ -46,13 +46,13 @@ launch(args); } - /* (non-Javadoc) + /* * @see javafx.application.Application#start(javafx.stage.Stage) */ @Override public void start(Stage primaryStage) throws Exception { - primaryStage.setTitle("FXTimer"); + primaryStage.setTitle("fxTimer"); Scene scene = (Scene)FXMLLoader.load(getClass().getResource("/MainView.fxml")); primaryStage.setScene(scene); @@ -61,6 +61,11 @@ } @FXML + protected void quit() { + System.exit(0); + } + + @FXML protected void loadTree(ActionEvent event) { final TreeItem<String> treeRoot = new TreeItem<String>("Root node"); treeRoot.getChildren().addAll(Arrays.asList( Modified: textjfx/src/main/resources/MainView.fxml =================================================================== --- textjfx/src/main/resources/MainView.fxml 2012-05-10 10:00:14 UTC (rev 540) +++ textjfx/src/main/resources/MainView.fxml 2012-05-16 20:17:18 UTC (rev 541) @@ -5,64 +5,159 @@ <?import javafx.scene.layout.*?> <?import javafx.scene.paint.*?> <?import javafx.scene.text.*?> +<?import javafx.scene.image.*?> <Scene width="400" height="800" fx:controller="org.codelutin.jfx.MainView" xmlns:fx="http://javafx.com/fxml"> <BorderPane> <top> - <MenuBar fx:id="menuBar"> - <menus> - <Menu fx:id="menuFile" text="File"> - <items> - <MenuItem text="Load" onAction="#loadTree" /> - <SeparatorMenuItem /> - <MenuItem text="Exit"/> - </items> - </Menu> - <Menu fx:id="menuFile" text="Project"> - <items> - <MenuItem text="New"/> - <SeparatorMenuItem /> - <MenuItem text="Exit"/> - </items> - </Menu> - <Menu fx:id="menuFile" text="Task"> - <items> - <MenuItem text="New"/> - <SeparatorMenuItem /> - <MenuItem text="Exit"/> - </items> - </Menu> - <Menu fx:id="menuFile" text="Report"> - <items> - <MenuItem text="Report" onAction="#showReport" /> - </items> - </Menu> - <Menu fx:id="menuFile" text="Options"> - <items> - <MenuItem text="New"/> - <SeparatorMenuItem /> - <MenuItem text="Exit"/> - </items> - </Menu> - <Menu fx:id="menuFile" text="Help"> - <items> - <MenuItem text="New"/> - <SeparatorMenuItem /> - <MenuItem text="Exit"/> - </items> - </Menu> - </menus> - </MenuBar> + <BorderPane> + <center> + <MenuBar fx:id="menuBar"> + <menus> + <Menu text="File"> + <items> + <MenuItem text="Quit" onAction="#quit" /> + </items> + </Menu> + <Menu text="Project"> + <items> + <MenuItem text="New _project" onAction="#loadTree"/> + <MenuItem text="Edit project" onAction="#loadTree"/> + <MenuItem text="Open/Close project" onAction="#loadTree"/> + <MenuItem text="Delete project" onAction="#loadTree"/> + </items> + </Menu> + <Menu text="Task"> + <items> + <MenuItem text="_New task" mnemonicParsing="true" /> + <MenuItem text="Edit task"/> + <MenuItem text="Open/Close task"/> + <MenuItem text="Delete task"/> + <MenuItem text="Start"/> + <MenuItem text="Stop"/> + <MenuItem text="Add annotation"/> + <MenuItem text="Edit alerts"/> + <MenuItem text="Increment 1 minute"/> + <MenuItem text="Increment 5 minute"/> + <MenuItem text="Increment 30 minute"/> + <MenuItem text="Decrement 1 minute"/> + <MenuItem text="Decrement 5 minute"/> + <MenuItem text="Decrement 30 minute"/> + <MenuItem text="Set to zero"/> + <MenuItem text="Merge"/> + </items> + </Menu> + <Menu text="Report"> + <items> + <MenuItem text="Report..." onAction="#showReport" /> + </items> + </Menu> + <Menu text="Options"> + <items> + <CheckMenuItem text="Show closed"/> + <CheckMenuItem text="Close to systray"/> + <fx:define> + <ToggleGroup fx:id="dayToggleGroup"/> + </fx:define> + <Menu text="Report - First day of week"> + <RadioMenuItem text="Sunday" toggleGroup="$dayToggleGroup" /> + <RadioMenuItem text="Monday" toggleGroup="$dayToggleGroup" /> + <RadioMenuItem text="Thuesday" toggleGroup="$dayToggleGroup" /> + <RadioMenuItem text="Wednesday" toggleGroup="$dayToggleGroup" /> + <RadioMenuItem text="Thursday" toggleGroup="$dayToggleGroup" /> + <RadioMenuItem text="Friday" toggleGroup="$dayToggleGroup" /> + <RadioMenuItem text="Saturday" toggleGroup="$dayToggleGroup" /> + </Menu> + </items> + </Menu> + <Menu text="Help"> + <items> + <MenuItem text="About..."/> + </items> + </Menu> + </menus> + </MenuBar> + </center> + <bottom> + <ToolBar> + <Button> + <graphic> + <ImageView> + <image> + <Image url="@img/go-next.png" /> + </image> + </ImageView> + </graphic> + </Button> + <Button> + <graphic> + <ImageView> + <image> + <Image url="@img/process-stop.png" /> + </image> + </ImageView> + </graphic> + </Button> + <Button> + <graphic> + <ImageView> + <image> + <Image url="@img/bookmark-new.png" /> + </image> + </ImageView> + </graphic> + </Button> + <Button> + <graphic> + <ImageView> + <image> + <Image url="@img/document-new.png" /> + </image> + </ImageView> + </graphic> + </Button> + <Separator /> + <Button> + <graphic> + <ImageView> + <image> + <Image url="@img/notes.png" /> + </image> + </ImageView> + </graphic> + </Button> + <Button> + <graphic> + <ImageView> + <image> + <Image url="@img/bell.png" /> + </image> + </ImageView> + </graphic> + </Button> + </ToolBar> + </bottom> + </BorderPane> </top> <center> - <TreeView fx:id="treeView"> </TreeView> - </center> + + <bottom> + <GridPane> + <columnConstraints> + <ColumnConstraints percentWidth="50"/> + <ColumnConstraints percentWidth="50" /> + </columnConstraints> + <Label text="No task running" GridPane.rowIndex="0" GridPane.columnIndex="0" /> + <Label text="Today : 00:00:00" + GridPane.halignment="CENTER" GridPane.rowIndex="0" GridPane.columnIndex="1" /> + </GridPane> + </bottom> </BorderPane> </Scene> Added: textjfx/src/main/resources/img/bell.png =================================================================== (Binary files differ) Property changes on: textjfx/src/main/resources/img/bell.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: textjfx/src/main/resources/img/bookmark-new.png =================================================================== (Binary files differ) Property changes on: textjfx/src/main/resources/img/bookmark-new.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: textjfx/src/main/resources/img/document-new.png =================================================================== (Binary files differ) Property changes on: textjfx/src/main/resources/img/document-new.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: textjfx/src/main/resources/img/go-next.png =================================================================== (Binary files differ) Property changes on: textjfx/src/main/resources/img/go-next.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: textjfx/src/main/resources/img/notes.png =================================================================== (Binary files differ) Property changes on: textjfx/src/main/resources/img/notes.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: textjfx/src/main/resources/img/process-stop.png =================================================================== (Binary files differ) Property changes on: textjfx/src/main/resources/img/process-stop.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream