From 08b56ee783131537d3f87e60819e88316ea1e062 Mon Sep 17 00:00:00 2001 From: Silarn Date: Wed, 18 Apr 2018 03:41:53 -0500 Subject: Improve and fix handling of external links --- src/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fef640b3..066d08d6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -30,6 +30,7 @@ SET(organizer_SRCS motddialog.cpp modlistsortproxy.cpp modlist.cpp + modidlineedit.cpp modinfodialog.cpp modinfo.cpp modinfobackup.cpp @@ -120,6 +121,7 @@ SET(organizer_HDRS motddialog.h modlistsortproxy.h modlist.h + modidlineedit.h modinfodialog.h modinfo.h modinfobackup.h -- cgit v1.3.1 From fbb93eaf8679a64152251164a5fc2faff902efab Mon Sep 17 00:00:00 2001 From: Silarn Date: Thu, 19 Apr 2018 01:43:57 -0500 Subject: Remove remnants of QtScript and fix some CMake issues --- src/CMakeLists.txt | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 066d08d6..41891732 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -251,7 +251,6 @@ FIND_PACKAGE(Qt5Quick REQUIRED) FIND_PACKAGE(Qt5Network REQUIRED) FIND_PACKAGE(Qt5WinExtras REQUIRED) FIND_PACKAGE(Qt5WebEngineWidgets REQUIRED) -FIND_PACKAGE(Qt5Script REQUIRED) FIND_PACKAGE(Qt5Qml REQUIRED) FIND_PACKAGE(Qt5LinguistTools) QT5_WRAP_UI(organizer_UIHDRS ${organizer_UIS}) @@ -318,18 +317,27 @@ ENDIF() ADD_EXECUTABLE(ModOrganizer WIN32 ${organizer_HDRS} ${organizer_SRCS} ${organizer_UIHDRS} ${organizer_RCS} ${organizer_RCCPPS} ${organizer_translations_qm}) TARGET_LINK_LIBRARIES(ModOrganizer Qt5::Widgets Qt5::WinExtras Qt5::WebEngineWidgets Qt5::Quick - Qt5::Script Qt5::Qml Qt5::QuickWidgets Qt5::Network + Qt5::Qml Qt5::QuickWidgets Qt5::Network ${Boost_LIBRARIES} zlibstatic uibase esptk bsatk githubpp ${usvfs_name} Dbghelp advapi32 Version Shlwapi liblz4) + +IF (MSVC) + SET_TARGET_PROPERTIES(ModOrganizer PROPERTIES COMPILE_FLAGS "/std:c++latest") +ENDIF() +IF (MSVC AND "${CMAKE_SIZEOF_VOID_P}" EQUAL 4) + # 32 bits + SET_TARGET_PROPERTIES(ModOrganizer PROPERTIES LINK_FLAGS "/LARGEADDRESSAWARE") +ENDIF() + IF (NOT "${OPTIMIZE_COMPILE_FLAGS}" STREQUAL "") - SET_TARGET_PROPERTIES(ModOrganizer PROPERTIES COMPILE_FLAGS_RELWITHDEBINFO - ${OPTIMIZE_COMPILE_FLAGS}) + SET_TARGET_PROPERTIES(ModOrganizer PROPERTIES COMPILE_FLAGS_RELWITHDEBINFO ${OPTIMIZE_COMPILE_FLAGS}) +ENDIF() +IF (NOT "${OPTIMIZE_LINK_FLAGS}" STREQUAL "") + SET_TARGET_PROPERTIES(ModOrganizer PROPERTIES LINK_FLAGS_RELWITHDEBINFO ${OPTIMIZE_LINK_FLAGS}) ENDIF() -SET_TARGET_PROPERTIES(ModOrganizer PROPERTIES LINK_FLAGS_RELWITHDEBINFO - "/LARGEADDRESSAWARE ${OPTIMIZE_LINK_FLAGS}") ############### -- cgit v1.3.1 From a29192f9b2fe6086f0640864b7e70d38c3d3dc2b Mon Sep 17 00:00:00 2001 From: Silarn Date: Fri, 4 May 2018 16:16:32 -0500 Subject: Incorporate uibase translations into organizer --- src/CMakeLists.txt | 3 +- src/organizer_en.ts | 238 +++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 182 insertions(+), 59 deletions(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 41891732..8463f098 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -255,7 +255,8 @@ FIND_PACKAGE(Qt5Qml REQUIRED) FIND_PACKAGE(Qt5LinguistTools) QT5_WRAP_UI(organizer_UIHDRS ${organizer_UIS}) QT5_ADD_RESOURCES(organizer_RCCPPS ${organizer_QRCS}) -QT5_CREATE_TRANSLATION(organizer_translations_qm ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/organizer_en.ts) +SET(mo_translation_sources ${CMAKE_SOURCE_DIR}/src ${project_path}/uibase/src) +QT5_CREATE_TRANSLATION(organizer_translations_qm ${mo_translation_sources} ${CMAKE_SOURCE_DIR}/src/organizer_en.ts) ADD_CUSTOM_TARGET(translations DEPENDS ${organizer_translations_qm}) INCLUDE_DIRECTORIES(${Qt5Declarative_INCLUDES}) diff --git a/src/organizer_en.ts b/src/organizer_en.ts index 8c36e720..4a5593fa 100644 --- a/src/organizer_en.ts +++ b/src/organizer_en.ts @@ -1093,33 +1093,43 @@ Right now the only case I know of where this needs to be overwritten is for the FindDialog + Find + Find what: + + Search term + + Find next occurence from current file position. + &Find Next + + + @@ -1208,82 +1218,82 @@ p, li { white-space: pre-wrap; } - + failed to create backup - + Mod Name - + Name - + Invalid name - + The name you entered is invalid, please enter a different one. - + File format "%1" not supported - + None of the available installer plugins were able to handle that archive - + no error - + 7z.dll not found - + 7z.dll isn't valid - + archive not found - + failed to open archive - + unsupported archive type - + internal library error - + archive invalid - + unknown archive error @@ -1332,6 +1342,50 @@ p, li { white-space: pre-wrap; } + + MOBase::TextViewer + + + Save changes? + + + + + Do you want to save changes to %1? + + + + + failed to write to %1 + + + + + file not found: %1 + + + + + Save + + + + + MOBase::TutorialControl + + + Tutorial failed to start, please check "mo_interface.log" for details. + + + + + MOBase::TutorialManager + + + tutorial manager not set up yet + + + MainWindow @@ -2156,7 +2210,7 @@ Please enter a name: - + Are you sure? @@ -2473,13 +2527,13 @@ You can also use online editors and converters instead. - + Exception: - + Unknown exception @@ -2658,181 +2712,181 @@ You can also use online editors and converters instead. - + Thank you! - + Thank you for your endorsement! - + Request to Nexus failed: %1 - - + + failed to read %1: %2 - - + + Error - + failed to extract %1 (errorcode %2) - + Extract BSA - + This archive contains invalid hashes. Some files may be broken. - + Extract... - + This will restart MO, continue? - + Edit Categories... - + Deselect filter - + Remove - + Enable all - + Disable all - + Unlock load order - + Lock load order - + depends on missing "%1" - + incompatible with "%1" - + Please wait while LOOT is running - + loot failed. Exit code was: %1 - + failed to start loot - + failed to run loot: %1 - + Errors occured - + Backup of load order created - + Choose backup to restore - + No Backups - + There are no backups to restore - - + + Restore failed - - + + Failed to restore the backup. Errorcode: %1 - + Backup of modlist created - + A file with the same name has already been downloaded. What would you like to do? - + Overwrite - + Rename new file - + Ignore file @@ -3861,6 +3915,14 @@ p, li { white-space: pre-wrap; } + + NXMUrl + + + invalid nxm-link: %1 + + + NexusInterface @@ -4908,6 +4970,8 @@ If the folder was still in use, restart MO and try again. + + Error @@ -5068,6 +5132,38 @@ Start elevated anyway? (you will be asked if you want to allow ModOrganizer.exe failed to spawn "%1": %2 + + + failed to open temporary file + + + + + removal of "%1" failed: %2 + + + + + removal of "%1" failed + + + + + "%1" doesn't exist (remove) + + + + + + failed to create directory "%1" + + + + + + failed to copy "%1" to "%2" + + QueryOverwriteDialog @@ -5107,6 +5203,19 @@ Start elevated anyway? (you will be asked if you want to allow ModOrganizer.exe + + QuestionBoxMemory + + + Remember selection + + + + + Remember selection only for + + + SaveTextAsDialog @@ -5978,6 +6087,19 @@ For the other games this is not a sufficient replacement for AI! + + TextViewer + + + Log Viewer + + + + + Placeholder + + + TransferSavesDialog -- cgit v1.3.1 From 5f8bbaae2aa8486859fedc12ec0372b0cf83d709 Mon Sep 17 00:00:00 2001 From: Silarn Date: Sun, 6 May 2018 10:18:23 -0500 Subject: Make sure project_path is set before trying to use it --- src/CMakeLists.txt | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8463f098..77ee4dfc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -240,6 +240,13 @@ SOURCE_GROUP(Source FILES ${organizer_SRCS}) SOURCE_GROUP(Headers FILES ${organizer_HDRS}) SOURCE_GROUP(UI FILES ${organizer_UIS}) +# MO projects +SET(default_project_path "${CMAKE_SOURCE_DIR}/..") +GET_FILENAME_COMPONENT(${default_project_path} ${default_project_path} REALPATH) + +SET(project_path "${default_project_path}" CACHE PATH "path to the other mo projects") +#TODO this should not be a hardcoded path +SET(lib_path "${project_path}/../../install/libs") # Qt5 SET(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -276,16 +283,6 @@ LINK_DIRECTORIES(${Boost_LIBRARY_DIRS}) FIND_PACKAGE(zlib REQUIRED) # TODO FindZlib doesn't find the static zlib library - -# MO projects -SET(default_project_path "${CMAKE_SOURCE_DIR}/..") -GET_FILENAME_COMPONENT(${default_project_path} ${default_project_path} REALPATH) - -SET(project_path "${default_project_path}" CACHE PATH "path to the other mo projects") -#TODO this should not be a hardcoded path -SET(lib_path "${project_path}/../../install/libs") - - INCLUDE_DIRECTORIES(${project_path}/uibase/src ${project_path}/bsatk/src ${project_path}/esptk/src -- cgit v1.3.1