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 ca28b678..00000000 Binary files a/src/icons/Apply.png and /dev/null differ diff --git a/src/icons/CollapseUp.png b/src/icons/CollapseUp.png deleted file mode 100644 index fae3cebc..00000000 Binary files a/src/icons/CollapseUp.png and /dev/null differ diff --git a/src/icons/Delete.png b/src/icons/Delete.png deleted file mode 100644 index 91e05070..00000000 Binary files a/src/icons/Delete.png and /dev/null differ diff --git a/src/icons/Edit.png b/src/icons/Edit.png deleted file mode 100644 index 8962c2d4..00000000 Binary files a/src/icons/Edit.png and /dev/null differ diff --git a/src/icons/Excel.png b/src/icons/Excel.png deleted file mode 100644 index d7103d50..00000000 Binary files a/src/icons/Excel.png and /dev/null differ diff --git a/src/icons/ExpandDown.png b/src/icons/ExpandDown.png deleted file mode 100644 index 2077df97..00000000 Binary files a/src/icons/ExpandDown.png and /dev/null differ diff --git a/src/icons/Filter.png b/src/icons/Filter.png deleted file mode 100644 index 24184946..00000000 Binary files a/src/icons/Filter.png and /dev/null differ diff --git a/src/icons/GCOV.PNG b/src/icons/GCOV.png similarity index 100% rename from src/icons/GCOV.PNG rename to src/icons/GCOV.png diff --git a/src/icons/GlobalStatistic.png b/src/icons/GlobalStatistic.png deleted file mode 100644 index e95b3b3a..00000000 Binary files a/src/icons/GlobalStatistic.png and /dev/null differ diff --git a/src/icons/Left.png b/src/icons/Left.png deleted file mode 100644 index 7f143b74..00000000 Binary files a/src/icons/Left.png and /dev/null differ diff --git a/src/icons/NotPick.png b/src/icons/NotPick.png deleted file mode 100644 index f2f5ff92..00000000 Binary files a/src/icons/NotPick.png and /dev/null differ diff --git a/src/icons/Pick.png b/src/icons/Pick.png deleted file mode 100644 index f84616de..00000000 Binary files a/src/icons/Pick.png and /dev/null differ diff --git a/src/icons/RedAdd.png b/src/icons/RedAdd.png deleted file mode 100644 index 40e46fab..00000000 Binary files a/src/icons/RedAdd.png and /dev/null differ diff --git a/src/icons/RedPick.png b/src/icons/RedPick.png deleted file mode 100644 index 482ffbd0..00000000 Binary files a/src/icons/RedPick.png and /dev/null differ diff --git a/src/icons/Right.png b/src/icons/Right.png deleted file mode 100644 index 99fb6a26..00000000 Binary files a/src/icons/Right.png and /dev/null differ diff --git a/src/icons/Save.png b/src/icons/Save.png deleted file mode 100644 index 239f6449..00000000 Binary files a/src/icons/Save.png and /dev/null differ diff --git a/src/icons/SelectAll.png b/src/icons/SelectAll.png deleted file mode 100644 index 35e6367e..00000000 Binary files a/src/icons/SelectAll.png and /dev/null differ diff --git a/src/icons/Settings.png b/src/icons/Settings.png deleted file mode 100644 index c06751cc..00000000 Binary files a/src/icons/Settings.png and /dev/null differ diff --git a/src/icons/UnselectAll.png b/src/icons/UnselectAll.png deleted file mode 100644 index 9195e0a0..00000000 Binary files a/src/icons/UnselectAll.png and /dev/null differ