Author: dylan
Date: 2005-07-07 20:24:11 -0400 (Thu, 07 Jul 2005)
New Revision: 852
Added:
trunk/clients/haver-qt/connect.ui
trunk/clients/haver-qt/connect.ui.h
Modified:
trunk/
trunk/clients/haver-qt/haver-qt.pro
trunk/clients/haver-qt/wmain.ui
trunk/clients/haver-qt/wmain.ui.h
Log:
[EMAIL PROTECTED]: dylan | 2005-07-07 17:59:01 -0400
added dialog box.
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/havercurs-objc:43089
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk:11166
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk-merge-10131:11178
27e50396-46e3-0310-8b22-ae223a1f35ce:/local:212
e9404bb1-7af0-0310-a7ff-e22194cd388b:/haver/local:1234
edfcd8bd-4ce7-0310-a97e-bb1efd40edf3:/local:238
+ 1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/havercurs-objc:43089
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk:11166
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk-merge-10131:11178
27e50396-46e3-0310-8b22-ae223a1f35ce:/local:212
e9404bb1-7af0-0310-a7ff-e22194cd388b:/haver/local:1236
edfcd8bd-4ce7-0310-a97e-bb1efd40edf3:/local:238
Added: trunk/clients/haver-qt/connect.ui
===================================================================
--- trunk/clients/haver-qt/connect.ui 2005-07-07 03:24:12 UTC (rev 851)
+++ trunk/clients/haver-qt/connect.ui 2005-07-08 00:24:11 UTC (rev 852)
@@ -0,0 +1,150 @@
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
+<class>Connect</class>
+<widget class="QDialog">
+ <property name="name">
+ <cstring>Connect</cstring>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>276</width>
+ <height>161</height>
+ </rect>
+ </property>
+ <property name="caption">
+ <string>Connect to Server</string>
+ </property>
+ <grid>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel" row="1" column="0">
+ <property name="name">
+ <cstring>textLabel7</cstring>
+ </property>
+ <property name="text">
+ <string>Hostname:</string>
+ </property>
+ </widget>
+ <widget class="QLabel" row="2" column="0">
+ <property name="name">
+ <cstring>textLabel8</cstring>
+ </property>
+ <property name="text">
+ <string>Port:</string>
+ </property>
+ </widget>
+ <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="2">
+ <property name="name">
+ <cstring>hostname</cstring>
+ </property>
+ <property name="text">
+ <string>hardison.net</string>
+ </property>
+ </widget>
+ <widget class="QLabel" row="0" column="0">
+ <property name="name">
+ <cstring>textLabel9</cstring>
+ </property>
+ <property name="text">
+ <string>Name:</string>
+ </property>
+ </widget>
+ <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="2">
+ <property name="name">
+ <cstring>username</cstring>
+ </property>
+ </widget>
+ <widget class="QPushButton" row="3" column="0">
+ <property name="name">
+ <cstring>connectButton</cstring>
+ </property>
+ <property name="text">
+ <string>Connect</string>
+ </property>
+ </widget>
+ <widget class="QPushButton" row="3" column="2">
+ <property name="name">
+ <cstring>cancelButton</cstring>
+ </property>
+ <property name="text">
+ <string>Cancel</string>
+ </property>
+ </widget>
+ <spacer row="3" column="1">
+ <property name="name">
+ <cstring>spacer13</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>81</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="QSpinBox" row="2" column="1">
+ <property name="name">
+ <cstring>port</cstring>
+ </property>
+ <property name="maxValue">
+ <number>65536</number>
+ </property>
+ <property name="minValue">
+ <number>1</number>
+ </property>
+ <property name="value">
+ <number>7575</number>
+ </property>
+ </widget>
+ <spacer row="2" column="2">
+ <property name="name">
+ <cstring>spacer14</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>91</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </grid>
+</widget>
+<connections>
+ <connection>
+ <sender>cancelButton</sender>
+ <signal>clicked()</signal>
+ <receiver>Connect</receiver>
+ <slot>close()</slot>
+ </connection>
+ <connection>
+ <sender>connectButton</sender>
+ <signal>clicked()</signal>
+ <receiver>Connect</receiver>
+ <slot>connectClicked()</slot>
+ </connection>
+</connections>
+<includes>
+ <include location="local" impldecl="in
implementation">connect.ui.h</include>
+</includes>
+<signals>
+ <signal>connectToServer(QString, QString, int)</signal>
+</signals>
+<slots>
+ <slot>connectClicked()</slot>
+</slots>
+<pixmapinproject/>
+<layoutdefaults spacing="6" margin="11"/>
+</UI>
Added: trunk/clients/haver-qt/connect.ui.h
===================================================================
--- trunk/clients/haver-qt/connect.ui.h 2005-07-07 03:24:12 UTC (rev 851)
+++ trunk/clients/haver-qt/connect.ui.h 2005-07-08 00:24:11 UTC (rev 852)
@@ -0,0 +1,17 @@
+/****************************************************************************
+** ui.h extension file, included from the uic-generated form implementation.
+**
+** If you want to add, delete, or rename functions or slots, use
+** Qt Designer to update this file, preserving your code.
+**
+** You should not define a constructor or destructor in this file.
+** Instead, write your code in functions called init() and destroy().
+** These will automatically be called by the form's constructor and
+** destructor.
+*****************************************************************************/
+
+
+void Connect::connectClicked()
+{
+
+}
Modified: trunk/clients/haver-qt/haver-qt.pro
===================================================================
--- trunk/clients/haver-qt/haver-qt.pro 2005-07-07 03:24:12 UTC (rev 851)
+++ trunk/clients/haver-qt/haver-qt.pro 2005-07-08 00:24:11 UTC (rev 852)
@@ -5,7 +5,8 @@
SOURCES += main.cpp
-FORMS = wmain.ui
+FORMS = wmain.ui \
+ connect.ui
IMAGES = images/filenew \
images/fileopen \
@@ -16,7 +17,17 @@
images/editcut \
images/editcopy \
images/editpaste \
- images/searchfind
+ images/searchfind \
+ images/filenew_1 \
+ images/fileopen_1 \
+ images/filesave_1 \
+ images/print_1 \
+ images/undo_1 \
+ images/redo_1 \
+ images/editcut_1 \
+ images/editcopy_1 \
+ images/editpaste_1 \
+ images/searchfind_1
unix {
UI_DIR = .ui
Modified: trunk/clients/haver-qt/wmain.ui
===================================================================
--- trunk/clients/haver-qt/wmain.ui 2005-07-07 03:24:12 UTC (rev 851)
+++ trunk/clients/haver-qt/wmain.ui 2005-07-08 00:24:11 UTC (rev 852)
@@ -17,7 +17,7 @@
</property>
<widget class="QLineEdit">
<property name="name">
- <cstring>entryArea</cstring>
+ <cstring>entry</cstring>
</property>
<property name="geometry">
<rect>
@@ -30,7 +30,7 @@
</widget>
<widget class="QTextEdit">
<property name="name">
- <cstring>displayArea</cstring>
+ <cstring>display</cstring>
</property>
<property name="geometry">
<rect>
@@ -52,26 +52,10 @@
<property name="name">
<cstring>MenuBar</cstring>
</property>
- <item text="&File" name="fileMenu">
- <action name="fileNewAction"/>
- <action name="fileOpenAction"/>
- <action name="fileSaveAction"/>
- <action name="fileSaveAsAction"/>
- <separator/>
- <action name="filePrintAction"/>
- <separator/>
- <action name="fileExitAction"/>
+ <item text="&Server" name="Server">
+ <action name="serverConnectAction"/>
</item>
- <item text="&Edit" name="editMenu">
- <action name="editUndoAction"/>
- <action name="editRedoAction"/>
- <separator/>
- <action name="editCutAction"/>
- <action name="editCopyAction"/>
- <action name="editPasteAction"/>
- <separator/>
- <action name="editFindAction"/>
- </item>
+ <separator/>
<item text="&Help" name="helpMenu">
<action name="helpContentsAction"/>
<action name="helpIndexAction"/>
@@ -84,313 +68,68 @@
<actions>
<action>
<property name="name">
- <cstring>fileNewAction</cstring>
+ <cstring>helpContentsAction</cstring>
</property>
- <property name="iconSet">
- <iconset>filenew</iconset>
- </property>
<property name="text">
- <string>New</string>
+ <string>Contents</string>
</property>
<property name="menuText">
- <string>&New</string>
+ <string>&Contents...</string>
</property>
<property name="accel">
- <string>Ctrl+N</string>
- </property>
- </action>
- <action>
- <property name="name">
- <cstring>fileOpenAction</cstring>
- </property>
- <property name="iconSet">
- <iconset>fileopen</iconset>
- </property>
- <property name="text">
- <string>Open</string>
- </property>
- <property name="menuText">
- <string>&Open...</string>
- </property>
- <property name="accel">
- <string>Ctrl+O</string>
- </property>
- </action>
- <action>
- <property name="name">
- <cstring>fileSaveAction</cstring>
- </property>
- <property name="iconSet">
- <iconset>filesave</iconset>
- </property>
- <property name="text">
- <string>Save</string>
- </property>
- <property name="menuText">
- <string>&Save</string>
- </property>
- <property name="accel">
- <string>Ctrl+S</string>
- </property>
- </action>
- <action>
- <property name="name">
- <cstring>fileSaveAsAction</cstring>
- </property>
- <property name="text">
- <string>Save As</string>
- </property>
- <property name="menuText">
- <string>Save &As...</string>
- </property>
- <property name="accel">
<string></string>
</property>
</action>
<action>
<property name="name">
- <cstring>filePrintAction</cstring>
+ <cstring>helpIndexAction</cstring>
</property>
- <property name="iconSet">
- <iconset>print</iconset>
- </property>
<property name="text">
- <string>Print</string>
+ <string>Index</string>
</property>
<property name="menuText">
- <string>&Print...</string>
+ <string>&Index...</string>
</property>
<property name="accel">
- <string>Ctrl+P</string>
- </property>
- </action>
- <action>
- <property name="name">
- <cstring>fileExitAction</cstring>
- </property>
- <property name="text">
- <string>Exit</string>
- </property>
- <property name="menuText">
- <string>E&xit</string>
- </property>
- <property name="accel">
<string></string>
</property>
</action>
<action>
<property name="name">
- <cstring>editUndoAction</cstring>
+ <cstring>helpAboutAction</cstring>
</property>
- <property name="iconSet">
- <iconset>undo</iconset>
- </property>
<property name="text">
- <string>Undo</string>
+ <string>About</string>
</property>
<property name="menuText">
- <string>&Undo</string>
+ <string>&About</string>
</property>
<property name="accel">
- <string>Ctrl+Z</string>
- </property>
- </action>
- <action>
- <property name="name">
- <cstring>editRedoAction</cstring>
- </property>
- <property name="iconSet">
- <iconset>redo</iconset>
- </property>
- <property name="text">
- <string>Redo</string>
- </property>
- <property name="menuText">
- <string>&Redo</string>
- </property>
- <property name="accel">
- <string>Ctrl+Y</string>
- </property>
- </action>
- <action>
- <property name="name">
- <cstring>editCutAction</cstring>
- </property>
- <property name="iconSet">
- <iconset>editcut</iconset>
- </property>
- <property name="text">
- <string>Cut</string>
- </property>
- <property name="menuText">
- <string>Cu&t</string>
- </property>
- <property name="accel">
- <string>Ctrl+X</string>
- </property>
- </action>
- <action>
- <property name="name">
- <cstring>editCopyAction</cstring>
- </property>
- <property name="iconSet">
- <iconset>editcopy</iconset>
- </property>
- <property name="text">
- <string>Copy</string>
- </property>
- <property name="menuText">
- <string>&Copy</string>
- </property>
- <property name="accel">
- <string>Ctrl+C</string>
- </property>
- </action>
- <action>
- <property name="name">
- <cstring>editPasteAction</cstring>
- </property>
- <property name="iconSet">
- <iconset>editpaste</iconset>
- </property>
- <property name="text">
- <string>Paste</string>
- </property>
- <property name="menuText">
- <string>&Paste</string>
- </property>
- <property name="accel">
- <string>Ctrl+V</string>
- </property>
- </action>
- <action>
- <property name="name">
- <cstring>editFindAction</cstring>
- </property>
- <property name="iconSet">
- <iconset>searchfind</iconset>
- </property>
- <property name="text">
- <string>Find</string>
- </property>
- <property name="menuText">
- <string>&Find...</string>
- </property>
- <property name="accel">
- <string>Ctrl+F</string>
- </property>
- </action>
- <action>
- <property name="name">
- <cstring>helpContentsAction</cstring>
- </property>
- <property name="text">
- <string>Contents</string>
- </property>
- <property name="menuText">
- <string>&Contents...</string>
- </property>
- <property name="accel">
<string></string>
</property>
</action>
<action>
<property name="name">
- <cstring>helpIndexAction</cstring>
+ <cstring>Action</cstring>
</property>
<property name="text">
- <string>Index</string>
+ <string>Unnamed</string>
</property>
- <property name="menuText">
- <string>&Index...</string>
- </property>
- <property name="accel">
- <string></string>
- </property>
</action>
<action>
<property name="name">
- <cstring>helpAboutAction</cstring>
+ <cstring>serverConnectAction</cstring>
</property>
<property name="text">
- <string>About</string>
+ <string>&Connect</string>
</property>
<property name="menuText">
- <string>&About</string>
+ <string>&Connect</string>
</property>
- <property name="accel">
- <string></string>
- </property>
</action>
</actions>
<connections>
<connection>
- <sender>fileNewAction</sender>
- <signal>activated()</signal>
- <receiver>WMain</receiver>
- <slot>fileNew()</slot>
- </connection>
- <connection>
- <sender>fileOpenAction</sender>
- <signal>activated()</signal>
- <receiver>WMain</receiver>
- <slot>fileOpen()</slot>
- </connection>
- <connection>
- <sender>fileSaveAction</sender>
- <signal>activated()</signal>
- <receiver>WMain</receiver>
- <slot>fileSave()</slot>
- </connection>
- <connection>
- <sender>fileSaveAsAction</sender>
- <signal>activated()</signal>
- <receiver>WMain</receiver>
- <slot>fileSaveAs()</slot>
- </connection>
- <connection>
- <sender>filePrintAction</sender>
- <signal>activated()</signal>
- <receiver>WMain</receiver>
- <slot>filePrint()</slot>
- </connection>
- <connection>
- <sender>fileExitAction</sender>
- <signal>activated()</signal>
- <receiver>WMain</receiver>
- <slot>fileExit()</slot>
- </connection>
- <connection>
- <sender>editUndoAction</sender>
- <signal>activated()</signal>
- <receiver>WMain</receiver>
- <slot>editUndo()</slot>
- </connection>
- <connection>
- <sender>editRedoAction</sender>
- <signal>activated()</signal>
- <receiver>WMain</receiver>
- <slot>editRedo()</slot>
- </connection>
- <connection>
- <sender>editCutAction</sender>
- <signal>activated()</signal>
- <receiver>WMain</receiver>
- <slot>editCut()</slot>
- </connection>
- <connection>
- <sender>editPasteAction</sender>
- <signal>activated()</signal>
- <receiver>WMain</receiver>
- <slot>editPaste()</slot>
- </connection>
- <connection>
- <sender>editFindAction</sender>
- <signal>activated()</signal>
- <receiver>WMain</receiver>
- <slot>editFind()</slot>
- </connection>
- <connection>
<sender>helpIndexAction</sender>
<signal>activated()</signal>
<receiver>WMain</receiver>
@@ -409,36 +148,40 @@
<slot>helpAbout()</slot>
</connection>
<connection>
- <sender>entryArea</sender>
+ <sender>entry</sender>
<signal>returnPressed()</signal>
<receiver>WMain</receiver>
<slot>dispatchLine()</slot>
</connection>
+ <connection>
+ <sender>serverConnectAction</sender>
+ <signal>activated()</signal>
+ <receiver>WMain</receiver>
+ <slot>serverConnect()</slot>
+ </connection>
</connections>
<includes>
+ <include location="global" impldecl="in implementation">qsocket.h</include>
+ <include location="global" impldecl="in declaration">qsocket.h</include>
<include location="local" impldecl="in implementation">wmain.ui.h</include>
</includes>
+<variables>
+ <variable access="private">QSocket *socket;</variable>
+</variables>
<signals>
<signal>processLine(QString)</signal>
</signals>
<slots>
- <slot>fileNew()</slot>
- <slot>fileOpen()</slot>
- <slot>fileSave()</slot>
- <slot>fileSaveAs()</slot>
- <slot>filePrint()</slot>
- <slot>fileExit()</slot>
- <slot>editUndo()</slot>
- <slot>editRedo()</slot>
- <slot>editCut()</slot>
- <slot>editCopy()</slot>
- <slot>editPaste()</slot>
- <slot>editFind()</slot>
+ <slot>serverConnect()</slot>
<slot>helpIndex()</slot>
<slot>helpContents()</slot>
<slot>helpAbout()</slot>
<slot>dispatchLine()</slot>
+ <slot>connectedSlot()</slot>
</slots>
+<functions>
+ <function>init()</function>
+</functions>
<pixmapinproject/>
<layoutdefaults spacing="6" margin="11"/>
</UI>
Modified: trunk/clients/haver-qt/wmain.ui.h
===================================================================
--- trunk/clients/haver-qt/wmain.ui.h 2005-07-07 03:24:12 UTC (rev 851)
+++ trunk/clients/haver-qt/wmain.ui.h 2005-07-08 00:24:11 UTC (rev 852)
@@ -10,103 +10,46 @@
** destructor.
*****************************************************************************/
-
-void WMain::fileNew()
+void WMain::serverConnect()
{
-
+ display->append("Connecting to server...");
+
}
-
-void WMain::fileOpen()
+void WMain::helpIndex()
{
}
-void WMain::fileSave()
+void WMain::helpContents()
{
}
-void WMain::fileSaveAs()
+void WMain::helpAbout()
{
}
-void WMain::filePrint()
+void WMain::dispatchLine()
{
-
+ QString line = entry->text();
+ entry->clear();
+ emit processLine(line);
+ display->append(line);
}
-void WMain::fileExit()
+void WMain::init()
{
-
}
-
-void WMain::editUndo()
+void WMain::connectedSlot()
{
-
+ display->append("Connected to hardison.net:7070\n");
}
-void WMain::editRedo()
-{
-
-}
-
-
-void WMain::editCut()
-{
-
-}
-
-
-void WMain::editCopy()
-{
-
-}
-
-
-void WMain::editPaste()
-{
-
-}
-
-
-void WMain::editFind()
-{
-
-}
-
-
-void WMain::helpIndex()
-{
-
-}
-
-
-void WMain::helpContents()
-{
-
-}
-
-
-void WMain::helpAbout()
-{
-
-}
-
-
-void WMain::dispatchLine()
-{
- QLineEdit *entry = this->entryArea;
- QTextEdit *text = this->displayArea;
- QString line = entry->text();
- entry->clear();
- emit processLine(line);
- text->append(line);
-}
