no message

This commit is contained in:
2024-10-08 22:33:49 +03:00
parent 90546fc62e
commit e0974fe4a8
246 changed files with 1170 additions and 849 deletions

View File

@@ -2,7 +2,7 @@ package Common_old.UI.Menus_2023.CredentialsBar;
import Common_old.Current;
import Common_old.UI.Menus_2023.MenuBarButton;
import Common_old.UI.Menus_2023.VisualiserMenuBar;
import _VisualDVM.Syntax.VisualiserFonts;
import Common.Visual.Fonts.VisualiserFonts;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;

View File

@@ -1,4 +1,5 @@
package Common_old.UI.Menus_2023.MainMenuBar;
import Common.Visual.CommonUI;
import _VisualDVM.Global;
import Common_old.UI.Menus_2023.MenuBarButton;
import Common_old.UI.Menus_2023.VisualiserMenuBar;
@@ -29,7 +30,7 @@ public class MainMenuBar extends VisualiserMenuBar {
setIcon("/icons/ComponentsActual.png");
addActionListener(e -> {
if (PerformanceAnalyzer.isActive) {
UI.Info("Перед работой с компонентами закройте анализатор производительности!");
CommonUI.Info("Перед работой с компонентами закройте анализатор производительности!");
} else {
Pass_2021.passes.get(PassCode_2021.GetComponentsActualVersions).Do();
Global.RefreshUpdatesStatus();

View File

@@ -15,7 +15,7 @@ public class VisualiserSettingsMenu extends VisualiserMenu {
"FocusPassesResult"
));
add(new CompactnessSettingsMenu());
if (CommonUtils.isWindows) {
if (CommonUtils.isWindows()) {
add(new SettingsSubmenu("Компиляция на локальной машине", null,
SettingName.LocalMakePathWindows,
SettingName.Kernels

View File

@@ -1,7 +1,7 @@
package Common_old.UI.Menus_2023;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Syntax.VisualiserFonts;
import Common.Visual.CommonUI;
import Common.Visual.Fonts.VisualiserFonts;
import javax.swing.*;
import java.awt.*;
@@ -9,7 +9,7 @@ import java.awt.*;
public class MenuBarButton extends JButton {
public MenuBarButton() {
super();
setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu));
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu));
//
setBorderPainted(false);
setContentAreaFilled(false);
@@ -30,6 +30,6 @@ public class MenuBarButton extends JButton {
setIcon(CommonUtils.getIcon(icon_path));
}
public void setFont(VisualiserFonts font_in){
setFont(Current.getTheme().Fonts.get(font_in));
setFont(CommonUI.getTheme().Fonts.get(font_in));
}
}

View File

@@ -1,9 +1,10 @@
package Common_old.UI.Menus_2023.ProjectMenuBar;
import Common.CurrentAnchestor;
import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import Common_old.Current;
import Common_old.UI.Menus_2023.VisualiserMenu;
import _VisualDVM.Syntax.VisualiserFonts;
import Common.Visual.Fonts.VisualiserFonts;
import Common_old.UI.UI;
import ProjectData.ProjectView;
@@ -18,7 +19,7 @@ public class ProjectViewMenu extends VisualiserMenu {
JMenuItem m = new JMenuItem(view.getDescription()) {
{
setIcon(CommonUtils.getIcon(view.getIcon()));
setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
addActionListener(e -> {
CurrentAnchestor.set(Current.ProjectView, view);
UI.getMainWindow().getProjectWindow().ShowProjectView();

View File

@@ -1,8 +1,8 @@
package Common_old.UI.Menus_2023;
import Common.Utils.CommonUtils;
import Common_old.Current;
import Common.Visual.CommonUI;
import GlobalData.GlobalDatabase;
import _VisualDVM.Syntax.VisualiserFonts;
import Common.Visual.Fonts.VisualiserFonts;
import GlobalData.Settings.SettingName;
import javax.swing.*;
@@ -11,7 +11,7 @@ public class SettingsSubmenu extends JMenu {
super(title);
if (icon != null)
setIcon(CommonUtils.getIcon(icon));
setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu));
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.Menu));
for (SettingName c : settings) {
add(((GlobalDatabase)CommonUtils.db).settings.get(c).getMenuItem());
}

View File

@@ -1,7 +1,7 @@
package Common_old.UI.Menus_2023;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Syntax.VisualiserFonts;
import Common.Visual.CommonUI;
import Common.Visual.Fonts.VisualiserFonts;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
@@ -13,7 +13,7 @@ public class VisualiserMenu extends JMenu {
setToolTipText(text);
if (textVisible)
setText(text);
setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
if (!iconPath.isEmpty())
setIcon(CommonUtils.getIcon(iconPath));
}

View File

@@ -1,7 +1,7 @@
package Common_old.UI.Menus_2023;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Syntax.VisualiserFonts;
import Common.Visual.CommonUI;
import Common.Visual.Fonts.VisualiserFonts;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
@@ -34,7 +34,7 @@ public class VisualiserMenuBar extends JToolBar {
public JLabel addLabel(String text_in, String icon_path_in) {
JLabel res = new JLabel(text_in) {
{
setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
setFont(CommonUI.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
if (icon_path_in != null) {
setIcon(CommonUtils.getIcon(icon_path_in));
}