Rename tes3mp-netlauncher into tes3mp-browser

CMakeLists.txt

@@ -69,7 +69,7 @@ option(BUILD_OPENMW_MP "build OpenMW-MP" ON)
 option(BUILD_BSATOOL "build BSA extractor" ON)
 option(BUILD_ESMTOOL "build ESM inspector" ON)
 option(BUILD_LAUNCHER "build Launcher" ON)
-option(BUILD_NETLAUNCHER "build tes3mp Launcher" ON)
+option(BUILD_BROWSER "build tes3mp Server Browser" ON)
 option(BUILD_MWINIIMPORTER "build MWiniImporter" ON)
 option(BUILD_ESSIMPORTER "build ESS (Morrowind save game) importer" ON)
 option(BUILD_OPENCS "build OpenMW Construction Set" ON)
@@ -129,7 +129,7 @@ endif()
 find_package(RakNet REQUIRED)
 include_directories(${RakNet_INCLUDES})
 
-if (NOT BUILD_LAUNCHER AND NOT BUILD_NETLAUNCHER AND NOT BUILD_OPENCS AND NOT BUILD_WIZARD)
+if (NOT BUILD_LAUNCHER AND NOT BUILD_BROWSER AND NOT BUILD_OPENCS AND NOT BUILD_WIZARD)
    set(USE_QT FALSE)
 else()
    set(USE_QT TRUE)
@@ -394,9 +394,9 @@ IF(NOT WIN32 AND NOT APPLE)
     IF(BUILD_LAUNCHER)
         INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/openmw-launcher" DESTINATION "${BINDIR}" )
     ENDIF(BUILD_LAUNCHER)
-    IF(BUILD_NETLAUNCHER)
+    IF(BUILD_BROWSER)
-        INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/openmw-netlauncher" DESTINATION "${BINDIR}" )
+        INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/openmw-browser" DESTINATION "${BINDIR}" )
-    ENDIF(BUILD_NETLAUNCHER)
+    ENDIF(BUILD_BROWSER)
     IF(BUILD_BSATOOL)
         INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/bsatool" DESTINATION "${BINDIR}" )
     ENDIF(BUILD_BSATOOL)
@@ -497,9 +497,9 @@ if(WIN32)
     IF(BUILD_LAUNCHER)
         SET(CPACK_PACKAGE_EXECUTABLES "${CPACK_PACKAGE_EXECUTABLES};openmw-launcher;OpenMW Launcher")
     ENDIF(BUILD_LAUNCHER)
-    IF(BUILD_NETLAUNCHER)
+    IF(BUILD_BROWSER)
-        SET(CPACK_PACKAGE_EXECUTABLES "${CPACK_PACKAGE_EXECUTABLES};tes3mp-netlauncher;tes3mp Launcher")
+        SET(CPACK_PACKAGE_EXECUTABLES "${CPACK_PACKAGE_EXECUTABLES};tes3mp-browser;tes3mp Launcher")
-    ENDIF(BUILD_NETLAUNCHER)
+    ENDIF(BUILD_BROWSER)
     IF(BUILD_OPENCS)
         SET(CPACK_PACKAGE_EXECUTABLES "${CPACK_PACKAGE_EXECUTABLES};openmw-cs;OpenMW Construction Set")
     ENDIF(BUILD_OPENCS)
@@ -586,8 +586,8 @@ if (BUILD_LAUNCHER)
    add_subdirectory( apps/launcher )
 endif()
 
-if (BUILD_NETLAUNCHER)
+if (BUILD_BROWSER)
-    add_subdirectory( apps/netlauncher )
+    add_subdirectory( apps/browser )
 endif()
 
 if (BUILD_MWINIIMPORTER)
@@ -723,8 +723,8 @@ if (WIN32)
         set_target_properties(openmw-launcher PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}")
     endif()
 
-    if (BUILD_NETLAUNCHER)
+    if (BUILD_BROWSER)
-        set_target_properties(tes3mp-netlauncher PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}")
+        set_target_properties(tes3mp-browser PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}")
     endif()
 
     if (BUILD_MWINIIMPORTER)

apps/browser/CMakeLists.txt

@@ -1,8 +1,8 @@
-set(NETLAUNCHER_UI
+set(BROWSER_UI
         ${CMAKE_SOURCE_DIR}/files/ui/Main.ui
         ${CMAKE_SOURCE_DIR}/files/ui/ServerInfo.ui
         )
-set(NETLAUNCHER
+set(BROWSER
         main.cpp
         MainWindow.cpp
         ServerModel.cpp
@@ -10,23 +10,23 @@ set(NETLAUNCHER
         ServerInfoDialog.cpp
         netutils/HTTPNetwork.cpp
         netutils/Utils.cpp
-        ${CMAKE_SOURCE_DIR}/files/tes3mp/netlauncher.rc
+        ${CMAKE_SOURCE_DIR}/files/tes3mp/browser.rc
         )
 
-set(NETLAUNCHER_HEADER_MOC
+set(BROWSER_HEADER_MOC
         MainWindow.hpp
         ServerModel.hpp
         ServerInfoDialog.hpp
         )
 
-set(NETLAUNCHER_HEADER
+set(BROWSER_HEADER
-        ${NETLAUNCHER_HEADER_MOC}
+        ${BROWSER_HEADER_MOC}
         NetController.hpp
         netutils/HTTPNetwork.hpp
         netutils/Utils.hpp
         )
 
-source_group(netlauncher FILES ${NETLAUNCHER} ${NETLAUNCHER_HEADER})
+source_group(browser FILES ${BROWSER} ${BROWSER_HEADER})
 
 set(QT_USE_QTGUI 1)
 
@@ -40,12 +40,12 @@ if (DESIRED_QT_VERSION MATCHES 4)
     message(SEND_ERROR "QT4 is not supported.")
     #include(${QT_USE_FILE})
     #QT4_ADD_RESOURCES(RCC_SRCS ${CMAKE_SOURCE_DIR}/files/launcher/launcher.qrc)
-    #QT4_WRAP_CPP(MOC_SRCS ${NETLAUNCHER_HEADER_MOC})
+    #QT4_WRAP_CPP(MOC_SRCS ${BROWSER_HEADER_MOC})
-    #QT4_WRAP_UI(UI_HDRS ${NETLAUNCHER_UI})
+    #QT4_WRAP_UI(UI_HDRS ${BROWSER_UI})
 else()
     QT5_ADD_RESOURCES(RCC_SRCS ${CMAKE_SOURCE_DIR}/files/launcher/launcher.qrc)
-    QT5_WRAP_CPP(MOC_SRCS ${NETLAUNCHER_HEADER_MOC})
+    QT5_WRAP_CPP(MOC_SRCS ${BROWSER_HEADER_MOC})
-    QT5_WRAP_UI(UI_HDRS ${NETLAUNCHER_UI})
+    QT5_WRAP_UI(UI_HDRS ${BROWSER_UI})
 endif()
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
@@ -54,35 +54,35 @@ if(NOT WIN32)
 endif(NOT WIN32)
 
 # Main executable
-add_executable(tes3mp-netlauncher
+add_executable(tes3mp-browser
         ${GUI_TYPE}
-        ${NETLAUNCHER}
+        ${BROWSER}
-        ${NETLAUNCHER_HEADER}
+        ${BROWSER_HEADER}
         ${RCC_SRCS}
         ${MOC_SRCS}
         ${UI_HDRS}
         )
 
 if (WIN32)
-    INSTALL(TARGETS tes3mp-netlauncher RUNTIME DESTINATION ".")
+    INSTALL(TARGETS tes3mp-browser RUNTIME DESTINATION ".")
 endif (WIN32)
 
-target_link_libraries(tes3mp-netlauncher
+target_link_libraries(tes3mp-browser
         ${SDL2_LIBRARY_ONLY}
         ${RakNet_LIBRARY}
         components
         )
 
 if (DESIRED_QT_VERSION MATCHES 4)
-#    target_link_libraries(tes3mp-netlauncher ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY})
+#    target_link_libraries(tes3mp-browser ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY})
 #    if(WIN32)
-#        target_link_libraries(tes3mp-netlauncher ${QT_QTMAIN_LIBRARY})
+#        target_link_libraries(tes3mp-browser ${QT_QTMAIN_LIBRARY})
 #    endif(WIN32)
 else()
-    qt5_use_modules(tes3mp-netlauncher Widgets Core)
+    qt5_use_modules(tes3mp-browser Widgets Core)
 endif()
 
 if (BUILD_WITH_CODE_COVERAGE)
     add_definitions (--coverage)
-    target_link_libraries(tes3mp-netlauncher gcov)
+    target_link_libraries(tes3mp-browser gcov)
 endif()

apps/launcher/maindialog.cpp

@@ -580,6 +580,6 @@ void Launcher::MainDialog::play()
 
     // Launch the game detached
 
-    if (mGameInvoker->startProcess(QLatin1String("tes3mp-netlauncher"), true))
+    if (mGameInvoker->startProcess(QLatin1String("tes3mp-browser"), true))
         return qApp->quit();
 }