preparations for new connect dialog

llcon.pro

@@ -46,6 +46,7 @@ FORMS += src/llconclientdlgbase.ui \
     src/llconserverdlgbase.ui \
     src/clientsettingsdlgbase.ui \
     src/chatdlgbase.ui \
+    src/connectdlgbase.ui \
     src/aboutdlgbase.ui
 
 HEADERS += src/audiomixerboard.h \
@@ -54,6 +55,7 @@ HEADERS += src/audiomixerboard.h \
     src/chatdlg.h \
     src/client.h \
     src/clientsettingsdlg.h \
+    src/connectdlg.h \
     src/global.h \
     src/llconclientdlg.h \
     src/llconserverdlg.h \
@@ -106,6 +108,7 @@ SOURCES += src/audiomixerboard.cpp \
     src/chatdlg.cpp \
     src/client.cpp \
     src/clientsettingsdlg.cpp \
+    src/connectdlg.cpp \
     src/llconclientdlg.cpp \
     src/llconserverdlg.cpp \
     src/main.cpp \

src/connectdlg.cpp

@@ -0,0 +1,28 @@
+/******************************************************************************\
+ * Copyright (c) 2004-2011
+ *
+ * Author(s):
+ *  Volker Fischer
+ *
+ ******************************************************************************
+ *
+ * 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., 
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+\******************************************************************************/
+
+#include "connectdlg.h"
+
+
+/* Implementation *************************************************************/

src/connectdlg.h

@@ -0,0 +1,51 @@
+/******************************************************************************\
+ * Copyright (c) 2004-2011
+ *
+ * Author(s):
+ *  Volker Fischer
+ *
+ ******************************************************************************
+ *
+ * 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., 
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+\******************************************************************************/
+
+#include <qlabel.h>
+#include <qlineedit.h>
+#include <qpushbutton.h>
+#include <qwhatsthis.h>
+#include <qtimer.h>
+#include "global.h"
+#ifdef _WIN32
+# include "../windows/moc/connectdlgbase.h"
+#else
+# ifdef _IS_QMAKE_CONFIG
+#  include "ui_connectdlgbase.h"
+# else
+#  include "moc/connectdlgbase.h"
+# endif
+#endif
+
+
+/* Classes ********************************************************************/
+class CConnectDlg : public QDialog, private Ui_CConnectDlgBase
+{
+    Q_OBJECT
+
+public:
+
+protected:
+
+};

src/connectdlgbase.ui

@@ -0,0 +1,96 @@
+<ui version="4.0" >
+ <class>CConnectDlgBase</class>
+ <widget class="QDialog" name="CConnectDlgBase" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>458</width>
+    <height>350</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Connection Setup</string>
+  </property>
+  <property name="windowIcon" >
+   <iconset resource="resources.qrc" >:/png/main/res/mainicon.png</iconset>
+  </property>
+  <property name="styleSheet" >
+   <string/>
+  </property>
+  <property name="sizeGripEnabled" >
+   <bool>true</bool>
+  </property>
+  <layout class="QVBoxLayout" >
+   <item>
+    <widget class="QTreeWidget" name="ListViewServers" >
+     <property name="rootIsDecorated" >
+      <bool>false</bool>
+     </property>
+     <column>
+      <property name="text" >
+       <string>Server IP : Port</string>
+      </property>
+     </column>
+     <column>
+      <property name="text" >
+       <string>Name</string>
+      </property>
+     </column>
+     <column>
+      <property name="text" >
+       <string>Ping Time</string>
+      </property>
+     </column>
+     <column>
+      <property name="text" >
+       <string>Ping Status</string>
+      </property>
+     </column>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="TextLabelServerAddr" >
+     <property name="text" >
+      <string>Server Address</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QComboBox" name="LineEditServerAddr" >
+     <property name="editable" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton" >
+       <property name="text" >
+        <string>PushButton</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="resources.qrc" />
+ </resources>
+ <connections/>
+</ui>

windows/MocQT.bat

@@ -35,6 +35,7 @@ rem .h --------------
 %qtdir%\bin\moc.exe ..\src\clientsettingsdlg.h -o moc\moc_clientsettingsdlg.cpp
 %qtdir%\bin\moc.exe ..\src\llconserverdlg.h -o moc\moc_llconserverdlg.cpp
 %qtdir%\bin\moc.exe ..\src\chatdlg.h -o moc\moc_chatdlg.cpp
+%qtdir%\bin\moc.exe ..\src\connectdlg.h -o moc\moc_connectdlg.cpp
 %qtdir%\bin\moc.exe ..\src\server.h -o moc\moc_server.cpp
 %qtdir%\bin\moc.exe ..\src\client.h -o moc\moc_client.cpp
 %qtdir%\bin\moc.exe ..\src\socket.h -o moc\moc_socket.cpp
@@ -53,6 +54,7 @@ rem .ui -------------
 %qtdir%\bin\uic.exe ..\src\clientsettingsdlgbase.ui -o moc\clientsettingsdlgbase.h
 %qtdir%\bin\uic.exe ..\src\llconserverdlgbase.ui -o moc\llconserverdlgbase.h
 %qtdir%\bin\uic.exe ..\src\chatdlgbase.ui -o moc\chatdlgbase.h
+%qtdir%\bin\uic.exe ..\src\connectdlgbase.ui -o moc\connectdlgbase.h
 
 
 rem .qrc ------------

windows/llcon.vcproj

@@ -476,6 +476,10 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\src\connectdlg.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\llconclientdlg.cpp"
 				>
@@ -954,6 +958,10 @@
 						/>
 					</FileConfiguration>
 				</File>
+				<File
+					RelativePath=".\moc\moc_connectdlg.cpp"
+					>
+				</File>
 				<File
 					RelativePath="moc\moc_llconclientdlg.cpp"
 					>
@@ -1490,6 +1498,10 @@
 				RelativePath="..\src\clientsettingsdlg.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\connectdlg.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\global.h"
 				>