Menu
▾
▴
[Acmcontester-developers] SF.net SVN: acmcontester: [171] WebEditor/src/edu/lnu/FireFly/WebEditor/GUI /Dialogs
|
From: <se...@us...> - 2008-05-26 21:47:32
|
Revision: 171
http://acmcontester.svn.sourceforge.net/acmcontester/?rev=171&view=rev
Author: sem62
Date: 2008-05-26 14:47:38 -0700 (Mon, 26 May 2008)
Log Message:
-----------
Added tabbedPane onto CompileQPropertyDlg.
Modified Paths:
--------------
WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/CompileQ/CompileQPropertiestsDlg.java
WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/PropertyDlg.java
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/CompileQ/CompileQPropertiestsDlg.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/CompileQ/CompileQPropertiestsDlg.java 2008-05-26 19:15:22 UTC (rev 170)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/CompileQ/CompileQPropertiestsDlg.java 2008-05-26 21:47:38 UTC (rev 171)
@@ -3,9 +3,21 @@
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import javax.swing.BorderFactory;
+import javax.swing.GroupLayout;
import javax.swing.JButton;
+import javax.swing.JCheckBox;
import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTabbedPane;
+import javax.swing.JTextField;
+import javax.swing.LayoutStyle;
import javax.swing.ScrollPaneConstants;
+import javax.swing.WindowConstants;
+import javax.swing.GroupLayout.Alignment;
+import javax.swing.LayoutStyle.ComponentPlacement;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.table.DefaultTableColumnModel;
@@ -25,29 +37,30 @@
private static final long serialVersionUID = 1961383080461718171L;
- private javax.swing.JCheckBox sameAsTitleCheckBox;
- private javax.swing.JCheckBox oneAnswerCheckBox;
- private javax.swing.JComboBox programmingLanguage;
- private javax.swing.JLabel titleLabel;
- private javax.swing.JLabel programminglanguageLabel;
- private javax.swing.JPanel generalPanel;
- private javax.swing.JPanel captionPanel;
- private javax.swing.JPanel partsPanel;
- private javax.swing.JScrollPane jScrollPane1;
+ private JCheckBox sameAsTitleCheckBox;
+ private JCheckBox oneAnswerCheckBox;
+ private JComboBox programmingLanguage;
+ private JLabel titleLabel;
+ private JLabel programminglanguageLabel;
+ private JPanel generalPanel;
+ private JPanel captionPanel;
+ private JPanel partsPanel;
+ private JPanel testingDataPanel;
+ private JScrollPane jScrollPane1;
private PartsTable partsTable;
- private javax.swing.JTextField titleTextField;
- private javax.swing.JTextField captionTextField;
- private javax.swing.JTextField questionTextField;
- private javax.swing.JButton editCaptionInHtmlBtn;
- private javax.swing.JButton editQuestionInHtmlBtn;
- private javax.swing.JButton editAnswerVariantInHtmlEditor;
- private javax.swing.JButton insertAnswerVariantBtn;
- private javax.swing.JButton deleteAnswerVariantBtn;
- private javax.swing.JButton moveUpAnswerVariantBtn;
- private javax.swing.JButton moveDownAnswerVariantBtn;
+ private JTextField titleTextField;
+ private JTextField captionTextField;
+ private JTextField questionTextField;
+ private JButton editCaptionInHtmlBtn;
+ private JButton editQuestionInHtmlBtn;
+ private JButton editAnswerVariantInHtmlEditor;
+ private JButton insertAnswerVariantBtn;
+ private JButton deleteAnswerVariantBtn;
+ private JButton moveUpAnswerVariantBtn;
+ private JButton moveDownAnswerVariantBtn;
private CompileQPartsTableModel compileQTableDataModel;
- private javax.swing.JTextField currentAnswerVariant;
+ private JTextField currentAnswerVariant;
private MultiLineTableCellEditor multiLineTableCellEditor = new MultiLineTableCellEditor();
private PartAttributesCellEditor partAttributesCellEditor = new PartAttributesCellEditor();
@@ -212,22 +225,25 @@
@Override
protected void initComponents() {
- setTitle("Propertiests...");
+ JTabbedPane tabbedPane = new JTabbedPane();
+ add(tabbedPane);
- generalPanel = new javax.swing.JPanel();
- titleLabel = new javax.swing.JLabel();
- programminglanguageLabel = new javax.swing.JLabel(
- "Programming language:");
- titleTextField = new javax.swing.JTextField();
- captionPanel = new javax.swing.JPanel();
- captionTextField = new javax.swing.JTextField();
- sameAsTitleCheckBox = new javax.swing.JCheckBox();
- questionTextField = new javax.swing.JTextField();
- oneAnswerCheckBox = new javax.swing.JCheckBox();
- partsPanel = new javax.swing.JPanel();
- jScrollPane1 = new javax.swing.JScrollPane();
- cancelButton = new javax.swing.JButton("Cancel");
- okButton = new javax.swing.JButton("Ok");
+ JPanel generalTab = new JPanel();
+
+ generalPanel = new JPanel();
+ titleLabel = new JLabel();
+ programminglanguageLabel = new JLabel("Programming language:");
+ titleTextField = new JTextField();
+ captionPanel = new JPanel();
+ captionTextField = new JTextField();
+ sameAsTitleCheckBox = new JCheckBox();
+ questionTextField = new JTextField();
+ oneAnswerCheckBox = new JCheckBox();
+ partsPanel = new JPanel();
+ testingDataPanel = new JPanel();
+ jScrollPane1 = new JScrollPane();
+ cancelButton = new JButton("Cancel");
+ okButton = new JButton("Ok");
editCaptionInHtmlBtn = new JButton("...");
editQuestionInHtmlBtn = new JButton("...");
editAnswerVariantInHtmlEditor = new JButton("HTML Editor");
@@ -243,7 +259,7 @@
moveDownAnswerVariantBtn.addActionListener(this);
moveUpAnswerVariantBtn.addActionListener(this);
- currentAnswerVariant = new javax.swing.JTextField();
+ currentAnswerVariant = new JTextField();
captionTextField.addActionListener(this);
cancelButton.addActionListener(this);
@@ -256,121 +272,87 @@
partsTable = new PartsTable();
- setDefaultCloseOperation(javax.swing.WindowConstants.HIDE_ON_CLOSE);
+ setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE);
- generalPanel.setBorder(javax.swing.BorderFactory
- .createTitledBorder("General"));
+ generalPanel.setBorder(BorderFactory.createTitledBorder("General"));
titleLabel.setText("Title");
- javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(
- generalPanel);
+ GroupLayout jPanel1Layout = new GroupLayout(generalPanel);
generalPanel.setLayout(jPanel1Layout);
+
jPanel1Layout.setHorizontalGroup(jPanel1Layout.createParallelGroup(
- javax.swing.GroupLayout.Alignment.LEADING).addGroup(
+ Alignment.LEADING).addGroup(
jPanel1Layout.createSequentialGroup().addContainerGap()
.addComponent(titleLabel)).addGroup(
jPanel1Layout.createSequentialGroup().addContainerGap()
+ .addComponent(titleTextField, GroupLayout.DEFAULT_SIZE,
+ 364, Short.MAX_VALUE).addContainerGap()));
+
+ jPanel1Layout.setVerticalGroup(jPanel1Layout.createParallelGroup(
+ Alignment.LEADING).addGroup(
+ jPanel1Layout.createSequentialGroup().addComponent(titleLabel)
+ .addPreferredGap(ComponentPlacement.RELATED,
+ GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(titleTextField,
- javax.swing.GroupLayout.DEFAULT_SIZE, 364,
- Short.MAX_VALUE).addContainerGap()));
- jPanel1Layout
- .setVerticalGroup(jPanel1Layout
- .createParallelGroup(
- javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(
- jPanel1Layout
- .createSequentialGroup()
- .addComponent(titleLabel)
- .addPreferredGap(
- javax.swing.LayoutStyle.ComponentPlacement.RELATED,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- Short.MAX_VALUE)
- .addComponent(
- titleTextField,
- javax.swing.GroupLayout.PREFERRED_SIZE,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- javax.swing.GroupLayout.PREFERRED_SIZE)
- .addContainerGap()));
+ GroupLayout.PREFERRED_SIZE,
+ GroupLayout.DEFAULT_SIZE,
+ GroupLayout.PREFERRED_SIZE).addContainerGap()));
- captionPanel.setBorder(javax.swing.BorderFactory
- .createTitledBorder("Caption"));
+ captionPanel.setBorder(BorderFactory.createTitledBorder("Caption"));
sameAsTitleCheckBox.setText("Some as the title");
- javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(
- captionPanel);
+ GroupLayout jPanel2Layout = new GroupLayout(captionPanel);
captionPanel.setLayout(jPanel2Layout);
- jPanel2Layout
- .setHorizontalGroup(jPanel2Layout
- .createParallelGroup(
- javax.swing.GroupLayout.Alignment.LEADING)
+ jPanel2Layout.setHorizontalGroup(jPanel2Layout.createParallelGroup(
+ Alignment.LEADING).addGroup(
+ jPanel2Layout.createSequentialGroup().addContainerGap()
.addGroup(
- jPanel2Layout
- .createSequentialGroup()
- .addContainerGap()
- .addGroup(
- jPanel2Layout
- .createParallelGroup(
- javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(
- sameAsTitleCheckBox))
- .addContainerGap(283, Short.MAX_VALUE))
- .addGroup(
- javax.swing.GroupLayout.Alignment.TRAILING,
- jPanel2Layout
- .createSequentialGroup()
- .addContainerGap()
- .addComponent(
- captionTextField,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- 370, Short.MAX_VALUE)
- .addPreferredGap(
- javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(
- editCaptionInHtmlBtn,
- javax.swing.GroupLayout.PREFERRED_SIZE,
- 30,
- javax.swing.GroupLayout.PREFERRED_SIZE)
- .addContainerGap()));
- jPanel2Layout
- .setVerticalGroup(jPanel2Layout
- .createParallelGroup(
- javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(
- jPanel2Layout
- .createSequentialGroup()
- .addComponent(sameAsTitleCheckBox)
- .addPreferredGap(
- javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addGroup(
- jPanel2Layout
- .createParallelGroup(
- javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(
- editCaptionInHtmlBtn,
- javax.swing.GroupLayout.PREFERRED_SIZE,
- 20,
- javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(
- captionTextField,
- javax.swing.GroupLayout.PREFERRED_SIZE,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- javax.swing.GroupLayout.PREFERRED_SIZE))
- .addContainerGap()));
+ jPanel2Layout.createParallelGroup(
+ Alignment.LEADING).addComponent(
+ sameAsTitleCheckBox)).addContainerGap(
+ 283, Short.MAX_VALUE))
+ .addGroup(
+ Alignment.TRAILING,
+ jPanel2Layout.createSequentialGroup().addContainerGap()
+ .addComponent(captionTextField,
+ GroupLayout.DEFAULT_SIZE, 370,
+ Short.MAX_VALUE).addPreferredGap(
+ LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(editCaptionInHtmlBtn,
+ GroupLayout.PREFERRED_SIZE, 30,
+ GroupLayout.PREFERRED_SIZE)
+ .addContainerGap()));
+ jPanel2Layout.setVerticalGroup(jPanel2Layout.createParallelGroup(
+ Alignment.LEADING).addGroup(
+ jPanel2Layout.createSequentialGroup().addComponent(
+ sameAsTitleCheckBox).addPreferredGap(
+ LayoutStyle.ComponentPlacement.RELATED).addGroup(
+ jPanel2Layout.createParallelGroup(Alignment.BASELINE)
+ .addComponent(editCaptionInHtmlBtn,
+ GroupLayout.PREFERRED_SIZE, 20,
+ GroupLayout.PREFERRED_SIZE)
+ .addComponent(captionTextField,
+ GroupLayout.PREFERRED_SIZE,
+ GroupLayout.DEFAULT_SIZE,
+ GroupLayout.PREFERRED_SIZE))
+ .addContainerGap()));
oneAnswerCheckBox.setText("Only one correct answer");
- partsPanel.setBorder(javax.swing.BorderFactory
+ partsPanel.setBorder(BorderFactory
.createTitledBorder("Variants of answer"));
+ testingDataPanel.setBorder(BorderFactory
+ .createTitledBorder("Input data / Valid respose"));
+
jScrollPane1.setViewportView(partsTable);
jScrollPane1
.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
- javax.swing.GroupLayout jPanel4Layout = new javax.swing.GroupLayout(
- partsPanel);
+ GroupLayout jPanel4Layout = new GroupLayout(partsPanel);
partsPanel.setLayout(jPanel4Layout);
jPanel4Layout.setHorizontalGroup(jPanel4Layout.createParallelGroup(
- javax.swing.GroupLayout.Alignment.TRAILING).addGroup(
+ GroupLayout.Alignment.TRAILING).addGroup(
jPanel4Layout.createSequentialGroup().addComponent(
moveUpAnswerVariantBtn).addContainerGap(10, 10)
.addComponent(moveDownAnswerVariantBtn)
@@ -381,23 +363,22 @@
editAnswerVariantInHtmlEditor)
.addContainerGap()).addGroup(
jPanel4Layout.createSequentialGroup().addContainerGap()
- .addComponent(jScrollPane1,
- javax.swing.GroupLayout.DEFAULT_SIZE, 364,
- Short.MAX_VALUE).addContainerGap()).addGroup(
- javax.swing.GroupLayout.Alignment.TRAILING,
- jPanel4Layout.createSequentialGroup().addContainerGap()
- .addComponent(programminglanguageLabel,
- javax.swing.GroupLayout.PREFERRED_SIZE,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- javax.swing.GroupLayout.PREFERRED_SIZE)
- .addContainerGap(10, 10).addComponent(
- programmingLanguage, 118, 118, 118)
- .addContainerGap()));
+ .addComponent(jScrollPane1, GroupLayout.DEFAULT_SIZE,
+ 364, Short.MAX_VALUE).addContainerGap())
+ .addGroup(
+ Alignment.TRAILING,
+ jPanel4Layout.createSequentialGroup().addContainerGap()
+ .addComponent(programminglanguageLabel,
+ GroupLayout.PREFERRED_SIZE,
+ GroupLayout.DEFAULT_SIZE,
+ GroupLayout.PREFERRED_SIZE)
+ .addContainerGap(10, 10).addComponent(
+ programmingLanguage, 118, 118, 118)
+ .addContainerGap()));
jPanel4Layout
.setVerticalGroup(jPanel4Layout
- .createParallelGroup(
- javax.swing.GroupLayout.Alignment.LEADING)
+ .createParallelGroup(Alignment.LEADING)
.addGroup(
jPanel4Layout
.createSequentialGroup()
@@ -405,11 +386,11 @@
.addGroup(
jPanel4Layout
.createParallelGroup(
- javax.swing.GroupLayout.Alignment.BASELINE)
+ Alignment.BASELINE)
.addGroup(
jPanel4Layout
.createParallelGroup(
- javax.swing.GroupLayout.Alignment.BASELINE)
+ Alignment.BASELINE)
.addComponent(
programminglanguageLabel,
20,
@@ -421,15 +402,14 @@
20,
20)))
.addContainerGap(10, 10)
- .addComponent(
- jScrollPane1,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- 111, Short.MAX_VALUE)
+ .addComponent(jScrollPane1,
+ GroupLayout.DEFAULT_SIZE, 111,
+ Short.MAX_VALUE)
.addContainerGap(10, 10)
.addGroup(
jPanel4Layout
.createParallelGroup(
- javax.swing.GroupLayout.Alignment.BASELINE)
+ Alignment.BASELINE)
.addComponent(
moveUpAnswerVariantBtn,
20, 20, 20)
@@ -447,89 +427,104 @@
20, 20, 20))
.addContainerGap()));
- javax.swing.GroupLayout layout = new javax.swing.GroupLayout(
- getContentPane());
+ GroupLayout generalTabLayout = new GroupLayout(generalTab);
+ generalTab.setLayout(generalTabLayout);
+ generalTabLayout
+ .setHorizontalGroup(generalTabLayout
+ .createParallelGroup(Alignment.LEADING)
+ .addGroup(
+ generalTabLayout
+ .createSequentialGroup()
+ .addContainerGap()
+ .addGroup(
+ generalTabLayout
+ .createParallelGroup(
+ Alignment.LEADING)
+ .addComponent(
+ captionPanel,
+ GroupLayout.DEFAULT_SIZE,
+ GroupLayout.DEFAULT_SIZE,
+ Short.MAX_VALUE)
+ .addComponent(
+ generalPanel,
+ GroupLayout.DEFAULT_SIZE,
+ GroupLayout.DEFAULT_SIZE,
+ Short.MAX_VALUE))
+ .addContainerGap()));
+ generalTabLayout.setVerticalGroup(generalTabLayout.createParallelGroup(
+ Alignment.LEADING).addGroup(
+ generalTabLayout.createSequentialGroup().addContainerGap()
+ .addComponent(generalPanel, GroupLayout.PREFERRED_SIZE,
+ GroupLayout.DEFAULT_SIZE,
+ GroupLayout.PREFERRED_SIZE).addPreferredGap(
+ ComponentPlacement.RELATED).addComponent(
+ captionPanel, GroupLayout.PREFERRED_SIZE,
+ GroupLayout.DEFAULT_SIZE,
+ GroupLayout.PREFERRED_SIZE).addPreferredGap(
+ ComponentPlacement.RELATED).addPreferredGap(
+ ComponentPlacement.RELATED).addPreferredGap(
+ ComponentPlacement.RELATED).addContainerGap(
+ GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
+
+ this.getRootPane().setDefaultButton(okButton);
+
+ tabbedPane.addTab("Main propertiests", generalTab);
+ tabbedPane.addTab("Content", partsPanel);
+ tabbedPane.addTab("Checking answers data", testingDataPanel);
+
+ GroupLayout layout = new GroupLayout(getContentPane());
getContentPane().setLayout(layout);
layout
.setHorizontalGroup(layout
- .createParallelGroup(
- javax.swing.GroupLayout.Alignment.LEADING)
+ .createParallelGroup(Alignment.LEADING)
.addGroup(
+ GroupLayout.Alignment.TRAILING,
layout
.createSequentialGroup()
.addContainerGap()
.addGroup(
layout
.createParallelGroup(
- javax.swing.GroupLayout.Alignment.LEADING)
+ Alignment.TRAILING)
.addComponent(
- partsPanel,
- 600, 600,
+ tabbedPane,
+ Alignment.LEADING,
+ GroupLayout.DEFAULT_SIZE,
+ 380,
Short.MAX_VALUE)
- .addComponent(
- captionPanel,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- Short.MAX_VALUE)
- .addComponent(
- generalPanel,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- Short.MAX_VALUE)
.addGroup(
- javax.swing.GroupLayout.Alignment.TRAILING,
layout
.createSequentialGroup()
.addComponent(
okButton)
.addPreferredGap(
- javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ LayoutStyle.ComponentPlacement.RELATED)
.addComponent(
cancelButton)))
.addContainerGap()));
layout
- .setVerticalGroup(layout
- .createParallelGroup(
- javax.swing.GroupLayout.Alignment.LEADING)
+ .setVerticalGroup(layout.createParallelGroup(Alignment.LEADING)
.addGroup(
- layout
- .createSequentialGroup()
- .addContainerGap()
- .addComponent(
- generalPanel,
- javax.swing.GroupLayout.PREFERRED_SIZE,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- javax.swing.GroupLayout.PREFERRED_SIZE)
+ Alignment.TRAILING,
+ layout.createSequentialGroup()
+ .addContainerGap().addComponent(
+ tabbedPane,
+ GroupLayout.DEFAULT_SIZE, 249,
+ Short.MAX_VALUE)
.addPreferredGap(
- javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(
- captionPanel,
- javax.swing.GroupLayout.PREFERRED_SIZE,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(
- javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addPreferredGap(
- javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(partsPanel, 300, 300, 300)
- .addPreferredGap(
- javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ ComponentPlacement.RELATED)
.addGroup(
- layout
- .createParallelGroup(
- javax.swing.GroupLayout.Alignment.BASELINE)
+ layout.createParallelGroup(
+ Alignment.BASELINE)
+ .addComponent(okButton,
+ 20, 20, 20)
.addComponent(
cancelButton,
- 20, 20, 20)
- .addComponent(okButton,
20, 20, 20))
- .addContainerGap(
- javax.swing.GroupLayout.DEFAULT_SIZE,
- Short.MAX_VALUE)));
+ .addContainerGap()));
- this.getRootPane().setDefaultButton(okButton);
-
pack();
+ setSize(550, 600);
}
@Override
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/PropertyDlg.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/PropertyDlg.java 2008-05-26 19:15:22 UTC (rev 170)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/PropertyDlg.java 2008-05-26 21:47:38 UTC (rev 171)
@@ -3,6 +3,7 @@
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import javax.swing.JButton;
import javax.swing.JDialog;
import javax.swing.text.JTextComponent;
@@ -16,6 +17,9 @@
private static final long serialVersionUID = -6002603750731392120L;
public PropertyDlg() {
+ setLocationByPlatform(true);
+ setTitle("Propertiests...");
+
initComponents();
}
@@ -43,8 +47,8 @@
protected abstract void fillFields();
- protected javax.swing.JButton cancelButton;
- protected javax.swing.JButton okButton;
+ protected JButton cancelButton;
+ protected JButton okButton;
public void showDialog(TreeItem item) {
manifestItem = item;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
