Skip to content

Commit 41a4792

Browse files
committed
implemented log view.
1 parent 6cae58c commit 41a4792

File tree

9 files changed

+50
-4
lines changed

9 files changed

+50
-4
lines changed

resources/messages/messages.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,4 +272,6 @@ GenerateTangentsDialogButtonCancel=Cancel
272272
BoundingVolumeModelPropertyControlName=Model size
273273
BoundingVolumeModelPropertyControlSphere=Sphere
274274
BoundingVolumeModelPropertyControlSphereRadius=radius
275-
BoundingVolumeModelPropertyControlBox=Box
275+
BoundingVolumeModelPropertyControlBox=Box
276+
277+
LogViewTitle=Logs

resources/messages/messages_ru.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,3 +273,5 @@ BoundingVolumeModelPropertyControlName=Размер модели
273273
BoundingVolumeModelPropertyControlSphere=Сфера
274274
BoundingVolumeModelPropertyControlSphereRadius=радиус
275275
BoundingVolumeModelPropertyControlBox=Бокс
276+
277+
LogViewTitle=Логи

src/com/ss/editor/JFXApplication.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import com.ss.editor.executor.impl.EditorThreadExecutor;
1313
import com.ss.editor.manager.JMEFilePreviewManager;
1414
import com.ss.editor.ui.builder.EditorFXSceneBuilder;
15+
import com.ss.editor.ui.component.log.LogView;
1516
import com.ss.editor.ui.scene.EditorFXScene;
1617

1718
import de.codecentric.centerdevice.javafxsvg.SvgImageLoaderFactory;
@@ -47,6 +48,8 @@ public static Stage getStage() {
4748

4849
public static void main(final String[] args) throws IOException {
4950

51+
LogView.getInstance();
52+
5053
// fix of the fonts render
5154
//System.setProperty("prism.lcdtext", "false");
5255
//System.setProperty("prism.text", "t2k");

src/com/ss/editor/Messages.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,8 @@ public class Messages {
289289
public static final String BOUNDING_VOLUME_MODEL_PROPERTY_CONTROL_SPHERE_RADIUS;
290290
public static final String BOUNDING_VOLUME_MODEL_PROPERTY_CONTROL_BOX;
291291

292+
public static final String LOG_VIEW_TITLE;
293+
292294
static {
293295

294296
final Locale locale = Locale.getDefault();
@@ -577,5 +579,7 @@ public class Messages {
577579
BOUNDING_VOLUME_MODEL_PROPERTY_CONTROL_SPHERE = bundle.getString("BoundingVolumeModelPropertyControlSphere");
578580
BOUNDING_VOLUME_MODEL_PROPERTY_CONTROL_SPHERE_RADIUS = bundle.getString("BoundingVolumeModelPropertyControlSphereRadius");
579581
BOUNDING_VOLUME_MODEL_PROPERTY_CONTROL_BOX = bundle.getString("BoundingVolumeModelPropertyControlBox");
582+
583+
LOG_VIEW_TITLE = bundle.getString("LogViewTitle");
580584
}
581585
}

src/com/ss/editor/ui/builder/EditorFXSceneBuilder.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.ss.editor.ui.component.asset.AssetComponent;
88
import com.ss.editor.ui.component.bar.EditorBarComponent;
99
import com.ss.editor.ui.component.editor.area.EditorAreaComponent;
10+
import com.ss.editor.ui.component.log.LogView;
1011
import com.ss.editor.ui.component.split.pane.GlobalToolSplitPane;
1112
import com.ss.editor.ui.component.tab.GlobalToolComponent;
1213
import com.ss.editor.ui.css.CSSIds;
@@ -89,6 +90,7 @@ private static void build(final EditorFXScene scene, final StackPane container,
8990

9091
final GlobalToolComponent globalToolComponent = new GlobalToolComponent(splitContainer);
9192
globalToolComponent.addComponent(new AssetComponent(), Messages.EDITOR_TOOL_ASSET);
93+
globalToolComponent.addComponent(LogView.getInstance(), Messages.LOG_VIEW_TITLE);
9294

9395
splitContainer.initFor(globalToolComponent, editorAreaComponent);
9496

src/com/ss/editor/ui/component/asset/tree/ResourceTreeCell.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public ResourceTreeCell() {
5656
setOnMouseClicked(this::processClick);
5757

5858
FXUtils.addClassTo(this, CSSClasses.TRANSPARENT_TREE_CELL);
59-
FXUtils.addClassTo(this, CSSClasses.SPECIAL_FONT_12);
59+
FXUtils.addClassTo(this, CSSClasses.SPECIAL_FONT_13);
6060

6161
this.tooltip = new Tooltip();
6262

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package com.ss.editor.ui.component.log;
2+
3+
import com.ss.editor.ui.css.CSSClasses;
4+
5+
import javafx.scene.control.TextArea;
6+
import rlib.logging.LoggerListener;
7+
import rlib.logging.LoggerManager;
8+
import rlib.ui.util.FXUtils;
9+
10+
/**
11+
* Implement the view for showing log messages from the editor.
12+
*
13+
* @author JavaSaBr
14+
*/
15+
public class LogView extends TextArea implements LoggerListener {
16+
17+
private static final LogView INSTANCE = new LogView();
18+
19+
public static LogView getInstance() {
20+
return INSTANCE;
21+
}
22+
23+
public LogView() {
24+
setWrapText(true);
25+
LoggerManager.addListener(this);
26+
FXUtils.addClassTo(this, CSSClasses.SPECIAL_FONT_14);
27+
}
28+
29+
@Override
30+
public void println(final String text) {
31+
appendText(text + "\n");
32+
}
33+
}

src/com/ss/editor/ui/control/model/property/particle/influencer/interpolation/control/AbstractInterpolationInfluencerControl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public AbstractInterpolationInfluencerControl(@NotNull final ModelChangeConsumer
6666

6767
protected void createControls() {
6868

69-
final Label propertyNameLabel = new Label(getControlTitle());
69+
final Label propertyNameLabel = new Label(getControlTitle() + ":");
7070
propertyNameLabel.setId(CSSIds.MODEL_PARAM_CONTROL_PARAM_NAME);
7171

7272
elementContainer = new VBox();

src/com/ss/editor/ui/control/model/tree/ModelNodeTreeCell.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public ModelNodeTreeCell(final ModelNodeTree nodeTree) {
8585
setOnDragExited(this::dragExited);
8686

8787
FXUtils.addClassTo(this, CSSClasses.TRANSPARENT_TREE_CELL);
88-
FXUtils.addClassTo(this, CSSClasses.SPECIAL_FONT_12);
88+
FXUtils.addClassTo(this, CSSClasses.SPECIAL_FONT_13);
8989

9090
setConverter(stringConverter);
9191
}

0 commit comments

Comments
 (0)