Fixed|UI|Client: Manual direct connection dialog

It is now again possible to connect to a manually specified server.
The dialog uses the same MP menu widget that is used in the Home
MP tab.

Also renamed the MultiplayerMenuWidget to MultiplayerStatusWidget.

doomsday/apps/client/include/ui/home/multiplayercolumnwidget.h

@@ -24,12 +24,6 @@
 class MultiplayerColumnWidget : public ColumnWidget
 {
 public:
-    enum DiscoveryMode {
-        NoDiscovery,
-        DiscoverUsingMaster,
-        DirectDiscoveryOnly
-    };
-
     MultiplayerColumnWidget();
 
     de::String tabHeading() const override;

doomsday/apps/client/include/ui/home/multiplayerpanelbuttonwidget.h

@@ -25,6 +25,9 @@ struct serverinfo_s;
 
 class MultiplayerPanelButtonWidget : public PanelButtonWidget
 {
+public:
+    DENG2_DEFINE_AUDIENCE2(AboutToJoin, void aboutToJoinMultiplayerGame(serverinfo_s const &))
+
 public:
     MultiplayerPanelButtonWidget();
 

doomsday/apps/client/include/ui/widgets/multiplayerservermenuwidget.h

@@ -0,0 +1,47 @@
+/** @file multiplayerservermenuwidget.h
+ *
+ * @authors Copyright (c) 2016 Jaakko Keränen <jaakko.keranen@iki.fi>
+ *
+ * @par License
+ * GPL: http://www.gnu.org/licenses/gpl.html
+ *
+ * <small>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, see:
+ * http://www.gnu.org/licenses</small>
+ */
+
+#ifndef DENG_CLIENT_UI_MULTIPLAYERSERVERMENUWIDGET_H
+#define DENG_CLIENT_UI_MULTIPLAYERSERVERMENUWIDGET_H
+
+#include "homemenuwidget.h"
+
+struct serverinfo_s;
+
+/**
+ * Menu for listing available multiplayer servers.
+ */
+class MultiplayerServerMenuWidget : public HomeMenuWidget
+{
+public:
+    DENG2_DEFINE_AUDIENCE2(AboutToJoin, void aboutToJoinMultiplayerGame(serverinfo_s const &))
+
+    enum DiscoveryMode {
+        NoDiscovery,
+        DiscoverUsingMaster,
+        DirectDiscoveryOnly
+    };
+
+    MultiplayerServerMenuWidget(DiscoveryMode discovery = DiscoverUsingMaster,
+                                de::String const &name = de::String());
+
+private:
+    DENG2_PRIVATE(d)
+};
+
+#endif // DENG_CLIENT_UIMULTIPLAYERSERVERMENUWIDGET_H

doomsday/apps/client/include/ui/widgets/multiplayermenuwidget.h → doomsday/apps/client/include/ui/widgets/multiplayerstatuswidget.h

@@ -1,6 +1,6 @@
-/** @file multiplayermenuwidget.h
+/** @file multiplayerstatuswidget.h
  *
- * @authors Copyright (c) 2014 Jaakko Keränen <jaakko.keranen@iki.fi>
+ * @authors Copyright (c) 2014-2016 Jaakko Keränen <jaakko.keranen@iki.fi>
  *
  * @par License
  * GPL: http://www.gnu.org/licenses/gpl.html
@@ -16,8 +16,8 @@
  * http://www.gnu.org/licenses</small>
  */
 
-#ifndef DENG_CLIENT_MULTIPLAYERMENUWIDGET_H
-#define DENG_CLIENT_MULTIPLAYERMENUWIDGET_H
+#ifndef DENG_CLIENT_MULTIPLAYERSTATUSWIDGET_H
+#define DENG_CLIENT_MULTIPLAYERSTATUSWIDGET_H
 
 #include <de/PopupMenuWidget>
 
@@ -26,13 +26,13 @@
  *
  * @ingroup ui
  */
-class MultiplayerMenuWidget : public de::PopupMenuWidget
+class MultiplayerStatusWidget : public de::PopupMenuWidget
 {
     Q_OBJECT
-    
+
 public:
-    MultiplayerMenuWidget();
-    
+    MultiplayerStatusWidget();
+
 public slots:
     void updateElapsedTime();
 
@@ -44,4 +44,4 @@ public slots:
     DENG2_PRIVATE(d)
 };
 
-#endif // DENG_CLIENT_MULTIPLAYERMENUWIDGET_H
+#endif // DENG_CLIENT_MULTIPLAYERSTATUSWIDGET_H

doomsday/apps/client/src/ui/dialogs/manualconnectiondialog.cpp

@@ -17,7 +17,7 @@
  */
 
 #include "ui/dialogs/manualconnectiondialog.h"
-//#include "ui/widgets/mpsessionmenuwidget.h"
+#include "ui/widgets/multiplayerservermenuwidget.h"
 #include "clientapp.h"
 
 #include <de/SignalAction>
@@ -28,10 +28,11 @@ using namespace de;
 
 DENG2_PIMPL(ManualConnectionDialog)
 , DENG2_OBSERVES(ServerLink, DiscoveryUpdate)
+, DENG2_OBSERVES(MultiplayerServerMenuWidget, AboutToJoin)
 {
     String usedAddress;
     FoldPanelWidget *fold;
-    //MPSessionMenuWidget *games; // TODO: refactor to use menu from MultiplayerColumnWidget
+    MultiplayerServerMenuWidget *servers;
     ProgressWidget *progress;
     bool querying;
     bool joinWhenEnterPressed;
@@ -46,7 +47,7 @@ DENG2_PIMPL(ManualConnectionDialog)
         ClientApp::serverLink().audienceForDiscoveryUpdate += this;
     }
 
-    void linkDiscoveryUpdate(ServerLink const &link)
+    void linkDiscoveryUpdate(ServerLink const &link) override
     {
         if (querying)
         {
@@ -80,26 +81,34 @@ DENG2_PIMPL(ManualConnectionDialog)
     {
         return self.buttonWidget(tr("Connect"));
     }
+
+    void aboutToJoinMultiplayerGame(serverinfo_t const &) override
+    {
+        self.accept();
+    }
 };
 
 ManualConnectionDialog::ManualConnectionDialog(String const &name)
     : InputDialog(name), d(new Impl(this))
 {
+    area().enableIndicatorDraw(true);
+
     add(d->progress = new ProgressWidget);
     d->progress->useMiniStyle("altaccent");
     d->progress->setWidthPolicy(ui::Expand);
     d->progress->setTextAlignment(ui::AlignLeft);
     d->progress->hide();
 
-    // The found games are shown inside a fold panel.
-    d->fold  = new FoldPanelWidget;
-/*    d->games = new MPSessionMenuWidget(MPSessionMenuWidget::DirectDiscoveryOnly);
-    connect(d->games, SIGNAL(sessionSelected(de::ui::Item const *)),
+    // The found servers are shown inside a fold panel.
+    d->fold = new FoldPanelWidget;
+    d->servers = new MultiplayerServerMenuWidget(MultiplayerServerMenuWidget::DirectDiscoveryOnly);
+    d->servers->audienceForAboutToJoin() += d;
+    /*connect(d->servers, SIGNAL(sessionSelected(de::ui::Item const *)),
             this,     SIGNAL(selected(de::ui::Item const *)));
-    connect(d->games, SIGNAL(sessionSelected(de::ui::Item const *)),
-            this,     SLOT  (serverSelected(de::ui::Item const *)));
-    d->games->rule().setInput(Rule::Width, rule().width() - margins().width());
-    d->fold->setContent(d->games);*/
+    connect(d->servers, SIGNAL(sessionSelected(de::ui::Item const *)),
+            this,     SLOT  (serverSelected(de::ui::Item const *)));*/
+    d->servers->rule().setInput(Rule::Width, rule().width() - margins().width());
+    d->fold->setContent(d->servers);
     area().add(d->fold);
 
     title().setText(tr("Connect to Server"));
@@ -124,7 +133,7 @@ ManualConnectionDialog::ManualConnectionDialog(String const &name)
     connect(&editor(), SIGNAL(editorContentChanged()), this, SLOT(validate()));
     connect(&editor(), SIGNAL(editorContentChanged()), this, SLOT(contentChanged()));
 
-    updateLayout();
+    updateLayout(IncludeHidden); // fold widgets are hidden while closed
 }
 
 void ManualConnectionDialog::enableJoinWhenSelected(bool joinWhenSelected)
@@ -134,7 +143,7 @@ void ManualConnectionDialog::enableJoinWhenSelected(bool joinWhenSelected)
 
 Action *ManualConnectionDialog::makeAction(ui::Item const &/*item*/)
 {
-    //return d->games->makeAction(item);
+    //return d->servers->makeAction(item);
     return nullptr;
 }
 
@@ -163,8 +172,8 @@ void ManualConnectionDialog::queryOrConnect()
         // Automatically connect if there is a single choice.
         if (d->joinWhenEnterPressed)
         {
-            //emit selected(&d->games->items().at(0));
-            //serverSelected(&d->games->items().at(0));
+            //emit selected(&d->servers->items().at(0));
+            //serverSelected(&d->servers->items().at(0));
             return;
         }
 
@@ -195,8 +204,10 @@ void ManualConnectionDialog::validate()
         valid = false;
     }
 
-    if (editor().text().isEmpty() || editor().text().contains(';') ||
-       editor().text().endsWith(":") || editor().text().startsWith(":"))
+    if (editor().text().isEmpty()     ||
+        editor().text().contains(';') ||
+        editor().text().endsWith(":") ||
+        (editor().text().startsWith(":") && !editor().text().startsWith("::")))
     {
         valid = false;
     }
@@ -220,6 +231,5 @@ void ManualConnectionDialog::finish(int result)
         // The dialog was accepted.
         d->usedAddress = editor().text();
     }
-
     InputDialog::finish(result);
 }