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/PassesSubMenu.java
View File

@@ -1,7 +1,7 @@
package Common_old.UI.Menus;
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;
@@ -9,7 +9,7 @@ import javax.swing.*;
public class PassesSubMenu extends JMenu {
public PassesSubMenu(String title, String icon, PassCode_2021... passes) {
super(title);
setIcon(Utils.getIcon(icon));
setIcon(CommonUtils.getIcon(icon));
setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu));
for (PassCode_2021 code : passes) {
add(Pass_2021.passes.get(code).createMenuItem());

6
src/Common_old/UI/Menus/ProjectFilesMenu.java
View File

@@ -1,4 +1,5 @@
package Common_old.UI.Menus;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Global;
import Common_old.UI.Menus_2023.LanguagesSubmenu;
@@ -7,7 +8,6 @@ import Common_old.UI.Menus_2023.StylesSubmenu;
import Common_old.UI.Menus_2023.TypesSubmenu;
import Common_old.UI.Trees.StyledTree;
import Common_old.UI.UI;
import Common_old.Utils.Utils;
import ProjectData.Files.FileType;
import ProjectData.Files.LanguageStyle;
import ProjectData.LanguageName;
@@ -61,10 +61,10 @@ public class ProjectFilesMenu extends GraphMenu {
});
addSeparator();
m_multiselection = new VisualiserMenuItem("Массовый режим работы с файлами");
m_multiselection.setIcon(Utils.getIcon(Global.files_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
m_multiselection.setIcon(CommonUtils.getIcon(Global.files_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
m_multiselection.addActionListener(e -> {
Global.files_multiselection = !Global.files_multiselection;
m_multiselection.setIcon(Utils.getIcon(Global.files_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
m_multiselection.setIcon(CommonUtils.getIcon(Global.files_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
Current.getProject().SelectAllFiles(false);
UI.getMainWindow().getProjectWindow().RefreshProjectFiles();

4
src/Common_old/UI/Menus/PropertiesSubmenu.java
View File

@@ -1,15 +1,15 @@
package Common_old.UI.Menus;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Global;
import _VisualDVM.Syntax.VisualiserFonts;
import Common_old.Utils.Utils;
import javax.swing.*;
public class PropertiesSubmenu extends JMenu {
public PropertiesSubmenu(String title, String icon, String... settings) {
super(title);
if (icon != null)
setIcon(Utils.getIcon(icon));
setIcon(CommonUtils.getIcon(icon));
setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu));
for (String name : settings) {
Global.properties.addFlagMenuItem(this, name);

6
src/Common_old/UI/Menus/VersionsMenu.java
View File

@@ -1,10 +1,10 @@
package Common_old.UI.Menus;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Global;
import Common_old.UI.Menus_2023.StableMenuItem;
import Common_old.UI.Trees.DataTree;
import Common_old.UI.UI;
import Common_old.Utils.Utils;
import Visual_DVM_2021.Passes.PassCode_2021;
import Visual_DVM_2021.Passes.Pass_2021;
public class VersionsMenu extends GraphMenu<DataTree> {
@@ -17,10 +17,10 @@ public class VersionsMenu extends GraphMenu<DataTree> {
add(Pass_2021.passes.get(PassCode_2021.DeleteLonelyM).createMenuItem());
addSeparator();
m_multiselection = new VisualiserMenuItem("Массовый режим работы с версиями");
m_multiselection.setIcon(Utils.getIcon(Global.versions_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
m_multiselection.setIcon(CommonUtils.getIcon(Global.versions_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
m_multiselection.addActionListener(e -> {
Global.versions_multiselection = !Global.versions_multiselection;
m_multiselection.setIcon(Utils.getIcon(Global.versions_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
m_multiselection.setIcon(CommonUtils.getIcon(Global.versions_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
Current.getRoot().SelectAllVersions(false);
UI.getVersionsWindow().getVersionsForm().getTree().updateUI();
});

4
src/Common_old/UI/Menus/VisualiserMenuItem.java
View File

@@ -1,7 +1,7 @@
package Common_old.UI.Menus;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Syntax.VisualiserFonts;
import Common_old.Utils.Utils;
import javax.swing.*;
public class VisualiserMenuItem extends JMenuItem {
@@ -13,7 +13,7 @@ public class VisualiserMenuItem extends JMenuItem {
super(text);
setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu));
if (icon_path != null)
setIcon(Utils.getIcon(icon_path));
setIcon(CommonUtils.getIcon(icon_path));
}
public VisualiserMenuItem(){
setFont(Current.getTheme().Fonts.get(VisualiserFonts.Menu));