Skip to content

Commit c0da7ae

Browse files
committed
доработаны файловые операции в дерве Asset.
1 parent 7b56abc commit c0da7ae

46 files changed

Lines changed: 1052 additions & 134 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

libs/commons-lang3-3.4-javadoc.jar

1.04 MB
Binary file not shown.

libs/commons-lang3-3.4.jar

424 KB
Binary file not shown.

libs/rlib-sources.jar

867 Bytes
Binary file not shown.

libs/rlib.jar

1.17 KB
Binary file not shown.

resources/messages/messages.properties

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ AssetComponentResourceTreeContextMenuCutFile=Cut
1010
AssetComponentResourceTreeContextMenuPasteFile=Paste
1111
AssetComponentResourceTreeContextMenuDeleteFile=Delete
1212
AssetComponentResourceTreeContextMenuConvertFile=Convert
13+
AssetComponentResourceTreeContextMenuOpenFileByExternalEditor=Open fine in external editor
14+
AssetComponentResourceTreeContextMenuRenameFile=Rename
1315

1416
FileEditorActionSave=Save
1517

@@ -92,4 +94,9 @@ ModelPropertyScale=Scale
9294
ModelPropertyRotation=Rotation
9395
ModelPropertyMaterial=Material
9496

95-
MaterialModelPropertyControlNoMaterial=No material
97+
MaterialModelPropertyControlNoMaterial=No material
98+
99+
RenameDialogTitle=Rename
100+
RenameDialogNewNameLabel=New name
101+
RenameDialogButtonOk=Rename
102+
RenameDialogButtonCancel=Cancel

resources/messages/messages_ru.properties

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ AssetComponentResourceTreeContextMenuCutFile=Вырезать
1010
AssetComponentResourceTreeContextMenuPasteFile=Вставить
1111
AssetComponentResourceTreeContextMenuDeleteFile=Удаить
1212
AssetComponentResourceTreeContextMenuConvertFile=Конвертировать
13+
AssetComponentResourceTreeContextMenuOpenFileByExternalEditor=Открыть файл во внешнем редакторе
14+
AssetComponentResourceTreeContextMenuRenameFile=Переименовать
1315

1416
FileEditorActionSave=Сохранить
1517

@@ -92,4 +94,9 @@ ModelPropertyScale=Маштаб
9294
ModelPropertyRotation=Вращение
9395
ModelPropertyMaterial=Материал
9496

95-
MaterialModelPropertyControlNoMaterial=Материал отсутствует
97+
MaterialModelPropertyControlNoMaterial=Материал отсутствует
98+
99+
RenameDialogTitle=Переименовать
100+
RenameDialogNewNameLabel=Новое имя
101+
RenameDialogButtonOk=Переименовать
102+
RenameDialogButtonCancel=Отменить

resources/ui/css/custom_ids.css

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,4 +373,20 @@
373373
-fx-min-width: 24;
374374
-fx-pref-width: -fx-min-width;
375375
-fx-max-width: -fx-min-width;
376+
}
377+
378+
#RenameDialogLabel {
379+
-fx-alignment: center-right;
380+
-fx-min-width: 120;
381+
-fx-pref-width: -fx-min-width;
382+
-fx-max-width: -fx-min-width;
383+
-fx-min-height: 25;
384+
-fx-pref-height: -fx-min-height;
385+
-fx-max-height: -fx-min-height;
386+
}
387+
388+
#RenameDialogTextField {
389+
-fx-min-height: 25;
390+
-fx-pref-height: -fx-min-height;
391+
-fx-max-height: -fx-min-height;
376392
}

src/com/ss/editor/Editor.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import java.nio.file.Path;
3939
import java.nio.file.Paths;
4040
import java.util.concurrent.locks.StampedLock;
41+
import java.util.logging.Level;
4142

4243
import javafx.scene.Parent;
4344
import rlib.concurrent.atomic.AtomicInteger;
@@ -110,10 +111,12 @@ public static void start(String[] args) throws IOException {
110111
protected static void configureLogger() {
111112

112113
// выключаем стандартный логгер
113-
// java.util.logging.Logger.getLogger("").setLevel(Level.SEVERE);
114+
if (!Config.DEV_DEBUG) {
115+
java.util.logging.Logger.getLogger("").setLevel(Level.SEVERE);
116+
}
114117

115118
// настраиваем логгер
116-
LoggerLevel.DEBUG.setEnabled(false);
119+
LoggerLevel.DEBUG.setEnabled(Config.DEV_DEBUG);
117120
LoggerLevel.INFO.setEnabled(true);
118121
LoggerLevel.ERROR.setEnabled(true);
119122
LoggerLevel.WARNING.setEnabled(true);

src/com/ss/editor/Messages.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ public class Messages {
2525
public static final String ASSET_COMPONENT_RESOURCE_TREE_CONTEXT_MENU_PASTE_FILE;
2626
public static final String ASSET_COMPONENT_RESOURCE_TREE_CONTEXT_MENU_DELETE_FILE;
2727
public static final String ASSET_COMPONENT_RESOURCE_TREE_CONTEXT_MENU_CONVERT_FILE;
28+
public static final String ASSET_COMPONENT_RESOURCE_TREE_CONTEXT_MENU_OPEN_FILE_BY_EXTERNAL_EDITOR;
29+
public static final String ASSET_COMPONENT_RESOURCE_TREE_CONTEXT_MENU_RENAME_FILE;
2830

2931
public static final String FILE_EDITOR_ACTION_SAVE;
3032

@@ -106,6 +108,12 @@ public class Messages {
106108

107109
public static final String MATERIAL_MODEL_PROPERTY_CONTROL_NO_MATERIAL;
108110

111+
public static final String RENAME_DIALOG_TITLE;
112+
public static final String RENAME_DIALOG_NEW_NAME_LABEL;
113+
public static final String RENAME_DIALOG_BUTTON_OK;
114+
public static final String RENAME_DIALOG_BUTTON_CANCEL;
115+
;
116+
109117
static {
110118

111119
final ResourceBundle bundle = ResourceBundle.getBundle(BUNDLE_NAME, ResourceControl.getInstance());
@@ -125,6 +133,8 @@ public class Messages {
125133
ASSET_COMPONENT_RESOURCE_TREE_CONTEXT_MENU_PASTE_FILE = bundle.getString("AssetComponentResourceTreeContextMenuPasteFile");
126134
ASSET_COMPONENT_RESOURCE_TREE_CONTEXT_MENU_DELETE_FILE = bundle.getString("AssetComponentResourceTreeContextMenuDeleteFile");
127135
ASSET_COMPONENT_RESOURCE_TREE_CONTEXT_MENU_CONVERT_FILE = bundle.getString("AssetComponentResourceTreeContextMenuConvertFile");
136+
ASSET_COMPONENT_RESOURCE_TREE_CONTEXT_MENU_OPEN_FILE_BY_EXTERNAL_EDITOR = bundle.getString("AssetComponentResourceTreeContextMenuOpenFileByExternalEditor");
137+
ASSET_COMPONENT_RESOURCE_TREE_CONTEXT_MENU_RENAME_FILE = bundle.getString("AssetComponentResourceTreeContextMenuRenameFile");
128138

129139
FILE_EDITOR_ACTION_SAVE = bundle.getString("FileEditorActionSave");
130140

@@ -205,5 +215,10 @@ public class Messages {
205215
MODEL_PROPERTY_MATERIAL = bundle.getString("ModelPropertyMaterial");
206216

207217
MATERIAL_MODEL_PROPERTY_CONTROL_NO_MATERIAL = bundle.getString("MaterialModelPropertyControlNoMaterial");
218+
219+
RENAME_DIALOG_TITLE = bundle.getString("RenameDialogTitle");
220+
RENAME_DIALOG_NEW_NAME_LABEL = bundle.getString("RenameDialogNewNameLabel");
221+
RENAME_DIALOG_BUTTON_OK = bundle.getString("RenameDialogButtonOk");
222+
RENAME_DIALOG_BUTTON_CANCEL = bundle.getString("RenameDialogButtonCancel");
208223
}
209224
}

src/com/ss/editor/config/Config.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public abstract class Config {
1717
public static final String CONFIG_RESOURCE_PATH = "/com/ss/editor/config/config.xml";
1818

1919
public static final String TITLE = "jME3 SpaceShift Editor";
20-
public static final String VERSION = "v.0.3.0";
20+
public static final String VERSION = "v.0.3.5";
2121

2222
/**
2323
* Путь к папке с программой.

0 commit comments

Comments
 (0)