рефакторинг. вынес часть иконок в общую часть

This commit is contained in:
2024-10-15 16:58:20 +03:00
parent 01041ccf75
commit f353c1b90c
142 changed files with 294 additions and 158 deletions

View File

@@ -14,7 +14,7 @@ public class AttachementsMenu extends StyledPopupMenu {
public AttachementsMenu() {
add(mscreenshot = Global.mainModule.getPass(PassCode.MakeScreenShot).createMenuItem());
addSeparator();
mExplorer = new VisualiserMenuItem("Открыть вложения в проводнике...", "/icons/Explorer.png");
mExplorer = new VisualiserMenuItem("Открыть вложения в проводнике...", "/Common/icons/Explorer.png");
mExplorer.addActionListener(
new AbstractAction() {
@Override

View File

@@ -14,7 +14,7 @@ public class CredentialsMenuBar extends VisualiserMenuBar {
public CredentialsMenuBar() {
this.add(bExpand = new MenuBarButton() {
{
setIcon("/icons/ExpandDown.png");
setIcon("/Common/icons/SiverArrowDown.png");
setToolTipText("Развернуть");
addActionListener(new ActionListener() {
@Override

View File

@@ -18,7 +18,7 @@ public class FileMenuBar extends VisualiserMenuBar {
add(new MenuBarButton() {
{
setToolTipText("Поиск(Ctrl+F)");
setIcon("/icons/LastOpened.png");
setIcon("/Common/icons/Search.png");
addActionListener(e -> Global.mainModule.getUI().ShowSearchForm());
}
});

View File

@@ -14,7 +14,7 @@ public class FileSettingsMenu extends VisualiserMenu {
JMenu mStyle;
JMenu mType;
public FileSettingsMenu() {
super("Настройки файла", "/icons/Settings.png");
super("Настройки файла", "/Common/icons/Settings.png");
add(mLanguage = new LanguagesSubmenu() {
@Override
public void action(LanguageName languageName) {

View File

@@ -3,7 +3,7 @@ import Common.Visual.Menus.VisualiserMenu;
import _VisualDVM.Passes.PassCode;
public class GlobalCleaningMenu extends VisualiserMenu {
public GlobalCleaningMenu() {
super("Очистка", "/icons/Clean.png", false);
super("Очистка", "/Common/icons/Clean.png", false);
addPasses(PassCode.DropLastProjects, PassCode.DropFastAccess);
addSeparator();
addPasses(PassCode.DeleteDownloadedBugReports);

View File

@@ -14,7 +14,7 @@ import java.io.File;
import java.util.Vector;
public class LastOpenedProjectsMenu extends VisualiserMenu {
public LastOpenedProjectsMenu() {
super("Недавние проекты", "/icons/LastOpened.png");
super("Недавние проекты", "/Common/icons/Search.png");
addMenuListener(new MenuListener() {
@Override
public void menuSelected(MenuEvent e) {

View File

@@ -55,7 +55,7 @@ public class MainMenuBar extends VisualiserMenuBar {
//---
add(new MenuBarButton() {
{
setIcon("/icons/Apply.png");
setIcon("/Common/icons/Apply.png");
setToolTipText("Test");
addActionListener(e -> {
Global.mainModule.getPass(PassCode.TestPass).Do();

View File

@@ -7,7 +7,7 @@ import _VisualDVM.Visual.Menus.PropertiesSubmenu;
import _VisualDVM.Visual.Menus.SettingsSubmenu;
public class VisualiserSettingsMenu extends VisualiserMenu {
public VisualiserSettingsMenu() {
super("Настройки визуализатора", "/icons/Settings.png");
super("Настройки визуализатора", "/Common/icons/Settings.png");
//-
add(new PropertiesSubmenu("Подтверждения и уведомления", null,
"ShowPassesDone",

View File

@@ -22,7 +22,7 @@ public class ProjectFilesMenu extends GraphMenu {
public ProjectFilesMenu(StyledTree tree) {
super(tree, "подпапки");
addSeparator();
JMenuItem m = new VisualiserMenuItem("Открыть в проводнике...", "/icons/Explorer.png");
JMenuItem m = new VisualiserMenuItem("Открыть в проводнике...", "/Common/icons/Explorer.png");
m.addActionListener(
new AbstractAction() {
@Override
@@ -36,7 +36,7 @@ public class ProjectFilesMenu extends GraphMenu {
});
add(m);
addSeparator();
add(new PassesSubMenu("Добавить", "/icons/RedAdd.png",
add(new PassesSubMenu("Добавить", "/Common/icons/RedAdd.png",
PassCode.AddFile,
PassCode.CreateEmptyDirectory,
PassCode.ImportFiles));
@@ -44,7 +44,7 @@ public class ProjectFilesMenu extends GraphMenu {
add(new PassesSubMenu("Переименовать", "/icons/Menu/Rename.png",
PassCode.RenameFile,
PassCode.RenameDirectory));
add(new VisualiserMenuItem("Удалить текущий проект", "/icons/Delete.png") {
add(new VisualiserMenuItem("Удалить текущий проект", "/Common/icons/Delete.png") {
{
addActionListener(e -> {
if (Global.mainModule.HasProject()) {
@@ -56,10 +56,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(Utils_.getIcon(Global.files_multiselection ? "/Common/icons/Pick.png" : "/Common/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(Utils_.getIcon(Global.files_multiselection ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
Global.mainModule.getProject().SelectAllFiles(false);
Global.mainModule.getUI().getMainWindow().getProjectWindow().RefreshProjectFiles();
//-
@@ -67,13 +67,13 @@ public class ProjectFilesMenu extends GraphMenu {
add(m_multiselection);
addSeparator();
//-
m_select_all = new StableMenuItem("Выбрать всё", "/icons/SelectAll.png");
m_select_all = new StableMenuItem("Выбрать всё", "/Common/icons/SelectAll.png");
m_select_all.addActionListener(e -> {
Global.mainModule.getProject().SelectAllFiles(true);
tree.updateUI();
});
add(m_select_all);
m_unselect_all = new StableMenuItem("Отменить всё", "/icons/UnselectAll.png");
m_unselect_all = new StableMenuItem("Отменить всё", "/Common/icons/UnselectAll.png");
m_unselect_all.addActionListener(e -> {
Global.mainModule.getProject().SelectAllFiles(false);
tree.updateUI();

View File

@@ -2,6 +2,6 @@ package _VisualDVM.Visual.Menus.ProjectMenuBar;
import Common.Visual.Menus.VisualiserMenu;
public class FilesOperationsMenu extends VisualiserMenu {
public FilesOperationsMenu() {
super("Массовые операции над файлами", "/icons/MassFiles.png");
super("Массовые операции над файлами", "/Common/icons/MassFiles.png");
}
}

View File

@@ -13,7 +13,7 @@ public class ProjectSettingsMenu extends VisualiserMenu {
JMenu mLanguage;
JMenu mStyle;
public ProjectSettingsMenu() {
super("Настройки проекта", "/icons/Settings.png");
super("Настройки проекта", "/Common/icons/Settings.png");
add(mLanguage = new LanguagesSubmenu() {
@Override
public void action(LanguageName languageName) {

View File

@@ -19,7 +19,7 @@ public abstract class SelectionTreeMenu extends GraphMenu<DataTree> {
super(tree_in, "");
addSeparator();
//-
m_select_all = new StableMenuItem("Выбрать всё", "/icons/SelectAll.png");
m_select_all = new StableMenuItem("Выбрать всё", "/Common/icons/SelectAll.png");
m_select_all.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
@@ -28,7 +28,7 @@ public abstract class SelectionTreeMenu extends GraphMenu<DataTree> {
}
});
add(m_select_all);
m_unselect_all = new StableMenuItem("Отменить всё", "/icons/UnselectAll.png");
m_unselect_all = new StableMenuItem("Отменить всё", "/Common/icons/UnselectAll.png");
m_unselect_all.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {

View File

@@ -15,10 +15,10 @@ public class VersionsMenu extends GraphMenu<DataTree> {
add(Global.mainModule.getPass(PassCode.DeleteLonelyM).createMenuItem());
addSeparator();
m_multiselection = new VisualiserMenuItem("Массовый режим работы с версиями");
m_multiselection.setIcon(Utils_.getIcon(Global.versions_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
m_multiselection.setIcon(Utils_.getIcon(Global.versions_multiselection ? "/Common/icons/Pick.png" : "/Common/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(Utils_.getIcon(Global.versions_multiselection ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
Global.mainModule.getRoot().SelectAllVersions(false);
Global.mainModule.getUI().getVersionsWindow().getVersionsForm().getTree().updateUI();
});
@@ -26,13 +26,13 @@ public class VersionsMenu extends GraphMenu<DataTree> {
addSeparator();
add(Global.mainModule.getPass(PassCode.DeleteVersion).createMenuItem());
//-
m_select_all = new StableMenuItem("Выбрать всё, кроме резервных копий", "/icons/SelectAll.png");
m_select_all = new StableMenuItem("Выбрать всё, кроме резервных копий", "/Common/icons/SelectAll.png");
m_select_all.addActionListener(e -> {
Global.mainModule.getRoot().SelectAllVersions(true);
tree.updateUI();
});
add(m_select_all);
m_unselect_all = new StableMenuItem("Отменить всё", "/icons/UnselectAll.png");
m_unselect_all = new StableMenuItem("Отменить всё", "/Common/icons/UnselectAll.png");
m_unselect_all.addActionListener(e -> {
Global.mainModule.getRoot().SelectAllVersions(false);
tree.updateUI();

View File

@@ -164,11 +164,11 @@
<properties>
<font name="Times New Roman" size="12" style="2"/>
<horizontalAlignment value="10"/>
<icon value="icons/NotPick.png"/>
<icon value="Common/icons/NotPick.png"/>
<maximumSize width="65" height="30"/>
<minimumSize width="65" height="30"/>
<preferredSize width="65" height="30"/>
<selectedIcon value="icons/Pick.png"/>
<selectedIcon value="Common/icons/Pick.png"/>
<text value="свои"/>
<verticalTextPosition value="0"/>
</properties>
@@ -178,11 +178,11 @@
<properties>
<font name="Times New Roman" size="12" style="2"/>
<horizontalAlignment value="10"/>
<icon value="icons/NotPick.png"/>
<icon value="Common/icons/NotPick.png"/>
<maximumSize width="100" height="30"/>
<minimumSize width="100" height="30"/>
<preferredSize width="100" height="30"/>
<selectedIcon value="icons/Pick.png"/>
<selectedIcon value="Common/icons/Pick.png"/>
<text value="открытые"/>
<verticalTextPosition value="0"/>
</properties>

View File

@@ -27,7 +27,7 @@
<constraints/>
<properties>
<borderPainted value="false"/>
<icon value="icons/Apply.png"/>
<icon value="Common/icons/Apply.png"/>
<maximumSize width="30" height="30"/>
<minimumSize width="30" height="30"/>
<preferredSize width="30" height="30"/>
@@ -39,7 +39,7 @@
<constraints/>
<properties>
<borderPainted value="false"/>
<icon value="icons/Close.png"/>
<icon value="Common/icons/Close.png"/>
<maximumSize width="30" height="30"/>
<minimumSize width="30" height="30"/>
<preferredSize width="30" height="30"/>
@@ -55,7 +55,7 @@
<constraints/>
<properties>
<borderPainted value="false"/>
<icon value="icons/Prev.png"/>
<icon value="Common/icons/Previous.png"/>
<maximumSize width="30" height="30"/>
<minimumSize width="30" height="30"/>
<preferredSize width="30" height="30"/>
@@ -67,7 +67,7 @@
<constraints/>
<properties>
<borderPainted value="false"/>
<icon value="icons/Next.png"/>
<icon value="Common/icons/Next.png"/>
<maximumSize width="30" height="30"/>
<minimumSize width="30" height="30"/>
<preferredSize width="30" height="30"/>

View File

@@ -38,7 +38,7 @@
</constraints>
<properties>
<enabled value="true"/>
<icon value="icons/LastOpened.png"/>
<icon value="Common/icons/Search.png"/>
<text value=""/>
<toolTipText value="Обзор..."/>
</properties>
@@ -59,8 +59,8 @@
<properties>
<font name="Times New Roman" size="16" style="2"/>
<horizontalAlignment value="10"/>
<icon value="icons/NotPick.png"/>
<selectedIcon value="icons/Pick.png"/>
<icon value="Common/icons/NotPick.png"/>
<selectedIcon value="Common/icons/Pick.png"/>
<text value=""/>
<verticalTextPosition value="0"/>
</properties>

View File

@@ -164,7 +164,7 @@
<grid id="b52a6" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<tabbedpane title="GCOV" icon="icons/GCOV.PNG">
<tabbedpane title="GCOV" icon="icons/GCOV.png">
<tooltip value="GCOV"/>
</tabbedpane>
</constraints>

View File

@@ -139,12 +139,12 @@
<properties>
<font name="Times New Roman" size="12" style="2"/>
<horizontalAlignment value="10"/>
<icon value="icons/NotPick.png"/>
<icon value="Common/icons/NotPick.png"/>
<maximumSize width="115" height="30"/>
<minimumSize width="115" height="30"/>
<preferredSize width="115" height="30"/>
<selected value="true"/>
<selectedIcon value="icons/Pick.png"/>
<selectedIcon value="Common/icons/Pick.png"/>
<text value="стандартные"/>
<toolTipText value="Отображать стандартные процедуры"/>
<verticalTextPosition value="0"/>
@@ -155,12 +155,12 @@
<properties>
<font name="Times New Roman" size="12" style="2"/>
<horizontalAlignment value="10"/>
<icon value="icons/NotPick.png"/>
<icon value="Common/icons/NotPick.png"/>
<maximumSize width="85" height="30"/>
<minimumSize width="85" height="30"/>
<preferredSize width="85" height="30"/>
<selected value="true"/>
<selectedIcon value="icons/Pick.png"/>
<selectedIcon value="Common/icons/Pick.png"/>
<text value="внешние"/>
<toolTipText value="Отображать внешние процедуры"/>
<verticalTextPosition value="0"/>
@@ -171,12 +171,12 @@
<properties>
<font name="Times New Roman" size="12" style="2"/>
<horizontalAlignment value="10"/>
<icon value="icons/NotPick.png"/>
<icon value="Common/icons/NotPick.png"/>
<maximumSize width="124" height="30"/>
<minimumSize width="124" height="30"/>
<preferredSize width="124" height="30"/>
<selected value="true"/>
<selectedIcon value="icons/Pick.png"/>
<selectedIcon value="Common/icons/Pick.png"/>
<text value="недостижимые"/>
<toolTipText value="Отображать недостижимые процедуры"/>
<verticalTextPosition value="0"/>
@@ -187,12 +187,12 @@
<properties>
<font name="Times New Roman" size="12" style="2"/>
<horizontalAlignment value="10"/>
<icon value="icons/NotPick.png"/>
<icon value="Common/icons/NotPick.png"/>
<maximumSize width="154" height="30"/>
<minimumSize width="154" height="30"/>
<preferredSize width="154" height="30"/>
<selected value="false"/>
<selectedIcon value="icons/Pick.png"/>
<selectedIcon value="Common/icons/Pick.png"/>
<text value="смежные c текущей: "/>
<toolTipText value="будут отображены только процедуры смежные с текущей"/>
<verticalTextPosition value="0"/>
@@ -229,12 +229,12 @@
<properties>
<font name="Times New Roman" size="12" style="2"/>
<horizontalAlignment value="10"/>
<icon value="icons/NotPick.png"/>
<icon value="Common/icons/NotPick.png"/>
<maximumSize width="91" height="30"/>
<minimumSize width="91" height="30"/>
<preferredSize width="91" height="30"/>
<selected value="true"/>
<selectedIcon value="icons/Pick.png"/>
<selectedIcon value="Common/icons/Pick.png"/>
<text value="входящие"/>
<toolTipText value="Отображать входящие в текущую процедуру вызовы"/>
<verticalTextPosition value="0"/>
@@ -245,12 +245,12 @@
<properties>
<font name="Times New Roman" size="12" style="2"/>
<horizontalAlignment value="10"/>
<icon value="icons/NotPick.png"/>
<icon value="Common/icons/NotPick.png"/>
<maximumSize width="97" height="30"/>
<minimumSize width="97" height="30"/>
<preferredSize width="97" height="30"/>
<selected value="true"/>
<selectedIcon value="icons/Pick.png"/>
<selectedIcon value="Common/icons/Pick.png"/>
<text value="исходящие"/>
<toolTipText value="Отображать исходящие из текущей процедуры вызовы"/>
<verticalTextPosition value="0"/>

View File

@@ -112,7 +112,7 @@ public class MainForm extends Form implements MainWindow {
}
private void InstallTestsPanel() {
globalTabs.insertTab("Тесты",
Utils_.getIcon("/icons/Library.PNG"),
Utils_.getIcon("/Common/icons/Library.png"),
(testsForm = new TestsForm()).getContent(),
"Библиотека тестов на сервере", 2);
}

View File

@@ -139,7 +139,7 @@
</grid>
<grid id="3cb4d" binding="analysisFormPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<tabbedpane title="" icon="icons/Metrics.png">
<tabbedpane title="" icon="Common/icons/Metrics.png">
<tooltip value="Анализ"/>
</tabbedpane>
</constraints>
@@ -154,7 +154,7 @@
<grid id="59473" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<tabbedpane title="" icon="icons/Log.png">
<tabbedpane title="" icon="Common/icons/Log.png">
<tooltip value="Журнал"/>
</tabbedpane>
</constraints>

View File

@@ -281,7 +281,7 @@ public class ProjectForm implements FormWithSplitters, ProjectWindow {
}
private void InstallDebugPanel() {
projectTabs.insertTab("",
Utils_.getIcon("/icons/Command.png"),
Utils_.getIcon("/Common/icons/Command.png"),
Global.mainModule.getUI().getDebugWindow().getContent(),
"Компиляция и запуск", 6);
}

View File

@@ -32,7 +32,7 @@
<constraints/>
<properties>
<borderPainted value="false"/>
<icon value="icons/Apply.png"/>
<icon value="Common/icons/Apply.png"/>
<maximumSize width="30" height="30"/>
<minimumSize width="30" height="30"/>
<preferredSize width="30" height="30"/>
@@ -44,7 +44,7 @@
<constraints/>
<properties>
<borderPainted value="false"/>
<icon value="icons/Close.png"/>
<icon value="Common/icons/Close.png"/>
<maximumSize width="30" height="30"/>
<minimumSize width="30" height="30"/>
<preferredSize width="30" height="30"/>
@@ -60,7 +60,7 @@
<constraints/>
<properties>
<borderPainted value="false"/>
<icon value="icons/Prev.png"/>
<icon value="Common/icons/Previous.png"/>
<maximumSize width="30" height="30"/>
<minimumSize width="30" height="30"/>
<preferredSize width="30" height="30"/>
@@ -72,7 +72,7 @@
<constraints/>
<properties>
<borderPainted value="false"/>
<icon value="icons/Next.png"/>
<icon value="Common/icons/Next.png"/>
<maximumSize width="30" height="30"/>
<minimumSize width="30" height="30"/>
<preferredSize width="30" height="30"/>

View File

@@ -34,7 +34,7 @@ public class VariantsForm implements VariantsWindow {
@Override
public void actionPerformed(ActionEvent e) {
Global.mainModule.getProject().SwitchFilterDistributed();
BDistributed.setIcon(Utils_.getIcon(Global.mainModule.getProject().f_distributed() ? "/icons/Pick.png" : "/icons/NotPick.png"));
BDistributed.setIcon(Utils_.getIcon(Global.mainModule.getProject().f_distributed() ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
ShowVariantsFilter();
ShowFilteredVariantsCount();
}
@@ -43,7 +43,7 @@ public class VariantsForm implements VariantsWindow {
@Override
public void actionPerformed(ActionEvent e) {
Global.mainModule.getProject().SwitchFilterMultiplied();
bMultiplied.setIcon(Utils_.getIcon(Global.mainModule.getProject().f_multiplied() ? "/icons/Pick.png" : "/icons/NotPick.png"));
bMultiplied.setIcon(Utils_.getIcon(Global.mainModule.getProject().f_multiplied() ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
ShowVariantsFilter();
ShowFilteredVariantsCount();
}
@@ -68,8 +68,8 @@ public class VariantsForm implements VariantsWindow {
}
@Override
public void ShowVariantsFilterButtons() {
BDistributed.setIcon(Utils_.getIcon(Global.mainModule.getProject().f_distributed() ? "/icons/Pick.png" : "/icons/NotPick.png"));
bMultiplied.setIcon(Utils_.getIcon(Global.mainModule.getProject().f_multiplied() ? "/icons/Pick.png" : "/icons/NotPick.png"));
BDistributed.setIcon(Utils_.getIcon(Global.mainModule.getProject().f_distributed() ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
bMultiplied.setIcon(Utils_.getIcon(Global.mainModule.getProject().f_multiplied() ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
}
@Override
public void ShowVariantsFilter() {