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-15 16:58:20 +03:00
parent 01041ccf75
commit f353c1b90c
142 changed files with 294 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/_VisualDVM/Visual/Menus/AttachementsMenu.java
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

2
src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsMenuBar.java
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

2
src/_VisualDVM/Visual/Menus/FileMenuBar/FileMenuBar.java
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());
}
});

2
src/_VisualDVM/Visual/Menus/FileMenuBar/FileSettingsMenu.java
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) {

2
src/_VisualDVM/Visual/Menus/MainMenuBar/GlobalCleaningMenu.java
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);

2
src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java
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) {

2
src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java
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();

2
src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java
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",

14
src/_VisualDVM/Visual/Menus/ProjectFilesMenu.java
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();

2
src/_VisualDVM/Visual/Menus/ProjectMenuBar/FilesOperationsMenu.java
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");
}
}

2
src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java
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) {

4
src/_VisualDVM/Visual/Menus/SelectionTreeMenu.java
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) {

8
src/_VisualDVM/Visual/Menus/VersionsMenu.java
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();