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 18:41:02 +03:00
parent 702529147d
commit 45447f34f8
54 changed files with 200 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/_VisualDVM/Visual/Editor/BaseEditor.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.Visual.Editor;
import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.Menus.StyledPopupMenu;
import Common.Visual.Menus.TextEditorMenu;
@@ -129,7 +130,7 @@ public class BaseEditor extends RSyntaxTextArea implements ThemeElement, DialogF
@Override
public void applyTheme() {
float font_size = (float) getFont().getSize();
((SPFEditorTheme) UI_.getTheme()).getEditorTheme().apply(this);
((SPFEditorTheme) MainModule_.instance.getUI().getTheme()).getEditorTheme().apply(this);
setFont(getFont().deriveFont(font_size));
menu.applyTheme();
//меню связано с редактором. поэтому тема меняется только вместе с ним.

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

@@ -1,4 +1,9 @@
package _VisualDVM.Visual;
import Common.Visual.UIModule_;
import Common.Visual.UI_;
import _VisualDVM.Visual.Syntax.LightSPFEditorTheme;
public class MainUI extends UIModule_ {
public MainUI(){
setTheme(new LightSPFEditorTheme());
}
}

8
src/_VisualDVM/Visual/Menus/FastAccessMenuBar/FastAccessMenuBar.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.Visual.Menus.FastAccessMenuBar;
import Common.MainModule_;
import Common.Passes.Pass;
import Common.Visual.UI_;
import _VisualDVM.Global;
@@ -8,9 +9,6 @@ import _VisualDVM.Visual.Menus.VisualiserMenuBar;
import javax.swing.*;
import java.awt.*;
public class FastAccessMenuBar extends VisualiserMenuBar {
public FastAccessMenuBar() {
Refresh();
}
@Override
public void setSizeLimits() {
//если задавать PreffredSize 0, скролл НЕ РАБОТАЕТ. Магия!
@@ -26,8 +24,8 @@ public class FastAccessMenuBar extends VisualiserMenuBar {
public void Refresh() {
Drop();
int i = 1;
for (Pass pass : Global.mainModule.getFirstAccessPasses()) {
showPass(pass);
for (Object pass : MainModule_.instance.getFirstAccessPasses()) {
showPass((Pass) pass);
++i;
if (i > ((Global.mainModule.getDb()).settings.get(SettingName.FastAccessPassesCount).toInt32())) break;
}

3
src/_VisualDVM/Visual/Menus/PassesSubMenu.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.Visual.Menus;
import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
@@ -10,7 +11,7 @@ public class PassesSubMenu extends JMenu {
public PassesSubMenu(String title, String icon, PassCode... passes) {
super(title);
setIcon(Utils_.getIcon(icon));
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
for (PassCode code : passes) {
add(Global.mainModule.getPass(code).createMenuItem());
}

3
src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectViewMenu.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.Visual.Menus.ProjectMenuBar;
import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
@@ -19,7 +20,7 @@ public class ProjectViewMenu extends VisualiserMenu {
JMenuItem m = new JMenuItem(view.getDescription()) {
{
setIcon(Utils_.getIcon(view.getIcon()));
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreeItalic));
addActionListener(e -> {
Global.mainModule.set(Current.ProjectView, view);
UI.getMainWindow().getProjectWindow().ShowProjectView();

3
src/_VisualDVM/Visual/Menus/PropertiesSubmenu.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.Visual.Menus;
import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
@@ -10,7 +11,7 @@ public class PropertiesSubmenu extends JMenu {
super(title);
if (icon != null)
setIcon(Utils_.getIcon(icon));
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
for (String name : settings) {
Global.properties.addFlagMenuItem(this, name);
}

3
src/_VisualDVM/Visual/Menus/SettingsSubmenu.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.Visual.Menus;
import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
@@ -11,7 +12,7 @@ public class SettingsSubmenu extends JMenu {
super(title);
if (icon != null)
setIcon(Utils_.getIcon(icon));
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.Menu));
setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.Menu));
for (SettingName c : settings) {
add((Global.mainModule.getDb()).settings.get(c).getMenuItem());
}

3
src/_VisualDVM/Visual/Menus/VisualiserMenu.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.Visual.Menus;
import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
@@ -13,7 +14,7 @@ public class VisualiserMenu extends JMenu {
setToolTipText(text);
if (textVisible)
setText(text);
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreeItalic));
if (!iconPath.isEmpty())
setIcon(Utils_.getIcon(iconPath));
}

3
src/_VisualDVM/Visual/Menus/VisualiserMenuBar.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.Visual.Menus;
import Common.MainModule_;
import Common.Utils.Utils_;
import Common.Visual.Fonts.VisualiserFonts;
import Common.Visual.UI_;
@@ -37,7 +38,7 @@ public class VisualiserMenuBar extends JToolBar {
public JLabel addLabel(String text_in, String icon_path_in) {
JLabel res = new JLabel(text_in) {
{
setFont(UI_.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
setFont(MainModule_.instance.getUI().getTheme().Fonts.get(VisualiserFonts.TreeItalic));
if (icon_path_in != null) {
setIcon(Utils_.getIcon(icon_path_in));
}

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

@@ -127,7 +127,6 @@ public class UI {
testingBar = new TestingBar();
credentialsBar = new CredentialsBar();
versionsMenuBar = new VersionsMenuBar();
MainModule_.instance.fastAccessMenuBar = new FastAccessMenuBar();
//---------------------------------------------------->>
UI_.menuBars.put(BugReportsDBTable.class, new BugReportsMenuBar());
UI_.menuBars.put(SubscriberWorkspaceDBTable.class, new SubscriberWorkspacesMenuBar());

2
src/_VisualDVM/Visual/Windows/ProjectForm.java
View File

@@ -55,7 +55,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
functionsFormPanel.add((functionsForm = new FunctionsForm()).getContent());
analysisFormPanel.add((analysisForm = new AnalysisForm()).getContent());
//-
FastAccessScroll = new JScrollPane(MainModule_.instance.fastAccessMenuBar) {
FastAccessScroll = new JScrollPane(MainModule_.instance.getUI().getFastAccessMenuBar()) {
{
getHorizontalScrollBar().setPreferredSize(new Dimension(0, 10));
setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_NEVER);