Merge remote-tracking branch 'remotes/origin/master' into savegame-re…

…factor
skyjake · Mar 8, 2014 · df918ff · df918ff
2 parents aab5318 + 6c7589f
commit df918ff
Show file tree

Hide file tree

Showing 60 changed files with 784 additions and 5,049 deletions.
diff --git a/doomsday/client/client.pro b/doomsday/client/client.pro
@@ -273,7 +273,6 @@ DENG_HEADERS += \
     include/network/protocol.h \
     include/network/serverlink.h \
     include/network/sys_network.h \
-    include/network/ui_mpi.h \
     include/partition.h \
     include/r_util.h \
     include/render/biasdigest.h \
@@ -415,7 +414,6 @@ DENG_HEADERS += \
     include/ui/sys_input.h \
     include/ui/ui2_main.h \
     include/ui/ui_main.h \
-    include/ui/ui_panel.h \
     include/ui/zonedebug.h \
     include/updater.h \
     include/updater/downloaddialog.h \
@@ -603,7 +601,6 @@ SOURCES += \
     src/network/net_ping.cpp \
     src/network/serverlink.cpp \
     src/network/sys_network.cpp \
-    src/network/ui_mpi.cpp \
     src/r_util.cpp \
     src/render/api_render.cpp \
     src/render/biasdigest.cpp \
@@ -722,7 +719,6 @@ SOURCES += \
     src/ui/sys_input.cpp \
     src/ui/ui2_main.cpp \
     src/ui/ui_main.cpp \
-    src/ui/ui_panel.cpp \
     src/ui/widgetactions.cpp \
     src/ui/widgets/busywidget.cpp \
     src/ui/widgets/consolecommandwidget.cpp \

diff --git a/doomsday/client/include/de_ui.h b/doomsday/client/include/de_ui.h
@@ -32,8 +32,6 @@
 #  include "ui/clientwindowsystem.h"
 #  include "ui/clientwindow.h"
 #  include "ui/ui_main.h"
-#  include "ui/ui_panel.h"
-#  include "network/ui_mpi.h"
 #endif
 
 #endif /* LIBDENG_USER_INTERFACE_H */
diff --git a/doomsday/client/include/network/ui_mpi.h b/doomsday/client/include/network/ui_mpi.h
diff --git a/doomsday/client/include/ui/dialogs/gamesdialog.h b/doomsday/client/include/ui/dialogs/gamesdialog.h
@@ -29,10 +29,17 @@ class GamesDialog : public de::DialogWidget
     Q_OBJECT
 
 public:
-    GamesDialog(de::String const &name = "games");
+    enum Mode {
+        ShowAll,
+        ShowSingleplayerOnly,
+        ShowMultiplayerOnly
+    };
+
+    GamesDialog(Mode mode = ShowAll, de::String const &name = "games");
 
 public slots:
     void showSettings();
+    void connectManually();
 
 protected:
     void preparePanelForOpening();

diff --git a/doomsday/client/include/ui/dialogs/manualconnectiondialog.h b/doomsday/client/include/ui/dialogs/manualconnectiondialog.h
@@ -43,7 +43,6 @@ public slots:
     void queryOrConnect();
     void contentChanged();
     void validate();
-    void disconnected();
 
 protected:
     void finish(int result);