- the last fixes for new build setup

- better connect dialog

8 files changed, 66 insertions, 28 deletions

diff --git a/.gitignore b/.gitignore
index 58501e0..461dff5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 pacman-c++/*.pro.user
 pacman-c++/pacman
+pacman-c++/build
 pacman-c++/enet
-pacman-c++/Makefile
 pacman-c++/qrc_*
 pacman-c++/*.o
 pacman-c++/*.moc
diff --git a/pacman-c++/client/client.cpp b/pacman-c++/client/client.cpp
index d064d9e..96ee59a 100644
--- a/pacman-c++/client/client.cpp
+++ b/pacman-c++/client/client.cpp
@@ -185,14 +185,14 @@ void Client::showConnectDialog()
   QGridLayout *layout = new QGridLayout(m_dialog);
   layout->setSizeConstraint(QLayout::SetFixedSize);
 
-  QLabel *srvLabel = new QLabel("Address:", m_dialog);
-  QLineEdit *srv = new QLineEdit(m_settings->value("address", "127.0.0.1").toString(), m_dialog);
-  QLabel *portLabel = new QLabel("Port:", m_dialog);
-  QDoubleSpinBox *port = new QDoubleSpinBox(m_dialog);
-  port->setDecimals(0);
-  port->setMinimum(1);
-  port->setMaximum(65535);
-  port->setValue(m_settings->value("port", Constants::Networking::port).toUInt());
+  QLabel *srvLabel = new QLabel("Server address:", m_dialog);
+
+  QComboBox *srv = new QComboBox(m_dialog);
+  srv->setEditable(true);
+  srv->setInsertPolicy(QComboBox::InsertAtTop);
+  QString defentry = QString("127.0.0.1:%1").arg(Constants::Networking::port);
+  QStringList srvlist = m_settings->value("srvlist", QStringList(defentry)).toStringList();
+  srv->addItems(srvlist);
 
   QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel,
                                                      Qt::Horizontal, m_dialog);
@@ -201,15 +201,12 @@ void Client::showConnectDialog()
   buttonBox->addButton(okButton, QDialogButtonBox::ButtonRole(QDialogButtonBox::AcceptRole));
   buttonBox->addButton(cancelButton, QDialogButtonBox::ButtonRole(QDialogButtonBox::RejectRole));
   connect(buttonBox, SIGNAL(rejected()), m_dialog, SLOT(reject()));
-  connect(buttonBox, SIGNAL(accepted()), m_dialog, SLOT(accept()));
+  connect(buttonBox, SIGNAL(accepted()), this, SLOT(onAcceptConnectDialog()));
 
   layout->addWidget(srvLabel, 0, 0);
   layout->addWidget(srv, 0, 1);
-  layout->addWidget(portLabel, 1, 0);
-  layout->addWidget(port, 1, 1);
   layout->addWidget(buttonBox, 4, 0, 1, 5);
 
-  connect(m_dialog, SIGNAL(accepted()), this, SLOT(onAcceptConnectDialog()));
   m_dialog->show();
 }
 
@@ -218,11 +215,38 @@ void Client::onAcceptConnectDialog()
   if (m_dialog == NULL)
     return;
   QGridLayout *layout = static_cast<QGridLayout *>(m_dialog->layout());
-  QLineEdit *srv = static_cast<QLineEdit *>(layout->itemAtPosition(0, 1)->widget());
-  QDoubleSpinBox *port = static_cast<QDoubleSpinBox *>(layout->itemAtPosition(1, 1)->widget());
-  m_settings->setValue("address", srv->text());
-  m_settings->setValue("port", int(port->value()));
-  m_mainWidget->doConnect(srv->text(), int(port->value()));
+  QComboBox *srv = static_cast<QComboBox *>(layout->itemAtPosition(0, 1)->widget());
+  QStringList selected = srv->currentText().split(':');
+  QString errormsg;
+  if (errormsg.isNull() && selected.count() < 2)
+    errormsg = "Invalid Syntax.\nUse: <address>:<port>";
+
+  /* port */
+  QString portstr = selected.takeLast();
+  bool ok;
+  unsigned int port = portstr.toUInt(&ok);
+  if (!ok || port < 1 || port > 65535)
+    errormsg = "Invalid port number. Must be between 1 and 65535";
+
+  /* address */
+  QString address = selected.join(":");
+
+  if (!errormsg.isNull())
+  {
+    QMessageBox::critical(this, "Error", errormsg);
+    return;
+  }
+
+  emit m_dialog->accept();
+
+  QStringList srvlist = m_settings->value("srvlist").toStringList();
+  srvlist.insert(0, srv->currentText());
+  srvlist.removeDuplicates();
+  while (srvlist.count() > 20)
+    srvlist.removeAt(20 - 1);
+  m_settings->setValue("srvlist", srvlist);
+
+  m_mainWidget->doConnect(address, port);
 }
 
 bool Constants::server = false;
diff --git a/pacman-c++/client/client.pro b/pacman-c++/client/client.pro
index 849cca2..4b326fe 100644
--- a/pacman-c++/client/client.pro
+++ b/pacman-c++/client/client.pro
@@ -9,4 +9,6 @@ HEADERS += clicklabel.h \
     mainwidget.h
 
 include(../common.pri)
-PRE_TARGETDEPS += ../common/libcommon.a
+PRE_TARGETDEPS += ../libcommon.a
+
+win32:RC_FILE = ../common/pacman.rc
diff --git a/pacman-c++/common.pri b/pacman-c++/common.pri
index fed2973..51db8ac 100644
--- a/pacman-c++/common.pri
+++ b/pacman-c++/common.pri
@@ -1,20 +1,21 @@
 LANGUAGE = C++
 VERSION = 0.1
 
-OBJECTS_DIR = .obj
-MOC_DIR = .moc
-
 QT += phonon network
 
+DESTDIR = ../
+
 INCLUDEPATH += ../common
 DEPENDPATH += ../common
-LIBS += -L../common -lcommon
+LIBS += -L.. -lcommon
 
 INCLUDEPATH += $$OUT_PWD/../proto
-LIBS += -L../proto -lproto -lprotobuf
+LIBS += -L.. -lproto -lprotobuf
 
 INCLUDEPATH += ../enet/include
 LIBS += -L$$PWD/enet/.libs -lenet
+# enable this if you want to link the archive
+#win32:LIBS += -lws2_32 -lwinmm
 
 CONFIG(release, debug|release) {
     DEFINES += QT_NO_DEBUG_OUTPUT
diff --git a/pacman-c++/common/common.pro b/pacman-c++/common/common.pro
index 5903f9d..ca82382 100644
--- a/pacman-c++/common/common.pro
+++ b/pacman-c++/common/common.pro
@@ -27,4 +27,3 @@ OTHER_FILES += style.qss \
     pacman.rc
 
 RESOURCES += pacman.qrc
-RC_FILE = pacman.rc
diff --git a/pacman-c++/rebuild.sh b/pacman-c++/rebuild.sh
index 58ec7c4..01454ed 100755
--- a/pacman-c++/rebuild.sh
+++ b/pacman-c++/rebuild.sh
@@ -1,4 +1,6 @@
 #!/bin/sh
+mkdir -p build
+cd build
 #make distclean
-qmake CONFIG+=debug pacman.pro
+qmake CONFIG+=debug ../pacman.pro
 make -j2
diff --git a/pacman-c++/server/server.cpp b/pacman-c++/server/server.cpp
index c9e4fff..65db87d 100644
--- a/pacman-c++/server/server.cpp
+++ b/pacman-c++/server/server.cpp
@@ -38,7 +38,7 @@ Server::~Server()
         break;
       case ENET_EVENT_TYPE_DISCONNECT:
         m_clientConnections.remove(event.peer);
-        return;
+        break;
       default:
         break;
       }
@@ -949,6 +949,12 @@ int main(int argc, char **argv)
    */
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
+  if (enet_initialize () != 0)
+  {
+    qCritical() << "An error occurred while initializing ENet";
+    return EXIT_FAILURE;
+  }
+
   QApplication app(argc, argv, false);
   app.setApplicationName("Pacman Server");
   app.setWindowIcon(QIcon(":/appicon"));
@@ -964,6 +970,8 @@ int main(int argc, char **argv)
   if (!ret)
     ret = app.exec();
 
+  enet_deinitialize();
+
   /* Delete all global objects allocated by libprotobuf */
   google::protobuf::ShutdownProtobufLibrary();
 
diff --git a/pacman-c++/server/server.pro b/pacman-c++/server/server.pro
index 05d5c9d..b5a9952 100644
--- a/pacman-c++/server/server.pro
+++ b/pacman-c++/server/server.pro
@@ -7,4 +7,6 @@ HEADERS += anyoption.h \
     server.h
 
 include(../common.pri)
-PRE_TARGETDEPS += ../common/libcommon.a
+PRE_TARGETDEPS += ../libcommon.a
+
+win32:RC_FILE = ../common/pacman.rc