no message
This commit is contained in:
@@ -1,14 +1,14 @@
|
||||
package _VisualDVM.Visual.Windows;
|
||||
import Common.Utils.Utils_;
|
||||
import Common.Visual.UI_;
|
||||
import _VisualDVM.Global;
|
||||
import _VisualDVM.Visual.Menus.MainMenuBar.MainWindow;
|
||||
import _VisualDVM.Visual.UI;
|
||||
import Common.Visual.Windows.Form;
|
||||
import _VisualDVM.Global;
|
||||
import _VisualDVM.Passes.PassCode;
|
||||
import _VisualDVM.TestingSystem.Common.Group.Group;
|
||||
import _VisualDVM.TestingSystem.Common.Test.Test;
|
||||
import _VisualDVM.Passes.PassCode;
|
||||
import _VisualDVM.Visual.Interface.*;
|
||||
import _VisualDVM.Visual.Menus.MainMenuBar.MainWindow;
|
||||
import _VisualDVM.Visual.UI;
|
||||
|
||||
import javax.swing.*;
|
||||
import java.awt.*;
|
||||
@@ -26,6 +26,15 @@ public class MainForm extends Form implements MainWindow {
|
||||
private JPanel Content;
|
||||
private JTabbedPane globalTabs;
|
||||
private JPanel mainPanel;
|
||||
public MainForm() {
|
||||
mainPanel.add(UI.mainMenuBar, BorderLayout.NORTH);
|
||||
InstallWelcomePanel();
|
||||
InstallCallbackPanel();
|
||||
InstallTestsPanel();
|
||||
InstallTestingPanel();
|
||||
ShowUpdatesIcon();
|
||||
//----------------------
|
||||
}
|
||||
@Override
|
||||
protected JPanel getMainPanel() {
|
||||
return Content;
|
||||
@@ -62,15 +71,6 @@ public class MainForm extends Form implements MainWindow {
|
||||
//--
|
||||
Global.FinishApplication();
|
||||
}
|
||||
public MainForm() {
|
||||
mainPanel.add(UI.mainMenuBar, BorderLayout.NORTH);
|
||||
InstallWelcomePanel();
|
||||
InstallCallbackPanel();
|
||||
InstallTestsPanel();
|
||||
InstallTestingPanel();
|
||||
ShowUpdatesIcon();
|
||||
//----------------------
|
||||
}
|
||||
private void InstallWelcomePanel() {
|
||||
globalTabs.insertTab("Начало работы",
|
||||
null,
|
||||
@@ -80,7 +80,7 @@ public class MainForm extends Form implements MainWindow {
|
||||
}
|
||||
private void InstallProjectPanel() {
|
||||
globalTabs.insertTab("", null,
|
||||
(projectForm = new ProjectForm()).content,Global.mainModule.getProject().description, 0);
|
||||
(projectForm = new ProjectForm()).content, Global.mainModule.getProject().description, 0);
|
||||
globalTabs.setTabComponentAt(0,
|
||||
new TabToolBar("Проект: " + Global.mainModule.getProject().name, PassCode.CloseCurrentProject) {
|
||||
@Override
|
||||
@@ -127,26 +127,26 @@ public class MainForm extends Form implements MainWindow {
|
||||
testingForm.getContent(),
|
||||
"Система тестирования", 3);
|
||||
}
|
||||
/*
|
||||
public void ShowCurrentCompiler() {
|
||||
String res = "";
|
||||
if (Current.HasMachine()) {
|
||||
res += "@" + Current.getMachine().getURL();
|
||||
if (Current.HasUser()) {
|
||||
res = Current.getUser().login + res;
|
||||
} else res = "?" + res;
|
||||
/*
|
||||
public void ShowCurrentCompiler() {
|
||||
String res = "";
|
||||
if (Current.HasMachine()) {
|
||||
res += "@" + Current.getMachine().getURL();
|
||||
if (Current.HasUser()) {
|
||||
res = Current.getUser().login + res;
|
||||
} else res = "?" + res;
|
||||
|
||||
if (Current.HasCompiler() && Current.getCompiler().type.equals(CompilerType.dvm)) {
|
||||
res += "DVM система: " + Current.getCompiler().description;
|
||||
} else {
|
||||
res += "DVM система: ?";
|
||||
}
|
||||
} else {
|
||||
res += "?@?";
|
||||
}
|
||||
globalTabs.setTitleAt(2, res);
|
||||
}
|
||||
*/
|
||||
if (Current.HasCompiler() && Current.getCompiler().type.equals(CompilerType.dvm)) {
|
||||
res += "DVM система: " + Current.getCompiler().description;
|
||||
} else {
|
||||
res += "DVM система: ?";
|
||||
}
|
||||
} else {
|
||||
res += "?@?";
|
||||
}
|
||||
globalTabs.setTitleAt(2, res);
|
||||
}
|
||||
*/
|
||||
@Override
|
||||
public void ShowCheckedTestsCount() {
|
||||
int res = 0;
|
||||
@@ -218,7 +218,7 @@ public class MainForm extends Form implements MainWindow {
|
||||
public void SwitchTestingTabs(boolean flag) {
|
||||
globalTabs.setEnabledAt(2, flag);
|
||||
globalTabs.setEnabledAt(3, flag);
|
||||
// globalTabs.setEnabledAt(4, flag);
|
||||
// globalTabs.setEnabledAt(4, flag);
|
||||
}
|
||||
@Override
|
||||
public TestingWindow getTestingWindow() {
|
||||
|
||||
Reference in New Issue
Block a user