summaryrefslogtreecommitdiffhomepage
path: root/IDE/src/main/java/org
diff options
context:
space:
mode:
authorAmlal El Mahrouss <amlal.elmahrouss@icloud.com>2024-01-21 22:37:22 +0100
committerAmlal El Mahrouss <amlal.elmahrouss@icloud.com>2024-01-21 22:37:22 +0100
commit804603bb89b0e0dcb3ec228391ced6d9b678f454 (patch)
treef1e40b78484064ecdde7d616d397431e9c8d11a7 /IDE/src/main/java/org
parent8b01380800db7e3d9aa92288eeeb1e65de77558f (diff)
Add colored buttons for Welcome page.
Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
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/CodeEditorController.java4
-rw-r--r--IDE/src/main/java/org/elmahrouss/CodeEditorView.java19
-rw-r--r--IDE/src/main/java/org/elmahrouss/ConsoleWindow.java36
4 files changed, 18 insertions, 50 deletions
diff --git a/IDE/src/main/java/org/elmahrouss/App.java b/IDE/src/main/java/org/elmahrouss/App.java
index b23b5ec..0cb0493 100644
--- a/IDE/src/main/java/org/elmahrouss/App.java
+++ b/IDE/src/main/java/org/elmahrouss/App.java
@@ -38,14 +38,17 @@ public class App extends Application
TabPane tabPages = new TabPane();
- Tab tabEditorWelcome = new Tab("Welcome!", new CodeEditorView(true));
+ tabPages.setStyle("-fx-background-color: #" + CodeEditorTheme.LINE_THEME);
+
+ Tab tabEditorWelcome = new Tab("Welcome!", new CodeEditorView());
CodeEditorView editorView = (CodeEditorView)tabEditorWelcome.getContent();
- Button buttonNewPane = new Button("New...");
+ Button buttonNewPane = new Button("New File...");
+ buttonNewPane.setStyle("-fx-background-color: #" + CodeEditorTheme.LINE_THEME + "; -fx-text-fill: #" + CodeEditorTheme.TEXT_THEME);
buttonNewPane.onMouseClickedProperty().set((EventHandler<MouseEvent>) (MouseEvent c) -> {
- CodeEditorController view = new CodeEditorController(false);
+ CodeEditorController view = new CodeEditorController();
Tab tabCode = new Tab("Untitled", view.getView());
view.getView().setController(view);
diff --git a/IDE/src/main/java/org/elmahrouss/CodeEditorController.java b/IDE/src/main/java/org/elmahrouss/CodeEditorController.java
index ae1027d..82181ea 100644
--- a/IDE/src/main/java/org/elmahrouss/CodeEditorController.java
+++ b/IDE/src/main/java/org/elmahrouss/CodeEditorController.java
@@ -18,9 +18,9 @@ public class CodeEditorController
{
private CodeEditorView vEditorView = null;
- CodeEditorController(boolean readOnly)
+ CodeEditorController()
{
- vEditorView = new CodeEditorView(readOnly);
+ vEditorView = new CodeEditorView();
}
CodeEditorView getView() { return vEditorView; }
diff --git a/IDE/src/main/java/org/elmahrouss/CodeEditorView.java b/IDE/src/main/java/org/elmahrouss/CodeEditorView.java
index ee1422f..e759c69 100644
--- a/IDE/src/main/java/org/elmahrouss/CodeEditorView.java
+++ b/IDE/src/main/java/org/elmahrouss/CodeEditorView.java
@@ -23,12 +23,11 @@ public class CodeEditorView extends Pane
private Pane linePane;
private Label codeText;
private boolean readOnly;
- private ConsoleWindow consoleWindow;
private HBox codeBox;
private String fileName = "untitled.c";
private CodeEditorController codeEditorController;
- CodeEditorView(boolean readOnly)
+ CodeEditorView()
{
super();
@@ -56,12 +55,6 @@ public class CodeEditorView extends Pane
codeBox = new HBox();
- if (!this.readOnly) {
- consoleWindow = new ConsoleWindow();
-
- codeBox.getChildren().add(consoleWindow);
- }
-
codeBox.getChildren().add(codeText);
this.getChildren().addAll(linePane, codeBox);
@@ -81,10 +74,18 @@ public class CodeEditorView extends Pane
this.fileName = fileName;
}
- public String getContents() { return codeText.getText(); }
+ public String getContents() {
+ if (this.codeText == null)
+ return "";
+
+ return codeText.getText();
+ }
public void setContents(String content)
{
+ if (this.codeText == null)
+ 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
deleted file mode 100644
index f967419..0000000
--- a/IDE/src/main/java/org/elmahrouss/ConsoleWindow.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * ========================================================
- *
- * MPCC
- * Copyright 2024, Mahrouss Logic, all rights reserved.
- *
- * ========================================================
- */
-
- package org.elmahrouss;
-
- import javafx.collections.ObservableList;
- import javafx.scene.Node;
- import javafx.scene.control.Label;
- import javafx.scene.layout.*;
-import javafx.scene.paint.Color;
-
-public class ConsoleWindow extends Pane
-{
- private Label vTitle = null;
-
- ConsoleWindow()
- {
- super();
-
- 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);
- }
-}