Menu
▾
▴
[Rochat-svn] SF.net SVN: rochat: [32] trunk
|
From: <spi...@us...> - 2007-10-21 19:16:30
|
Revision: 32
http://rochat.svn.sourceforge.net/rochat/?rev=32&view=rev
Author: spike1506
Date: 2007-10-21 12:16:25 -0700 (Sun, 21 Oct 2007)
Log Message:
-----------
- Made a start with the quick connect dialog
Modified Paths:
--------------
trunk/build.xml
trunk/nbproject/project.xml
trunk/src/net/sensiva/rochat/core/connection/IRCConnection.java
trunk/src/net/sensiva/rochat/ui/main/MainFrame.java
trunk/src/net/sensiva/rochat/ui/main/MenuBar.java
Added Paths:
-----------
trunk/src/net/sensiva/rochat/ui/file/
trunk/src/net/sensiva/rochat/ui/file/ConnectDialog.java
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2007-10-21 18:31:08 UTC (rev 31)
+++ trunk/build.xml 2007-10-21 19:16:25 UTC (rev 32)
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
-<project name="ROChat" default="default" basedir=".">
- <description>Builds, tests, and runs the project ROChat.</description>
- <import file="nbproject/build-impl.xml"/>
- <!--
-
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
-
- -pre-init: called before initialization of project properties
- -post-init: called after initialization of project properties
- -pre-compile: called before javac compilation
- -post-compile: called after javac compilation
- -pre-compile-single: called before javac compilation of single file
- -post-compile-single: called after javac compilation of single file
- -pre-compile-test: called before javac compilation of JUnit tests
- -post-compile-test: called after javac compilation of JUnit tests
- -pre-compile-test-single: called before javac compilation of single JUnit test
- -post-compile-test-single: called after javac compilation of single JUunit test
- -pre-jar: called before JAR building
- -post-jar: called after JAR building
- -post-clean: called after cleaning build products
-
- (Targets beginning with '-' are not intended to be called on their own.)
-
- Example of inserting an obfuscator after compilation could look like this:
-
- <target name="-post-compile">
- <obfuscate>
- <fileset dir="${build.classes.dir}"/>
- </obfuscate>
- </target>
-
- For list of available properties check the imported
- nbproject/build-impl.xml file.
-
-
- Another way to customize the build is by overriding existing main targets.
- The targets of interest are:
-
- -init-macrodef-javac: defines macro for javac compilation
- -init-macrodef-junit: defines macro for junit execution
- -init-macrodef-debug: defines macro for class debugging
- -init-macrodef-java: defines macro for class execution
- -do-jar-with-manifest: JAR building (if you are using a manifest)
- -do-jar-without-manifest: JAR building (if you are not using a manifest)
- run: execution of project
- -javadoc-build: Javadoc generation
- test-report: JUnit report generation
-
- An example of overriding the target for project execution could look like this:
-
- <target name="run" depends="ROChat-impl.jar">
- <exec dir="bin" executable="launcher.exe">
- <arg file="${dist.jar}"/>
- </exec>
- </target>
-
- Notice that the overridden target depends on the jar target and not only on
- the compile target as the regular run target does. Again, for a list of available
- properties which you can use, check the target you are overriding in the
- nbproject/build-impl.xml file.
-
- -->
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See commented blocks below for -->
+<!-- some examples of how to customize the build. -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
+<project name="ROChat" default="default" basedir=".">
+ <description>Builds, tests, and runs the project ROChat.</description>
+ <import file="nbproject/build-impl.xml"/>
+ <!--
+
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
+
+ -pre-init: called before initialization of project properties
+ -post-init: called after initialization of project properties
+ -pre-compile: called before javac compilation
+ -post-compile: called after javac compilation
+ -pre-compile-single: called before javac compilation of single file
+ -post-compile-single: called after javac compilation of single file
+ -pre-compile-test: called before javac compilation of JUnit tests
+ -post-compile-test: called after javac compilation of JUnit tests
+ -pre-compile-test-single: called before javac compilation of single JUnit test
+ -post-compile-test-single: called after javac compilation of single JUunit test
+ -pre-jar: called before JAR building
+ -post-jar: called after JAR building
+ -post-clean: called after cleaning build products
+
+ (Targets beginning with '-' are not intended to be called on their own.)
+
+ Example of inserting an obfuscator after compilation could look like this:
+
+ <target name="-post-compile">
+ <obfuscate>
+ <fileset dir="${build.classes.dir}"/>
+ </obfuscate>
+ </target>
+
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
+
+
+ Another way to customize the build is by overriding existing main targets.
+ The targets of interest are:
+
+ -init-macrodef-javac: defines macro for javac compilation
+ -init-macrodef-junit: defines macro for junit execution
+ -init-macrodef-debug: defines macro for class debugging
+ -init-macrodef-java: defines macro for class execution
+ -do-jar-with-manifest: JAR building (if you are using a manifest)
+ -do-jar-without-manifest: JAR building (if you are not using a manifest)
+ run: execution of project
+ -javadoc-build: Javadoc generation
+ test-report: JUnit report generation
+
+ An example of overriding the target for project execution could look like this:
+
+ <target name="run" depends="ROChat-impl.jar">
+ <exec dir="bin" executable="launcher.exe">
+ <arg file="${dist.jar}"/>
+ </exec>
+ </target>
+
+ Notice that the overridden target depends on the jar target and not only on
+ the compile target as the regular run target does. Again, for a list of available
+ properties which you can use, check the target you are overriding in the
+ nbproject/build-impl.xml file.
+
+ -->
+</project>
Modified: trunk/nbproject/project.xml
===================================================================
--- trunk/nbproject/project.xml 2007-10-21 18:31:08 UTC (rev 31)
+++ trunk/nbproject/project.xml 2007-10-21 19:16:25 UTC (rev 32)
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.java.j2seproject</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
- <name>ROChat</name>
- <minimum-ant-version>1.6.5</minimum-ant-version>
- <source-roots>
- <root id="src.dir"/>
- </source-roots>
- <test-roots/>
- </data>
- </configuration>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+ <type>org.netbeans.modules.java.j2seproject</type>
+ <configuration>
+ <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
+ <name>ROChat</name>
+ <minimum-ant-version>1.6.5</minimum-ant-version>
+ <source-roots>
+ <root id="src.dir"/>
+ </source-roots>
+ <test-roots/>
+ </data>
+ </configuration>
+</project>
Modified: trunk/src/net/sensiva/rochat/core/connection/IRCConnection.java
===================================================================
--- trunk/src/net/sensiva/rochat/core/connection/IRCConnection.java 2007-10-21 18:31:08 UTC (rev 31)
+++ trunk/src/net/sensiva/rochat/core/connection/IRCConnection.java 2007-10-21 19:16:25 UTC (rev 32)
@@ -20,6 +20,7 @@
package net.sensiva.rochat.core.connection;
import net.sensiva.rochat.core.logging.*;
+import net.sensiva.rochat.ui.tabs.*;
import java.util.*;
import java.net.*;
import java.io.*;
Added: trunk/src/net/sensiva/rochat/ui/file/ConnectDialog.java
===================================================================
--- trunk/src/net/sensiva/rochat/ui/file/ConnectDialog.java (rev 0)
+++ trunk/src/net/sensiva/rochat/ui/file/ConnectDialog.java 2007-10-21 19:16:25 UTC (rev 32)
@@ -0,0 +1,55 @@
+/*
+ ROChat
+ Copyright (C) 2007 The ROChat team
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ ----------------------------------------------------------------------------
+*/
+package net.sensiva.rochat.ui.file;
+
+import net.sensiva.rochat.core.util.Constants;
+import javax.swing.*;
+import java.awt.*;
+
+public class ConnectDialog extends JDialog
+{
+
+ public ConnectDialog(JFrame frame)
+ {
+ super(frame,"Connect",true);
+ initialize();
+ }
+
+ public void initialize()
+ {
+ setSize(100,100);
+ setLocationRelativeTo(null);
+ setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+ JPanel contentPane = new JPanel();
+ contentPane.setLayout(new BoxLayout(contentPane,BoxLayout.PAGE_AXIS));
+ setContentPane(contentPane);
+ contentPane.setBorder(BorderFactory.createEmptyBorder(3,3,3,3));
+ setText();
+ setVisible(true);
+ }
+
+ public void paintComponents(Graphics g) {
+ }
+
+ public void setText()
+ {
+
+ }
+}
Modified: trunk/src/net/sensiva/rochat/ui/main/MainFrame.java
===================================================================
--- trunk/src/net/sensiva/rochat/ui/main/MainFrame.java 2007-10-21 18:31:08 UTC (rev 31)
+++ trunk/src/net/sensiva/rochat/ui/main/MainFrame.java 2007-10-21 19:16:25 UTC (rev 32)
@@ -75,12 +75,12 @@
//Creates a statustab when the program initializes all components.
StatusTab statusTab = new StatusTab(this);
- statusTab.initialize("Server naam bijvoorbeeld", "Not connected!");
+ statusTab.initialize("Not connected...", "Not connected!");
ChannelTab channelTab = new ChannelTab(this);
channelTab.initialize("#Channel", "#Channel information!");
- IRCConnection irc = new IRCConnection("Levia_", "Levia_", "Levia_", "lars");
+ IRCConnection irc = new IRCConnection("ROChat", "ROChat_", "ROChat", "ROC");
statusTab.setIRCConnection(irc);
irc.connect("127.0.0.1", 6667);
Modified: trunk/src/net/sensiva/rochat/ui/main/MenuBar.java
===================================================================
--- trunk/src/net/sensiva/rochat/ui/main/MenuBar.java 2007-10-21 18:31:08 UTC (rev 31)
+++ trunk/src/net/sensiva/rochat/ui/main/MenuBar.java 2007-10-21 19:16:25 UTC (rev 32)
@@ -20,6 +20,7 @@
package net.sensiva.rochat.ui.main;
import net.sensiva.rochat.ui.help.*;
+import net.sensiva.rochat.ui.file.*;
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
@@ -80,9 +81,12 @@
public void actionPerformed(ActionEvent event)
{
String e = event.getActionCommand();
-
- if (e.equals("Exit"))
+ if (e.equals("Connect"))
{
+ new ConnectDialog(m_Frame);
+ }
+ else if (e.equals("Exit"))
+ {
System.exit(0);
}
else if (e.equals("About"))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
