From 0557d45bd156844772a5be5cdc602cdf22781eb5 Mon Sep 17 00:00:00 2001 From: Marc Zinnschlag Date: Tue, 3 Feb 2015 13:18:03 +0100 Subject: [PATCH] renamed opencs into openmw-cs --- CMakeLists.txt | 14 +++++++------- apps/opencs/CMakeLists.txt | 14 +++++++------- apps/opencs/editor.cpp | 4 ++-- apps/opencs/main.cpp | 2 +- files/mac/{opencs.icns => openmw-cs.icns} | Bin files/opencs/{opencs.png => openmw-cs.png} | Bin files/opencs/resources.qrc | 2 +- files/{opencs.desktop => openmw-cs.desktop} | 6 +++--- files/windows/opencs.rc | 2 +- files/windows/{opencs.ico => openmw-cs.ico} | Bin 10 files changed, 22 insertions(+), 22 deletions(-) rename files/mac/{opencs.icns => openmw-cs.icns} (100%) rename files/opencs/{opencs.png => openmw-cs.png} (100%) rename files/{opencs.desktop => openmw-cs.desktop} (83%) rename files/windows/{opencs.ico => openmw-cs.ico} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index f316034606..019d53c4e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -373,8 +373,8 @@ if (NOT WIN32 AND NOT APPLE) "${OpenMW_BINARY_DIR}/openmw.desktop") configure_file(${OpenMW_SOURCE_DIR}/files/openmw-mimeinfo.xml "${OpenMW_BINARY_DIR}/openmw-mimeinfo.xml") - configure_file(${OpenMW_SOURCE_DIR}/files/opencs.desktop - "${OpenMW_BINARY_DIR}/opencs.desktop") + configure_file(${OpenMW_SOURCE_DIR}/files/openmw-cs.desktop + "${OpenMW_BINARY_DIR}/openmw-cs.desktop") endif() # Compiler settings @@ -423,7 +423,7 @@ IF(NOT WIN32 AND NOT APPLE) INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/openmw-essimporter" DESTINATION "${BINDIR}" ) ENDIF(BUILD_ESSIMPORTER) IF(BUILD_OPENCS) - INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/opencs" DESTINATION "${BINDIR}" ) + INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/openmw-cs" DESTINATION "${BINDIR}" ) ENDIF(BUILD_OPENCS) IF(BUILD_NIFTEST) INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/niftest" DESTINATION "${BINDIR}" ) @@ -444,8 +444,8 @@ IF(NOT WIN32 AND NOT APPLE) INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw-mimeinfo.xml" DESTINATION "${DATAROOTDIR}/mime/packages" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ COMPONENT "openmw") INSTALL(FILES "${OpenMW_SOURCE_DIR}/files/launcher/images/openmw.png" DESTINATION "${ICONDIR}" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ COMPONENT "openmw") IF(BUILD_OPENCS) - INSTALL(FILES "${OpenMW_BINARY_DIR}/opencs.desktop" DESTINATION "${DATAROOTDIR}/applications" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ COMPONENT "opencs") - INSTALL(FILES "${OpenMW_SOURCE_DIR}/files/opencs/opencs.png" DESTINATION "${ICONDIR}" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ COMPONENT "opencs") + INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw-cs.desktop" DESTINATION "${DATAROOTDIR}/applications" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ COMPONENT "opencs") + INSTALL(FILES "${OpenMW_SOURCE_DIR}/files/opencs/openmw-cs.png" DESTINATION "${ICONDIR}" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ COMPONENT "opencs") ENDIF(BUILD_OPENCS) # Install global configuration files @@ -485,7 +485,7 @@ if(WIN32) INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/Release/openmw-essimporter.exe" DESTINATION ".") ENDIF(BUILD_ESSIMPORTER) IF(BUILD_OPENCS) - INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/Release/opencs.exe" DESTINATION ".") + INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/Release/openmw-cs.exe" DESTINATION ".") INSTALL(FILES "${OpenMW_BINARY_DIR}/opencs.ini" DESTINATION ".") ENDIF(BUILD_OPENCS) IF(BUILD_WIZARD) @@ -509,7 +509,7 @@ if(WIN32) SET(CPACK_PACKAGE_EXECUTABLES "${CPACK_PACKAGE_EXECUTABLES};openmw-launcher;OpenMW Launcher") ENDIF(BUILD_LAUNCHER) IF(BUILD_OPENCS) - SET(CPACK_PACKAGE_EXECUTABLES "${CPACK_PACKAGE_EXECUTABLES};opencs;OpenMW Construction Set") + SET(CPACK_PACKAGE_EXECUTABLES "${CPACK_PACKAGE_EXECUTABLES};openmw-cs;OpenMW Construction Set") ENDIF(BUILD_OPENCS) IF(BUILD_WIZARD) SET(CPACK_PACKAGE_EXECUTABLES "${CPACK_PACKAGE_EXECUTABLES};openmw-wizard;OpenMW Wizard") diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt index 468e172cd2..be30431dfa 100644 --- a/apps/opencs/CMakeLists.txt +++ b/apps/opencs/CMakeLists.txt @@ -146,7 +146,7 @@ set (OPENCS_UI ${CMAKE_SOURCE_DIR}/files/ui/filedialog.ui ) -source_group (opencs FILES ${OPENCS_SRC} ${OPENCS_HDR}) +source_group (openmw-cs FILES ${OPENCS_SRC} ${OPENCS_HDR}) if(WIN32) set(QT_USE_QTMAIN TRUE) @@ -169,12 +169,12 @@ qt4_add_resources(OPENCS_RES_SRC ${OPENCS_RES}) include_directories(${CMAKE_CURRENT_BINARY_DIR} ${BULLET_INCLUDE_DIRS}) if(APPLE) - set (OPENCS_MAC_ICON ${CMAKE_SOURCE_DIR}/files/mac/opencs.icns) + set (OPENCS_MAC_ICON ${CMAKE_SOURCE_DIR}/files/mac/openmw-cs.icns) else() set (OPENCS_MAC_ICON "") endif(APPLE) -add_executable(opencs +add_executable(openmw-cs MACOSX_BUNDLE ${OENGINE_BULLET} ${OPENCS_SRC} @@ -187,8 +187,8 @@ add_executable(opencs if(APPLE) set_target_properties(opencs PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${OpenMW_BINARY_DIR}" - OUTPUT_NAME "OpenCS" - MACOSX_BUNDLE_ICON_FILE "opencs.icns" + OUTPUT_NAME "OpenMW-CS" + MACOSX_BUNDLE_ICON_FILE "openmw-cs.icns" MACOSX_BUNDLE_BUNDLE_NAME "OpenCS" MACOSX_BUNDLE_GUI_IDENTIFIER "org.openmw.opencs" MACOSX_BUNDLE_SHORT_VERSION_STRING ${OPENMW_VERSION} @@ -199,7 +199,7 @@ if(APPLE) MACOSX_PACKAGE_LOCATION Resources) endif(APPLE) -target_link_libraries(opencs +target_link_libraries(openmw-cs ${OGRE_LIBRARIES} ${OGRE_Overlay_LIBRARIES} ${OGRE_STATIC_PLUGINS} @@ -211,5 +211,5 @@ target_link_libraries(opencs ) if(APPLE) - INSTALL(TARGETS opencs BUNDLE DESTINATION OpenMW COMPONENT BUNDLE) + INSTALL(TARGETS opencs BUNDLE DESTINATION OpenMW-CS COMPONENT BUNDLE) endif() diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp index 58614ec5f6..1d31c83969 100644 --- a/apps/opencs/editor.cpp +++ b/apps/opencs/editor.cpp @@ -96,7 +96,7 @@ void CS::Editor::setupDataFiles (const Files::PathContainer& dataDirs) std::pair > CS::Editor::readConfig() { boost::program_options::variables_map variables; - boost::program_options::options_description desc("Syntax: opencs \nAllowed options"); + boost::program_options::options_description desc("Syntax: openmw-cs \nAllowed options"); desc.add_options() ("data", boost::program_options::value()->default_value(Files::PathContainer(), "data")->multitoken()->composing()) @@ -249,7 +249,7 @@ bool CS::Editor::makeIPCServer() try { mPid = boost::filesystem::temp_directory_path(); - mPid /= "opencs.pid"; + mPid /= "openmw-cs.pid"; bool pidExists = boost::filesystem::exists(mPid); mPidFile.open(mPid); diff --git a/apps/opencs/main.cpp b/apps/opencs/main.cpp index 0b8da61efe..b11561c135 100644 --- a/apps/opencs/main.cpp +++ b/apps/opencs/main.cpp @@ -78,7 +78,7 @@ int main(int argc, char *argv[]) application.setLibraryPaths(libraryPaths); #endif - application.setWindowIcon (QIcon (":./opencs.png")); + application.setWindowIcon (QIcon (":./openmw-cs.png")); CS::Editor editor (ogreInit); diff --git a/files/mac/opencs.icns b/files/mac/openmw-cs.icns similarity index 100% rename from files/mac/opencs.icns rename to files/mac/openmw-cs.icns diff --git a/files/opencs/opencs.png b/files/opencs/openmw-cs.png similarity index 100% rename from files/opencs/opencs.png rename to files/opencs/openmw-cs.png diff --git a/files/opencs/resources.qrc b/files/opencs/resources.qrc index 0cc6996a8f..1bcd3ab4f2 100644 --- a/files/opencs/resources.qrc +++ b/files/opencs/resources.qrc @@ -1,6 +1,6 @@ - opencs.png + openmw-cs.png activator.png added.png apparatus.png diff --git a/files/opencs.desktop b/files/openmw-cs.desktop similarity index 83% rename from files/opencs.desktop rename to files/openmw-cs.desktop index 638de6ebf4..a5e3c27f2a 100644 --- a/files/opencs.desktop +++ b/files/openmw-cs.desktop @@ -4,7 +4,7 @@ Name=OpenMW Content Editor GenericName=Content Editor Comment=A replacement for the Morrowind Construction Set. Keywords=Morrowind;Construction Set;Creation Kit Editor;Set;Kit; -TryExec=opencs -Exec=opencs -Icon=opencs +TryExec=openmw-cs +Exec=openmw-cs +Icon=openmw-cs Categories=Game;RolePlaying; diff --git a/files/windows/opencs.rc b/files/windows/opencs.rc index 8839f18613..3ae18dddd8 100644 --- a/files/windows/opencs.rc +++ b/files/windows/opencs.rc @@ -1 +1 @@ -IDI_ICON1 ICON DISCARDABLE "opencs.ico" +IDI_ICON1 ICON DISCARDABLE "openmw-cs.ico" diff --git a/files/windows/opencs.ico b/files/windows/openmw-cs.ico similarity index 100% rename from files/windows/opencs.ico rename to files/windows/openmw-cs.ico