From f353c1b90cd63161d7ea64264134ec3fc8d1839e Mon Sep 17 00:00:00 2001 From: 02090095 Date: Tue, 15 Oct 2024 16:58:20 +0300 Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3.=20=D0=B2=D1=8B=D0=BD=D0=B5=D1=81=20?= =?UTF-8?q?=D1=87=D0=B0=D1=81=D1=82=D1=8C=20=D0=B8=D0=BA=D0=BE=D0=BD=D0=BE?= =?UTF-8?q?=D0=BA=20=D0=B2=20=D0=BE=D0=B1=D1=89=D1=83=D1=8E=20=D1=87=D0=B0?= =?UTF-8?q?=D1=81=D1=82=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 148 +++++++++++++++++- src/Common/Passes/AddObjectPass.java | 2 +- src/Common/Passes/DeleteObjectPass.java | 2 +- src/Common/Passes/EditObjectPass.java | 2 +- src/Common/Visual/Tables/ColumnFilter.java | 2 +- src/{icons/Ban.PNG => Common/icons/Ban.png} | Bin .../Start.png => Common/icons/BlueStart.png} | Bin src/{ => Common}/icons/Clean.png | Bin src/{ => Common}/icons/CleanTime.png | Bin src/{ => Common}/icons/Close.png | Bin src/{ => Common}/icons/Close_18.png | Bin src/{ => Common}/icons/Command.png | Bin src/{ => Common}/icons/Date.png | Bin src/{ => Common}/icons/Explorer.png | Bin src/{ => Common}/icons/File.png | Bin src/{ => Common}/icons/GreenStart.png | Bin src/{ => Common}/icons/Info.png | Bin .../Library.PNG => Common/icons/Library.png} | Bin src/{ => Common}/icons/Log.png | Bin src/{ => Common}/icons/MassFiles.png | Bin src/{ => Common}/icons/Maxtime.png | Bin src/{ => Common}/icons/Metrics.png | Bin src/{ => Common}/icons/Next.png | Bin .../Prev.png => Common/icons/Previous.png} | Bin src/{ => Common}/icons/Publish.png | Bin .../icons/Search.png} | Bin ...ilwerArrowLeft.png => SilverArrowLeft.png} | Bin ...werArrowRight.png => SilverArrowRight.png} | Bin .../{CollapseUp.png => SilverArrowUp.png} | Bin .../{ExpandDown.png => SiverArrowDown.png} | Bin .../{GlobalStatistic.png => Statistic.png} | Bin src/{ => Common}/icons/Stop.png | Bin src/{ => Common}/icons/Time.png | Bin .../Compiler/UI/CompilerFields.form | 2 +- .../GlobalData/Machine/MachinesMenuBar.java | 2 +- .../UI/RunConfigurationFields.form | 4 +- .../GlobalData/Settings/DBSetting.java | 2 +- src/_VisualDVM/Passes/All/AddSubscriber.java | 2 +- .../Passes/All/ApplyBugReportSettings.java | 2 +- .../Passes/All/ApplyCurrentFunction.java | 2 +- src/_VisualDVM/Passes/All/ApplyProfile.java | 2 +- .../Passes/All/CloseCurrentFile.java | 4 +- .../Passes/All/CloseCurrentProject.java | 4 +- src/_VisualDVM/Passes/All/Compile.java | 2 +- .../Passes/All/CreateTestFromProject.java | 2 +- .../All/CreateTestFromSelectedFiles.java | 2 +- .../CreateTestsGroupFromSelectedVersions.java | 2 +- .../Passes/All/DeleteDirectory.java | 2 +- src/_VisualDVM/Passes/All/DeleteFile.java | 2 +- .../All/DeleteSelectedCompilationTasks.java | 2 +- .../Passes/All/DeleteSelectedFiles.java | 2 +- .../Passes/All/DeleteSelectedRunTasks.java | 2 +- .../Passes/All/DeleteSelectedVersions.java | 2 +- .../Passes/All/DeleteSubversions.java | 2 +- src/_VisualDVM/Passes/All/DeleteVersion.java | 2 +- .../All/EditProjectCompilationMaxtime.java | 2 +- .../Passes/All/EditProjectRunMaxtime.java | 2 +- .../Passes/All/ExportDVMPackageToExcel.java | 2 +- .../Passes/All/ExtractRecipients.java | 2 +- src/_VisualDVM/Passes/All/GCOV.java | 2 +- .../All/InstallComponentFromFolder.java | 2 +- .../Passes/All/OpenCurrentProject.java | 2 +- .../Passes/All/PublishBugReport.java | 2 +- .../Passes/All/PublishComponent.java | 2 +- .../Passes/All/PublishComponentsServer.java | 2 +- .../Passes/All/PublishTestingServer.java | 2 +- src/_VisualDVM/Passes/All/Run.java | 2 +- .../Passes/All/SPF_GetGCovInfo.java | 4 +- src/_VisualDVM/Passes/All/Save.java | 2 +- .../Passes/All/SaveBugReportComment.java | 2 +- .../Passes/All/SaveBugReportDescription.java | 2 +- .../Passes/All/SaveBugReportExecutor.java | 2 +- .../Passes/All/SaveBugReportRecipients.java | 2 +- src/_VisualDVM/Passes/All/SaveProfile.java | 2 +- .../Passes/All/ShowComponentChangesLog.java | 2 +- .../Passes/All/StartComponentsServer.java | 2 +- .../All/StartSelectedDVMConfigurations.java | 2 +- .../StartSelectedSAPFORConfigurations.java | 2 +- .../Passes/All/StartTestingServer.java | 2 +- .../Passes/Sapfor/SapforAnalysis.java | 4 +- .../Passes/Server/DeleteServerObject.java | 2 +- .../Passes/Server/DeleteServerObjects.java | 2 +- .../Passes/Server/EditServerObject.java | 2 +- .../Passes/Server/PublishServerObject.java | 2 +- .../Passes/Testing/AbortTestingPackage.java | 2 +- .../Testing/SaveCurrentConfiguration.java | 2 +- .../Passes/Testing/StartTestingPackage.java | 2 +- .../SapforData/Includes/FileInfo.java | 2 +- .../Subscribes/UI/SubscriberFields.form | 4 +- .../Common/Group/GroupsMenuBar.java | 2 +- .../Common/Group/UI/AddGroupMenu.java | 2 +- .../Common/Group/UI/EditGroupMenu.java | 2 +- .../Common/Test/UI/AddTestMenu.java | 2 +- .../Common/Test/UI/EditTestMenu.java | 2 +- .../TestingSystem/Common/TestingMenuBar.java | 6 +- .../DVM/DVMPackage/DVMPackagesBar.java | 4 +- .../DVM/DVMSettings/UI/DVMSettingsFields.form | 12 +- .../UI/SapforSettingsFields.form | 16 +- .../UI/AddSapforPackageMenu.java | 2 +- .../UI/SapforPackagesBar.java | 4 +- .../Visual/Menus/AttachementsMenu.java | 2 +- .../CredentialsBar/CredentialsMenuBar.java | 2 +- .../Visual/Menus/FileMenuBar/FileMenuBar.java | 2 +- .../Menus/FileMenuBar/FileSettingsMenu.java | 2 +- .../Menus/MainMenuBar/GlobalCleaningMenu.java | 2 +- .../MainMenuBar/LastOpenedProjectsMenu.java | 2 +- .../Visual/Menus/MainMenuBar/MainMenuBar.java | 2 +- .../VisualiserSettingsMenu.java | 2 +- .../Visual/Menus/ProjectFilesMenu.java | 14 +- .../ProjectMenuBar/FilesOperationsMenu.java | 2 +- .../ProjectMenuBar/ProjectSettingsMenu.java | 2 +- .../Visual/Menus/SelectionTreeMenu.java | 4 +- src/_VisualDVM/Visual/Menus/VersionsMenu.java | 8 +- .../Visual/Windows/CallbackForm.form | 8 +- .../Visual/Windows/ComparisonForm.form | 8 +- .../Visual/Windows/CopyProjectFields.form | 6 +- src/_VisualDVM/Visual/Windows/FileForm.form | 2 +- .../Visual/Windows/FunctionsForm.form | 24 +-- src/_VisualDVM/Visual/Windows/MainForm.java | 2 +- .../Visual/Windows/ProjectForm.form | 4 +- .../Visual/Windows/ProjectForm.java | 2 +- .../Windows/SapforPackagesComparisonForm.form | 8 +- .../Visual/Windows/VariantsForm.java | 8 +- src/icons/Apply.png | Bin 2248 -> 0 bytes src/icons/CollapseUp.png | Bin 1414 -> 0 bytes src/icons/Delete.png | Bin 1745 -> 0 bytes src/icons/Edit.png | Bin 1558 -> 0 bytes src/icons/Excel.png | Bin 1320 -> 0 bytes src/icons/ExpandDown.png | Bin 1570 -> 0 bytes src/icons/Filter.png | Bin 1625 -> 0 bytes src/icons/{GCOV.PNG => GCOV.png} | Bin src/icons/GlobalStatistic.png | Bin 2147 -> 0 bytes src/icons/Left.png | Bin 2316 -> 0 bytes src/icons/NotPick.png | Bin 1407 -> 0 bytes src/icons/Pick.png | Bin 1713 -> 0 bytes src/icons/RedAdd.png | Bin 1507 -> 0 bytes src/icons/RedPick.png | Bin 1157 -> 0 bytes src/icons/Right.png | Bin 2294 -> 0 bytes src/icons/Save.png | Bin 616 -> 0 bytes src/icons/SelectAll.png | Bin 575 -> 0 bytes src/icons/Settings.png | Bin 2226 -> 0 bytes src/icons/UnselectAll.png | Bin 514 -> 0 bytes 142 files changed, 294 insertions(+), 158 deletions(-) rename src/{icons/Ban.PNG => Common/icons/Ban.png} (100%) rename src/{icons/Start.png => Common/icons/BlueStart.png} (100%) rename src/{ => Common}/icons/Clean.png (100%) rename src/{ => Common}/icons/CleanTime.png (100%) rename src/{ => Common}/icons/Close.png (100%) rename src/{ => Common}/icons/Close_18.png (100%) rename src/{ => Common}/icons/Command.png (100%) rename src/{ => Common}/icons/Date.png (100%) rename src/{ => Common}/icons/Explorer.png (100%) rename src/{ => Common}/icons/File.png (100%) rename src/{ => Common}/icons/GreenStart.png (100%) rename src/{ => Common}/icons/Info.png (100%) rename src/{icons/Library.PNG => Common/icons/Library.png} (100%) rename src/{ => Common}/icons/Log.png (100%) rename src/{ => Common}/icons/MassFiles.png (100%) rename src/{ => Common}/icons/Maxtime.png (100%) rename src/{ => Common}/icons/Metrics.png (100%) rename src/{ => Common}/icons/Next.png (100%) rename src/{icons/Prev.png => Common/icons/Previous.png} (100%) rename src/{ => Common}/icons/Publish.png (100%) rename src/{icons/LastOpened.png => Common/icons/Search.png} (100%) rename src/Common/icons/{SilwerArrowLeft.png => SilverArrowLeft.png} (100%) rename src/Common/icons/{SilwerArrowRight.png => SilverArrowRight.png} (100%) rename src/Common/icons/{CollapseUp.png => SilverArrowUp.png} (100%) rename src/Common/icons/{ExpandDown.png => SiverArrowDown.png} (100%) rename src/Common/icons/{GlobalStatistic.png => Statistic.png} (100%) rename src/{ => Common}/icons/Stop.png (100%) rename src/{ => Common}/icons/Time.png (100%) delete mode 100644 src/icons/Apply.png delete mode 100644 src/icons/CollapseUp.png delete mode 100644 src/icons/Delete.png delete mode 100644 src/icons/Edit.png delete mode 100644 src/icons/Excel.png delete mode 100644 src/icons/ExpandDown.png delete mode 100644 src/icons/Filter.png rename src/icons/{GCOV.PNG => GCOV.png} (100%) delete mode 100644 src/icons/GlobalStatistic.png delete mode 100644 src/icons/Left.png delete mode 100644 src/icons/NotPick.png delete mode 100644 src/icons/Pick.png delete mode 100644 src/icons/RedAdd.png delete mode 100644 src/icons/RedPick.png delete mode 100644 src/icons/Right.png delete mode 100644 src/icons/Save.png delete mode 100644 src/icons/SelectAll.png delete mode 100644 src/icons/Settings.png delete mode 100644 src/icons/UnselectAll.png diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 8c6f9308..be8d698a 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -8,11 +8,147 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/_VisualDVM/GlobalData/Machine/MachinesMenuBar.java b/src/_VisualDVM/GlobalData/Machine/MachinesMenuBar.java index d2501446..d599781a 100644 --- a/src/_VisualDVM/GlobalData/Machine/MachinesMenuBar.java +++ b/src/_VisualDVM/GlobalData/Machine/MachinesMenuBar.java @@ -15,7 +15,7 @@ public class MachinesMenuBar extends DataMenuBar { PassCode.DeleteMachine); this.add(bCollapse = new MenuBarButton() { { - setIcon("/icons/CollapseUp.png"); + setIcon("/Common/icons/SilverArrowUp.png"); setToolTipText("Свернуть"); addActionListener(new ActionListener() { @Override diff --git a/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationFields.form b/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationFields.form index 5040c8f4..4f8230be 100644 --- a/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationFields.form +++ b/src/_VisualDVM/GlobalData/RunConfiguration/UI/RunConfigurationFields.form @@ -188,8 +188,8 @@ - - + + diff --git a/src/_VisualDVM/GlobalData/Settings/DBSetting.java b/src/_VisualDVM/GlobalData/Settings/DBSetting.java index ae72232c..03194d35 100644 --- a/src/_VisualDVM/GlobalData/Settings/DBSetting.java +++ b/src/_VisualDVM/GlobalData/Settings/DBSetting.java @@ -64,7 +64,7 @@ public class DBSetting extends DBObject { public void Mark() { switch (settingType) { case SapforFlag: - getMenuItem().setIcon(Utils_.getIcon(toBoolean() ? "/icons/Pick.png" : "/icons/NotPick.png")); + getMenuItem().setIcon(Utils_.getIcon(toBoolean() ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png")); break; case PercentField: getMenuItem().setText(Name.getDescription() + " : " + this + "%"); diff --git a/src/_VisualDVM/Passes/All/AddSubscriber.java b/src/_VisualDVM/Passes/All/AddSubscriber.java index 77d65ca3..e3e5aa6a 100644 --- a/src/_VisualDVM/Passes/All/AddSubscriber.java +++ b/src/_VisualDVM/Passes/All/AddSubscriber.java @@ -8,7 +8,7 @@ import _VisualDVM.Repository.Subscribes.Subscriber; public class AddSubscriber extends ComponentsRepositoryPass { @Override public String getIconPath() { - return "/icons/RedAdd.png"; + return "/Common/icons/RedAdd.png"; } @Override public String getButtonText() { diff --git a/src/_VisualDVM/Passes/All/ApplyBugReportSettings.java b/src/_VisualDVM/Passes/All/ApplyBugReportSettings.java index 6f13c095..75adacf0 100644 --- a/src/_VisualDVM/Passes/All/ApplyBugReportSettings.java +++ b/src/_VisualDVM/Passes/All/ApplyBugReportSettings.java @@ -10,7 +10,7 @@ import java.util.LinkedHashMap; public class ApplyBugReportSettings extends Pass { @Override public String getIconPath() { - return "/icons/Apply.png"; + return "/Common/icons/Apply.png"; } @Override public String getButtonText() { diff --git a/src/_VisualDVM/Passes/All/ApplyCurrentFunction.java b/src/_VisualDVM/Passes/All/ApplyCurrentFunction.java index ebc6d89b..a5167d87 100644 --- a/src/_VisualDVM/Passes/All/ApplyCurrentFunction.java +++ b/src/_VisualDVM/Passes/All/ApplyCurrentFunction.java @@ -12,7 +12,7 @@ import java.util.Vector; public class ApplyCurrentFunction extends Pass { @Override public String getIconPath() { - return "/icons/Apply.png"; + return "/Common/icons/Apply.png"; } @Override public String getButtonText() { diff --git a/src/_VisualDVM/Passes/All/ApplyProfile.java b/src/_VisualDVM/Passes/All/ApplyProfile.java index 1e1784c3..2e4d0ad2 100644 --- a/src/_VisualDVM/Passes/All/ApplyProfile.java +++ b/src/_VisualDVM/Passes/All/ApplyProfile.java @@ -10,7 +10,7 @@ import java.util.Vector; public class ApplyProfile extends Pass { @Override public String getIconPath() { - return "/icons/Apply.png"; + return "/Common/icons/Apply.png"; } @Override public String getButtonText() { diff --git a/src/_VisualDVM/Passes/All/CloseCurrentFile.java b/src/_VisualDVM/Passes/All/CloseCurrentFile.java index d3b40d0a..eb4666e5 100644 --- a/src/_VisualDVM/Passes/All/CloseCurrentFile.java +++ b/src/_VisualDVM/Passes/All/CloseCurrentFile.java @@ -9,11 +9,11 @@ import javax.swing.*; public class CloseCurrentFile extends Pass { @Override public String getIconPath() { - return "/icons/Close.png"; + return "/Common/icons/Close.png"; } @Override public Icon getTabIcon() { - return Utils_.getIcon("/icons/Close_18.png"); + return Utils_.getIcon("/Common/icons/Close_18.png"); } @Override public String getButtonText() { diff --git a/src/_VisualDVM/Passes/All/CloseCurrentProject.java b/src/_VisualDVM/Passes/All/CloseCurrentProject.java index 91febe48..73691bba 100644 --- a/src/_VisualDVM/Passes/All/CloseCurrentProject.java +++ b/src/_VisualDVM/Passes/All/CloseCurrentProject.java @@ -13,11 +13,11 @@ public class CloseCurrentProject extends Pass { } @Override public String getIconPath() { - return "/icons/Close.png"; + return "/Common/icons/Close.png"; } @Override public Icon getTabIcon() { - return Utils_.getIcon("/icons/Close_18.png"); + return Utils_.getIcon("/Common/icons/Close_18.png"); } @Override protected boolean canStart(Object... args) throws Exception { diff --git a/src/_VisualDVM/Passes/All/Compile.java b/src/_VisualDVM/Passes/All/Compile.java index 6d2f985a..b01ca71c 100644 --- a/src/_VisualDVM/Passes/All/Compile.java +++ b/src/_VisualDVM/Passes/All/Compile.java @@ -19,7 +19,7 @@ public class Compile extends Pass { } @Override public String getIconPath() { - return "/icons/Start.png"; + return "/Common/icons/BlueStart.png"; } @Override public String getButtonText() { diff --git a/src/_VisualDVM/Passes/All/CreateTestFromProject.java b/src/_VisualDVM/Passes/All/CreateTestFromProject.java index b6d32410..9ff8efd3 100644 --- a/src/_VisualDVM/Passes/All/CreateTestFromProject.java +++ b/src/_VisualDVM/Passes/All/CreateTestFromProject.java @@ -10,7 +10,7 @@ public class CreateTestFromProject extends CreateTestFromDirectory { db_project_info project; @Override public String getIconPath() { - return "/icons/RedAdd.png"; + return "/Common/icons/RedAdd.png"; } @Override protected boolean canStart(Object... args) throws Exception { diff --git a/src/_VisualDVM/Passes/All/CreateTestFromSelectedFiles.java b/src/_VisualDVM/Passes/All/CreateTestFromSelectedFiles.java index ea07c1ed..5cf6afd7 100644 --- a/src/_VisualDVM/Passes/All/CreateTestFromSelectedFiles.java +++ b/src/_VisualDVM/Passes/All/CreateTestFromSelectedFiles.java @@ -7,7 +7,7 @@ import java.util.Vector; public class CreateTestFromSelectedFiles extends CreateTestFromDirectory { @Override public String getIconPath() { - return "/icons/MassFiles.png"; + return "/Common/icons/MassFiles.png"; } @Override protected boolean selectFiles() { diff --git a/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java b/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java index 7ff50da6..0dad3a7b 100644 --- a/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java +++ b/src/_VisualDVM/Passes/All/CreateTestsGroupFromSelectedVersions.java @@ -12,7 +12,7 @@ import java.util.Vector; public class CreateTestsGroupFromSelectedVersions extends PublishTests { @Override public String getIconPath() { - return "/icons/Publish.png"; + return "/Common/icons/Publish.png"; } @Override protected PassCode getCreateTestCode() { diff --git a/src/_VisualDVM/Passes/All/DeleteDirectory.java b/src/_VisualDVM/Passes/All/DeleteDirectory.java index 78c459d2..afc43fac 100644 --- a/src/_VisualDVM/Passes/All/DeleteDirectory.java +++ b/src/_VisualDVM/Passes/All/DeleteDirectory.java @@ -15,7 +15,7 @@ import java.util.Vector; public class DeleteDirectory extends ChangeFilePass { @Override public String getIconPath() { - return "/icons/Delete.png"; + return "/Common/icons/Delete.png"; } @Override protected boolean canStart(Object... args) { diff --git a/src/_VisualDVM/Passes/All/DeleteFile.java b/src/_VisualDVM/Passes/All/DeleteFile.java index 556fe0d5..9f96535e 100644 --- a/src/_VisualDVM/Passes/All/DeleteFile.java +++ b/src/_VisualDVM/Passes/All/DeleteFile.java @@ -9,7 +9,7 @@ import _VisualDVM.ProjectData.Files.DBProjectFile; public class DeleteFile extends ChangeFilePass { @Override public String getIconPath() { - return "/icons/Delete.png"; + return "/Common/icons/Delete.png"; } @Override protected boolean canStart(Object... args) { diff --git a/src/_VisualDVM/Passes/All/DeleteSelectedCompilationTasks.java b/src/_VisualDVM/Passes/All/DeleteSelectedCompilationTasks.java index 389f3820..7fd38143 100644 --- a/src/_VisualDVM/Passes/All/DeleteSelectedCompilationTasks.java +++ b/src/_VisualDVM/Passes/All/DeleteSelectedCompilationTasks.java @@ -9,7 +9,7 @@ import java.util.Vector; public class DeleteSelectedCompilationTasks extends Pass> { @Override public String getIconPath() { - return "/icons/Delete.png"; + return "/Common/icons/Delete.png"; } @Override public String getButtonText() { diff --git a/src/_VisualDVM/Passes/All/DeleteSelectedFiles.java b/src/_VisualDVM/Passes/All/DeleteSelectedFiles.java index addd93c3..fec9036b 100644 --- a/src/_VisualDVM/Passes/All/DeleteSelectedFiles.java +++ b/src/_VisualDVM/Passes/All/DeleteSelectedFiles.java @@ -9,7 +9,7 @@ import _VisualDVM.ProjectData.Files.DBProjectFile; public class DeleteSelectedFiles extends Pass { @Override public String getIconPath() { - return "/icons/Delete.png"; + return "/Common/icons/Delete.png"; } @Override protected boolean canStart(Object... args) throws Exception { diff --git a/src/_VisualDVM/Passes/All/DeleteSelectedRunTasks.java b/src/_VisualDVM/Passes/All/DeleteSelectedRunTasks.java index 33266543..22952f12 100644 --- a/src/_VisualDVM/Passes/All/DeleteSelectedRunTasks.java +++ b/src/_VisualDVM/Passes/All/DeleteSelectedRunTasks.java @@ -8,7 +8,7 @@ import java.util.Vector; public class DeleteSelectedRunTasks extends Pass> { @Override public String getIconPath() { - return "/icons/Delete.png"; + return "/Common/icons/Delete.png"; } @Override public String getButtonText() { diff --git a/src/_VisualDVM/Passes/All/DeleteSelectedVersions.java b/src/_VisualDVM/Passes/All/DeleteSelectedVersions.java index 8bfc4bad..fb95b564 100644 --- a/src/_VisualDVM/Passes/All/DeleteSelectedVersions.java +++ b/src/_VisualDVM/Passes/All/DeleteSelectedVersions.java @@ -15,7 +15,7 @@ public class DeleteSelectedVersions extends Pass> { } @Override public String getIconPath() { - return "/icons/Delete.png"; + return "/Common/icons/Delete.png"; } @Override protected boolean canStart(Object... args) throws Exception { diff --git a/src/_VisualDVM/Passes/All/DeleteSubversions.java b/src/_VisualDVM/Passes/All/DeleteSubversions.java index 586bd152..5cfa13e7 100644 --- a/src/_VisualDVM/Passes/All/DeleteSubversions.java +++ b/src/_VisualDVM/Passes/All/DeleteSubversions.java @@ -8,7 +8,7 @@ import java.util.Vector; public class DeleteSubversions extends CurrentProjectPass { @Override public String getIconPath() { - return "/icons/Delete.png"; + return "/Common/icons/Delete.png"; } @Override protected void body() throws Exception { diff --git a/src/_VisualDVM/Passes/All/DeleteVersion.java b/src/_VisualDVM/Passes/All/DeleteVersion.java index 899ed5cc..c6367eba 100644 --- a/src/_VisualDVM/Passes/All/DeleteVersion.java +++ b/src/_VisualDVM/Passes/All/DeleteVersion.java @@ -11,7 +11,7 @@ public class DeleteVersion extends Pass { boolean current; @Override public String getIconPath() { - return "/icons/Delete.png"; + return "/Common/icons/Delete.png"; } @Override protected boolean canStart(Object... args) { diff --git a/src/_VisualDVM/Passes/All/EditProjectCompilationMaxtime.java b/src/_VisualDVM/Passes/All/EditProjectCompilationMaxtime.java index 1f4baba7..a7e9d22a 100644 --- a/src/_VisualDVM/Passes/All/EditProjectCompilationMaxtime.java +++ b/src/_VisualDVM/Passes/All/EditProjectCompilationMaxtime.java @@ -6,7 +6,7 @@ public class EditProjectCompilationMaxtime extends CurrentProjectPass { SessionMaxtimeDialog f; @Override public String getIconPath() { - return "/icons/Maxtime.png"; + return "/Common/icons/Maxtime.png"; } @Override public String getButtonText() { diff --git a/src/_VisualDVM/Passes/All/EditProjectRunMaxtime.java b/src/_VisualDVM/Passes/All/EditProjectRunMaxtime.java index 3c166a30..d7f50386 100644 --- a/src/_VisualDVM/Passes/All/EditProjectRunMaxtime.java +++ b/src/_VisualDVM/Passes/All/EditProjectRunMaxtime.java @@ -6,7 +6,7 @@ public class EditProjectRunMaxtime extends CurrentProjectPass { SessionMaxtimeDialog f; @Override public String getIconPath() { - return "/icons/Maxtime.png"; + return "/Common/icons/Maxtime.png"; } @Override public String getButtonText() { diff --git a/src/_VisualDVM/Passes/All/ExportDVMPackageToExcel.java b/src/_VisualDVM/Passes/All/ExportDVMPackageToExcel.java index f6ef5f35..e564dd64 100644 --- a/src/_VisualDVM/Passes/All/ExportDVMPackageToExcel.java +++ b/src/_VisualDVM/Passes/All/ExportDVMPackageToExcel.java @@ -41,7 +41,7 @@ public class ExportDVMPackageToExcel extends Pass> { //-- @Override public String getIconPath() { - return "/icons/Excel.png"; + return "/Common/icons/Excel.png"; } @Override public String getButtonText() { diff --git a/src/_VisualDVM/Passes/All/ExtractRecipients.java b/src/_VisualDVM/Passes/All/ExtractRecipients.java index 69a6f9fe..4d7d7b23 100644 --- a/src/_VisualDVM/Passes/All/ExtractRecipients.java +++ b/src/_VisualDVM/Passes/All/ExtractRecipients.java @@ -10,7 +10,7 @@ public class ExtractRecipients extends Pass { } @Override public String getIconPath() { - return "/icons/LastOpened.png"; + return "/Common/icons/Search.png"; } @Override public String getButtonText() { diff --git a/src/_VisualDVM/Passes/All/GCOV.java b/src/_VisualDVM/Passes/All/GCOV.java index 9f89a9f4..96fb8616 100644 --- a/src/_VisualDVM/Passes/All/GCOV.java +++ b/src/_VisualDVM/Passes/All/GCOV.java @@ -23,7 +23,7 @@ public class GCOV extends Precompilation { } @Override public String getIconPath() { - return "/icons/GCOV.PNG"; + return "/icons/GCOV.png"; } @Override public boolean hasStats() { diff --git a/src/_VisualDVM/Passes/All/InstallComponentFromFolder.java b/src/_VisualDVM/Passes/All/InstallComponentFromFolder.java index 6ad78031..985246f0 100644 --- a/src/_VisualDVM/Passes/All/InstallComponentFromFolder.java +++ b/src/_VisualDVM/Passes/All/InstallComponentFromFolder.java @@ -11,7 +11,7 @@ public class InstallComponentFromFolder extends CurrentComponentPass { File file; @Override public String getIconPath() { - return "/icons/LastOpened.png"; + return "/Common/icons/Search.png"; } @Override public String getButtonText() { diff --git a/src/_VisualDVM/Passes/All/OpenCurrentProject.java b/src/_VisualDVM/Passes/All/OpenCurrentProject.java index fb80a66f..d2c88081 100644 --- a/src/_VisualDVM/Passes/All/OpenCurrentProject.java +++ b/src/_VisualDVM/Passes/All/OpenCurrentProject.java @@ -130,7 +130,7 @@ public class OpenCurrentProject extends Pass { Global.mainModule.getUI().getVersionsWindow().BlockVariants(); //- Global.mainModule.getUI().getMainWindow().ShowProject(); - //криво. но при тихом режиме открытие файлов все равно не понадобится. + //криво. но при тихом режиме открытие файлов все равно не понадобится. LastOpenedProjectsMenu Global.mainModule.getPass(PassCode.OpenCurrentFile).Do(target.getLastOpenedFile()); } @Override diff --git a/src/_VisualDVM/Passes/All/PublishBugReport.java b/src/_VisualDVM/Passes/All/PublishBugReport.java index 87230e89..7b16efd8 100644 --- a/src/_VisualDVM/Passes/All/PublishBugReport.java +++ b/src/_VisualDVM/Passes/All/PublishBugReport.java @@ -15,7 +15,7 @@ import java.util.Date; public class PublishBugReport extends Pass { @Override public String getIconPath() { - return "/icons/Publish.png"; + return "/Common/icons/Publish.png"; } @Override public String getButtonText() { diff --git a/src/_VisualDVM/Passes/All/PublishComponent.java b/src/_VisualDVM/Passes/All/PublishComponent.java index c41a0927..5d18860d 100644 --- a/src/_VisualDVM/Passes/All/PublishComponent.java +++ b/src/_VisualDVM/Passes/All/PublishComponent.java @@ -21,7 +21,7 @@ public class PublishComponent extends ComponentsRepositoryPass { PublishForm f = new PublishForm(); @Override public String getIconPath() { - return "/icons/Publish.png"; + return "/Common/icons/Publish.png"; } @Override public String getButtonText() { diff --git a/src/_VisualDVM/Passes/All/PublishComponentsServer.java b/src/_VisualDVM/Passes/All/PublishComponentsServer.java index e16f52f6..88557f99 100644 --- a/src/_VisualDVM/Passes/All/PublishComponentsServer.java +++ b/src/_VisualDVM/Passes/All/PublishComponentsServer.java @@ -17,7 +17,7 @@ public class PublishComponentsServer extends RepositoryServerSSHPass { } @Override public String getIconPath() { - return "/icons/Publish.png"; + return "/Common/icons/Publish.png"; } //1. остановить сервер. //2. заменить файл сервера на компонент визуализатора. переименовать его. diff --git a/src/_VisualDVM/Passes/All/PublishTestingServer.java b/src/_VisualDVM/Passes/All/PublishTestingServer.java index 32aef185..1ea1efa5 100644 --- a/src/_VisualDVM/Passes/All/PublishTestingServer.java +++ b/src/_VisualDVM/Passes/All/PublishTestingServer.java @@ -17,7 +17,7 @@ public class PublishTestingServer extends RepositoryServerSSHPass { } @Override public String getIconPath() { - return "/icons/Publish.png"; + return "/Common/icons/Publish.png"; } //1. остановить сервер. //2. заменить файл сервера на компонент визуализатора. переименовать его. diff --git a/src/_VisualDVM/Passes/All/Run.java b/src/_VisualDVM/Passes/All/Run.java index 8efd9eae..731f1da5 100644 --- a/src/_VisualDVM/Passes/All/Run.java +++ b/src/_VisualDVM/Passes/All/Run.java @@ -16,7 +16,7 @@ public class Run extends Pass { Vector runTasks; @Override public String getIconPath() { - return "/icons/GreenStart.png"; + return "/Common/icons/GreenStart.png"; } @Override public String getButtonText() { diff --git a/src/_VisualDVM/Passes/All/SPF_GetGCovInfo.java b/src/_VisualDVM/Passes/All/SPF_GetGCovInfo.java index 43044d21..38b23f66 100644 --- a/src/_VisualDVM/Passes/All/SPF_GetGCovInfo.java +++ b/src/_VisualDVM/Passes/All/SPF_GetGCovInfo.java @@ -9,10 +9,10 @@ import _VisualDVM.ProjectData.Files.DBProjectFile; public class SPF_GetGCovInfo extends SilentSapforPass { @Override public String getIconPath() { - return "/icons/NotPick.png"; + return "/Common/icons/NotPick.png"; } protected String getDoneIconPath() { - return "/icons/Pick.png"; + return "/Common/icons/Pick.png"; } @Override public boolean hasStats() { diff --git a/src/_VisualDVM/Passes/All/Save.java b/src/_VisualDVM/Passes/All/Save.java index 267402e5..339edb7e 100644 --- a/src/_VisualDVM/Passes/All/Save.java +++ b/src/_VisualDVM/Passes/All/Save.java @@ -6,7 +6,7 @@ import org.apache.commons.io.FileUtils; public class Save extends Pass { @Override public String getIconPath() { - return "/icons/Save.png"; + return "/Common/icons/Save.png"; } @Override public String getButtonText() { diff --git a/src/_VisualDVM/Passes/All/SaveBugReportComment.java b/src/_VisualDVM/Passes/All/SaveBugReportComment.java index 0426e475..83e0e417 100644 --- a/src/_VisualDVM/Passes/All/SaveBugReportComment.java +++ b/src/_VisualDVM/Passes/All/SaveBugReportComment.java @@ -3,7 +3,7 @@ import _VisualDVM.Global; public class SaveBugReportComment extends UpdateBugReportField { @Override public String getIconPath() { - return "/icons/Save.png"; + return "/Common/icons/Save.png"; } @Override public String getButtonText() { diff --git a/src/_VisualDVM/Passes/All/SaveBugReportDescription.java b/src/_VisualDVM/Passes/All/SaveBugReportDescription.java index 80547906..5e6a8fc0 100644 --- a/src/_VisualDVM/Passes/All/SaveBugReportDescription.java +++ b/src/_VisualDVM/Passes/All/SaveBugReportDescription.java @@ -3,7 +3,7 @@ import _VisualDVM.Global; public class SaveBugReportDescription extends UpdateBugReportField { @Override public String getIconPath() { - return "/icons/Save.png"; + return "/Common/icons/Save.png"; } @Override public String getButtonText() { diff --git a/src/_VisualDVM/Passes/All/SaveBugReportExecutor.java b/src/_VisualDVM/Passes/All/SaveBugReportExecutor.java index bc273b85..8554bc47 100644 --- a/src/_VisualDVM/Passes/All/SaveBugReportExecutor.java +++ b/src/_VisualDVM/Passes/All/SaveBugReportExecutor.java @@ -4,7 +4,7 @@ import _VisualDVM.Global; public class SaveBugReportExecutor extends UpdateBugReportField { @Override public String getIconPath() { - return "/icons/Apply.png"; + return "/Common/icons/Apply.png"; } @Override public String getButtonText() { diff --git a/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java b/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java index f1ebc197..6df8ff5d 100644 --- a/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java +++ b/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java @@ -3,7 +3,7 @@ import _VisualDVM.Repository.BugReport.BugReportInterface; public class SaveBugReportRecipients extends UpdateBugReportField { @Override public String getIconPath() { - return "/icons/Save.png"; + return "/Common/icons/Save.png"; } @Override public String getButtonText() { diff --git a/src/_VisualDVM/Passes/All/SaveProfile.java b/src/_VisualDVM/Passes/All/SaveProfile.java index ca4031aa..dba42272 100644 --- a/src/_VisualDVM/Passes/All/SaveProfile.java +++ b/src/_VisualDVM/Passes/All/SaveProfile.java @@ -11,7 +11,7 @@ public class SaveProfile extends AddObjectPass { } @Override public String getIconPath() { - return "/icons/Save.png"; + return "/Common/icons/Save.png"; } @Override protected boolean canStart(Object... args) throws Exception { diff --git a/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java b/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java index af53a105..ddd7fdf3 100644 --- a/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java +++ b/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java @@ -17,7 +17,7 @@ public class ShowComponentChangesLog extends ComponentsRepositoryPass File res; @Override public String getIconPath() { - return "/icons/Log.png"; + return "/Common/icons/Log.png"; } @Override public String getButtonText() { diff --git a/src/_VisualDVM/Passes/All/StartComponentsServer.java b/src/_VisualDVM/Passes/All/StartComponentsServer.java index 89be6eea..bcdb68e0 100644 --- a/src/_VisualDVM/Passes/All/StartComponentsServer.java +++ b/src/_VisualDVM/Passes/All/StartComponentsServer.java @@ -5,7 +5,7 @@ import _VisualDVM.Passes.SSH.RepositoryServerSSHPass; public class StartComponentsServer extends RepositoryServerSSHPass { @Override public String getIconPath() { - return "/icons/GreenStart.png"; + return "/Common/icons/GreenStart.png"; } @Override protected String getServerHomeName() { diff --git a/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java b/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java index fd864f01..9828b0a0 100644 --- a/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java +++ b/src/_VisualDVM/Passes/All/StartSelectedDVMConfigurations.java @@ -18,7 +18,7 @@ public class StartSelectedDVMConfigurations extends PublishServerObject } @Override public String getIconPath() { - return "/icons/Delete.png"; + return "/Common/icons/Delete.png"; } @Override protected boolean canStart(Object... args) throws Exception { diff --git a/src/_VisualDVM/Passes/Server/DeleteServerObjects.java b/src/_VisualDVM/Passes/Server/DeleteServerObjects.java index d383473e..35a94438 100644 --- a/src/_VisualDVM/Passes/Server/DeleteServerObjects.java +++ b/src/_VisualDVM/Passes/Server/DeleteServerObjects.java @@ -21,7 +21,7 @@ public class DeleteServerObjects //--- @Override public String getIconPath() { - return "/icons/Delete.png"; + return "/Common/icons/Delete.png"; } @Override public String getButtonText() { diff --git a/src/_VisualDVM/Passes/Server/EditServerObject.java b/src/_VisualDVM/Passes/Server/EditServerObject.java index 2105000d..c55692cb 100644 --- a/src/_VisualDVM/Passes/Server/EditServerObject.java +++ b/src/_VisualDVM/Passes/Server/EditServerObject.java @@ -10,7 +10,7 @@ public class EditServerObject ex //-- @Override public String getIconPath() { - return "/icons/Edit.png"; + return "/Common/icons/Edit.png"; } //-- @Override diff --git a/src/_VisualDVM/Passes/Server/PublishServerObject.java b/src/_VisualDVM/Passes/Server/PublishServerObject.java index 5b46a84b..73082c00 100644 --- a/src/_VisualDVM/Passes/Server/PublishServerObject.java +++ b/src/_VisualDVM/Passes/Server/PublishServerObject.java @@ -12,7 +12,7 @@ public class PublishServerObject } @Override public String getIconPath() { - return "/icons/RedAdd.png"; + return "/Common/icons/RedAdd.png"; } //-- @Override diff --git a/src/_VisualDVM/Passes/Testing/AbortTestingPackage.java b/src/_VisualDVM/Passes/Testing/AbortTestingPackage.java index f758e763..d63dbc37 100644 --- a/src/_VisualDVM/Passes/Testing/AbortTestingPackage.java +++ b/src/_VisualDVM/Passes/Testing/AbortTestingPackage.java @@ -10,7 +10,7 @@ public abstract class AbortTestingPackage extends TestingSystemPass extends Publ } @Override public String getIconPath() { - return "/icons/Start.png"; + return "/Common/icons/BlueStart.png"; } protected abstract Current getCurrentName(); @Override diff --git a/src/_VisualDVM/ProjectData/SapforData/Includes/FileInfo.java b/src/_VisualDVM/ProjectData/SapforData/Includes/FileInfo.java index 0281a433..e88b71c9 100644 --- a/src/_VisualDVM/ProjectData/SapforData/Includes/FileInfo.java +++ b/src/_VisualDVM/ProjectData/SapforData/Includes/FileInfo.java @@ -19,7 +19,7 @@ public class FileInfo extends FileObject { } @Override public ImageIcon GetDisabledIcon() { - return Utils_.getIcon("/icons/File.png"); + return Utils_.getIcon("/Common/icons/File.png"); } @Override public void SelectAllChildren(boolean select) { diff --git a/src/_VisualDVM/Repository/Subscribes/UI/SubscriberFields.form b/src/_VisualDVM/Repository/Subscribes/UI/SubscriberFields.form index 2293bdb0..9880eb58 100644 --- a/src/_VisualDVM/Repository/Subscribes/UI/SubscriberFields.form +++ b/src/_VisualDVM/Repository/Subscribes/UI/SubscriberFields.form @@ -78,8 +78,8 @@ - - + + diff --git a/src/_VisualDVM/TestingSystem/Common/Group/GroupsMenuBar.java b/src/_VisualDVM/TestingSystem/Common/Group/GroupsMenuBar.java index fd35c280..40526bfd 100644 --- a/src/_VisualDVM/TestingSystem/Common/Group/GroupsMenuBar.java +++ b/src/_VisualDVM/TestingSystem/Common/Group/GroupsMenuBar.java @@ -29,7 +29,7 @@ public class GroupsMenuBar extends DataMenuBar { }); } public void Mark() { - setIcon(Utils_.getIcon(GroupsDBTable.filterMyOnly ? "/icons/Pick.png" : "/icons/NotPick.png")); + setIcon(Utils_.getIcon(GroupsDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png")); } }); } diff --git a/src/_VisualDVM/TestingSystem/Common/Group/UI/AddGroupMenu.java b/src/_VisualDVM/TestingSystem/Common/Group/UI/AddGroupMenu.java index bdb83a3d..fa8b6df5 100644 --- a/src/_VisualDVM/TestingSystem/Common/Group/UI/AddGroupMenu.java +++ b/src/_VisualDVM/TestingSystem/Common/Group/UI/AddGroupMenu.java @@ -3,7 +3,7 @@ import Common.Visual.Menus.VisualiserMenu; import _VisualDVM.Passes.PassCode; public class AddGroupMenu extends VisualiserMenu { public AddGroupMenu() { - super("", "/icons/RedAdd.png"); + super("", "/Common/icons/RedAdd.png"); addPasses(PassCode.PublishGroup, PassCode.CreateGroupFromDirectory, PassCode.CreateGroupFromFiles); } } diff --git a/src/_VisualDVM/TestingSystem/Common/Group/UI/EditGroupMenu.java b/src/_VisualDVM/TestingSystem/Common/Group/UI/EditGroupMenu.java index e7997265..8f0b1178 100644 --- a/src/_VisualDVM/TestingSystem/Common/Group/UI/EditGroupMenu.java +++ b/src/_VisualDVM/TestingSystem/Common/Group/UI/EditGroupMenu.java @@ -3,7 +3,7 @@ import Common.Visual.Menus.VisualiserMenu; import _VisualDVM.Passes.PassCode; public class EditGroupMenu extends VisualiserMenu { public EditGroupMenu() { - super("", "/icons/Edit.png"); + super("", "/Common/icons/Edit.png"); addPasses(PassCode.EditGroup, PassCode.ReplaceTestsFromFiles); } } diff --git a/src/_VisualDVM/TestingSystem/Common/Test/UI/AddTestMenu.java b/src/_VisualDVM/TestingSystem/Common/Test/UI/AddTestMenu.java index 67f9f6e0..75d9ad36 100644 --- a/src/_VisualDVM/TestingSystem/Common/Test/UI/AddTestMenu.java +++ b/src/_VisualDVM/TestingSystem/Common/Test/UI/AddTestMenu.java @@ -4,7 +4,7 @@ import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; public class AddTestMenu extends VisualiserMenu { public AddTestMenu() { - super("Добавление теста", "/icons/RedAdd.png", false); + super("Добавление теста", "/Common/icons/RedAdd.png", false); add(Global.mainModule.getPass(PassCode.CreateTestFromProject).createMenuItem()); add(Global.mainModule.getPass(PassCode.CreateTestFromDirectory).createMenuItem()); add(Global.mainModule.getPass(PassCode.CreateTestsFromFiles).createMenuItem()); diff --git a/src/_VisualDVM/TestingSystem/Common/Test/UI/EditTestMenu.java b/src/_VisualDVM/TestingSystem/Common/Test/UI/EditTestMenu.java index 0deede5a..b58994e7 100644 --- a/src/_VisualDVM/TestingSystem/Common/Test/UI/EditTestMenu.java +++ b/src/_VisualDVM/TestingSystem/Common/Test/UI/EditTestMenu.java @@ -4,7 +4,7 @@ import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; public class EditTestMenu extends VisualiserMenu { public EditTestMenu() { - super("Редактирование теста", "/icons/Edit.png", false); + super("Редактирование теста", "/Common/icons/Edit.png", false); add(Global.mainModule.getPass(PassCode.EditTest).createMenuItem()); add(Global.mainModule.getPass(PassCode.ReplaceTestProject).createMenuItem()); } diff --git a/src/_VisualDVM/TestingSystem/Common/TestingMenuBar.java b/src/_VisualDVM/TestingSystem/Common/TestingMenuBar.java index 17aefc8c..7e6eca2e 100644 --- a/src/_VisualDVM/TestingSystem/Common/TestingMenuBar.java +++ b/src/_VisualDVM/TestingSystem/Common/TestingMenuBar.java @@ -46,7 +46,7 @@ public class TestingMenuBar extends VisualiserMenuBar { }); } public void Mark() { - setIcon(Utils_.getIcon(Global.properties.EmailOnTestingProgress ? "/icons/Pick.png" : "/icons/NotPick.png")); + setIcon(Utils_.getIcon(Global.properties.EmailOnTestingProgress ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png")); } }); //-- @@ -67,7 +67,7 @@ public class TestingMenuBar extends VisualiserMenuBar { }); } public void Mark() { - setIcon(Utils_.getIcon(Global.properties.AutoCheckTesting ? "/icons/Pick.png" : "/icons/NotPick.png")); + setIcon(Utils_.getIcon(Global.properties.AutoCheckTesting ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png")); } }); //-- @@ -90,7 +90,7 @@ public class TestingMenuBar extends VisualiserMenuBar { addPasses(PassCode.StartTestingServer, PassCode.ShutdownTestingServer, PassCode.PublishTestingServer); } public void ShowAutoCheckTesting() { - autorefreshButton.setIcon(Utils_.getIcon(Global.properties.AutoCheckTesting ? "/icons/Pick.png" : "/icons/NotPick.png")); + autorefreshButton.setIcon(Utils_.getIcon(Global.properties.AutoCheckTesting ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png")); } public void showServerAdminLabel(boolean flag) { serverAdminLabel.setVisible(flag); diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java index ae93a865..3606baf8 100644 --- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java +++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java @@ -29,7 +29,7 @@ public class DVMPackagesBar extends DataMenuBar { }); } public void Mark() { - setIcon(Utils_.getIcon(DVMPackageDBTable.filterMyOnly ? "/icons/Pick.png" : "/icons/NotPick.png")); + setIcon(Utils_.getIcon(DVMPackageDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png")); } }); add(new MenuBarButton() { @@ -44,7 +44,7 @@ public class DVMPackagesBar extends DataMenuBar { }); } public void Mark() { - setIcon(Utils_.getIcon(DVMPackageDBTable.filterActive ? "/icons/Pick.png" : "/icons/NotPick.png")); + setIcon(Utils_.getIcon(DVMPackageDBTable.filterActive ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png")); } }); } diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.form b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.form index 1716718e..8d4c75c9 100644 --- a/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.form +++ b/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.form @@ -82,8 +82,8 @@ - - + + @@ -185,7 +185,7 @@ - + @@ -199,7 +199,7 @@ - + @@ -214,8 +214,8 @@ - - + + diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsFields.form b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsFields.form index 16accb11..9ca44067 100644 --- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsFields.form +++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/UI/SapforSettingsFields.form @@ -49,8 +49,8 @@ - - + + @@ -62,8 +62,8 @@ - - + + @@ -86,8 +86,8 @@ - - + + @@ -99,8 +99,8 @@ - - + + diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/AddSapforPackageMenu.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/AddSapforPackageMenu.java index 137cb6fa..e40b7535 100644 --- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/AddSapforPackageMenu.java +++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/AddSapforPackageMenu.java @@ -2,7 +2,7 @@ package _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI; import Common.Visual.Menus.VisualiserMenu; public class AddSapforPackageMenu extends VisualiserMenu { public AddSapforPackageMenu() { - super("", "/icons/RedAdd.png"); + super("", "/Common/icons/RedAdd.png"); // addPasses(PassCode_2021.AddSapforPackage,PassCode_2021.CloneSapforPackage); } } diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java index 1f2f85f5..084fc6c9 100644 --- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java +++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackagesBar.java @@ -30,7 +30,7 @@ public class SapforPackagesBar extends DataMenuBar { }); } public void Mark() { - setIcon(Utils_.getIcon(SapforPackageDBTable.filterMyOnly ? "/icons/Pick.png" : "/icons/NotPick.png")); + setIcon(Utils_.getIcon(SapforPackageDBTable.filterMyOnly ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png")); } }); add(new MenuBarButton() { @@ -45,7 +45,7 @@ public class SapforPackagesBar extends DataMenuBar { }); } public void Mark() { - setIcon(Utils_.getIcon(SapforPackageDBTable.filterActive ? "/icons/Pick.png" : "/icons/NotPick.png")); + setIcon(Utils_.getIcon(SapforPackageDBTable.filterActive ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png")); } }); } diff --git a/src/_VisualDVM/Visual/Menus/AttachementsMenu.java b/src/_VisualDVM/Visual/Menus/AttachementsMenu.java index 615bdec9..fb0a0187 100644 --- a/src/_VisualDVM/Visual/Menus/AttachementsMenu.java +++ b/src/_VisualDVM/Visual/Menus/AttachementsMenu.java @@ -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 diff --git a/src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsMenuBar.java b/src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsMenuBar.java index ad3257c2..6380589c 100644 --- a/src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsMenuBar.java +++ b/src/_VisualDVM/Visual/Menus/CredentialsBar/CredentialsMenuBar.java @@ -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 diff --git a/src/_VisualDVM/Visual/Menus/FileMenuBar/FileMenuBar.java b/src/_VisualDVM/Visual/Menus/FileMenuBar/FileMenuBar.java index 5a025830..8e955549 100644 --- a/src/_VisualDVM/Visual/Menus/FileMenuBar/FileMenuBar.java +++ b/src/_VisualDVM/Visual/Menus/FileMenuBar/FileMenuBar.java @@ -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()); } }); diff --git a/src/_VisualDVM/Visual/Menus/FileMenuBar/FileSettingsMenu.java b/src/_VisualDVM/Visual/Menus/FileMenuBar/FileSettingsMenu.java index f8ae8738..bfc072f6 100644 --- a/src/_VisualDVM/Visual/Menus/FileMenuBar/FileSettingsMenu.java +++ b/src/_VisualDVM/Visual/Menus/FileMenuBar/FileSettingsMenu.java @@ -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) { diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/GlobalCleaningMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/GlobalCleaningMenu.java index ae45f8e8..96e909aa 100644 --- a/src/_VisualDVM/Visual/Menus/MainMenuBar/GlobalCleaningMenu.java +++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/GlobalCleaningMenu.java @@ -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); diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java index 9710c1f0..4d1173cd 100644 --- a/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java +++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/LastOpenedProjectsMenu.java @@ -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) { diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java index 8217c5aa..2d57e9e1 100644 --- a/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java +++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java @@ -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(); diff --git a/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java b/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java index a1a12271..7d33d1e9 100644 --- a/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java +++ b/src/_VisualDVM/Visual/Menus/MainMenuBar/VisualiserSettingsMenu/VisualiserSettingsMenu.java @@ -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", diff --git a/src/_VisualDVM/Visual/Menus/ProjectFilesMenu.java b/src/_VisualDVM/Visual/Menus/ProjectFilesMenu.java index cec69c44..2db35903 100644 --- a/src/_VisualDVM/Visual/Menus/ProjectFilesMenu.java +++ b/src/_VisualDVM/Visual/Menus/ProjectFilesMenu.java @@ -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(); diff --git a/src/_VisualDVM/Visual/Menus/ProjectMenuBar/FilesOperationsMenu.java b/src/_VisualDVM/Visual/Menus/ProjectMenuBar/FilesOperationsMenu.java index b3ce8242..6018aaa9 100644 --- a/src/_VisualDVM/Visual/Menus/ProjectMenuBar/FilesOperationsMenu.java +++ b/src/_VisualDVM/Visual/Menus/ProjectMenuBar/FilesOperationsMenu.java @@ -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"); } } diff --git a/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java b/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java index f7fb71a6..b726c0f4 100644 --- a/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java +++ b/src/_VisualDVM/Visual/Menus/ProjectMenuBar/ProjectSettingsMenu.java @@ -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) { diff --git a/src/_VisualDVM/Visual/Menus/SelectionTreeMenu.java b/src/_VisualDVM/Visual/Menus/SelectionTreeMenu.java index ce696e3b..93d522c9 100644 --- a/src/_VisualDVM/Visual/Menus/SelectionTreeMenu.java +++ b/src/_VisualDVM/Visual/Menus/SelectionTreeMenu.java @@ -19,7 +19,7 @@ public abstract class SelectionTreeMenu extends GraphMenu { 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 { } }); 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) { diff --git a/src/_VisualDVM/Visual/Menus/VersionsMenu.java b/src/_VisualDVM/Visual/Menus/VersionsMenu.java index acc3f080..403ea2b0 100644 --- a/src/_VisualDVM/Visual/Menus/VersionsMenu.java +++ b/src/_VisualDVM/Visual/Menus/VersionsMenu.java @@ -15,10 +15,10 @@ public class VersionsMenu extends GraphMenu { 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 { 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(); diff --git a/src/_VisualDVM/Visual/Windows/CallbackForm.form b/src/_VisualDVM/Visual/Windows/CallbackForm.form index 06672d0a..3d742ce8 100644 --- a/src/_VisualDVM/Visual/Windows/CallbackForm.form +++ b/src/_VisualDVM/Visual/Windows/CallbackForm.form @@ -164,11 +164,11 @@ - + - + @@ -178,11 +178,11 @@ - + - + diff --git a/src/_VisualDVM/Visual/Windows/ComparisonForm.form b/src/_VisualDVM/Visual/Windows/ComparisonForm.form index ab5c52ae..86524d35 100644 --- a/src/_VisualDVM/Visual/Windows/ComparisonForm.form +++ b/src/_VisualDVM/Visual/Windows/ComparisonForm.form @@ -27,7 +27,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -67,7 +67,7 @@ - + diff --git a/src/_VisualDVM/Visual/Windows/CopyProjectFields.form b/src/_VisualDVM/Visual/Windows/CopyProjectFields.form index 2141752c..a3c7c65a 100644 --- a/src/_VisualDVM/Visual/Windows/CopyProjectFields.form +++ b/src/_VisualDVM/Visual/Windows/CopyProjectFields.form @@ -38,7 +38,7 @@ - + @@ -59,8 +59,8 @@ - - + + diff --git a/src/_VisualDVM/Visual/Windows/FileForm.form b/src/_VisualDVM/Visual/Windows/FileForm.form index 7565a060..53142c89 100644 --- a/src/_VisualDVM/Visual/Windows/FileForm.form +++ b/src/_VisualDVM/Visual/Windows/FileForm.form @@ -164,7 +164,7 @@ - + diff --git a/src/_VisualDVM/Visual/Windows/FunctionsForm.form b/src/_VisualDVM/Visual/Windows/FunctionsForm.form index c401ea7a..944879a4 100644 --- a/src/_VisualDVM/Visual/Windows/FunctionsForm.form +++ b/src/_VisualDVM/Visual/Windows/FunctionsForm.form @@ -139,12 +139,12 @@ - + - + @@ -155,12 +155,12 @@ - + - + @@ -171,12 +171,12 @@ - + - + @@ -187,12 +187,12 @@ - + - + @@ -229,12 +229,12 @@ - + - + @@ -245,12 +245,12 @@ - + - + diff --git a/src/_VisualDVM/Visual/Windows/MainForm.java b/src/_VisualDVM/Visual/Windows/MainForm.java index 45644fcb..a1ef3979 100644 --- a/src/_VisualDVM/Visual/Windows/MainForm.java +++ b/src/_VisualDVM/Visual/Windows/MainForm.java @@ -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); } diff --git a/src/_VisualDVM/Visual/Windows/ProjectForm.form b/src/_VisualDVM/Visual/Windows/ProjectForm.form index 55a7ffcf..c9a84c10 100644 --- a/src/_VisualDVM/Visual/Windows/ProjectForm.form +++ b/src/_VisualDVM/Visual/Windows/ProjectForm.form @@ -139,7 +139,7 @@ - + @@ -154,7 +154,7 @@ - + diff --git a/src/_VisualDVM/Visual/Windows/ProjectForm.java b/src/_VisualDVM/Visual/Windows/ProjectForm.java index a8e11cf2..da6f5d13 100644 --- a/src/_VisualDVM/Visual/Windows/ProjectForm.java +++ b/src/_VisualDVM/Visual/Windows/ProjectForm.java @@ -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); } diff --git a/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.form b/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.form index 49449de7..9d1fd0a5 100644 --- a/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.form +++ b/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.form @@ -32,7 +32,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -60,7 +60,7 @@ - + @@ -72,7 +72,7 @@ - + diff --git a/src/_VisualDVM/Visual/Windows/VariantsForm.java b/src/_VisualDVM/Visual/Windows/VariantsForm.java index 0f37f19e..8fd0ec30 100644 --- a/src/_VisualDVM/Visual/Windows/VariantsForm.java +++ b/src/_VisualDVM/Visual/Windows/VariantsForm.java @@ -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() { diff --git a/src/icons/Apply.png b/src/icons/Apply.png deleted file mode 100644 index ca28b678f66f00f58f46116b4cc7e5007b4053d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2248 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 U!;M<3SO5S307*qoM6N<$f>er%cmMzZ diff --git a/src/icons/Delete.png b/src/icons/Delete.png deleted file mode 100644 index 91e050702f4f7fe84b64a50fc3b9b3063233f965..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1745 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 eG5){nzX1T<`^8KX0TA{80000FDO diff --git a/src/icons/ExpandDown.png b/src/icons/ExpandDown.png deleted file mode 100644 index 2077df97e9b5e514c021c537e09d54fa7834f0fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1570 zcmV+-2Hp9IP)P000>X1^@s6#OZ}&00009a7bBm000XU z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ>s7XXYRCwBamRnO3XBfv{w4b1@?ewbCUi1^x>2OH0A%Ttx;$g7Eu!==Src;l- zQK@!>I$9$hdWAp^+G+*jfm0G3VWxsMr_FH_a@gG*Hk)h`_zeDg5fcePFMjjxzR%(R zJkQ1ML$q3|ZZjHCEc5=HETd2?A}7np=5ol%awTyY zIiIhxm;EhPD@)T|Un!Lhq)LRMn#jI=Z6D9g%>{C@jGQb(k|apk?3MzXg`{j28A(DZ zHV>=K7VhY1+fg1J(P&h46xB#Z$L>yK-X<0^8Du1>Qsu^q%g>wNB}syq$-Ir1U@#h< zHa9DYMx&}DN@YDcb?WE#P&f=Jn?)*}u85SoDOZ}!<*LrIt&Et-AeBx-%4QLcL~!QJ zsRIf{Jt0~xwe8WwBfFT9kV>bJOr?+(MWn?HL{Ws8DUr?P;AY$y7#M)v;XqE#Rcsqc zrb;<7QU+7zDR*mY^LEnHLx0P7Ja5vX2qBR`GL=Fqoql`1BPYvPc>WxR4jqEUVnI%p ztL!C8aY7=2v?#*s^P{)7r=AQBUcMOTcnFCEctL=WNNh<)lCbdnIl8;MVX<0~k)-$f zmh*5tkKeBh4Uw_&@o8QV!14SCNsA(E3k&G(?#8^ug0v{U*Eh~_;CLRqAi!ucT8a6w znc;XIv3R@&UJ#H-Cc*JMlBpCdRx445!eOjNA{ZMVvyqFJe!Ub32Em3x2(l~!!C-|T%VISWfnKi%P187e z@+A8E`*GsL3D7hRy}^J;G`eLR8ww#1WO4cOZ&%3SBi%dyU4Ho{6b{252*Bs}!|U@^ z@CO12g~J#hAIFg+M{w-eG4%BGK(E&$yt-QB@ALcN4+Ox5LRel|K~E3eNVHmNyWXI8 z23fWw;`4#=c&hMty$G@_Mn^}{+uMuLu`vW$79Ov+#W_$0*+BaH z`#N5(tiT@#R03UYH(YKv+zeAW8IK2xOG{upo~rw@Z@D0UAb{nSSNQ3t{!XQ`fe?*G zRoC3CB*Qm{AG;X_UZ1xT=yW;ZaK6Loa)I%9;B>jF?j25NMbP6dP2$d~J_7l@8qu1BcTEyC{o_LRH_Ej(xR@T z>8^(J=g$q^x_xWjU^IB{|8+lPFd96!Z{N0DxNvUh@Zs*JmKOCkm8$W*d)NO10P-== UT%p_06aWAK07*qoM6N<$f?ea|hyVZp diff --git a/src/icons/Filter.png b/src/icons/Filter.png deleted file mode 100644 index 241849464e8e0dfed5ffba0f2c933d43c4637fec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1625 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 Z4*-=sO*iW5015yA002ovPDHLkV1lFn2`B&n diff --git a/src/icons/Left.png b/src/icons/Left.png deleted file mode 100644 index 7f143b74016001a0a4b56f6c0d7424302d84882b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2316 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 Hu0mjfTDTi= diff --git a/src/icons/RedAdd.png b/src/icons/RedAdd.png deleted file mode 100644 index 40e46fabad13c6c430e76c1c49175d14e236ffeb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1507 zcmV<91swW`P)P000^Y1^@s6LVfqm00009a7bBm008E& z008E&0oiqwRsaA1AY({UO#lFTB>(_`g8%^e{{R4h=l}px2mk>USO5SzmjD14Z`WEM zkN^M$X-PyuRCwBimdkD&*Aa%lQ|FxSnIS2Yx*6t(5kyH7i4X#3;lz++2mxfT`~Z1~ zY_rK5c$EN&w+@g1$s&s&*2|v`{@#)Oxs7Jyfgx1jipo1sKp0&v^6% zfXZM~4SNH`;KN$=x0x4$2%P|rixLyd9ByQcbL_kcf@3397)EfT1JtaJB231NQkAM! z+QH+%+(>|sa-UehM6x)Cz z)$D7xX}`T66#+9O%h>Aod3fh8NsX{w#cL1)9FAQvlFWA8=C)-RrkYA?imJjL`z~_o z6gY>=bIO}Hx%c@wDpg*++AzvX4j2yswZ?Jc97&b`)QO~qQ^lV=1s{EcI7hX($l7PW zCJhFN2-NlegFKh69X!rJ%ybA;YD96w5b)z;u)M5kWrZid`#tsA8ZJc8`n6ooATp|% zoEdotggtwF)oznrzC!Lj!3Q}14LTh7;k9d`8v|UPL#m%S1>B{WWC{3fq zo#P1JBh%B!2Oms&C*+r}kc$w#hfDupb93{PD%C$rB2-mHm1?S#03(DZhZk87=Kc4_ zLik?W3$+qN48aa6qH#0LIg2)+p=N*`x#m&xw8M?d-%ggA!dz7iRep&uFwA;Utxw%H36DP?3 zc^Soi8sQJYIoBA%5!!9!;6dEs!?>9lNU01!iE7iOb-ld^9O6Btb37^vw#u^X?A?pJ z_a5|maPT0lJVQb#CHM-!w&R+y{X#y~(H$=$lqs?Dw9haltSlu?OyGX_1L%yw?c3xV z17a3Mf=9O(-kTQd>yQvgo13g$y~dy{@jjqx#9h0f)yA$~#g>+6ZS--i7A`a?6sU`$ zsp5Y^vW&Xl=kA|AN1r@lSKa~)%Q9L;fzAINy>b;>TqL$yxVhuayfOpls0RaVaS>7) z4RJA|k00~zU;YYr>n0PO&d%1e9P+^i_RR%sVS%)|O8EF=Pc#jQ-41WF#WMP5v@rjq~^^W}MQ*?fwYJHtDCH#pKxV`&eFyO@n;*KAOPN(U5 z_iQtYKvj{x_=0$Mm26^sgcBkXB3t(#P+^p2{$Y3i5xzRJ9!eyax^5y z!gss(V!wae=I3wN`SaJ)_3KOhqWo*(4gYF`0TUY=be!YA0{|$CrHr!Q8*2an002ov JPDHLkV1f!C(Z~P* diff --git a/src/icons/RedPick.png b/src/icons/RedPick.png deleted file mode 100644 index 482ffbd088aa29a692a464d1a09ae58772f31f6d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1157 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 QPXGV_07*qoM6N<$f^AnaH~;_u diff --git a/src/icons/Save.png b/src/icons/Save.png deleted file mode 100644 index 239f6449a3c78f349101aefce625459795c9e76e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 616 zcmV-u0+;=XP)P000>X1ONa4Zs1Mm00009a7bBm000fw z000fw0YWI7cmMzZAY({UO#lFTB>(_`g8%^e{{R4h=l}px2mk>USO5SzmjD14Z`WEM zkN^My?ny*JRCwBylD%#eF%(9R?K?laAz>APgeWLUMZuO7h&n=%(o)gz2uKu&j*^a7 zNPz?`1&VlpNHkC&A@Kx|L?U6cGh_QwjAv(OcN@mC$F}bAcfV^J<$phc=^b8{E}na> z_2KBrwThAw3n(xna`O58mb+`O%LnuE7y+j787N9bu@sCb$#Gopjtd^42hFx*O4zrL z`C=hBr9~9QAmohMVh7=vPn_X)HB*#$D?9}OROujaIC3QY3kotKO2hzokS?@MOA&;e zjEoGMQtcuZ_Ir(pAwyEn$xtE|lVWJ+{@1}r0X2x#vm;;H#FPzX!20wJWjN%vGdFxjBc>G%|vkm0Fe!#v=I zh@u2MmxE-MA)##FNAIOYsud4CqU4)YV0$I8RWA&Yh~F68jSz`FGN(!5>m}%REP;x= zMZ~erwhk|!0GHcQ|_mF4HZJ_k&Le# zp_gD3Gb$d~u?QIsF_PZ8Nsa@-csxFMt*evf^xpt|0eA>~5sDN50000J%=P)(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ-#Ysd#RCwAaQVVMn5tI@1 zvXF{eL_smAxNs4)2rP2ZqTJLbFs4n0FMKqVHc3-cI(NKx=HC0Yn5cedc{qz7GmP_= zIeqN{d0d?TaBDuNkI4)nIYt`qPPIMR@wlu2Kmd`<>Gv&KQI3taPn62ibYt7NO^6`4 zL|9MM8y&K;yh!#8y=&3Vyq=>#nG%cSm_A&$x#Htn5hV1>KM)D56fu0h6EJ&q;AyeB z)&uL}@Y3GcvNAqfR#p4Q6E;z%ue`i|{M@G3ZUXe1{mG1~1Q@ffvYhJgJ*&UPpWixp zK6QT#M?kZpeFQAYCwBH7s!I=OPIWat@K}QY8mS&r!L8DcL_kob4DuS9KtP zm2?fC*l-UfF|3eat%s!njBH)a>SCw;@R$0Dpn#A?z8uBZ5aLDmWe(mMT4;=D)_3smhRAvwOwsnmE0OZ9d%JgY~f z*fz3faK0&w$e%h;4GSAHo;k2k??j-hn*v2E{|}0-!yg!Aj9GI09stL4zf~M?x`Y4# N002ovPDHLkV1ft<`R@P# diff --git a/src/icons/Settings.png b/src/icons/Settings.png deleted file mode 100644 index c06751ccde8ac830935a68e18f16e0e854dc3342..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2226 zcmV;j2u=5iP)P000>X1^@s6#OZ}&00009a7bBm000XU z000XU0RWnu7ytkPHfcjcP*7-ZbZ>KLZ*U+R`sCEkzKl)gj5&q@hY_5?)@_euSf22N!q0z{yc?Q2YY_Kym8e z5Fvwu2%hQO!{u_psMvL#(bD64NQRTZj^-}DnS22ry9f-;mW=gZvQj}U-ZdMsK&I8^7~DvX`q=iOIa1zHe9?#8l zIdj{WK8#5tSWjC^Yprjsy}rHm3BF~iR4U_n;fN3tDFo7SkWwIoL- zAs^&Aj^wGQo_hL&58h9?QcBnJJlPJ~w1eP5VQVb{2#3QU1VO9C+`fIR+`i4^)D(q6 zfo``;$aT@%1P};>9IRO>MKYO`(vcxo2!ZE?ZL_h3Qu@LDheIKHy&j2VlEcqG&nK5I zF*BP*NWtE{)09gkGMNmWZioL|{hUN1j@AYt1Xzo)mS`+)<$$FE-}7lS8Z_!#Y}INM zHwtK@IeP2`QbQ?5M|N@Y)GLG>hq+viaLDDr!U9h|Igb>A>6vL}vRO8ZMXHrD_4*dg zW`k%fh7f|mB)&%{Xj8A(*f~7ROg77%)m5UA2+uwD9Jg-Y=D#Z|luIRAtpLyWcNGKGh+}fm3Z&0mNSy(*86Z7+IY;5rE zJMVDw=1q*zghC+%f>D)PL)e4bl4A*giZ4lRW zsaC5z_UNOyp%5##ZZWrSj-|Jjs8uT@5=o4;bUPh-y&k!_Iqt9BWA*E=FyG9|u&d!~~l**-T#xdB5<2qC-WiDR4$oRxK>2#X>dY<|D{dm4lskDi7B$HE9 ze1HFb#>U54{$iO{vw^jSjY5I9-+r5TBF>919jCfgWA*D*lv0C9zF|``mBNqsTwh)$ zkxcR4dw=Eh=^t_U$n)H~b(7iI9MNbL0IfA6qoeE^9bx763XbdW*}t!_d-oLGPL~_k zuaih7wx0t?5U9SQUa#}mW7CXhGF-X*FWNziGiR3g?CNJs?cPnfQeo}>eb(02$mjEH zZPl5XnZ@%w+ChMjlB-v*GPGj{Cto?m(2ikxy&hn3!D5Y}QmJs^!g&rZ9->q(Bcy{X z1jUUa@kA1144cIw^Gr!3P<% z14hzmGNJH*ra^$U7Na$e>ryF~(OOg3C^9>nrBo_ov_dIGIP8(l<`7b%wW3m~Fg`Is zBod+DQxAc(0`A_uOTXV|YH|{#1_c~PQZAPPi`JT0EJn3jBb7>0+AIQsTCK+V`a0Gc zq~kD~ou#;0q+Bj@u-h4cXsxMlZSk|8zm6j%tyYUzEY6LuzC^1*XPy^EYmJZ+Yc=Ka zCaSM+9f!h30XO90x-Plg9P>}k3_U)9taebOx;zE(q%N zE&1VxA2K|=lRbO(kWP>C%E^;tvsspwmbklikJ4s|Xly`X-}7j9ItVE_bYPKJfAT6b z*(@Q~rBo{Mw}1SdAn4HUbfgf%y2j|%>gt`s$De+T(i)6qe*Zj&78e*F8{>yBzf90> z@zs}K5d;C+Xu91lkw}ESd#8Ev*fG-SH0$@*_~g@nvV7w@Qc9wcC?JbUsitEss#2|X z=N{kpYGz`BSUk?^-8(EVf5A{Pf$KN~tv2iVb*#0-<1vC(fbaSI;K*SnCnw40^PKzh zU#QfojEs(uNFxVf^z@UC5qjirfrQG74Lh4UAF`|+iZ-UN(z zSh^&W$!Bx9+_907(Vf2U+pzEBY^xSW$_HY?7>mWy@Av6+I#@G!Q(7xgZ#3#RZe0Ip zqfof`9ZB?%C4k7cokDy!^c&UkE$aeX4?F%h0HDKfLz%MAFaQ7m07*qoM6N<$g1~z( AxBvhE diff --git a/src/icons/UnselectAll.png b/src/icons/UnselectAll.png deleted file mode 100644 index 9195e0a01bb73fe434036f61819f7195398e4fe5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 514 zcmV+d0{#7oP)(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ-h)G02RCwA6!kfr3OUuJu98F-`cD% z<#nQ)PU<#F?&V2C!H3u5T#{G0|0dtHyv;0I9FXPj03bG@2z^wPivR!s07*qoM6N<$ Ef_&J}r2qf`