M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
02090095
2024-10-14 21:55:58 +03:00
parent 7f1d21a067
commit 1f6cc4a579
18 changed files with 129 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/_VisualDVM/Visual/MainUI.java
View File

@@ -1,7 +1,30 @@
package _VisualDVM.Visual;
import Common.Visual.UIModule_;
import _VisualDVM.TestingSystem.Common.TestingMenuBar;
import _VisualDVM.Visual.Menus.CredentialsBar.CredentialsMenuBar;
import _VisualDVM.Visual.Menus.FileMenuBar.FileMenuBar;
import _VisualDVM.Visual.Menus.MainMenuBar.MainMenuBar;
import _VisualDVM.Visual.Menus.VersionsMenuBar.VersionsMenuBar;
import _VisualDVM.Visual.Syntax.LightSPFEditorTheme;
public class MainUI extends UIModule_ {
TestingMenuBar testingMenuBar = null;
CredentialsMenuBar credentialsMenuBar = null;
VersionsMenuBar versionsMenuBar = null;
public TestingMenuBar getTestingMenuBar(){
if (testingMenuBar ==null)
testingMenuBar = new TestingMenuBar();
return testingMenuBar;
}
public VersionsMenuBar getVersionsMenuBar(){
if (versionsMenuBar ==null)
versionsMenuBar = new VersionsMenuBar();
return versionsMenuBar;
}
public CredentialsMenuBar getCredentialsMenuBar(){
if (credentialsMenuBar==null)
credentialsMenuBar= new CredentialsMenuBar();
return credentialsMenuBar;
}
public MainUI(){
setTheme(new LightSPFEditorTheme());
}

4
src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsBar.java → src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsMenuBar.java
View File

@@ -7,11 +7,11 @@ import _VisualDVM.Passes.PassCode;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
public class CredentialsBar extends VisualiserMenuBar {
public class CredentialsMenuBar extends VisualiserMenuBar {
public MenuBarButton MachineButton;
public MenuBarButton UserButton;
MenuBarButton bExpand;
public CredentialsBar() {
public CredentialsMenuBar() {
this.add(bExpand = new MenuBarButton() {
{
setIcon("/icons/ExpandDown.png");

50
src/_VisualDVM/Visual/UI.java
View File

@@ -18,12 +18,11 @@ import _VisualDVM.ProjectData.SapforData.Arrays.UI.DimensionStateChanger;
import _VisualDVM.ProjectData.SapforData.Arrays.UI.RulesTreeCellRenderer;
import _VisualDVM.ProjectData.SapforData.Variants.UI.VariantRankRenderer;
import _VisualDVM.Repository.Component.UI.ComponentsForm;
import _VisualDVM.TestingSystem.Common.TestingBar;
import _VisualDVM.TestingSystem.Common.TestingMenuBar;
import _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI.SapforVersionsTreeCellRenderer;
import _VisualDVM.Visual.Interface.DebugWindow;
import _VisualDVM.Visual.Interface.VersionsWindow;
import _VisualDVM.Visual.Menus.CredentialsBar.CredentialsBar;
import _VisualDVM.Visual.Menus.FileMenuBar.FileMenuBar;
import _VisualDVM.Visual.Menus.CredentialsBar.CredentialsMenuBar;
import _VisualDVM.Visual.Menus.MainMenuBar.MainMenuBar;
import _VisualDVM.Visual.Menus.MainMenuBar.MainWindow;
import _VisualDVM.Visual.Menus.VersionsMenuBar.VersionsMenuBar;
@@ -45,11 +44,7 @@ public class UI {
//------------
public static final Highlighter.HighlightPainter GoodLoopPainter = new DefaultHighlighter.DefaultHighlightPainter(new Color(152, 251, 152, 90));
public static final Highlighter.HighlightPainter BadLoopPainter = new DefaultHighlighter.DefaultHighlightPainter(new Color(240, 128, 128, 90));
public static MainMenuBar mainMenuBar = null;
public static TestingBar testingBar = null;
public static CredentialsBar credentialsBar = null;
public static FileMenuBar fileMenuBar = null;
public static VersionsMenuBar versionsMenuBar = null;
public static LinkedHashMap<Common.Visual.Tables.TableRenderers, TableCellRenderer> TableRenderers = new LinkedHashMap<>();
public static LinkedHashMap<Common.Visual.Tables.TableEditors, TableCellEditor> TableEditors = new LinkedHashMap<>();
public static LinkedHashMap<Common.Visual.Trees.TreeRenderers, TreeCellRenderer> TreeRenderers = new LinkedHashMap<>();
@@ -64,12 +59,6 @@ public class UI {
public static boolean HasMainWindow() {
return mainWindow != null;
}
public static void CreateMenus() {
mainMenuBar = new MainMenuBar();
testingBar = new TestingBar();
credentialsBar = new CredentialsBar();
versionsMenuBar = new VersionsMenuBar();
}
public static void CreateWindows() {
searchReplaceWindow = new SearchReplaceForm();
remoteFileChooser = new RemoteFileChooser();
@@ -80,39 +69,6 @@ public class UI {
}
//-
public static void CreateAll() {
//<editor-fold desc="Локализация компонентов окна JFileChooser">
UIManager.put("FileChooser.openButtonText", "Открыть");
UIManager.put("FileChooser.cancelButtonText", "Отмена");
UIManager.put("FileChooser.lookInLabelText", "Смотреть в");
UIManager.put("FileChooser.fileNameLabelText", "Имя файла");
UIManager.put("FileChooser.filesOfTypeLabelText", "Тип файла");
UIManager.put("FileChooser.saveButtonText", "Сохранить");
UIManager.put("FileChooser.saveButtonToolTipText", "Сохранить");
UIManager.put("FileChooser.openButtonToolTipText", "Открыть");
UIManager.put("FileChooser.cancelButtonText", "Отмена");
UIManager.put("FileChooser.cancelButtonToolTipText", "Отмена");
UIManager.put("FileChooser.lookInLabelText", "Папка");
UIManager.put("FileChooser.saveInLabelText", "Папка");
UIManager.put("FileChooser.fileNameLabelText", "Имя файла");
UIManager.put("FileChooser.filesOfTypeLabelText", "Тип файлов");
UIManager.put("FileChooser.upFolderToolTipText", "На один уровень вверх");
UIManager.put("FileChooser.newFolderToolTipText", "Создание новой папки");
UIManager.put("FileChooser.listViewButtonToolTipText", "Список");
UIManager.put("FileChooser.detailsViewButtonToolTipText", "Таблица");
UIManager.put("FileChooser.fileNameHeaderText", "Имя");
UIManager.put("FileChooser.fileSizeHeaderText", "Размер");
UIManager.put("FileChooser.fileTypeHeaderText", "Тип");
UIManager.put("FileChooser.fileDateHeaderText", "Изменен");
UIManager.put("FileChooser.fileAttrHeaderText", "Атрибуты");
UIManager.put("FileChooser.acceptAllFileFilterText", "Все файлы");
//</editor-fold>
//<editor-fold desc="Локализация компонентов окна подтверждения">
UIManager.put("OptionPane.yesButtonText", "Да");
UIManager.put("OptionPane.noButtonText", "Нет");
UIManager.put("OptionPane.cancelButtonText", "Отмена");
UIManager.put("OptionPane.okButtonText", "Готово");
//</editor-fold>
//</editor-fold>
//<editor-fold desc="Объекты отрисовки и редактирования деревьев и таблиц">
TableRenderers.put(RendererDate, new DateRenderer_());
TableRenderers.put(RendererProgress, new ProgressBarRenderer());

6
src/_VisualDVM/Visual/Windows/CallbackForm.java
View File

@@ -372,13 +372,13 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
public void setUserRights() {
LockMyOnly();
Global.mainModule.SetUserPassesAccess();
UI.testingBar.showServerAdminLabel(false);
Global.mainModule.getUI().getTestingMenuBar().showServerAdminLabel(false);
adminLabel.setVisible(false);
}
private void setDeveloperRights() {
UnlockMyOnly();
Global.mainModule.SetDeveloperPassesAccess();
UI.testingBar.showServerAdminLabel(false);
Global.mainModule.getUI().getTestingMenuBar().showServerAdminLabel(false);
adminLabel.setVisible(false);
}
@Override
@@ -386,7 +386,7 @@ public class CallbackForm implements FormWithSplitters, CallbackWindow {
UnlockMyOnly();
Global.mainModule.SetAdminPassesAccess();
//--
UI.testingBar.showServerAdminLabel(true);
Global.mainModule.getUI().getTestingMenuBar().showServerAdminLabel(true);
adminLabel.setVisible(true);
}
@Override

17
src/_VisualDVM/Visual/Windows/FileForm.java
View File

@@ -67,6 +67,7 @@ public class FileForm implements FileWindow, FormWithSplitters {
private TreeForm arraysForm;
//-
private SPFEditor Body = null; //времянка? не очень красиво.
FileMenuBar fileMenuBar= null;
//-
public FileForm(DBProjectFile file_in) {
LoadSplitters();
@@ -90,11 +91,11 @@ public class FileForm implements FileWindow, FormWithSplitters {
ShowGCOVLog();
ShowAllAnalyses();
Body.addCaretListener(ce -> ShowCaretInfo());
editorPanel.add(UI.fileMenuBar = new FileMenuBar(Body), BorderLayout.NORTH);
editorPanel.add(fileMenuBar = new FileMenuBar(Body), BorderLayout.NORTH);
ShowCaretInfo();
Body.requestFocus();
RefreshTabsNames();
UI.fileMenuBar.sToGo.addChangeListener(e -> Body.gotoLine((Integer) UI.fileMenuBar.sToGo.getValue()));
fileMenuBar.sToGo.addChangeListener(e -> Body.gotoLine((Integer) fileMenuBar.sToGo.getValue()));
ShowProperties();
Global.mainModule.getPass(PassCode.Save).setControlsEnabled(false);
//-
@@ -122,11 +123,11 @@ public class FileForm implements FileWindow, FormWithSplitters {
Body.setSyntaxEditingStyle(file.languageName.getStyleKey());
Body.setCodeFoldingEnabled(true);
Body.switching_language = false;
UI.fileMenuBar.ShowLanguage();
fileMenuBar.ShowLanguage();
}
@Override
public void ShowType() {
UI.fileMenuBar.ShowType();
fileMenuBar.ShowType();
}
@Override
public void ShowStyle() {
@@ -149,7 +150,7 @@ public class FileForm implements FileWindow, FormWithSplitters {
}
}
Body.switching_language = false;
UI.fileMenuBar.ShowStyle();
fileMenuBar.ShowStyle();
}
@Override
public SPFEditorInterface getEditor() {
@@ -299,12 +300,12 @@ public class FileForm implements FileWindow, FormWithSplitters {
int new_current_line = Body.getCurrentLine();
boolean line_changed = (new_current_line != current_file_line);
current_file_line = new_current_line;
UI.fileMenuBar.sToGo.setModel(new SpinnerNumberModel(current_file_line,
fileMenuBar.sToGo.setModel(new SpinnerNumberModel(current_file_line,
1, Body.getLineCount(), 1
));
//-
UI.fileMenuBar.ShowLinesCount();
UI.fileMenuBar.CurrentSymbolLabel.setText(String.valueOf(Body.getCurrentSymbol()));
fileMenuBar.ShowLinesCount();
fileMenuBar.CurrentSymbolLabel.setText(String.valueOf(Body.getCurrentSymbol()));
//если выделяем строку из графа, то тоже надо отключиьт события.
//чтобы по ней не начался поиск.
if (events_on && line_changed) {

14
src/_VisualDVM/Visual/Windows/MainForm.java
View File

@@ -1,13 +1,14 @@
package _VisualDVM.Visual.Windows;
import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.Controls.TabToolBar;
import Common.Visual.UI_;
import Common.Visual.Windows.Form;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.TestingSystem.Common.Group.Group;
import _VisualDVM.TestingSystem.Common.Test.Test;
import _VisualDVM.Visual.Interface.*;
import _VisualDVM.Visual.Menus.MainMenuBar.MainMenuBar;
import _VisualDVM.Visual.Menus.MainMenuBar.MainWindow;
import _VisualDVM.Visual.UI;
@@ -27,8 +28,9 @@ public class MainForm extends Form implements MainWindow {
private JPanel Content;
private JTabbedPane globalTabs;
private JPanel mainPanel;
MainMenuBar mainMenuBar;
public MainForm() {
mainPanel.add(UI.mainMenuBar, BorderLayout.NORTH);
mainPanel.add( mainMenuBar = new MainMenuBar(), BorderLayout.NORTH);
InstallWelcomePanel();
InstallCallbackPanel();
InstallTestsPanel();
@@ -197,7 +199,7 @@ public class MainForm extends Form implements MainWindow {
}
@Override
public void ShowUpdatesIcon() {
UI.mainMenuBar.ShowUpdatesIcon();
mainMenuBar.ShowUpdatesIcon();
}
@Override
public void FocusProject() {
@@ -233,7 +235,7 @@ public class MainForm extends Form implements MainWindow {
getTestsWindow().ShowAll();
if (getTestingWindow() != null)
getTestingWindow().ShowAll();
UI_.windowsStack.push(this);
MainModule_.instance.getUI().windowsStack.push(this);
super.Show();
}
@Override
@@ -244,7 +246,7 @@ public class MainForm extends Form implements MainWindow {
InstallProjectPanel();
restoreGlobalTab();
UI.getDebugWindow().DropCompilationTasksComparison();
UI.mainMenuBar.ShowProject(true);
mainMenuBar.ShowProject(true);
}
@Override
public void ShowNoProject() {
@@ -253,6 +255,6 @@ public class MainForm extends Form implements MainWindow {
RemoveProjectPanel();
InstallWelcomePanel();
restoreGlobalTab();
UI.mainMenuBar.ShowProject(false);
mainMenuBar.ShowProject(false);
}
}

4
src/_VisualDVM/Visual/Windows/TestingForm.java
View File

@@ -97,7 +97,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
};
//--
public TestingForm() {
content.add(UI.testingBar, BorderLayout.NORTH);
content.add(Global.mainModule.getUI().getTestingMenuBar(), BorderLayout.NORTH);
LoadSplitters();
//-
dvmTestingRunMaster = new DVMRunTasksComparisonForm(dvmTestingRunSlave = new DVMRunTasksComparisonForm(null));
@@ -313,7 +313,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
public void CollapseCredentials() {
Global.mainModule.getDb().splitters.get("SC71").position = SC71.getDividerLocation();
UI_.Clear(credentialsPanel);
credentialsPanel.add(UI.credentialsBar);
credentialsPanel.add(Global.mainModule.getUI().getCredentialsMenuBar());
SC71.setDividerLocation(30);
SC71.setDividerSize(0);
credentialsPanel.revalidate();

4
src/_VisualDVM/Visual/Windows/VersionsForm.java
View File

@@ -1,6 +1,8 @@
package _VisualDVM.Visual.Windows;
import Common.MainModule_;
import Common.Visual.Trees.TreeForm;
import Common.Visual.UI_;
import _VisualDVM.Global;
import _VisualDVM.ProjectData.Project.UI.VersionsTree;
import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.Visual.Interface.FormWithSplitters;
@@ -34,7 +36,7 @@ public class VersionsForm implements FormWithSplitters, VersionsWindow {
versionsTreeForm.Show();
//-
versionsTabs.setEnabledAt(0, false);
versionsPanel.add(UI.versionsMenuBar, BorderLayout.NORTH);
versionsPanel.add(Global.mainModule.getUI().getVersionsMenuBar(), BorderLayout.NORTH);
}
private void createUIComponents() {
// TODO: place custom component creation code here