Thread: [Zerofile-svn] SF.net SVN: zerofile: [15] trunk/src/ZeroFileSettingsWindow.java
Status: Pre-Alpha
Brought to you by:
karl-bengtsson
Menu
▾
▴
zerofile-svn
|
From: <kar...@us...> - 2007-11-05 15:13:30
|
Revision: 15
http://zerofile.svn.sourceforge.net/zerofile/?rev=15&view=rev
Author: karl-bengtsson
Date: 2007-11-05 07:13:34 -0800 (Mon, 05 Nov 2007)
Log Message:
-----------
Testing SVN collision detection
Modified Paths:
--------------
trunk/src/ZeroFileSettingsWindow.java
Modified: trunk/src/ZeroFileSettingsWindow.java
===================================================================
--- trunk/src/ZeroFileSettingsWindow.java 2007-11-05 15:11:23 UTC (rev 14)
+++ trunk/src/ZeroFileSettingsWindow.java 2007-11-05 15:13:34 UTC (rev 15)
@@ -1,5 +1,9 @@
+
+/*
+ * Din mamma!
+ */
+
import java.io.Serializable;
-
import javax.swing.JFrame;
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <el...@us...> - 2007-11-05 15:11:23
|
Revision: 14
http://zerofile.svn.sourceforge.net/zerofile/?rev=14&view=rev
Author: elpedr0
Date: 2007-11-05 07:11:23 -0800 (Mon, 05 Nov 2007)
Log Message:
-----------
Made a new settingswindow
Added Paths:
-----------
trunk/src/ZeroFileSettingsWindow.java
Added: trunk/src/ZeroFileSettingsWindow.java
===================================================================
--- trunk/src/ZeroFileSettingsWindow.java (rev 0)
+++ trunk/src/ZeroFileSettingsWindow.java 2007-11-05 15:11:23 UTC (rev 14)
@@ -0,0 +1,15 @@
+import java.io.Serializable;
+
+import javax.swing.JFrame;
+
+/**
+ *
+ */
+
+/**
+ * @author Peter
+ *
+ */
+public class ZeroFileSettingsWindow extends JFrame implements Serializable {
+ static final long serialVersionUID = -5208364155946320552L;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <el...@us...> - 2007-11-05 15:16:29
|
Revision: 16
http://zerofile.svn.sourceforge.net/zerofile/?rev=16&view=rev
Author: elpedr0
Date: 2007-11-05 07:16:26 -0800 (Mon, 05 Nov 2007)
Log Message:
-----------
update
Modified Paths:
--------------
trunk/src/ZeroFileSettingsWindow.java
Modified: trunk/src/ZeroFileSettingsWindow.java
===================================================================
--- trunk/src/ZeroFileSettingsWindow.java 2007-11-05 15:13:34 UTC (rev 15)
+++ trunk/src/ZeroFileSettingsWindow.java 2007-11-05 15:16:26 UTC (rev 16)
@@ -9,7 +9,7 @@
/**
*
*/
-
+//hej
/**
* @author Peter
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <el...@us...> - 2007-11-06 10:44:31
|
Revision: 21
http://zerofile.svn.sourceforge.net/zerofile/?rev=21&view=rev
Author: elpedr0
Date: 2007-11-06 02:44:22 -0800 (Tue, 06 Nov 2007)
Log Message:
-----------
messed around with the window
Modified Paths:
--------------
trunk/src/ZeroFileSettingsWindow.java
Modified: trunk/src/ZeroFileSettingsWindow.java
===================================================================
--- trunk/src/ZeroFileSettingsWindow.java 2007-11-06 10:42:14 UTC (rev 20)
+++ trunk/src/ZeroFileSettingsWindow.java 2007-11-06 10:44:22 UTC (rev 21)
@@ -11,8 +11,13 @@
public ZeroFileSettingsWindow()
{
- JButton Button1 = new JButton();
+ this.setSize(new Dimension(200,200));
+ this.setLayout(new GridLayout(1,2));
+ JButton Button1 = new JButton("OK");
+ JButton Button2 = new JButton("Cancel");
+ Button1.setSize(40, 20);
this.add(Button1);
+ this.add(Button2);
this.setVisible(true);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zo...@us...> - 2007-11-06 17:07:35
|
Revision: 30
http://zerofile.svn.sourceforge.net/zerofile/?rev=30&view=rev
Author: zondar
Date: 2007-11-06 09:07:38 -0800 (Tue, 06 Nov 2007)
Log Message:
-----------
Added a checkbox
Modified Paths:
--------------
trunk/src/ZeroFileSettingsWindow.java
Modified: trunk/src/ZeroFileSettingsWindow.java
===================================================================
--- trunk/src/ZeroFileSettingsWindow.java 2007-11-06 16:17:15 UTC (rev 29)
+++ trunk/src/ZeroFileSettingsWindow.java 2007-11-06 17:07:38 UTC (rev 30)
@@ -14,29 +14,35 @@
settingsWindowFrame.setLayout(new GridLayout(0,2,1,1));
// Label + field for Nickname parameter
- JLabel nickNameLabel = new JLabel("Nickname:");
+ JLabel nickNameLabel = new JLabel("Nickname:", JLabel.CENTER);
JTextField nickNameField = new JTextField();
settingsWindowFrame.add(nickNameLabel);
settingsWindowFrame.add(nickNameField);
// Label + field for First Name parameter
- JLabel firstNameLabel = new JLabel("First name:");
+ JLabel firstNameLabel = new JLabel("First name:", JLabel.CENTER);
JTextField firstNameField = new JTextField();
settingsWindowFrame.add(firstNameLabel);
settingsWindowFrame.add(firstNameField);
// Label + field for Last Name parameter
- JLabel lastNameLabel = new JLabel("Last name:");
+ JLabel lastNameLabel = new JLabel("Last name:", JLabel.CENTER);
JTextField lastNameField = new JTextField();
settingsWindowFrame.add(lastNameLabel);
settingsWindowFrame.add(lastNameField);
// Label + field for Last Name parameter
- JLabel emailLabel = new JLabel("Email:");
+ JLabel emailLabel = new JLabel("Email:", JLabel.CENTER);
JTextField emailField = new JTextField();
settingsWindowFrame.add(emailLabel);
settingsWindowFrame.add(emailField);
+ //Checkbox for auto accept file transfers
+ JLabel checkBoxLabel = new JLabel("Auto accept file transfers", JLabel.CENTER);
+ JCheckBox checkBoxTransfer = new JCheckBox();
+ settingsWindowFrame.add(checkBoxLabel);
+ settingsWindowFrame.add(checkBoxTransfer);
+
// OK and Cancel buttons
JButton okButton = new JButton("OK");
JButton cancelButton = new JButton("Cancel");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zo...@us...> - 2007-11-07 15:20:22
|
Revision: 38
http://zerofile.svn.sourceforge.net/zerofile/?rev=38&view=rev
Author: zondar
Date: 2007-11-07 07:20:24 -0800 (Wed, 07 Nov 2007)
Log Message:
-----------
added listeners to ZeroFileSettingsWindow
Modified Paths:
--------------
trunk/src/ZeroFileSettingsWindow.java
Modified: trunk/src/ZeroFileSettingsWindow.java
===================================================================
--- trunk/src/ZeroFileSettingsWindow.java 2007-11-07 14:32:01 UTC (rev 37)
+++ trunk/src/ZeroFileSettingsWindow.java 2007-11-07 15:20:24 UTC (rev 38)
@@ -1,5 +1,6 @@
import javax.swing.*;
import java.awt.*;
+import java.awt.event.*;
/**
* @author Peter
@@ -8,7 +9,7 @@
{
static void startSettingsWindow()
{
- JFrame settingsWindowFrame = new JFrame();
+ final JFrame settingsWindowFrame = new JFrame();
settingsWindowFrame.setSize(new Dimension(300,200));
settingsWindowFrame.setResizable(false);
settingsWindowFrame.setLayout(new GridLayout(0,2,1,1));
@@ -17,31 +18,31 @@
// Label + field for Nickname parameter
JLabel nickNameLabel = new JLabel("Nickname:", JLabel.CENTER);
- JTextField nickNameField = new JTextField();
+ final JTextField nickNameField = new JTextField();
settingsWindowFrame.add(nickNameLabel);
settingsWindowFrame.add(nickNameField);
// Label + field for First Name parameter
JLabel firstNameLabel = new JLabel("First name:", JLabel.CENTER);
- JTextField firstNameField = new JTextField();
+ final JTextField firstNameField = new JTextField();
settingsWindowFrame.add(firstNameLabel);
settingsWindowFrame.add(firstNameField);
// Label + field for Last Name parameter
JLabel lastNameLabel = new JLabel("Last name:", JLabel.CENTER);
- JTextField lastNameField = new JTextField();
+ final JTextField lastNameField = new JTextField();
settingsWindowFrame.add(lastNameLabel);
settingsWindowFrame.add(lastNameField);
// Label + field for Last Name parameter
JLabel emailLabel = new JLabel("Email:", JLabel.CENTER);
- JTextField emailField = new JTextField();
+ final JTextField emailField = new JTextField();
settingsWindowFrame.add(emailLabel);
settingsWindowFrame.add(emailField);
//Checkbox for auto accept file transfers
JLabel checkBoxLabel = new JLabel("Auto accept file transfers", JLabel.CENTER);
- JCheckBox checkBoxTransfer = new JCheckBox();
+ final JCheckBox checkBoxTransfer = new JCheckBox();
settingsWindowFrame.add(checkBoxLabel);
settingsWindowFrame.add(checkBoxTransfer);
@@ -52,7 +53,47 @@
settingsWindowFrame.add(okButton);
settingsWindowFrame.add(cancelButton);
+
// Show the window
- settingsWindowFrame.setVisible(true);
+ settingsWindowFrame.setVisible(true);
+
+
+
+ cancelButton.addActionListener(
+ new ActionListener(){
+ public void actionPerformed(ActionEvent e){
+ settingsWindowFrame.setVisible(false);
+ System.out.println("cancel");
+ }
+ }
+ );
+ okButton.addActionListener(
+ new ActionListener(){
+ public void actionPerformed(ActionEvent e){
+ System.out.println("ok");
+ String ni,na,la,em;
+ Boolean check;
+ na = firstNameField.getText();
+ la = lastNameField.getText();
+ em = emailField.getText();
+ check = checkBoxTransfer.isSelected();
+ System.out.println("");
+ System.out.print(na);
+ System.out.println("");
+ System.out.print(la);
+ System.out.println("");
+ System.out.print(em);
+ System.out.println("");
+ System.out.print(check);
+ if(!nickNameField.getText().equals(""))
+ {
+ ni = nickNameField.getText();
+
+ System.out.print(ni);
+
+ }
+ }
+ }
+ );
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zo...@us...> - 2007-11-07 16:31:40
|
Revision: 40
http://zerofile.svn.sourceforge.net/zerofile/?rev=40&view=rev
Author: zondar
Date: 2007-11-07 08:31:40 -0800 (Wed, 07 Nov 2007)
Log Message:
-----------
upgrade of listeners
Modified Paths:
--------------
trunk/src/ZeroFileSettingsWindow.java
Modified: trunk/src/ZeroFileSettingsWindow.java
===================================================================
--- trunk/src/ZeroFileSettingsWindow.java 2007-11-07 15:57:15 UTC (rev 39)
+++ trunk/src/ZeroFileSettingsWindow.java 2007-11-07 16:31:40 UTC (rev 40)
@@ -3,7 +3,7 @@
import java.awt.event.*;
/**
- * @author Peter
+ * @author Richard & Peter
*/
public class ZeroFileSettingsWindow
{
@@ -58,7 +58,7 @@
settingsWindowFrame.setVisible(true);
-
+ //listener to Cancel button
cancelButton.addActionListener(
new ActionListener(){
public void actionPerformed(ActionEvent e){
@@ -67,23 +67,14 @@
}
}
);
+ //listener to Ok button will change the local variables later when ZeroFileSettings is final
okButton.addActionListener(
new ActionListener(){
public void actionPerformed(ActionEvent e){
System.out.println("ok");
String ni,na,la,em;
Boolean check;
- na = firstNameField.getText();
- la = lastNameField.getText();
- em = emailField.getText();
check = checkBoxTransfer.isSelected();
- System.out.println("");
- System.out.print(na);
- System.out.println("");
- System.out.print(la);
- System.out.println("");
- System.out.print(em);
- System.out.println("");
System.out.print(check);
if(!nickNameField.getText().equals(""))
{
@@ -92,6 +83,24 @@
System.out.print(ni);
}
+ if(!firstNameField.getText().equals(""))
+ {
+ na = firstNameField.getText();
+
+ System.out.print(na);
+
+ }
+ if(!lastNameField.getText().equals(""))
+ {
+ la = lastNameField.getText();
+ System.out.print(la);
+ }
+ if(!emailField.getText().equals(""))
+ {
+ em = emailField.getText();
+ System.out.print(em);
+ }
+ settingsWindowFrame.setVisible(false);
}
}
);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zo...@us...> - 2007-11-07 19:03:29
|
Revision: 41
http://zerofile.svn.sourceforge.net/zerofile/?rev=41&view=rev
Author: zondar
Date: 2007-11-07 11:03:28 -0800 (Wed, 07 Nov 2007)
Log Message:
-----------
Updated SeroFileSettingsWindow
Modified Paths:
--------------
trunk/src/ZeroFileSettingsWindow.java
Modified: trunk/src/ZeroFileSettingsWindow.java
===================================================================
--- trunk/src/ZeroFileSettingsWindow.java 2007-11-07 16:31:40 UTC (rev 40)
+++ trunk/src/ZeroFileSettingsWindow.java 2007-11-07 19:03:28 UTC (rev 41)
@@ -3,43 +3,57 @@
import java.awt.event.*;
/**
- * @author Richard & Peter
+ * @author Richard
*/
public class ZeroFileSettingsWindow
{
static void startSettingsWindow()
{
final JFrame settingsWindowFrame = new JFrame();
- settingsWindowFrame.setSize(new Dimension(300,200));
+ settingsWindowFrame.setSize(new Dimension(350,200));
settingsWindowFrame.setResizable(false);
settingsWindowFrame.setLayout(new GridLayout(0,2,1,1));
settingsWindowFrame.setLocation(200, 200);
- settingsWindowFrame.setTitle("Settings");
+ settingsWindowFrame.setTitle("ZeroFile Settings");
// Label + field for Nickname parameter
JLabel nickNameLabel = new JLabel("Nickname:", JLabel.CENTER);
final JTextField nickNameField = new JTextField();
+ nickNameField.setText(ZeroFileSettings.getNickName());
settingsWindowFrame.add(nickNameLabel);
settingsWindowFrame.add(nickNameField);
// Label + field for First Name parameter
JLabel firstNameLabel = new JLabel("First name:", JLabel.CENTER);
final JTextField firstNameField = new JTextField();
+ firstNameField.setText(ZeroFileSettings.getFirstName());
settingsWindowFrame.add(firstNameLabel);
settingsWindowFrame.add(firstNameField);
// Label + field for Last Name parameter
JLabel lastNameLabel = new JLabel("Last name:", JLabel.CENTER);
final JTextField lastNameField = new JTextField();
+ lastNameField.setText(ZeroFileSettings.getLastName());
settingsWindowFrame.add(lastNameLabel);
settingsWindowFrame.add(lastNameField);
- // Label + field for Last Name parameter
+ // Label + field for email parameter
JLabel emailLabel = new JLabel("Email:", JLabel.CENTER);
final JTextField emailField = new JTextField();
+ emailField.setText(ZeroFileSettings.getEmail());
settingsWindowFrame.add(emailLabel);
settingsWindowFrame.add(emailField);
+ //Label + browsing for chosing download folder
+ JLabel downloadLabel = new JLabel("Download Folder:", JLabel.CENTER);
+ JLabel pathNowLabel = new JLabel("", JLabel.CENTER);
+ JLabel pathLabel = new JLabel("Desired catalog:", JLabel.CENTER);
+ JButton browseButton = new JButton("Browse");
+ settingsWindowFrame.add(downloadLabel);
+ settingsWindowFrame.add(browseButton);
+ settingsWindowFrame.add(pathLabel);
+ settingsWindowFrame.add(pathNowLabel);
+
//Checkbox for auto accept file transfers
JLabel checkBoxLabel = new JLabel("Auto accept file transfers", JLabel.CENTER);
final JCheckBox checkBoxTransfer = new JCheckBox();
@@ -61,45 +75,24 @@
//listener to Cancel button
cancelButton.addActionListener(
new ActionListener(){
- public void actionPerformed(ActionEvent e){
+ public void actionPerformed(ActionEvent cancelb){
settingsWindowFrame.setVisible(false);
- System.out.println("cancel");
}
}
);
- //listener to Ok button will change the local variables later when ZeroFileSettings is final
+ //listener to Ok, passes on the values to ZeroFileSettings methods
okButton.addActionListener(
new ActionListener(){
- public void actionPerformed(ActionEvent e){
- System.out.println("ok");
- String ni,na,la,em;
- Boolean check;
- check = checkBoxTransfer.isSelected();
- System.out.print(check);
+ public void actionPerformed(ActionEvent okb){
+ //checkBoxTransfer.isSelected();
if(!nickNameField.getText().equals(""))
- {
- ni = nickNameField.getText();
-
- System.out.print(ni);
-
- }
+ ZeroFileSettings.setNickName(nickNameField.getText());
if(!firstNameField.getText().equals(""))
- {
- na = firstNameField.getText();
-
- System.out.print(na);
-
- }
+ ZeroFileSettings.setFirstName(firstNameField.getText());
if(!lastNameField.getText().equals(""))
- {
- la = lastNameField.getText();
- System.out.print(la);
- }
+ ZeroFileSettings.setLastName(lastNameField.getText());
if(!emailField.getText().equals(""))
- {
- em = emailField.getText();
- System.out.print(em);
- }
+ ZeroFileSettings.setEmail(emailField.getText());
settingsWindowFrame.setVisible(false);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zo...@us...> - 2007-11-09 10:20:02
|
Revision: 42
http://zerofile.svn.sourceforge.net/zerofile/?rev=42&view=rev
Author: zondar
Date: 2007-11-09 02:20:03 -0800 (Fri, 09 Nov 2007)
Log Message:
-----------
added some functionality to the browse button.
TODO: add method to handle the result from the JFileChooser
(I will do this later)
Modified Paths:
--------------
trunk/src/ZeroFileSettingsWindow.java
Modified: trunk/src/ZeroFileSettingsWindow.java
===================================================================
--- trunk/src/ZeroFileSettingsWindow.java 2007-11-07 19:03:28 UTC (rev 41)
+++ trunk/src/ZeroFileSettingsWindow.java 2007-11-09 10:20:03 UTC (rev 42)
@@ -1,10 +1,12 @@
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
+import java.io.IOException;
/**
* @author Richard
*/
+
public class ZeroFileSettingsWindow
{
static void startSettingsWindow()
@@ -44,6 +46,13 @@
settingsWindowFrame.add(emailLabel);
settingsWindowFrame.add(emailField);
+ //Label + field for port parameter
+ JLabel portLabel = new JLabel("Port", JLabel.CENTER);
+ final JTextField portField = new JTextField();
+ portField.setText(String.valueOf(ZeroFileSettings.getMainPort()));
+ settingsWindowFrame.add(portLabel);
+ settingsWindowFrame.add(portField);
+
//Label + browsing for chosing download folder
JLabel downloadLabel = new JLabel("Download Folder:", JLabel.CENTER);
JLabel pathNowLabel = new JLabel("", JLabel.CENTER);
@@ -93,9 +102,29 @@
ZeroFileSettings.setLastName(lastNameField.getText());
if(!emailField.getText().equals(""))
ZeroFileSettings.setEmail(emailField.getText());
+ if(!portField.getText().equals(""))
+ ZeroFileSettings.setMainPort(Integer.valueOf(portField.getText()));
+ try {
+ ZeroFileSettings.saveSettings();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
settingsWindowFrame.setVisible(false);
+
}
}
+ );
+
+ browseButton.addActionListener(
+ new ActionListener(){
+ public void actionPerformed(ActionEvent browseb){
+ JFileChooser _directory = new JFileChooser();
+ _directory.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+ _directory.showOpenDialog(null);
+ //todo add method to handle the result
+ }
+ }
);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <zo...@us...> - 2007-11-09 10:30:47
|
Revision: 43
http://zerofile.svn.sourceforge.net/zerofile/?rev=43&view=rev
Author: zondar
Date: 2007-11-09 02:30:52 -0800 (Fri, 09 Nov 2007)
Log Message:
-----------
a little more complete
Modified Paths:
--------------
trunk/src/ZeroFileSettingsWindow.java
Modified: trunk/src/ZeroFileSettingsWindow.java
===================================================================
--- trunk/src/ZeroFileSettingsWindow.java 2007-11-09 10:20:03 UTC (rev 42)
+++ trunk/src/ZeroFileSettingsWindow.java 2007-11-09 10:30:52 UTC (rev 43)
@@ -55,7 +55,7 @@
//Label + browsing for chosing download folder
JLabel downloadLabel = new JLabel("Download Folder:", JLabel.CENTER);
- JLabel pathNowLabel = new JLabel("", JLabel.CENTER);
+ final JLabel pathNowLabel = new JLabel("", JLabel.CENTER);
JLabel pathLabel = new JLabel("Desired catalog:", JLabel.CENTER);
JButton browseButton = new JButton("Browse");
settingsWindowFrame.add(downloadLabel);
@@ -122,7 +122,7 @@
JFileChooser _directory = new JFileChooser();
_directory.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
_directory.showOpenDialog(null);
- //todo add method to handle the result
+ pathNowLabel.setText(String.valueOf(_directory.getSelectedFile()));
}
}
);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X