рефакторинг. вынес часть иконок в общую часть
This commit is contained in:
@@ -36,7 +36,7 @@
|
||||
</constraints>
|
||||
<properties>
|
||||
<enabled value="true"/>
|
||||
<icon value="icons/LastOpened.png"/>
|
||||
<icon value="Common/icons/Search.png"/>
|
||||
<text value=""/>
|
||||
</properties>
|
||||
</component>
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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 + "%");
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -17,7 +17,7 @@ public class PublishComponentsServer extends RepositoryServerSSHPass {
|
||||
}
|
||||
@Override
|
||||
public String getIconPath() {
|
||||
return "/icons/Publish.png";
|
||||
return "/Common/icons/Publish.png";
|
||||
}
|
||||
//1. остановить сервер.
|
||||
//2. заменить файл сервера на компонент визуализатора. переименовать его.
|
||||
|
||||
@@ -17,7 +17,7 @@ public class PublishTestingServer extends RepositoryServerSSHPass {
|
||||
}
|
||||
@Override
|
||||
public String getIconPath() {
|
||||
return "/icons/Publish.png";
|
||||
return "/Common/icons/Publish.png";
|
||||
}
|
||||
//1. остановить сервер.
|
||||
//2. заменить файл сервера на компонент визуализатора. переименовать его.
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -18,7 +18,7 @@ public class StartSelectedDVMConfigurations extends PublishServerObject<TestingS
|
||||
}
|
||||
@Override
|
||||
public String getIconPath() {
|
||||
return "/icons/Start.png";
|
||||
return "/Common/icons/BlueStart.png";
|
||||
}
|
||||
//--
|
||||
@Override
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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"));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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());
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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"));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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"));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
});
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -22,7 +22,7 @@ public class ProjectFilesMenu extends GraphMenu {
|
||||
public ProjectFilesMenu(StyledTree tree) {
|
||||
super(tree, "подпапки");
|
||||
addSeparator();
|
||||
JMenuItem m = new VisualiserMenuItem("Открыть в проводнике...", "/icons/Explorer.png");
|
||||
JMenuItem m = new VisualiserMenuItem("Открыть в проводнике...", "/Common/icons/Explorer.png");
|
||||
m.addActionListener(
|
||||
new AbstractAction() {
|
||||
@Override
|
||||
@@ -36,7 +36,7 @@ public class ProjectFilesMenu extends GraphMenu {
|
||||
});
|
||||
add(m);
|
||||
addSeparator();
|
||||
add(new PassesSubMenu("Добавить", "/icons/RedAdd.png",
|
||||
add(new PassesSubMenu("Добавить", "/Common/icons/RedAdd.png",
|
||||
PassCode.AddFile,
|
||||
PassCode.CreateEmptyDirectory,
|
||||
PassCode.ImportFiles));
|
||||
@@ -44,7 +44,7 @@ public class ProjectFilesMenu extends GraphMenu {
|
||||
add(new PassesSubMenu("Переименовать", "/icons/Menu/Rename.png",
|
||||
PassCode.RenameFile,
|
||||
PassCode.RenameDirectory));
|
||||
add(new VisualiserMenuItem("Удалить текущий проект", "/icons/Delete.png") {
|
||||
add(new VisualiserMenuItem("Удалить текущий проект", "/Common/icons/Delete.png") {
|
||||
{
|
||||
addActionListener(e -> {
|
||||
if (Global.mainModule.HasProject()) {
|
||||
@@ -56,10 +56,10 @@ public class ProjectFilesMenu extends GraphMenu {
|
||||
});
|
||||
addSeparator();
|
||||
m_multiselection = new VisualiserMenuItem("Массовый режим работы с файлами");
|
||||
m_multiselection.setIcon(Utils_.getIcon(Global.files_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
|
||||
m_multiselection.setIcon(Utils_.getIcon(Global.files_multiselection ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
|
||||
m_multiselection.addActionListener(e -> {
|
||||
Global.files_multiselection = !Global.files_multiselection;
|
||||
m_multiselection.setIcon(Utils_.getIcon(Global.files_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
|
||||
m_multiselection.setIcon(Utils_.getIcon(Global.files_multiselection ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
|
||||
Global.mainModule.getProject().SelectAllFiles(false);
|
||||
Global.mainModule.getUI().getMainWindow().getProjectWindow().RefreshProjectFiles();
|
||||
//-
|
||||
@@ -67,13 +67,13 @@ public class ProjectFilesMenu extends GraphMenu {
|
||||
add(m_multiselection);
|
||||
addSeparator();
|
||||
//-
|
||||
m_select_all = new StableMenuItem("Выбрать всё", "/icons/SelectAll.png");
|
||||
m_select_all = new StableMenuItem("Выбрать всё", "/Common/icons/SelectAll.png");
|
||||
m_select_all.addActionListener(e -> {
|
||||
Global.mainModule.getProject().SelectAllFiles(true);
|
||||
tree.updateUI();
|
||||
});
|
||||
add(m_select_all);
|
||||
m_unselect_all = new StableMenuItem("Отменить всё", "/icons/UnselectAll.png");
|
||||
m_unselect_all = new StableMenuItem("Отменить всё", "/Common/icons/UnselectAll.png");
|
||||
m_unselect_all.addActionListener(e -> {
|
||||
Global.mainModule.getProject().SelectAllFiles(false);
|
||||
tree.updateUI();
|
||||
|
||||
@@ -2,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");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -19,7 +19,7 @@ public abstract class SelectionTreeMenu extends GraphMenu<DataTree> {
|
||||
super(tree_in, "");
|
||||
addSeparator();
|
||||
//-
|
||||
m_select_all = new StableMenuItem("Выбрать всё", "/icons/SelectAll.png");
|
||||
m_select_all = new StableMenuItem("Выбрать всё", "/Common/icons/SelectAll.png");
|
||||
m_select_all.addActionListener(new ActionListener() {
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
@@ -28,7 +28,7 @@ public abstract class SelectionTreeMenu extends GraphMenu<DataTree> {
|
||||
}
|
||||
});
|
||||
add(m_select_all);
|
||||
m_unselect_all = new StableMenuItem("Отменить всё", "/icons/UnselectAll.png");
|
||||
m_unselect_all = new StableMenuItem("Отменить всё", "/Common/icons/UnselectAll.png");
|
||||
m_unselect_all.addActionListener(new ActionListener() {
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
|
||||
@@ -15,10 +15,10 @@ public class VersionsMenu extends GraphMenu<DataTree> {
|
||||
add(Global.mainModule.getPass(PassCode.DeleteLonelyM).createMenuItem());
|
||||
addSeparator();
|
||||
m_multiselection = new VisualiserMenuItem("Массовый режим работы с версиями");
|
||||
m_multiselection.setIcon(Utils_.getIcon(Global.versions_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
|
||||
m_multiselection.setIcon(Utils_.getIcon(Global.versions_multiselection ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
|
||||
m_multiselection.addActionListener(e -> {
|
||||
Global.versions_multiselection = !Global.versions_multiselection;
|
||||
m_multiselection.setIcon(Utils_.getIcon(Global.versions_multiselection ? "/icons/Pick.png" : "/icons/NotPick.png"));
|
||||
m_multiselection.setIcon(Utils_.getIcon(Global.versions_multiselection ? "/Common/icons/Pick.png" : "/Common/icons/NotPick.png"));
|
||||
Global.mainModule.getRoot().SelectAllVersions(false);
|
||||
Global.mainModule.getUI().getVersionsWindow().getVersionsForm().getTree().updateUI();
|
||||
});
|
||||
@@ -26,13 +26,13 @@ public class VersionsMenu extends GraphMenu<DataTree> {
|
||||
addSeparator();
|
||||
add(Global.mainModule.getPass(PassCode.DeleteVersion).createMenuItem());
|
||||
//-
|
||||
m_select_all = new StableMenuItem("Выбрать всё, кроме резервных копий", "/icons/SelectAll.png");
|
||||
m_select_all = new StableMenuItem("Выбрать всё, кроме резервных копий", "/Common/icons/SelectAll.png");
|
||||
m_select_all.addActionListener(e -> {
|
||||
Global.mainModule.getRoot().SelectAllVersions(true);
|
||||
tree.updateUI();
|
||||
});
|
||||
add(m_select_all);
|
||||
m_unselect_all = new StableMenuItem("Отменить всё", "/icons/UnselectAll.png");
|
||||
m_unselect_all = new StableMenuItem("Отменить всё", "/Common/icons/UnselectAll.png");
|
||||
m_unselect_all.addActionListener(e -> {
|
||||
Global.mainModule.getRoot().SelectAllVersions(false);
|
||||
tree.updateUI();
|
||||
|
||||
@@ -164,11 +164,11 @@
|
||||
<properties>
|
||||
<font name="Times New Roman" size="12" style="2"/>
|
||||
<horizontalAlignment value="10"/>
|
||||
<icon value="icons/NotPick.png"/>
|
||||
<icon value="Common/icons/NotPick.png"/>
|
||||
<maximumSize width="65" height="30"/>
|
||||
<minimumSize width="65" height="30"/>
|
||||
<preferredSize width="65" height="30"/>
|
||||
<selectedIcon value="icons/Pick.png"/>
|
||||
<selectedIcon value="Common/icons/Pick.png"/>
|
||||
<text value="свои"/>
|
||||
<verticalTextPosition value="0"/>
|
||||
</properties>
|
||||
@@ -178,11 +178,11 @@
|
||||
<properties>
|
||||
<font name="Times New Roman" size="12" style="2"/>
|
||||
<horizontalAlignment value="10"/>
|
||||
<icon value="icons/NotPick.png"/>
|
||||
<icon value="Common/icons/NotPick.png"/>
|
||||
<maximumSize width="100" height="30"/>
|
||||
<minimumSize width="100" height="30"/>
|
||||
<preferredSize width="100" height="30"/>
|
||||
<selectedIcon value="icons/Pick.png"/>
|
||||
<selectedIcon value="Common/icons/Pick.png"/>
|
||||
<text value="открытые"/>
|
||||
<verticalTextPosition value="0"/>
|
||||
</properties>
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
<constraints/>
|
||||
<properties>
|
||||
<borderPainted value="false"/>
|
||||
<icon value="icons/Apply.png"/>
|
||||
<icon value="Common/icons/Apply.png"/>
|
||||
<maximumSize width="30" height="30"/>
|
||||
<minimumSize width="30" height="30"/>
|
||||
<preferredSize width="30" height="30"/>
|
||||
@@ -39,7 +39,7 @@
|
||||
<constraints/>
|
||||
<properties>
|
||||
<borderPainted value="false"/>
|
||||
<icon value="icons/Close.png"/>
|
||||
<icon value="Common/icons/Close.png"/>
|
||||
<maximumSize width="30" height="30"/>
|
||||
<minimumSize width="30" height="30"/>
|
||||
<preferredSize width="30" height="30"/>
|
||||
@@ -55,7 +55,7 @@
|
||||
<constraints/>
|
||||
<properties>
|
||||
<borderPainted value="false"/>
|
||||
<icon value="icons/Prev.png"/>
|
||||
<icon value="Common/icons/Previous.png"/>
|
||||
<maximumSize width="30" height="30"/>
|
||||
<minimumSize width="30" height="30"/>
|
||||
<preferredSize width="30" height="30"/>
|
||||
@@ -67,7 +67,7 @@
|
||||
<constraints/>
|
||||
<properties>
|
||||
<borderPainted value="false"/>
|
||||
<icon value="icons/Next.png"/>
|
||||
<icon value="Common/icons/Next.png"/>
|
||||
<maximumSize width="30" height="30"/>
|
||||
<minimumSize width="30" height="30"/>
|
||||
<preferredSize width="30" height="30"/>
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
</constraints>
|
||||
<properties>
|
||||
<enabled value="true"/>
|
||||
<icon value="icons/LastOpened.png"/>
|
||||
<icon value="Common/icons/Search.png"/>
|
||||
<text value=""/>
|
||||
<toolTipText value="Обзор..."/>
|
||||
</properties>
|
||||
@@ -59,8 +59,8 @@
|
||||
<properties>
|
||||
<font name="Times New Roman" size="16" style="2"/>
|
||||
<horizontalAlignment value="10"/>
|
||||
<icon value="icons/NotPick.png"/>
|
||||
<selectedIcon value="icons/Pick.png"/>
|
||||
<icon value="Common/icons/NotPick.png"/>
|
||||
<selectedIcon value="Common/icons/Pick.png"/>
|
||||
<text value=""/>
|
||||
<verticalTextPosition value="0"/>
|
||||
</properties>
|
||||
|
||||
@@ -164,7 +164,7 @@
|
||||
<grid id="b52a6" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
|
||||
<margin top="0" left="0" bottom="0" right="0"/>
|
||||
<constraints>
|
||||
<tabbedpane title="GCOV" icon="icons/GCOV.PNG">
|
||||
<tabbedpane title="GCOV" icon="icons/GCOV.png">
|
||||
<tooltip value="GCOV"/>
|
||||
</tabbedpane>
|
||||
</constraints>
|
||||
|
||||
@@ -139,12 +139,12 @@
|
||||
<properties>
|
||||
<font name="Times New Roman" size="12" style="2"/>
|
||||
<horizontalAlignment value="10"/>
|
||||
<icon value="icons/NotPick.png"/>
|
||||
<icon value="Common/icons/NotPick.png"/>
|
||||
<maximumSize width="115" height="30"/>
|
||||
<minimumSize width="115" height="30"/>
|
||||
<preferredSize width="115" height="30"/>
|
||||
<selected value="true"/>
|
||||
<selectedIcon value="icons/Pick.png"/>
|
||||
<selectedIcon value="Common/icons/Pick.png"/>
|
||||
<text value="стандартные"/>
|
||||
<toolTipText value="Отображать стандартные процедуры"/>
|
||||
<verticalTextPosition value="0"/>
|
||||
@@ -155,12 +155,12 @@
|
||||
<properties>
|
||||
<font name="Times New Roman" size="12" style="2"/>
|
||||
<horizontalAlignment value="10"/>
|
||||
<icon value="icons/NotPick.png"/>
|
||||
<icon value="Common/icons/NotPick.png"/>
|
||||
<maximumSize width="85" height="30"/>
|
||||
<minimumSize width="85" height="30"/>
|
||||
<preferredSize width="85" height="30"/>
|
||||
<selected value="true"/>
|
||||
<selectedIcon value="icons/Pick.png"/>
|
||||
<selectedIcon value="Common/icons/Pick.png"/>
|
||||
<text value="внешние"/>
|
||||
<toolTipText value="Отображать внешние процедуры"/>
|
||||
<verticalTextPosition value="0"/>
|
||||
@@ -171,12 +171,12 @@
|
||||
<properties>
|
||||
<font name="Times New Roman" size="12" style="2"/>
|
||||
<horizontalAlignment value="10"/>
|
||||
<icon value="icons/NotPick.png"/>
|
||||
<icon value="Common/icons/NotPick.png"/>
|
||||
<maximumSize width="124" height="30"/>
|
||||
<minimumSize width="124" height="30"/>
|
||||
<preferredSize width="124" height="30"/>
|
||||
<selected value="true"/>
|
||||
<selectedIcon value="icons/Pick.png"/>
|
||||
<selectedIcon value="Common/icons/Pick.png"/>
|
||||
<text value="недостижимые"/>
|
||||
<toolTipText value="Отображать недостижимые процедуры"/>
|
||||
<verticalTextPosition value="0"/>
|
||||
@@ -187,12 +187,12 @@
|
||||
<properties>
|
||||
<font name="Times New Roman" size="12" style="2"/>
|
||||
<horizontalAlignment value="10"/>
|
||||
<icon value="icons/NotPick.png"/>
|
||||
<icon value="Common/icons/NotPick.png"/>
|
||||
<maximumSize width="154" height="30"/>
|
||||
<minimumSize width="154" height="30"/>
|
||||
<preferredSize width="154" height="30"/>
|
||||
<selected value="false"/>
|
||||
<selectedIcon value="icons/Pick.png"/>
|
||||
<selectedIcon value="Common/icons/Pick.png"/>
|
||||
<text value="смежные c текущей: "/>
|
||||
<toolTipText value="будут отображены только процедуры смежные с текущей"/>
|
||||
<verticalTextPosition value="0"/>
|
||||
@@ -229,12 +229,12 @@
|
||||
<properties>
|
||||
<font name="Times New Roman" size="12" style="2"/>
|
||||
<horizontalAlignment value="10"/>
|
||||
<icon value="icons/NotPick.png"/>
|
||||
<icon value="Common/icons/NotPick.png"/>
|
||||
<maximumSize width="91" height="30"/>
|
||||
<minimumSize width="91" height="30"/>
|
||||
<preferredSize width="91" height="30"/>
|
||||
<selected value="true"/>
|
||||
<selectedIcon value="icons/Pick.png"/>
|
||||
<selectedIcon value="Common/icons/Pick.png"/>
|
||||
<text value="входящие"/>
|
||||
<toolTipText value="Отображать входящие в текущую процедуру вызовы"/>
|
||||
<verticalTextPosition value="0"/>
|
||||
@@ -245,12 +245,12 @@
|
||||
<properties>
|
||||
<font name="Times New Roman" size="12" style="2"/>
|
||||
<horizontalAlignment value="10"/>
|
||||
<icon value="icons/NotPick.png"/>
|
||||
<icon value="Common/icons/NotPick.png"/>
|
||||
<maximumSize width="97" height="30"/>
|
||||
<minimumSize width="97" height="30"/>
|
||||
<preferredSize width="97" height="30"/>
|
||||
<selected value="true"/>
|
||||
<selectedIcon value="icons/Pick.png"/>
|
||||
<selectedIcon value="Common/icons/Pick.png"/>
|
||||
<text value="исходящие"/>
|
||||
<toolTipText value="Отображать исходящие из текущей процедуры вызовы"/>
|
||||
<verticalTextPosition value="0"/>
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -139,7 +139,7 @@
|
||||
</grid>
|
||||
<grid id="3cb4d" binding="analysisFormPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
|
||||
<constraints>
|
||||
<tabbedpane title="" icon="icons/Metrics.png">
|
||||
<tabbedpane title="" icon="Common/icons/Metrics.png">
|
||||
<tooltip value="Анализ"/>
|
||||
</tabbedpane>
|
||||
</constraints>
|
||||
@@ -154,7 +154,7 @@
|
||||
<grid id="59473" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
|
||||
<margin top="0" left="0" bottom="0" right="0"/>
|
||||
<constraints>
|
||||
<tabbedpane title="" icon="icons/Log.png">
|
||||
<tabbedpane title="" icon="Common/icons/Log.png">
|
||||
<tooltip value="Журнал"/>
|
||||
</tabbedpane>
|
||||
</constraints>
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
<constraints/>
|
||||
<properties>
|
||||
<borderPainted value="false"/>
|
||||
<icon value="icons/Apply.png"/>
|
||||
<icon value="Common/icons/Apply.png"/>
|
||||
<maximumSize width="30" height="30"/>
|
||||
<minimumSize width="30" height="30"/>
|
||||
<preferredSize width="30" height="30"/>
|
||||
@@ -44,7 +44,7 @@
|
||||
<constraints/>
|
||||
<properties>
|
||||
<borderPainted value="false"/>
|
||||
<icon value="icons/Close.png"/>
|
||||
<icon value="Common/icons/Close.png"/>
|
||||
<maximumSize width="30" height="30"/>
|
||||
<minimumSize width="30" height="30"/>
|
||||
<preferredSize width="30" height="30"/>
|
||||
@@ -60,7 +60,7 @@
|
||||
<constraints/>
|
||||
<properties>
|
||||
<borderPainted value="false"/>
|
||||
<icon value="icons/Prev.png"/>
|
||||
<icon value="Common/icons/Previous.png"/>
|
||||
<maximumSize width="30" height="30"/>
|
||||
<minimumSize width="30" height="30"/>
|
||||
<preferredSize width="30" height="30"/>
|
||||
@@ -72,7 +72,7 @@
|
||||
<constraints/>
|
||||
<properties>
|
||||
<borderPainted value="false"/>
|
||||
<icon value="icons/Next.png"/>
|
||||
<icon value="Common/icons/Next.png"/>
|
||||
<maximumSize width="30" height="30"/>
|
||||
<minimumSize width="30" height="30"/>
|
||||
<preferredSize width="30" height="30"/>
|
||||
|
||||
@@ -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() {
|
||||
|
||||
Reference in New Issue
Block a user