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

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

View File

@@ -19,7 +19,7 @@ public abstract class AddObjectPass<D extends DBObject> extends ObjectPass<D> {
}
@Override
public String getIconPath() {
return "/icons/RedAdd.png";
return "/Common/icons/RedAdd.png";
}
@Override
protected void body() throws Exception {

View File

@@ -6,7 +6,7 @@ public abstract class DeleteObjectPass<D extends DBObject> extends ObjectPass<D>
}
@Override
public String getIconPath() {
return "/icons/Delete.png";
return "/Common/icons/Delete.png";
}
@Override
protected boolean canStart(Object... args) throws Exception {

View File

@@ -6,7 +6,7 @@ public abstract class EditObjectPass<D extends DBObject> extends ObjectPass<D> {
}
@Override
public String getIconPath() {
return "/icons/Edit.png";
return "/Common/icons/Edit.png";
}
@Override
protected boolean canStart(Object... args) throws Exception {

View File

@@ -47,7 +47,7 @@ public class ColumnFilter {
//--
dataSet.getUi().control.getColumnModel().getColumn(columnIndex).setHeaderRenderer((table, value, isSelected, hasFocus, row, column1) -> new JLabel() {
{
setIcon(Utils_.getIcon("/icons/Filter.png"));
setIcon(Utils_.getIcon("/Common/icons/Filter.png"));
setForeground(dataSet.getUi().control.getTableHeader().getForeground());
setBackground(dataSet.getUi().control.getTableHeader().getBackground());
setFont(dataSet.getUi().control.getTableHeader().getFont());

View File

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

View File

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

Before

Width:  |  Height:  |  Size: 861 B

After

Width:  |  Height:  |  Size: 861 B

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

View File

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

Before

Width:  |  Height:  |  Size: 931 B

After

Width:  |  Height:  |  Size: 931 B

View File

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

View File

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

View File

@@ -36,7 +36,7 @@
</constraints>
<properties>
<enabled value="true"/>
<icon value="icons/LastOpened.png"/>
<icon value="Common/icons/Search.png"/>
<text value=""/>
</properties>
</component>

View File

@@ -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

View File

@@ -188,8 +188,8 @@
<properties>
<font name="Times New Roman" size="16" style="2"/>
<horizontalAlignment value="0"/>
<icon value="icons/NotPick.png"/>
<selectedIcon value="icons/Pick.png"/>
<icon value="Common/icons/NotPick.png"/>
<selectedIcon value="Common/icons/Pick.png"/>
<text value="кубические решётки"/>
<toolTipText value="матрица с одинаковым размером измерений"/>
</properties>

View File

@@ -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 + "%");

View File

@@ -8,7 +8,7 @@ import _VisualDVM.Repository.Subscribes.Subscriber;
public class AddSubscriber extends ComponentsRepositoryPass<Subscriber> {
@Override
public String getIconPath() {
return "/icons/RedAdd.png";
return "/Common/icons/RedAdd.png";
}
@Override
public String getButtonText() {

View File

@@ -10,7 +10,7 @@ import java.util.LinkedHashMap;
public class ApplyBugReportSettings extends Pass<BugReport> {
@Override
public String getIconPath() {
return "/icons/Apply.png";
return "/Common/icons/Apply.png";
}
@Override
public String getButtonText() {

View File

@@ -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() {

View File

@@ -10,7 +10,7 @@ import java.util.Vector;
public class ApplyProfile extends Pass<SapforProfile> {
@Override
public String getIconPath() {
return "/icons/Apply.png";
return "/Common/icons/Apply.png";
}
@Override
public String getButtonText() {

View File

@@ -9,11 +9,11 @@ import javax.swing.*;
public class CloseCurrentFile extends Pass<DBProjectFile> {
@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() {

View File

@@ -13,11 +13,11 @@ public class CloseCurrentProject extends Pass<db_project_info> {
}
@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 {

View File

@@ -19,7 +19,7 @@ public class Compile extends Pass<db_project_info> {
}
@Override
public String getIconPath() {
return "/icons/Start.png";
return "/Common/icons/BlueStart.png";
}
@Override
public String getButtonText() {

View File

@@ -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 {

View File

@@ -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() {

View File

@@ -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() {

View File

@@ -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) {

View File

@@ -9,7 +9,7 @@ import _VisualDVM.ProjectData.Files.DBProjectFile;
public class DeleteFile extends ChangeFilePass<DBProjectFile> {
@Override
public String getIconPath() {
return "/icons/Delete.png";
return "/Common/icons/Delete.png";
}
@Override
protected boolean canStart(Object... args) {

View File

@@ -9,7 +9,7 @@ import java.util.Vector;
public class DeleteSelectedCompilationTasks extends Pass<Vector<CompilationTask>> {
@Override
public String getIconPath() {
return "/icons/Delete.png";
return "/Common/icons/Delete.png";
}
@Override
public String getButtonText() {

View File

@@ -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 {

View File

@@ -8,7 +8,7 @@ import java.util.Vector;
public class DeleteSelectedRunTasks extends Pass<Vector<RunTask>> {
@Override
public String getIconPath() {
return "/icons/Delete.png";
return "/Common/icons/Delete.png";
}
@Override
public String getButtonText() {

View File

@@ -15,7 +15,7 @@ public class DeleteSelectedVersions extends Pass<Vector<db_project_info>> {
}
@Override
public String getIconPath() {
return "/icons/Delete.png";
return "/Common/icons/Delete.png";
}
@Override
protected boolean canStart(Object... args) throws Exception {

View File

@@ -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 {

View File

@@ -11,7 +11,7 @@ public class DeleteVersion extends Pass<db_project_info> {
boolean current;
@Override
public String getIconPath() {
return "/icons/Delete.png";
return "/Common/icons/Delete.png";
}
@Override
protected boolean canStart(Object... args) {

View File

@@ -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() {

View File

@@ -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() {

View File

@@ -41,7 +41,7 @@ public class ExportDVMPackageToExcel extends Pass<Vector<DVMPackage>> {
//--
@Override
public String getIconPath() {
return "/icons/Excel.png";
return "/Common/icons/Excel.png";
}
@Override
public String getButtonText() {

View File

@@ -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() {

View File

@@ -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() {

View File

@@ -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() {

View File

@@ -130,7 +130,7 @@ public class OpenCurrentProject extends Pass<db_project_info> {
Global.mainModule.getUI().getVersionsWindow().BlockVariants();
//-
Global.mainModule.getUI().getMainWindow().ShowProject();
//криво. но при тихом режиме открытие файлов все равно не понадобится.
//криво. но при тихом режиме открытие файлов все равно не понадобится. LastOpenedProjectsMenu
Global.mainModule.getPass(PassCode.OpenCurrentFile).Do(target.getLastOpenedFile());
}
@Override

View File

@@ -15,7 +15,7 @@ import java.util.Date;
public class PublishBugReport extends Pass<BugReport> {
@Override
public String getIconPath() {
return "/icons/Publish.png";
return "/Common/icons/Publish.png";
}
@Override
public String getButtonText() {

View File

@@ -21,7 +21,7 @@ public class PublishComponent extends ComponentsRepositoryPass<Component> {
PublishForm f = new PublishForm();
@Override
public String getIconPath() {
return "/icons/Publish.png";
return "/Common/icons/Publish.png";
}
@Override
public String getButtonText() {

View File

@@ -17,7 +17,7 @@ public class PublishComponentsServer extends RepositoryServerSSHPass {
}
@Override
public String getIconPath() {
return "/icons/Publish.png";
return "/Common/icons/Publish.png";
}
//1. остановить сервер.
//2. заменить файл сервера на компонент визуализатора. переименовать его.

View File

@@ -17,7 +17,7 @@ public class PublishTestingServer extends RepositoryServerSSHPass {
}
@Override
public String getIconPath() {
return "/icons/Publish.png";
return "/Common/icons/Publish.png";
}
//1. остановить сервер.
//2. заменить файл сервера на компонент визуализатора. переименовать его.

View File

@@ -16,7 +16,7 @@ public class Run extends Pass<db_project_info> {
Vector<RunTask> runTasks;
@Override
public String getIconPath() {
return "/icons/GreenStart.png";
return "/Common/icons/GreenStart.png";
}
@Override
public String getButtonText() {

View File

@@ -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() {

View File

@@ -6,7 +6,7 @@ import org.apache.commons.io.FileUtils;
public class Save extends Pass<DBProjectFile> {
@Override
public String getIconPath() {
return "/icons/Save.png";
return "/Common/icons/Save.png";
}
@Override
public String getButtonText() {

View File

@@ -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() {

View File

@@ -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() {

View File

@@ -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() {

View File

@@ -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() {

View File

@@ -11,7 +11,7 @@ public class SaveProfile extends AddObjectPass<SapforProfile> {
}
@Override
public String getIconPath() {
return "/icons/Save.png";
return "/Common/icons/Save.png";
}
@Override
protected boolean canStart(Object... args) throws Exception {

View File

@@ -17,7 +17,7 @@ public class ShowComponentChangesLog extends ComponentsRepositoryPass<Component>
File res;
@Override
public String getIconPath() {
return "/icons/Log.png";
return "/Common/icons/Log.png";
}
@Override
public String getButtonText() {

View File

@@ -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() {

View File

@@ -18,7 +18,7 @@ public class StartSelectedDVMConfigurations extends PublishServerObject<TestingS
}
@Override
public String getIconPath() {
return "/icons/Start.png";
return "/Common/icons/BlueStart.png";
}
//--
@Override

View File

@@ -19,7 +19,7 @@ public class StartSelectedSAPFORConfigurations extends PublishServerObject<Testi
}
@Override
public String getIconPath() {
return "/icons/Start.png";
return "/Common/icons/BlueStart.png";
}
@Override
protected boolean canStart(Object... args) throws Exception {

View File

@@ -5,7 +5,7 @@ import _VisualDVM.Passes.SSH.RepositoryServerSSHPass;
public class StartTestingServer extends RepositoryServerSSHPass {
@Override
public String getIconPath() {
return "/icons/GreenStart.png";
return "/Common/icons/GreenStart.png";
}
@Override
protected String getServerHomeName() {

View File

@@ -37,10 +37,10 @@ public class SapforAnalysis extends SapforPass {
}
@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
protected boolean isGoodCode() {

View File

@@ -8,7 +8,7 @@ public class DeleteServerObject<S extends RepositoryServer, D extends DBObject>
}
@Override
public String getIconPath() {
return "/icons/Delete.png";
return "/Common/icons/Delete.png";
}
@Override
protected boolean canStart(Object... args) throws Exception {

View File

@@ -21,7 +21,7 @@ public class DeleteServerObjects<S extends RepositoryServer, D extends DBObject>
//---
@Override
public String getIconPath() {
return "/icons/Delete.png";
return "/Common/icons/Delete.png";
}
@Override
public String getButtonText() {

View File

@@ -10,7 +10,7 @@ public class EditServerObject<S extends RepositoryServer, D extends DBObject> ex
//--
@Override
public String getIconPath() {
return "/icons/Edit.png";
return "/Common/icons/Edit.png";
}
//--
@Override

View File

@@ -12,7 +12,7 @@ public class PublishServerObject<S extends RepositoryServer, D extends DBObject>
}
@Override
public String getIconPath() {
return "/icons/RedAdd.png";
return "/Common/icons/RedAdd.png";
}
//--
@Override

View File

@@ -10,7 +10,7 @@ public abstract class AbortTestingPackage extends TestingSystemPass<TestingPacka
TestingPackageToKill packageToKill = null;
@Override
public String getIconPath() {
return "/icons/Ban.PNG";
return "/Common/icons/Ban.png";
}
@Override
public String getButtonText() {

View File

@@ -21,7 +21,7 @@ public abstract class SaveCurrentConfiguration<C extends Configuration, S extend
}
@Override
public String getIconPath() {
return "/icons/Save.png";
return "/Common/icons/Save.png";
}
public abstract Current currentName();
@Override

View File

@@ -16,7 +16,7 @@ public abstract class StartTestingPackage<P extends TestingPackage> extends Publ
}
@Override
public String getIconPath() {
return "/icons/Start.png";
return "/Common/icons/BlueStart.png";
}
protected abstract Current getCurrentName();
@Override

View File

@@ -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) {

View File

@@ -78,8 +78,8 @@
<properties>
<font name="Times New Roman" size="16" style="2"/>
<horizontalAlignment value="0"/>
<icon value="icons/NotPick.png"/>
<selectedIcon value="icons/Pick.png"/>
<icon value="Common/icons/NotPick.png"/>
<selectedIcon value="Common/icons/Pick.png"/>
<text value=""/>
<toolTipText value="Будет ли включена рассылка для этого пользователя"/>
</properties>

View File

@@ -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"));
}
});
}

View File

@@ -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);
}
}

View File

@@ -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);
}
}

View File

@@ -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());

View File

@@ -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());
}

View File

@@ -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);

View File

@@ -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"));
}
});
}

View File

@@ -82,8 +82,8 @@
<properties>
<font name="Times New Roman" size="16" style="2"/>
<horizontalAlignment value="0"/>
<icon value="icons/NotPick.png"/>
<selectedIcon value="icons/Pick.png"/>
<icon value="Common/icons/NotPick.png"/>
<selectedIcon value="Common/icons/Pick.png"/>
<text value="кубические решётки"/>
<toolTipText value="матрица с одинаковым размером измерений"/>
</properties>
@@ -185,7 +185,7 @@
</constraints>
<properties>
<borderPainted value="false"/>
<icon value="icons/Delete.png"/>
<icon value="Common/icons/Delete.png"/>
<maximumSize width="30" height="30"/>
<minimumSize width="30" height="30"/>
<preferredSize width="30" height="30"/>
@@ -199,7 +199,7 @@
</constraints>
<properties>
<borderPainted value="false"/>
<icon value="icons/Delete.png"/>
<icon value="Common/icons/Delete.png"/>
<maximumSize width="30" height="30"/>
<minimumSize width="30" height="30"/>
<preferredSize width="30" height="30"/>
@@ -214,8 +214,8 @@
<properties>
<font name="Times New Roman" size="16" style="2"/>
<horizontalAlignment value="0"/>
<icon value="icons/NotPick.png"/>
<selectedIcon value="icons/Pick.png"/>
<icon value="Common/icons/NotPick.png"/>
<selectedIcon value="Common/icons/Pick.png"/>
<text value="Is_DVM_STAT"/>
<toolTipText value="сбор статистики DVM после запуска"/>
</properties>

View File

@@ -49,8 +49,8 @@
</constraints>
<properties>
<font name="Times New Roman" size="14" style="2"/>
<icon value="icons/NotPick.png"/>
<selectedIcon value="icons/Pick.png"/>
<icon value="Common/icons/NotPick.png"/>
<selectedIcon value="Common/icons/Pick.png"/>
<text value="Свободный выходной стиль"/>
</properties>
</component>
@@ -62,8 +62,8 @@
</constraints>
<properties>
<font name="Times New Roman" size="14" style="2"/>
<icon value="icons/NotPick.png"/>
<selectedIcon value="icons/Pick.png"/>
<icon value="Common/icons/NotPick.png"/>
<selectedIcon value="Common/icons/Pick.png"/>
<text value="Сохранять SPF директивы"/>
</properties>
</component>
@@ -86,8 +86,8 @@
</constraints>
<properties>
<font name="Times New Roman" size="14" style="2"/>
<icon value="icons/NotPick.png"/>
<selectedIcon value="icons/Pick.png"/>
<icon value="Common/icons/NotPick.png"/>
<selectedIcon value="Common/icons/Pick.png"/>
<text value="Оптимизация теневых обменов"/>
</properties>
</component>
@@ -99,8 +99,8 @@
</constraints>
<properties>
<font name="Times New Roman" size="14" style="2"/>
<icon value="icons/NotPick.png"/>
<selectedIcon value="icons/Pick.png"/>
<icon value="Common/icons/NotPick.png"/>
<selectedIcon value="Common/icons/Pick.png"/>
<text value="Учитывать DVM директивы"/>
</properties>
</component>

View File

@@ -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);
}
}

View File

@@ -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"));
}
});
}

View File

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

Some files were not shown because too many files have changed in this diff Show More