summaryrefslogtreecommitdiffhomepage
path: root/IDE/src/main/java/org
diff options
context:
space:
mode:
Diffstat (limited to 'IDE/src/main/java/org')
-rw-r--r--IDE/src/main/java/org/elmahrouss/App.java9
-rw-r--r--IDE/src/main/java/org/elmahrouss/AppSettings.java6
-rw-r--r--IDE/src/main/java/org/elmahrouss/CodeEditorView.java16
-rw-r--r--IDE/src/main/java/org/elmahrouss/ConsoleWindow.java11
4 files changed, 27 insertions, 15 deletions
diff --git a/IDE/src/main/java/org/elmahrouss/App.java b/IDE/src/main/java/org/elmahrouss/App.java
index cb061ca..b23b5ec 100644
--- a/IDE/src/main/java/org/elmahrouss/App.java
+++ b/IDE/src/main/java/org/elmahrouss/App.java
@@ -38,14 +38,14 @@ public class App extends Application
TabPane tabPages = new TabPane();
- Tab tabEditorWelcome = new Tab("Welcome!", new CodeEditorView(false));
+ Tab tabEditorWelcome = new Tab("Welcome!", new CodeEditorView(true));
CodeEditorView editorView = (CodeEditorView)tabEditorWelcome.getContent();
- Button buttonNewPane = new Button("Add...");
+ Button buttonNewPane = new Button("New...");
buttonNewPane.onMouseClickedProperty().set((EventHandler<MouseEvent>) (MouseEvent c) -> {
- CodeEditorController view = new CodeEditorController(true);
+ CodeEditorController view = new CodeEditorController(false);
Tab tabCode = new Tab("Untitled", view.getView());
view.getView().setController(view);
@@ -61,7 +61,6 @@ public class App extends Application
editorView.getChildren().addAll(buttonNewPane);
editorView.setContents("Welcome to MetroWorks!\nThe embedded code editor.");
- editorView.getChildren().addAll();
tabEditorWelcome.setClosable(false);
@@ -69,7 +68,7 @@ public class App extends Application
projectPane.getChildren().addAll(tabPages);
- var scene = new Scene(projectPane, 1280, 720);
+ var scene = new Scene(projectPane, AppSettings.WIDTH, AppSettings.HEIGHT);
stage.setScene(scene);
stage.show();
diff --git a/IDE/src/main/java/org/elmahrouss/AppSettings.java b/IDE/src/main/java/org/elmahrouss/AppSettings.java
new file mode 100644
index 0000000..69d9e6a
--- /dev/null
+++ b/IDE/src/main/java/org/elmahrouss/AppSettings.java
@@ -0,0 +1,6 @@
+package org.elmahrouss;
+
+public class AppSettings {
+ static int WIDTH = 1280;
+ static int HEIGHT = 1080;
+}
diff --git a/IDE/src/main/java/org/elmahrouss/CodeEditorView.java b/IDE/src/main/java/org/elmahrouss/CodeEditorView.java
index faac5c4..ee1422f 100644
--- a/IDE/src/main/java/org/elmahrouss/CodeEditorView.java
+++ b/IDE/src/main/java/org/elmahrouss/CodeEditorView.java
@@ -46,13 +46,13 @@ public class CodeEditorView extends Pane
linePane = new Pane();
linePane.setStyle("-fx-background-color: #" + CodeEditorTheme.LINE_THEME);
- linePane.setMinSize(52, 720);
- linePane.setMaxSize(52, 1080);
+ linePane.setMinSize(52, AppSettings.HEIGHT);
+ linePane.setMaxSize(52, AppSettings.HEIGHT);
this.setStyle("-fx-background-color: #" + CodeEditorTheme.BACKGROUND_THEME);
- this.setMinSize(1280, 720);
- this.setMaxSize(1920, 1080);
+ this.setMinSize(AppSettings.WIDTH, AppSettings.HEIGHT);
+ this.setMaxSize(AppSettings.WIDTH, AppSettings.HEIGHT);
codeBox = new HBox();
@@ -60,9 +60,10 @@ public class CodeEditorView extends Pane
consoleWindow = new ConsoleWindow();
codeBox.getChildren().add(consoleWindow);
- codeBox.getChildren().add(codeText);
}
+ codeBox.getChildren().add(codeText);
+
this.getChildren().addAll(linePane, codeBox);
}
@@ -83,10 +84,7 @@ public class CodeEditorView extends Pane
public String getContents() { return codeText.getText(); }
public void setContents(String content)
- {
- if (readOnly)
- return;
-
+ {
this.codeText.setText(content);
}
diff --git a/IDE/src/main/java/org/elmahrouss/ConsoleWindow.java b/IDE/src/main/java/org/elmahrouss/ConsoleWindow.java
index 85f7dac..f967419 100644
--- a/IDE/src/main/java/org/elmahrouss/ConsoleWindow.java
+++ b/IDE/src/main/java/org/elmahrouss/ConsoleWindow.java
@@ -13,6 +13,7 @@
import javafx.scene.Node;
import javafx.scene.control.Label;
import javafx.scene.layout.*;
+import javafx.scene.paint.Color;
public class ConsoleWindow extends Pane
{
@@ -22,6 +23,14 @@ public class ConsoleWindow extends Pane
{
super();
- vTitle = new Label("UNIX Console");
+ vTitle = new Label("Debug Output:");
+
+ vTitle.setStyle("-fx-font-size: 20");
+ vTitle.setTextFill(Color.color(1, 1, 1));
+
+ vTitle.setTranslateX(80);
+ vTitle.setTranslateY(500);
+
+ this.getChildren().add(vTitle);
}
}