GUI2: moved MP Lobby and Player Info files into the multiplayer dialo…

…g subdir
wesnoth · Oct 20, 2017 · f259303 · f259303
1 parent 5d25988
commit f259303
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 39 deletions.
diff --git a/projectfiles/VC12/wesnoth.vcxproj b/projectfiles/VC12/wesnoth.vcxproj
@@ -1748,20 +1748,6 @@
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">$(IntDir)Gui\Dialogs\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Gui\Dialogs\</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\..\src\gui\dialogs\lobby\lobby.cpp">
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Gui\Dialogs\Lobby\</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Gui\Dialogs\Lobby\</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Gui\Dialogs\Lobby\</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">$(IntDir)Gui\Dialogs\Lobby\</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Gui\Dialogs\Lobby\</ObjectFileName>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gui\dialogs\lobby\player_info.cpp">
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Gui\Dialogs\Lobby\</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Gui\Dialogs\Lobby\</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)Gui\Dialogs\Lobby\</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">$(IntDir)Gui\Dialogs\Lobby\</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Gui\Dialogs\Lobby\</ObjectFileName>
-    </ClCompile>
     <ClCompile Include="..\..\src\gui\dialogs\log_settings.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Gui\Dialogs\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Gui\Dialogs\</ObjectFileName>
@@ -1804,6 +1790,7 @@
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">$(IntDir)Gui\Dialogs\Multiplayer\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Gui\Dialogs\Multiplayer\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\src\gui\dialogs\multiplayer\lobby.cpp" />
     <ClCompile Include="..\..\src\gui\dialogs\multiplayer\mp_alerts_options.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Gui\Dialogs\Multiplayer\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Gui\Dialogs\Multiplayer\</ObjectFileName>
@@ -1888,6 +1875,7 @@
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">$(IntDir)Gui\Dialogs\Multiplayer\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Gui\Dialogs\Multiplayer\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\src\gui\dialogs\multiplayer\player_info.cpp" />
     <ClCompile Include="..\..\src\gui\dialogs\multiplayer\synced_choice_wait.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Gui\Dialogs\Multiplayer\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Gui\Dialogs\Multiplayer\</ObjectFileName>
@@ -3743,14 +3731,13 @@
     <ClInclude Include="..\..\src\gui\dialogs\label_settings.hpp" />
     <ClInclude Include="..\..\src\gui\dialogs\language_selection.hpp" />
     <ClInclude Include="..\..\src\gui\dialogs\loading_screen.hpp" />
-    <ClInclude Include="..\..\src\gui\dialogs\lobby\lobby.hpp" />
-    <ClInclude Include="..\..\src\gui\dialogs\lobby\player_info.hpp" />
     <ClInclude Include="..\..\src\gui\dialogs\log_settings.hpp" />
     <ClInclude Include="..\..\src\gui\dialogs\lua_interpreter.hpp" />
     <ClInclude Include="..\..\src\gui\dialogs\message.hpp" />
     <ClInclude Include="..\..\src\gui\dialogs\modal_dialog.hpp" />
     <ClInclude Include="..\..\src\gui\dialogs\modeless_dialog.hpp" />
     <ClInclude Include="..\..\src\gui\dialogs\multiplayer\faction_select.hpp" />
+    <ClInclude Include="..\..\src\gui\dialogs\multiplayer\lobby.hpp" />
     <ClInclude Include="..\..\src\gui\dialogs\multiplayer\mp_alerts_options.hpp" />
     <ClInclude Include="..\..\src\gui\dialogs\multiplayer\mp_change_control.hpp" />
     <ClInclude Include="..\..\src\gui\dialogs\multiplayer\mp_cmd_wrapper.hpp" />
@@ -3763,6 +3750,7 @@
     <ClInclude Include="..\..\src\gui\dialogs\multiplayer\mp_method_selection.hpp" />
     <ClInclude Include="..\..\src\gui\dialogs\multiplayer\mp_options_helper.hpp" />
     <ClInclude Include="..\..\src\gui\dialogs\multiplayer\mp_staging.hpp" />
+    <ClInclude Include="..\..\src\gui\dialogs\multiplayer\player_info.hpp" />
     <ClInclude Include="..\..\src\gui\dialogs\multiplayer\plugin_executor.hpp" />
     <ClInclude Include="..\..\src\gui\dialogs\multiplayer\synced_choice_wait.hpp" />
     <ClInclude Include="..\..\src\gui\dialogs\network_transmission.hpp" />

diff --git a/projectfiles/VC12/wesnoth.vcxproj.filters b/projectfiles/VC12/wesnoth.vcxproj.filters
@@ -56,9 +56,6 @@
     <Filter Include="Gui\Dialogs">
       <UniqueIdentifier>{006b82d3-7b2b-41ef-bfd8-8f98867cab7b}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Gui\Dialogs\Lobby">
-      <UniqueIdentifier>{7c98108b-ad5b-4712-8824-40ac9b734ff4}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Gui\Dialogs\Addon">
       <UniqueIdentifier>{994675eb-e9db-4699-a08a-d29248d169e7}</UniqueIdentifier>
     </Filter>
@@ -701,12 +698,6 @@
     <ClCompile Include="..\..\src\gui\dialogs\wml_message.cpp">
       <Filter>Gui\Dialogs</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\gui\dialogs\lobby\lobby.cpp">
-      <Filter>Gui\Dialogs\Lobby</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gui\dialogs\lobby\player_info.cpp">
-      <Filter>Gui\Dialogs\Lobby</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\gui\dialogs\addon\connect.cpp">
       <Filter>Gui\Dialogs\Addon</Filter>
     </ClCompile>
@@ -1547,6 +1538,12 @@
     <ClCompile Include="..\..\src\preferences\lobby.cpp">
       <Filter>Preferences</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\gui\dialogs\multiplayer\lobby.cpp">
+      <Filter>Gui\Dialogs\Multiplayer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\gui\dialogs\multiplayer\player_info.cpp">
+      <Filter>Gui\Dialogs\Multiplayer</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\addon\client.hpp">
@@ -2107,12 +2104,6 @@
     <ClInclude Include="..\..\src\gui\dialogs\wml_message.hpp">
       <Filter>Gui\Dialogs</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\gui\dialogs\lobby\lobby.hpp">
-      <Filter>Gui\Dialogs\Lobby</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\gui\dialogs\lobby\player_info.hpp">
-      <Filter>Gui\Dialogs\Lobby</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\gui\dialogs\addon\connect.hpp">
       <Filter>Gui\Dialogs\Addon</Filter>
     </ClInclude>
@@ -3003,6 +2994,12 @@
     <ClInclude Include="..\..\src\preferences\lobby.hpp">
       <Filter>Preferences</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\gui\dialogs\multiplayer\lobby.hpp">
+      <Filter>Gui\Dialogs\Multiplayer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\gui\dialogs\multiplayer\player_info.hpp">
+      <Filter>Gui\Dialogs\Multiplayer</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\src\tests\test_sdl_utils.hpp">

diff --git a/source_lists/wesnoth b/source_lists/wesnoth
@@ -202,14 +202,13 @@ gui/dialogs/hotkey_bind.cpp
 gui/dialogs/label_settings.cpp
 gui/dialogs/language_selection.cpp
 gui/dialogs/loading_screen.cpp
-gui/dialogs/lobby/lobby.cpp
-gui/dialogs/lobby/player_info.cpp
 gui/dialogs/log_settings.cpp
 gui/dialogs/lua_interpreter.cpp
 gui/dialogs/message.cpp
 gui/dialogs/modal_dialog.cpp
 gui/dialogs/modeless_dialog.cpp
 gui/dialogs/multiplayer/faction_select.cpp
+gui/dialogs/multiplayer/lobby.cpp
 gui/dialogs/multiplayer/mp_alerts_options.cpp
 gui/dialogs/multiplayer/mp_change_control.cpp
 gui/dialogs/multiplayer/mp_cmd_wrapper.cpp
@@ -222,6 +221,7 @@ gui/dialogs/multiplayer/mp_login.cpp
 gui/dialogs/multiplayer/mp_method_selection.cpp
 gui/dialogs/multiplayer/mp_options_helper.cpp
 gui/dialogs/multiplayer/mp_staging.cpp
+gui/dialogs/multiplayer/player_info.cpp
 gui/dialogs/multiplayer/synced_choice_wait.cpp
 gui/dialogs/network_transmission.cpp
 gui/dialogs/outro.cpp

diff --git a/src/game_initialization/multiplayer.cpp b/src/game_initialization/multiplayer.cpp
@@ -22,8 +22,8 @@
 #include "preferences/credentials.hpp"
 #include "preferences/game.hpp"
 #include "gettext.hpp"
-#include "gui/dialogs/lobby/lobby.hpp"
 #include "gui/dialogs/message.hpp"
+#include "gui/dialogs/multiplayer/lobby.hpp"
 #include "gui/dialogs/multiplayer/mp_connect.hpp"
 #include "gui/dialogs/multiplayer/mp_create_game.hpp"
 #include "gui/dialogs/multiplayer/mp_join_game.hpp"

diff --git a/src/gui/dialogs/lobby/lobby.cpp → src/gui/dialogs/multiplayer/lobby.cpp b/src/gui/dialogs/lobby/lobby.cpp → src/gui/dialogs/multiplayer/lobby.cpp
@@ -13,12 +13,12 @@
 */
 #define GETTEXT_DOMAIN "wesnoth-lib"
 
-#include "gui/dialogs/lobby/lobby.hpp"
+#include "gui/dialogs/multiplayer/lobby.hpp"
 
 #include "gui/auxiliary/find_widget.hpp"
-#include "gui/dialogs/lobby/player_info.hpp"
 #include "gui/dialogs/message.hpp"
 #include "gui/dialogs/multiplayer/mp_join_game_password_prompt.hpp"
+#include "gui/dialogs/multiplayer/player_info.hpp"
 #include "gui/dialogs/preferences_dialog.hpp"
 #include "gui/dialogs/helper.hpp"
 

diff --git a/src/gui/dialogs/lobby/lobby.hpp → src/gui/dialogs/multiplayer/lobby.hpp b/src/gui/dialogs/lobby/lobby.hpp → src/gui/dialogs/multiplayer/lobby.hpp
diff --git a/src/gui/dialogs/lobby/player_info.cpp → src/gui/dialogs/multiplayer/player_info.cpp b/src/gui/dialogs/lobby/player_info.cpp → src/gui/dialogs/multiplayer/player_info.cpp
@@ -12,9 +12,10 @@
    See the COPYING file for more details.
 */
 
+#include "gui/dialogs/multiplayer/player_info.hpp"
+
 #include "gui/auxiliary/find_widget.hpp"
 #include "gui/dialogs/helper.hpp"
-#include "gui/dialogs/lobby/player_info.hpp"
 #include "gui/widgets/button.hpp"
 #include "gui/widgets/label.hpp"
 #include "gui/widgets/settings.hpp"

diff --git a/src/gui/dialogs/lobby/player_info.hpp → src/gui/dialogs/multiplayer/player_info.hpp b/src/gui/dialogs/lobby/player_info.hpp → src/gui/dialogs/multiplayer/player_info.hpp
diff --git a/src/tests/gui/test_gui2.cpp b/src/tests/gui/test_gui2.cpp
@@ -68,12 +68,11 @@
 #include "gui/dialogs/label_settings.hpp"
 #include "gui/dialogs/language_selection.hpp"
 #include "gui/dialogs/loading_screen.hpp"
-#include "gui/dialogs/lobby/lobby.hpp"
-#include "gui/dialogs/lobby/player_info.hpp"
 #include "gui/dialogs/log_settings.hpp"
 #include "gui/dialogs/lua_interpreter.hpp"
 #include "gui/dialogs/message.hpp"
 #include "gui/dialogs/multiplayer/faction_select.hpp"
+#include "gui/dialogs/multiplayer/lobby.hpp"
 #include "gui/dialogs/multiplayer/mp_alerts_options.hpp"
 #include "gui/dialogs/multiplayer/mp_change_control.hpp"
 #include "gui/dialogs/multiplayer/mp_cmd_wrapper.hpp"
@@ -82,6 +81,7 @@
 #include "gui/dialogs/multiplayer/mp_join_game.hpp"
 #include "gui/dialogs/multiplayer/mp_join_game_password_prompt.hpp"
 #include "gui/dialogs/multiplayer/mp_staging.hpp"
+#include "gui/dialogs/multiplayer/player_info.hpp"
 #include "gui/dialogs/outro.hpp"
 #include "gui/dialogs/depcheck_confirm_change.hpp"
 #include "gui/dialogs/depcheck_select_new.hpp"