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

продолжение рефакторинга и проверка на занятость файлов

Browse Source
This commit is contained in:
02090095
2024-10-07 20:04:11 +03:00
parent e7f661f7ad
commit 7fac84740d
41 changed files with 164 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Common_old/UI/Menus_2023/LanguagesSubmenu.java
View File

@@ -1,5 +1,5 @@
package Common_old.UI.Menus_2023;
import Common_old.Utils.Utils;
import Common.Utils.CommonUtils;
import ProjectData.LanguageName;
import javax.swing.*;
@@ -18,7 +18,7 @@ public abstract class LanguagesSubmenu extends VisualiserMenu {
JMenuItem languageItem = new StableMenuItem(languageName.getDescription());
String li = languageName.getIcon();
if (!li.isEmpty())
languageItem.setIcon(Utils.getIcon(li));
languageItem.setIcon(CommonUtils.getIcon(li));
languageItem.addActionListener(
new AbstractAction() {
@Override

4
src/Common_old/UI/Menus_2023/MenuBarButton.java
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_old.Utils.Utils;
import javax.swing.*;
import java.awt.*;
@@ -27,7 +27,7 @@ public class MenuBarButton extends JButton {
super.paintComponent(g);
}
public void setIcon(String icon_path) {
setIcon(Utils.getIcon(icon_path));
setIcon(CommonUtils.getIcon(icon_path));
}
public void setFont(VisualiserFonts font_in){
setFont(Current.getTheme().Fonts.get(font_in));

4
src/Common_old/UI/Menus_2023/PassMenuItem.java
View File

@@ -1,11 +1,11 @@
package Common_old.UI.Menus_2023;
import Common.Utils.CommonUtils;
import Common_old.UI.Menus.VisualiserMenuItem;
import Common_old.Utils.Utils;
import Visual_DVM_2021.Passes.Pass_2021;
public class PassMenuItem extends VisualiserMenuItem implements PassControl {
@Override
public void setIcon(String icon_path) {
setIcon(Utils.getIcon(icon_path));
setIcon(CommonUtils.getIcon(icon_path));
}
public PassMenuItem(Pass_2021 pass) {
setText(pass.getDescription());

4
src/Common_old/UI/Menus_2023/ProjectMenuBar/ProjectViewMenu.java
View File

@@ -1,9 +1,9 @@
package Common_old.UI.Menus_2023.ProjectMenuBar;
import Common.Utils.CommonUtils;
import Common_old.Current;
import Common_old.UI.Menus_2023.VisualiserMenu;
import _VisualDVM.Syntax.VisualiserFonts;
import Common_old.UI.UI;
import Common_old.Utils.Utils;
import ProjectData.ProjectView;
import javax.swing.*;
@@ -16,7 +16,7 @@ public class ProjectViewMenu extends VisualiserMenu {
for (ProjectView view : ProjectView.values()) {
JMenuItem m = new JMenuItem(view.getDescription()) {
{
setIcon(Utils.getIcon(view.getIcon()));
setIcon(CommonUtils.getIcon(view.getIcon()));
setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
addActionListener(e -> {
Current.set(Current.ProjectView, view);

4
src/Common_old/UI/Menus_2023/SettingsSubmenu.java
View File

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

4
src/Common_old/UI/Menus_2023/StableMenuItem.java
View File

@@ -1,7 +1,7 @@
package Common_old.UI.Menus_2023;
import Common.Utils.CommonUtils;
import Common_old.UI.Menus.VisualiserMenuItem;
import Common_old.UI.UI;
import Common_old.Utils.Utils;
import javax.swing.*;
import javax.swing.plaf.ComponentUI;
@@ -32,7 +32,7 @@ public class StableMenuItem extends VisualiserMenuItem {
}
public StableMenuItem(String text, String icon_path) {
super(text);
setIcon(Utils.getIcon(icon_path));
setIcon(CommonUtils.getIcon(icon_path));
setUI(new StableItemUI());
}
public StableMenuItem() {

4
src/Common_old/UI/Menus_2023/StablePassMenuItem.java
View File

@@ -1,10 +1,10 @@
package Common_old.UI.Menus_2023;
import Common_old.Utils.Utils;
import Common.Utils.CommonUtils;
import Visual_DVM_2021.Passes.Pass_2021;
public class StablePassMenuItem extends StableMenuItem implements PassControl {
@Override
public void setIcon(String icon_path) {
setIcon(Utils.getIcon(icon_path));
setIcon(CommonUtils.getIcon(icon_path));
}
public StablePassMenuItem(Pass_2021 pass) {
setText(pass.getDescription());

4
src/Common_old/UI/Menus_2023/VisualiserMenu.java
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_old.Utils.Utils;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
@@ -15,7 +15,7 @@ public class VisualiserMenu extends JMenu {
setText(text);
setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
if (!iconPath.isEmpty())
setIcon(Utils.getIcon(iconPath));
setIcon(CommonUtils.getIcon(iconPath));
}
public VisualiserMenu(String text, String iconPath) {
this(text, iconPath, false);

4
src/Common_old/UI/Menus_2023/VisualiserMenuBar.java
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_old.Utils.Utils;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
@@ -36,7 +36,7 @@ public class VisualiserMenuBar extends JToolBar {
{
setFont(Current.getTheme().Fonts.get(VisualiserFonts.TreeItalic));
if (icon_path_in != null) {
setIcon(Utils.getIcon(icon_path_in));
setIcon(CommonUtils.getIcon(icon_path_in));
}
}
};