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

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

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