Author: dylan
Date: 2005-07-07 20:24:13 -0400 (Thu, 07 Jul 2005)
New Revision: 853
Modified:
trunk/
trunk/clients/haver-qt/connect.ui
trunk/clients/haver-qt/connect.ui.h
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 20:24:02 -0400
dialog box works, sorta. :)
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:1236
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:1237
edfcd8bd-4ce7-0310-a97e-bb1efd40edf3:/local:238
Modified: trunk/clients/haver-qt/connect.ui
===================================================================
--- trunk/clients/haver-qt/connect.ui 2005-07-08 00:24:11 UTC (rev 852)
+++ trunk/clients/haver-qt/connect.ui 2005-07-08 00:24:13 UTC (rev 853)
@@ -9,7 +9,7 @@
<x>0</x>
<y>0</y>
<width>276</width>
- <height>161</height>
+ <height>165</height>
</rect>
</property>
<property name="caption">
@@ -27,16 +27,8 @@
<string>Hostname:</string>
</property>
</widget>
- <widget class="QLabel" row="2" column="0">
+ <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="3">
<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">
@@ -51,7 +43,7 @@
<string>Name:</string>
</property>
</widget>
- <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="2">
+ <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="3">
<property name="name">
<cstring>username</cstring>
</property>
@@ -64,17 +56,23 @@
<string>Connect</string>
</property>
</widget>
- <widget class="QPushButton" row="3" column="2">
+ <widget class="QSpinBox" row="2" column="1">
<property name="name">
- <cstring>cancelButton</cstring>
+ <cstring>port</cstring>
</property>
- <property name="text">
- <string>Cancel</string>
+ <property name="maxValue">
+ <number>65536</number>
</property>
+ <property name="minValue">
+ <number>1</number>
+ </property>
+ <property name="value">
+ <number>7575</number>
+ </property>
</widget>
- <spacer row="3" column="1">
+ <spacer row="2" column="2" rowspan="1" colspan="2">
<property name="name">
- <cstring>spacer13</cstring>
+ <cstring>spacer14</cstring>
</property>
<property name="orientation">
<enum>Horizontal</enum>
@@ -84,28 +82,30 @@
</property>
<property name="sizeHint">
<size>
- <width>81</width>
+ <width>91</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QSpinBox" row="2" column="1">
+ <widget class="QLabel" row="2" column="0">
<property name="name">
- <cstring>port</cstring>
+ <cstring>textLabel8</cstring>
</property>
- <property name="maxValue">
- <number>65536</number>
+ <property name="text">
+ <string>Port:</string>
</property>
- <property name="minValue">
- <number>1</number>
+ </widget>
+ <widget class="QPushButton" row="3" column="3">
+ <property name="name">
+ <cstring>cancelButton</cstring>
</property>
- <property name="value">
- <number>7575</number>
+ <property name="text">
+ <string>Cancel</string>
</property>
</widget>
- <spacer row="2" column="2">
+ <spacer row="3" column="1" rowspan="1" colspan="2">
<property name="name">
- <cstring>spacer14</cstring>
+ <cstring>spacer3</cstring>
</property>
<property name="orientation">
<enum>Horizontal</enum>
@@ -127,24 +127,18 @@
<sender>cancelButton</sender>
<signal>clicked()</signal>
<receiver>Connect</receiver>
- <slot>close()</slot>
+ <slot>reject()</slot>
</connection>
<connection>
<sender>connectButton</sender>
<signal>clicked()</signal>
<receiver>Connect</receiver>
- <slot>connectClicked()</slot>
+ <slot>accept()</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>
Modified: trunk/clients/haver-qt/connect.ui.h
===================================================================
--- trunk/clients/haver-qt/connect.ui.h 2005-07-08 00:24:11 UTC (rev 852)
+++ trunk/clients/haver-qt/connect.ui.h 2005-07-08 00:24:13 UTC (rev 853)
@@ -11,7 +11,3 @@
*****************************************************************************/
-void Connect::connectClicked()
-{
-
-}
Modified: trunk/clients/haver-qt/haver-qt.pro
===================================================================
--- trunk/clients/haver-qt/haver-qt.pro 2005-07-08 00:24:11 UTC (rev 852)
+++ trunk/clients/haver-qt/haver-qt.pro 2005-07-08 00:24:13 UTC (rev 853)
@@ -18,16 +18,6 @@
images/editcopy \
images/editpaste \
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-08 00:24:11 UTC (rev 852)
+++ trunk/clients/haver-qt/wmain.ui 2005-07-08 00:24:13 UTC (rev 853)
@@ -161,8 +161,10 @@
</connection>
</connections>
<includes>
+ <include location="global" impldecl="in declaration">qsocket.h</include>
<include location="global" impldecl="in implementation">qsocket.h</include>
- <include location="global" impldecl="in declaration">qsocket.h</include>
+ <include location="local" impldecl="in implementation">connect.h</include>
+ <include location="global" impldecl="in
implementation">qspinbox.h</include>
<include location="local" impldecl="in implementation">wmain.ui.h</include>
</includes>
<variables>
Modified: trunk/clients/haver-qt/wmain.ui.h
===================================================================
--- trunk/clients/haver-qt/wmain.ui.h 2005-07-08 00:24:11 UTC (rev 852)
+++ trunk/clients/haver-qt/wmain.ui.h 2005-07-08 00:24:13 UTC (rev 853)
@@ -10,10 +10,24 @@
** destructor.
*****************************************************************************/
+
void WMain::serverConnect()
{
display->append("Connecting to server...");
-
+ Connect *dialog = new Connect(this);
+
+ if ( dialog->exec() == QDialog::Accepted ) {
+ QString username = dialog->username->text();
+ QString hostname = dialog->hostname->text();
+ int port = dialog->port->value();
+ QString msg = QString("Connecting to %1:%2 as %3")
+ .arg(hostname)
+ .arg(port)
+ .arg(username);
+ display->append(msg);
+ }
+
+ delete dialog;
}
void WMain::helpIndex()
