Compare commits

...
Author SHA1 Message Date
Tannin fe8c3aaea5 some fixes and removed obsolete code 2015-11-23 21:44:47 +01:00
Tannin dda9e11976 added interface for file mapping plugins 2015-11-23 21:43:37 +01:00
Tannin 9945b5e926 added support for fallout 4 savegames 2015-11-23 21:41:25 +01:00
Tannin dbbd0c4eec usvfs log is now written to a persistent file (no log rotation yet though) 2015-11-19 19:10:18 +01:00
Tannin 4ff751fb7e some fixes/disabled code required since hook.dll is gone 2015-11-19 19:09:34 +01:00
Tannin d8d81ee06f fix/workaround for a problem where Qt thinks it's not connected to the net 2015-11-19 19:07:23 +01:00
Tannin a4b69c9ed8 added fallout 4 support 2015-11-19 19:05:50 +01:00
Tannin 053ebc898f build system fix 2015-11-17 20:01:44 +01:00
Tannin 0bd38e3f67 Merge branch 'master' into new_vfs_library
Conflicts:
	src/CMakeLists.txt
2015-11-17 19:12:53 +01:00
Tannin 7f4f4cafea first work on interfacing with usvfs 2015-11-17 18:58:00 +01:00
Tannin 56ba058cd5 updated build scripts 2015-11-16 21:39:52 +01:00
TanninOne f25a51446c Merge pull request #329 from ThosRTanner/master
Update to scons build
2015-10-14 19:52:44 +02:00
Thomas Tanner ec07d3d4d9 Updated scons build a bit to produce helpful-ish git tag for organizer.
Use r"..." strings in template file to make it easier to copy/paste paths from windows clipboard.

Changed organizer.pro to not produce strange messages if you opened it because it couldn't find a .hg directory
2015-10-13 15:24:41 +01:00
Thomas Tanner 939993aefe Bring scons build up to date with cmake build 2015-10-11 21:28:38 +01:00
Thomas Tanner af9a128b4f Merge branch 'TanninOne/master' 2015-10-11 21:26:21 +01:00
Tannin 7d93a9a200 updated about dialog. Now contains a link to the source code 2015-10-10 19:36:12 +02:00
Tannin 90d87a0cf7 fixed progress dialogs appearing on startup
Appears to be a new bug in qt or maybe incompatibility with Windows 10: All Progress dialogs were made visibly automatically a few seconds after application startup. This was "fixed" by creating the dialog dynamically on demand
2015-10-10 19:35:18 +02:00
Tannin 115315df28 build fixes 2015-10-10 19:29:45 +02:00
Thomas Tanner c5876cb6a1 Merge remote-tracking branch 'TanninOne/master' 2015-10-10 13:50:22 +01:00
Thomas Tanner e7b61cb485 Remove the exec of hg which does funny things in your QT project window if you aren't using mercurial 2015-10-10 13:43:01 +01:00
Tannin a0eb00b6b6 more work on build system 2015-10-08 23:56:07 +02:00
TanninOne f2484c3b0e Update readme.md 2015-10-06 20:08:57 +02:00
TanninOne 107adbfffc Update readme.md 2015-10-06 20:03:49 +02:00
TanninOne de98fe64a3 Merge pull request #1 from ThosRTanner/master
Small cleanups
2015-09-26 19:54:31 +02:00
Thomas Tanner 364c385f1a Merge branch 'master' of https://github.com/TanninOne/modorganizer.git
# Conflicts:
#	.gitignore
2015-09-26 12:21:43 +01:00
Thomas Tanner 3c1c50fefc Create an ignore file 2015-09-26 12:12:31 +01:00
Tom Tanner 095967451e Remove some unused files and build esptk as a library 2015-09-26 11:55:17 +01:00
Tom Tanner eb901e0dfc This fixes some resource leaks with archive handling 2015-09-26 11:54:27 +01:00
Tannin 462c549f77 added cmake build system 2015-09-26 11:39:30 +02:00
Tannin 1f8c24ee7a updated readme 2015-09-23 21:57:03 +02:00
Tannin 8865f9d7bc added cmake build script and a few fixes for 64-bit compatibility 2015-09-23 21:47:56 +02:00
Tannin ae82ab7dca Merge 2015-09-06 09:50:35 +02:00
Tannin 999810e1d5 incremented version number 2015-09-06 09:49:01 +02:00
Tom Tanner 4dbf01cd56 Merge 2015-09-05 17:18:58 +01:00
Tom Tanner cd7b409c10 Weren't getting warned if you changed an executable then selected another
This fixes that and also redisplays the newly selected item properly
2015-09-05 17:18:37 +01:00
Tannin ff8377a8ff Added tag release v1.3.11 for changeset c14a9865ea2e 2015-09-05 17:24:47 +02:00
Tannin 4573d111a2 better sorting on the flag-column 2015-09-03 21:35:48 +02:00
Tannin 84ec954073 more intuitive sorting with grouping active 2015-09-03 21:35:04 +02:00
Tannin 63188eb6f3 Merge 2015-09-03 19:34:53 +02:00
Tannin 0a51fdf08e DLC bsas are now auto-enabled for pre-skyrim games 2015-09-03 19:33:33 +02:00
Tannin cb315b4179 bugfix: "add" button in editexecutables dialog didn't work 2015-09-03 19:32:40 +02:00
Tom Tanner d96d904765 Fix not recognising 'add' (1308) 2015-09-02 22:13:24 +01:00
Tannin 9588667404 Added tag release v1.3.10 for changeset 8638428b1ebc 2015-09-01 20:31:32 +02:00
Tannin b008753e1d workaround: after editing in a filtered view, if the edited item disappears as
a result of the edit, no further editor could be opened
2015-09-01 19:49:28 +02:00
Tannin 3c7ab3b668 Merge 2015-08-31 21:26:47 +02:00
Tannin d85019f4b1 auto-discovered executables aren't turned into custom ones if the user presses
"Modify" without doing any changes
2015-08-31 21:25:43 +02:00
Tannin 05edcf8840 code cleanup 2015-08-31 21:24:48 +02:00
Tannin 2a22461f14 bugfix: auto-discovered executables couldn't be customized 2015-08-31 21:24:04 +02:00
Tom Tanner 0c3c822d77 Stop the temp files to delete list growing on each install 2015-08-30 13:36:11 +01:00
Tom Tanner f0ee9c3e4d Merge 2015-08-28 20:04:15 +01:00
Tannin 83edfe0c96 Merge 2015-08-27 20:59:37 +02:00
Tannin 86d833bcc8 bugfix: crash on network connection problem 2015-08-27 20:58:39 +02:00
Tannin 58198a6bfd bugfix: update.bsa sorted incorrectly 2015-08-27 20:58:01 +02:00
Tom Tanner 32339addbf Fix nasty message when starting MO for first time 2015-08-22 22:53:13 +01:00
Tannin dd875c05de removed obsolete code 2015-08-17 20:56:53 +02:00
Tannin 17938b503a Merge 2015-08-17 20:52:12 +02:00
Tannin 269d4f6765 bugfix: wrong app ids used for oblivion and fallout 3
rewrote handling of different game variants: now resides in game plugin and works
2015-08-17 20:50:47 +02:00
Tom Tanner 0fa7f7469f Merge 2015-08-15 16:52:18 +01:00
Tannin ea1c2b46fe Merge 2015-08-15 12:37:19 +02:00
Tannin 89f3c0d65a more verbosity about login/logout to/from nexus 2015-08-15 12:06:26 +02:00
Tom Tanner 821f95b8ab Clean up of fixes for custom executable window 2015-08-13 22:37:33 +01:00
Tom Tanner 716dbcc97d Merge 2015-08-13 21:48:33 +01:00
Tom Tanner 8e7ac4e064 Fix the executable configuration flags going awry from Customise window 2015-08-13 20:07:21 +01:00
Tannin 69a8a40b99 bugfix: categories that reference each other in a cycle could send MO into an endless loop 2015-08-12 21:50:06 +02:00
Tannin 229161565e some fixes after reverting changes in c361167b9b75 2015-08-12 21:48:51 +02:00
Tom Tanner 9c3b390f08 Fix up merge mess 2015-08-11 21:53:00 +01:00
Tom Tanner 5244544424 Merge 2015-08-11 21:35:06 +01:00
Tannin 217ca284fe Merge 2015-08-11 19:31:48 +02:00
Tannin 0aecc3427a small bugfix 2015-08-11 19:23:12 +02:00
Tannin b6627ff5e0 small code cleanup 2015-08-09 17:11:18 +02:00
Tom Tanner b0d86c9e01 Merge 2015-08-09 15:56:39 +01:00
Tannin a7d6eb75c2 reverted most changes of changeset 626da419828a as I don't agree with them 2015-08-09 15:16:57 +02:00
Tannin 6f09cf2205 Merge 2015-08-09 13:51:17 +02:00
Tannin e6abe486a7 added some (currently unused) functionality to dump the list of file mappings
from real to virtual location
2015-08-09 13:04:01 +02:00
Tannin 52fcfaa292 some code cleanup 2015-08-09 12:52:30 +02:00
Tannin 4230313ef5 now displays currently logged in account in title bar 2015-08-09 12:51:19 +02:00
Tannin ff8057d34b - MO now validates session cookie on startup
- It also retrieves account status
- rewrote how MO decides when to log-in/when to give up on logging in
2015-08-09 12:40:57 +02:00
Tom Tanner b098214860 More work on the executables list
Apart from an off by one in the popup list which had crept back in, reworked
the underlying code even more, which now seems to get the list behaving in
a predictable way.
2015-08-05 22:40:49 +01:00
Tannin 8cf429a1dd - bugfix: manual installer now cancels drag&drop when dropping on a subitem
- bugfix: objects dropped on the modlist were treated as mods when they weren't urls
2015-08-05 22:48:34 +02:00
Tom Tanner 9f7bec01d0 Merge 2015-08-02 21:58:02 +01:00
Tannin 643a50ad5a - changed the way flags on executables are stored in memory
- some coding style fixes
2015-08-02 20:09:56 +02:00
Tom Tanner eaaa1b312d Extract multiple copies of file from archive
Had to rewrite the archive handling a bit. First pass, some tidyups required.
2015-08-02 16:25:32 +01:00
Tannin 9c17ecc87e Merge 2015-08-02 14:58:17 +02:00
Tannin 051589c38e bugfix: archive list wasn't saved after enabling/disabling a mod. 2015-07-31 14:18:44 +02:00
Tom Tanner 48fae44566 Fix up selection with exactly/at least/at most one 2015-07-18 20:57:37 +01:00
Tom Tanner e1c8d00979 Reworked executable lists to not use 3 bools in addExecutable
Think it's more readable
2015-07-18 13:34:10 +01:00
Tom Tanner 0503097494 Allow user to select app icon or mo icon for generated shortcuts
Also fixes 'x' for toolbar not disappearing when it should
Issue 701
2015-07-18 10:44:49 +01:00
Tom Tanner 3a39f90870 small patch to show which obsolete files are being removed 2015-07-17 22:12:46 +01:00
Tom Tanner 18ad656586 Merge 2015-07-09 18:58:57 +01:00
Tom Tanner eaafc489fc Reworking the Custom Executables list and the shortcut popup.
Certainly fixes the issue where the 'toolbar' entry doesn't lose the cross.

One of the 'find' methods ignored case but none of the others did, so I've
made it not ignore case either.

Also made the code to get the desktop/startmenu paths use a more up-to-date API
2015-07-09 18:58:34 +01:00
Tannin 7799c348ba defining PSAPI_VERSION to 1 may allow MO 1.3 to run on Vista again. 2015-07-07 20:57:20 +02:00
Tannin 0a1f3efac5 filter names in the filter pane now also show up as tooltips 2015-07-07 20:54:18 +02:00
Tannin 1eea37e4e1 small code beautification 2015-07-07 20:53:38 +02:00
Tannin 9a5965afa7 bugfix: invalidation bsa wasn't created when switching to a profile that needed it
invalidation bsa is now always placed as the first bsa
2015-07-07 20:52:46 +02:00
Tannin 7853ba5f9a Merge 2015-06-30 19:57:59 +02:00
Tannin 90dcc81715 incremented version number 2015-06-30 19:57:46 +02:00
Tannin 1e75fd8dae bugfix: dropping files from overwrite on mod failed whien mod grouping was active 2015-06-29 20:38:16 +02:00
Tannin 61033814fd bugfix: aboutToChangeData and postDataChanged signals were not correctly set up when mod grouping was enabled 2015-06-29 20:28:56 +02:00
Tom Tanner ca591dbd23 and now I find out I don't need to do it at all 2015-06-23 20:27:38 +01:00
Tom Tanner 7602fef6e7 Finish refactoring all the tab code into classes 2015-06-21 18:27:03 +01:00
Tom Tanner 67b1f9dca2 Merge 2015-06-21 07:51:49 +01:00
Tom Tanner 5ae279d8bb More refactoring, slightly easier to use classes 2015-06-21 07:51:05 +01:00
Tom Tanner 81ef3d0a81 Factor out general, nexis, plugins tab code into individual classes
Add some code and page to control what is/isn't significant in overwrite
2015-06-20 15:37:32 +01:00
Tannin dc0e67a8b3 Added tag release v1.3.8 for changeset 04197ab95dcd 2015-06-20 13:55:39 +02:00
Tannin aa21a192cb bugfix: fix in changeset f4c306711386 wasn't fully working 2015-06-20 13:55:29 +02:00
Tannin d4d7ce1fd3 small stuff 2015-06-17 18:33:28 +02:00
Tannin e31baf3ee6 - bugfix: MO crashed without error message when "bootstrapping" failed 2015-06-17 18:33:16 +02:00
Tannin 5dcfca7c9d bugfix: disabled mods were marked "redundant" 2015-06-15 20:01:28 +02:00
Tannin e9ee7e7f85 bugfix: dialog-memory wasn't initialized when starting through a desktop link so
access (in case steam wasn't running) caused a crash
2015-06-15 20:00:27 +02:00
Tannin 67d017fc98 fix: some names in about dialog were marked translatable 2015-06-15 19:58:57 +02:00
Tannin a700e6a3ef Added tag release v1.3.7 for changeset e857b583c68f 2015-06-13 16:21:21 +02:00
Tannin c95de1b3aa small stuff 2015-06-12 18:32:50 +02:00
Tannin 351fc9ca9c fixed display of installation time for mods without nexus id 2015-06-11 18:54:59 +02:00
Tannin 53f0a2bc79 bugfix: opening a foreign mod info dialog caused the content to be "forgotten" 2015-06-11 18:54:20 +02:00
Tannin 793dfb1637 added plugin interface to add/remove/list categories to/from/of mods 2015-06-10 22:09:32 +02:00
Tannin d25a81071c more generic solution to the problem fixed in changeset bb74f8eb639c, now also applied in another location 2015-06-10 21:22:54 +02:00
Tannin ef9a61886c a mod that overwrites another yet is completely overwritten by another is now displayed as "redundant" 2015-06-10 21:21:32 +02:00
Tannin 13a40b43c8 bugfix: files weren't correctly assigned to unmanaged mods. 2015-06-10 21:20:31 +02:00
Tannin d7790cd717 incorrect use of "complete" file suffixes 2015-06-09 20:40:13 +02:00
Tannin 84d632af6a fixes regarding path name generation during mod installation 2015-06-09 20:39:17 +02:00
Tannin b14b35349d post-merge cleanup 2015-06-08 19:55:00 +02:00
Tannin 83a4db2362 Merge 2015-06-08 18:29:49 +02:00
Tannin c797af8b76 increased ui responsiveness while integrated loot is running 2015-06-08 18:28:59 +02:00
Tannin ebf6ff3f76 workaround to prevent crashes when toggling mods causes the filtered list to change 2015-06-08 18:28:20 +02:00
Tannin 02b5e73c2d bugfix: potential null-pointer access when something goes wrong enabling a mod 2015-06-08 17:27:34 +02:00
Tom Tanner b0b2f1d3a9 Make the about dialog come up on the first tab 2015-06-07 13:37:41 +01:00
Tom Tanner d8e406daa0 Merge 2015-06-06 15:58:51 +01:00
Tom Tanner 50dcc4c1d4 Addition of FileNameString clase which ignores case during compares.
Affects rather a lot of stuff.
2015-06-06 15:56:44 +01:00
Tannin e21db0eaea bugfix: moving an executable in the executable list caused that executable
to disappear
2015-06-04 12:50:35 +02:00
Tannin 859332e18d a little more logging during startup 2015-06-04 12:50:11 +02:00
Tannin 1fd8f44960 bugfix: selecting an image in the modinfo dialog caused the image label
to grow slightly each time
2015-06-04 12:49:47 +02:00
Tannin e0c655330d Added tag release v1.3.6 for changeset 7bed8faa975a 2015-05-31 00:36:58 +02:00
Tannin a0999cd42b Removed tag release v1.3.6 2015-05-31 00:36:56 +02:00
Tannin eb47d4d0bb small stuff in preparation of release 2015-05-31 00:36:16 +02:00
Tannin 59476e38ec Added tag release v1.3.6 for changeset 11b2864c40c9 2015-05-30 17:34:11 +02:00
Tannin c5d36af06d Added tag release v1.3.5 for changeset 3f7672859c79 2015-05-30 16:12:14 +02:00
Tannin 8d1931bc6b - fix to the look of save game tooltip in dracula theme 2015-05-27 20:10:55 +02:00
Tannin c05be9f5c3 small stuff 2015-05-26 20:42:15 +02:00
Tannin 75714907d9 closing the categories context menu no longer completely resets the mod list 2015-05-25 15:29:58 +02:00
Tannin 02471a3da1 cleaned up warning messages from the download manager in case of download problems 2015-05-25 14:58:34 +02:00
Tannin afab0cec7e compact download view now uses icons instead of colors to distinguish state 2015-05-25 14:57:58 +02:00
Tannin 02cc97a58d - bugfix: bsa order wasn't correctly restored. 2015-05-24 18:51:03 +02:00
Tannin ffd94e72b4 - bugfix: immediately after creating the first profile, the directory structure
didn't correctly assign files to unhandled.
2015-05-23 17:25:58 +02:00
Tannin 6435e1ab8a - bugfix: couldn't change from "qt" styles back to regular style 2015-05-23 17:18:04 +02:00
Tannin dbfa9b89d1 some fixes to the dracula qss 2015-05-18 20:42:07 +02:00
Tannin fe5c4255c8 bugfix: previous fix for download name filter didn't work 2015-05-18 20:41:46 +02:00
Tannin ac8f6dbdec added theme inspired by JetBrains Dracula (created by Kojoley on github) 2015-05-17 14:39:01 +02:00
Tannin d2ab10ecff reduced number of mods for which update information is requested at once 2015-05-17 14:32:01 +02:00
Tannin 883f4d9894 bugfix: MO requested update information for mods without mod-id 2015-05-17 14:31:38 +02:00
Tannin d3e904e9ad - bugfix (not released): double click on mod didn't work until a mod was checked/unchecked once 2015-05-17 14:31:07 +02:00
Tannin e38592da97 extended plugin interface. Plugins can now activate/deactivate mods, install mods
suggesting a name and retrieve a list of all installed mods
2015-05-17 14:30:14 +02:00
Tannin 268d2ffe8b - some code cleanup and modernization trying to fix "dr memory" reports
(though they were almost certainly false positives)
- there is now a 50ms timeout on logging messages
- bugfix: leaked handles after directory searches
2015-05-17 14:03:01 +02:00
Tannin 9d3364f4da fixes to make MO compile with mingw (also fixes some warnings generated by mingw) 2015-05-16 18:44:07 +02:00
Tannin 9ea5086c4c slight cleanup regarding steam log-in settings 2015-05-12 20:34:05 +02:00
Tannin 4c1155a6ab Merge 2015-05-12 19:00:41 +02:00
Tannin 90365041f4 workaround to prevent repeated checking of mods with the mouse was interpreted
as double click
2015-05-12 18:56:44 +02:00
Tannin 183b571560 minor stuff 2015-05-11 21:41:00 +02:00
Tannin 0f1271dd99 - bugfix: moving a mod didn't properly update conflict highlighting 2015-05-11 21:40:35 +02:00
Tannin dbdc2538f9 bugfix: upon closing the profiles dialog, the profile was changed to the
top-most profile and back
2015-05-11 21:39:56 +02:00
Tannin 5a908442d6 dropping an url on the download widget now attempts to download the url 2015-05-11 21:37:12 +02:00
Tannin 328244692b better type safety in accessing tool plugins 2015-05-11 18:05:01 +02:00
Tannin f32b4c3ce1 - language list in settings no longer contains english twice
- language names in settings are now in the native language
2015-05-10 16:01:07 +02:00
Tannin 83a896d0a9 - bugfix: case conversion could produce different local-dependent results
between the time the vfs lookup map is set up and later when querying it.
2015-05-10 16:00:15 +02:00
Tannin 209fe5cab5 esp list refresh is now delayed if the directory-structure is being updated. This
may have been causing the lists to be cleared.
2015-05-10 15:45:27 +02:00
Tom Tanner cd68c9d53c Merge from master 2015-05-10 12:35:52 +01:00
Tannin 65b64d111b Merge with branch1.2 2015-05-10 11:24:25 +02:00
Tannin 73fa7045b6 missed a file when dropping redundant report.h (changeset a2d809870347) 2015-05-10 11:22:50 +02:00
Tannin a25d889e78 - bugfix: shortcuts specifying a profile didn't work 2015-05-10 11:22:10 +02:00
Tannin 3680e37d39 Merge 2015-05-09 21:46:40 +02:00
Tannin abba182b1b dropped redundant report.h/report.cpp 2015-05-09 21:44:19 +02:00
Tom Tanner ffb470a380 Add in a tab to allow saving of steam username and password. 2015-05-09 18:10:38 +01:00
Tom Tanner 1403d51a82 Fix mod organiser not picking up stuff from a blank profile 2015-05-09 11:41:39 +01:00
Tom Tanner 89eabf3c4d added a 'yes to all' shellMove and made the drag-and-drop code use shellMove/shellCopy 2015-05-03 09:51:01 +01:00
Tom Tanner 26368df7a6 Retain 'backup' switch state on mod overwrite options 2015-05-03 08:43:12 +01:00
Tom Tanner 5f399f6a39 Another removal of redundant commentary 2015-04-29 21:18:43 +01:00
Tom Tanner c909f8ce4f remove redundant comments/code from drag'n'drop stuff 2015-04-29 21:14:46 +01:00
Tom Tanner ce925bc73e Allows drag-and-drop into the download tab 2015-04-26 09:44:57 +01:00
Tom Tanner 927504cbd9 1) reintroduce the report error when unpacking archives to avoid the error
message disappearing entirely
2) Allow very long filenames to be used when unpacking
2015-04-25 13:04:14 +01:00
Tom Tanner a44cb011a5 Small fixup to passing of argc/argv. 2015-04-19 21:10:32 +01:00
Tom Tanner 11e67d7a6c More fixing up of scons. Give up entirely with debugging python proxy 2015-04-19 21:10:03 +01:00
Tannin 0b58653e2d bugfix: filter on download list always filtered by file name, not by displayed name 2015-04-19 20:33:46 +02:00
Tannin e47e04dcf2 refactorings 2015-04-12 15:54:14 +02:00
Tannin fd584f8038 - operations not possible during directory refresh can now be delayed unit after
the refresh.
- will now rewrite the plugin list(s) immediately after running external
application
- changes missing from changeset 9f522a324341
2015-04-12 15:52:22 +02:00
Tannin 942bd04e5e bugfix: batch-activation/deactivation used non-persistent indices which seems to
be a problem nowadays (probably related to Qt5?)
2015-04-12 15:48:50 +02:00
Tannin 4b6e8ac51b safe file writer now ignores the hash if the file doesn't exist 2015-04-12 15:45:34 +02:00
Tannin 8c2e88b9c9 MO will no longer use the load order from an empty loadorder.txt because the
file should at least have a header.
2015-04-12 15:43:46 +02:00
Tannin ef39699d69 missing changes that belong into changeset 5eaf1e439403 2015-04-12 15:42:45 +02:00
Tannin 55eacfbd80 bugfix: save-dir monitoring is now disabled while editing a profile so that,
in case of local save games the active profile path isn't locked
2015-04-12 15:41:17 +02:00
Tannin 056acd03cd bugfix: when using a user-selected game path that path wasn't use for
auto-detecting executables
2015-04-12 15:39:16 +02:00
Tannin 9eb1a303a7 cosmetic changes and increased version number 2015-04-08 18:54:09 +02:00
Tannin a44c4bbdb2 enabling/disabling a plugin should now immediately cause a check for problems 2015-04-08 18:53:43 +02:00
Tannin 8cca47454a if overwriting the ModOrganizer.ini file fails, another attempt to store
settings is made, writing to the ini file directly.
2015-04-08 18:52:43 +02:00
Tannin a818688d3f bugfix: save games didn't show up in the transfer saves dialog 2015-04-08 18:30:22 +02:00
Tannin feaad36168 download directory, cache directory and mod directory are now only stored in the
ini file when they differ from the default. this should make moving MO easier
2015-04-08 18:30:02 +02:00
Tannin a6f7480ab9 bugfix: tutorial broken 2015-04-08 18:09:36 +02:00
Tannin 1ba140e0fa avoid saving plugin list during directory updates as they may be invalid 2015-03-31 18:32:46 +02:00
Tannin eed3664302 a signal is now emitted when the state (checked/unchecked) of a plugin changes 2015-03-31 18:31:54 +02:00
Tannin 35eb41daf9 will now avoid writing plugin lists if they would be empty (as its probably a bug) 2015-03-31 18:31:21 +02:00
Tannin 38eb03c306 bugfix: modlist automatically scrolled to the top after closing context menu 2015-03-31 17:48:07 +02:00
Tannin 6ff201385c bugfix: re-enabled alignment of content icons 2015-03-31 17:43:36 +02:00
Tom Tanner 0269fc36e6 If there are no Missing ESPs, say "None" rather than leaving an empty list. 2015-03-29 18:01:56 +01:00
Tom Tanner fa5d3cdaf3 Update readme with information about getting python proxy to work in a debug build. 2015-03-29 18:01:12 +01:00
Tom Tanner ab28c9631a Merge 2015-03-28 10:54:02 +00:00
Tom Tanner 04b6f2e475 Added json file dependency into moc scanner 2015-03-28 10:11:09 +00:00
Tannin 0d5197a3c8 Merge in changes by Tom Tanner 2015-03-27 18:24:37 +01:00
Tannin 8eb63a068c cleanup 2015-03-27 16:37:31 +01:00
Tannin 4d4a7713fb bugfix: not all icons showed up 2015-03-27 16:36:55 +01:00
Tannin 4161696527 bugfix: MO didn't use all parameters of preconfigured executables 2015-03-27 16:33:32 +01:00
Tannin 73eea93abb bugfix: "edit executables" dialog didn't actually save a modified executable when
confirming the save-on-close dialog
2015-03-27 16:31:26 +01:00
Tom Tanner db7c6e6006 Add in all the necessary stuff for scons 2015-03-25 22:35:53 +00:00
Tom Tanner 266a696429 Merge 2015-03-22 10:51:43 +00:00
Tom Tanner ea520baf4e Fix a meory leak with modules that error during loading
More Sconscript stuff
2015-03-22 10:49:15 +00:00
Tannin 07b8896f92 updated build instructions, version number, packaging scripts 2015-03-21 16:39:54 +01:00
Tannin 4a2e4652f4 - after closing the overwrite dialog the in-memory directory structure is updated again
- bugfix: crash on creating shortcuts
2015-03-21 16:37:49 +01:00
Tannin a9e1d44a2a changed the way the right-most column in the mod list is stretched to a way that is independent of the mod ordering 2015-03-21 16:35:10 +01:00
Tannin b210a2f083 MO will again remove obsolete files on startup 2015-03-21 16:31:54 +01:00
Tannin cbbc2d191d bugfix: crash when entering search terms for the mod list 2015-03-21 16:30:43 +01:00
Tannin cad7ed47be bugfix: sync-overwrite dialog didn't open 2015-03-21 16:29:55 +01:00
Tom Tanner a9cec9e5e2 Fixed Scons build for existing bits.
Changed pynedit.pro to fetch from 'standard' install location
Changed saveas code to use organizer report rather than uibase - this way it's
not dependant on the vagaries of the include path, and works the same as the
rest of the organiser directory
2015-03-20 10:34:30 +00:00
Tom Tanner 771dde7771 Merge 2015-03-19 16:48:21 +00:00
Tannin c6758e47c8 minor stuff (slight changes to the visual style, code refactorings, version increment) 2015-03-18 19:41:46 +01:00
Tannin 4a99cfe6ad bugfix: crash related to bad timing when filtering the mod list 2015-03-18 19:41:11 +01:00
Tannin f134c7ab4c - plugin list can now be sorted by flags
- sorting by mod index now puts the disabled mods to one end of the list
2015-03-18 19:40:12 +01:00
Tannin 03b029c613 - avoiding unnecessary meta.ini saves when checking mods for updates 2015-03-18 19:35:49 +01:00
Tom Tanner a1c8e529f7 Merge with branch1.2 2015-03-18 17:40:29 +00:00
Tom Tanner 39dd67f22f Refactoring and cleanup. 2015-03-18 14:16:04 +00:00
Tom Tanner de79d15980 Every plugin now built 2015-03-17 16:31:15 +00:00
Tom Tanner 16beb6f9b1 Abortive attempt to use official 'qt' tool
This resulted in some small cleanups but not much else
2015-03-16 10:14:00 +00:00
Tom Tanner a00a9a5bba Cleanup 2015-03-16 08:35:14 +00:00
Tom Tanner 4b1059f5a1 Building cleanly without patched versions. Doesn't do the plugins yet 2015-03-15 16:26:41 +00:00
Tom Tanner 2628dd3fb8 Yet more scons stuff. Now builds everything but the plugins, and installs all the dlls 2015-03-15 10:58:21 +00:00
Tom Tanner 2d20185e77 More sconscripts set up 2015-03-14 14:59:52 +00:00
Tannin 7a1ae9b0f1 Merge with branch1.2 2015-03-09 12:34:34 +01:00
Tannin d45ebf1348 added LocalPaths to ignore list 2015-03-09 12:33:37 +01:00
Tannin db2954e8eb minor cleanup 2015-03-09 12:22:13 +01:00
Tannin 8c0756bd9d - bugfix: changing the highlight in the modlist didn't always prompt an immediate update of overwrite markers 2015-03-09 12:18:25 +01:00
Tannin 026b97835e - when activating/deactivating a mod the contained esps are only activated/deactivated if no other
active mod provides the same plugins
2015-03-09 12:17:57 +01:00
Tom Tanner 97d6f7ce01 First attempt at using scons to build 2015-03-08 13:20:56 +00:00
Tom Tanner d80cdf726e Small typo fix 2015-03-01 13:16:27 +00:00
Thomas Tanner 9c8f0a2041 revert 2015-03-01 12:52:57 +00:00
Thomas Tanner 1b16897228 test 2015-03-01 12:24:04 +00:00
Thomas Tanner 4bd5df5ab4 Change readme to include sip install 2015-03-01 11:48:55 +00:00
Tannin d08e0ebab0 - some fixes to how file changes are signaled and delayed 2015-03-01 11:28:49 +01:00
Tannin 6479f972dc tons of code cleanup and minor fixes to harden the code (mostly suggestions from static code analysis) 2015-02-25 18:38:01 +01:00
Tannin e01ab940b0 bugfix: tooltips in dark style were too transparent 2015-02-25 18:11:31 +01:00
Tannin e9c937f909 bugfix: plugin list wasn't user-sortable 2015-02-25 18:03:26 +01:00
Tannin d87661a66f sorting by content now produces a more useful list 2015-02-25 18:02:39 +01:00
Tannin 3c030a28e9 bugfix: filtering by meta-categories (checked/unchecked, update available) didn't work 2015-02-25 18:01:49 +01:00
Tannin 6b4cb9ff4c bugfix: crash when trying to delete mods (issue #1016) 2015-02-25 18:00:46 +01:00
Tannin cbe84327c6 - added content icon for BSAs
- improved display of content icons (better scaling and some borders)
- bugfix: contains changes missing from changeset bc6b6430017b
2015-02-25 17:57:38 +01:00
Tannin ce228e512c - No longer setting the dll directory as a windows search folder for dlls because
that appears to remove another search folder AND the configured seach folders seem
to be inherited by processes started from MO (both confirmed only in windows 8.1)
2015-02-25 17:53:48 +01:00
Tannin 1579e4dcb0 - bugfix: detection of support for direct loading load mechanism was broken
- proxy dll load mechanism disabled since it seems to have been bugged for ages
and nobody noticed so it appears to be unneeded
2015-02-25 17:50:57 +01:00
Tannin 671d96383b icon delegates now use a pixmap cache to improve rendering performance 2015-02-25 17:48:37 +01:00
Tannin bdfd41a862 cleanup 2015-01-29 19:30:10 +01:00
Tannin 8aa6dc4c7d extended the game-plugin interface 2015-01-29 19:26:42 +01:00
Tannin c3a95bdef1 Merge with branch1.2 2015-01-24 19:34:12 +01:00
Tannin f756aede08 updated version number 2015-01-24 19:16:42 +01:00
Tannin 855e8bd737 fixed logging in case of changes and errors in the mod list 2015-01-22 19:55:41 +01:00
Tannin b0fe23a711 bugfix: When displaying the list of save games to delete the list is capped to 10 entries, otherwise the window may extend beyond the screen 2015-01-22 19:50:51 +01:00
Tannin c2edbcf90f bugfix: initialization order was wrong and so kept foreign language systems from correctly loading mod order if Unmanaged is translated
"Unmanaged" is no longer translatable as its used internally as an identifier
2015-01-22 19:47:18 +01:00
Tannin 2400e2c99e cleanup (mostly removing unused includes) 2015-01-22 19:44:38 +01:00
Tannin af1e3d0187 removed some obsolete code 2015-01-22 19:38:14 +01:00
Tannin 9ab9c072fc Added tag release v1.2.17 for changeset 2078ce371648 2015-01-22 19:02:47 +01:00
Tannin 9edc39633b - bugfixes
- moved more functionality to game-plugins
- further decoupled management functionality from the UI
- created another "tutorial" which is only a single page with relevant parts of
  the ui highlighted with info as tooltips
2015-01-06 19:31:53 +01:00
Tannin b415db619e Merge 2015-01-04 10:33:37 +01:00
Tannin bd8267993d - fixes after merge 2015-01-04 10:13:12 +01:00
Tannin f5c56efeb3 re-integrated changes missing from the merge 2015-01-03 16:18:38 +01:00
Tannin a16e25380f Merge with branch1.2 2015-01-03 15:58:52 +01:00
Tannin b2d04d70fc accidentally removed loot_cli from build 2014-11-28 11:51:52 +01:00
Tannin 99de80e722 replaced all uses of NULL with nullptr
fixed a few placed where NULL was used as a number or boolean
2014-11-28 11:19:20 +01:00
Tannin 78f628e0af cleanup und bugfixes after refactoring 2014-11-28 11:06:28 +01:00
Tannin 45a46778fb Merge 2014-11-21 15:07:31 +01:00
Tannin cfb863f6c3 qt5 compatibility 2014-11-21 15:01:47 +01:00
Tannin f2f9e11fdd - started on a refactoring moving functionality out of the MainWindow class
- started on support for game-plugins
2014-11-21 14:45:30 +01:00
Tannin d23466f036 - fixed manifest for qt5
- download messages can now be sent from different user accounts
2014-11-14 23:33:49 +01:00
Tannin 53896e66f1 - updated staging script to use qt5 and to fetch translations from transifex
- removed call to function unavailable in Windows XP
2014-11-11 23:48:22 +01:00
Tannin efc77930ad Merge 2014-11-11 21:52:50 +01:00
Tannin 01265e9b03 - re-enabled use of img-tags in bbcode converter
- addded a workaround for cases where, after a MO update, the stored modlist layout has no size for new columns
- using a webview again for the nexus view of the modinfo dialog
2014-11-11 21:46:16 +01:00
Tannin 9494938534 Merge 2014-11-11 21:42:18 +01:00
Tannin 7c1273b246 some work on installer scripts 2014-11-11 21:41:22 +01:00
Tannin 9ab7bada1c - bsa parser will now cancel in case of a read error. Before, when attempting to parse a broken bsa it could take forever and continuously allocate memory
- better error message when bsa parsing fails
- slightly better support for font colors in bbcode converter
- configurator now also uses pyqt5
- bugfix: bsa hashing function converted backslashes to slashes instead of the other way around. hash calculation is still often wrong on folder names...
2014-11-09 14:01:48 +01:00
Tannin 10cc566081 Merge 2014-11-06 00:07:06 +01:00
Tannin 53d1f3e00e - workaround for GetModuleFileName-calls that supply wrong buffer size
- removed obsoleted calls to GetVersionEx
- bugfix: download urls were potentially not encoded correctly
- bugfixes to tls-based recursion protection
2014-11-06 00:03:44 +01:00
Tannin df0bd3331a - archive library can now query for password during extraction (seems to be necessary for rars)
- process blacklist is now taken from a file if there is one, not hardcoded
- removed workaround for the papyrus compiler
- updated loot client to work with the actual api
- loot client now links with loot32.dll at runtime
- loot client now produces its output in a (json-)file which includes all plugin messages and dirty flags
- fomod installer now tries to parse the xml with several encodings
- fomod installer will now display a diagnostics warning if the jpg imageformat isn't supported
- base preview plugin now tries to be a bit smarter about resizing images to fit the screen
- bugfix: fomod installer no longer tries to open an image even after detecting its invalid
- bugfix: potential null-pointer dereferentiation in getprivateprofile... hooks
- bugfix: potential null-pointer dereferentiation in download manager
- bugfix: internal origin name showed up in one more place
- bugfix: ToString function produced strings that were one (zero-termination-)character too long
2014-11-05 23:48:06 +01:00
Tannin db0e278817 - moved the hook-recursion-protection to tls
- some code cleanup and consolidation
- hook.dll will now report all of its own exceptions
- some more logging during startup
- changed the way urls are encoded for download requests
- now displaying (one of the) process name(s) while waiting for a program to end
- bugfix: spawned processes were forced to leave the job
2014-09-29 20:35:35 +02:00
Tannin 2ce135e0bf updated minimum nmm compatible version number 2014-09-27 19:18:33 +02:00
Tannin 93bd29c13d - several style fixes suggested by static analysis
- will now support up to 4 levels of version numbers (major.minor.subminor.subsubminor
2014-09-24 19:51:51 +02:00
Tannin 637ce6bcc1 - removed a use of wostringstream which seems to have been involved in a bug. Still not sure how
- rewrote widechar <-> multibyte conversion functions to handle arbitrary string lengths
2014-09-19 22:01:37 +02:00
Tannin d3d7e30286 non-mo mods now have a constructed name that cannot conflict with a regular mod 2014-09-10 20:44:39 +02:00
Tannin 7d27138086 when MO fails to overwrite its ini file it tries another method using qt functions 2014-09-10 20:43:33 +02:00
Tannin 19cb2d4076 plugins can now query the list of masters for a plugin 2014-09-10 20:37:17 +02:00
Tannin 5aa5c90d39 profiles are now created with an (empty) archives.txt 2014-09-10 20:35:57 +02:00
Tannin 12a57d7f6d - descriptions for plugin settings are now displayed 2014-09-10 20:34:31 +02:00
Tannin 482f13a50b - re-enabled building of loot_cli and started developing against the new api
- extended set of default categories
- more tolerand bbcode parser
- added a few colors for the bbcode parser
- more fixes to qt5 compatibility
- started work on ability to unloading (and thus re-loading) of plugins
- names of plugins are no longer localizable (because those names are also used to store settings)
- added settings to disable individual diagnosis settings
- path of dependencies is now configured in a .pri file instead of environment variablees
- bugfix: if the modid-input is canceled, the id was saved as -1 and wasn't re-requested from the user
- bugfix: moving files with the SHFileOperation-Api didn't update the vfs correctly (still not perfect but better)
- bugfix: attempt to remove the deleter-file seems to have caused error messages for some users
- bugfix: fixed a couple of cases that might have caused the tutorial to hang
2014-09-08 20:37:23 +02:00
Tannin f481a7aae3 Merge 2014-08-28 18:21:51 +02:00
Tannin 15b9927cef minor fixes 2014-08-28 18:20:40 +02:00
Tannin cc42e76f54 - bugfix: MO would report invalid index errors when downloading while download list is sorted by filetime descending 2014-08-25 21:07:29 +02:00
Tannin 84598cbcbf - processes spawned from MO are now themselves allowed to break away from the job.
Without this the CEF (chromium embedded framework) seems to fail
- bugfix: Fixed an error message when installing a fomod wrapped in an archive
- bugfix: sorting plugins had no effect on non-skyrim games
- bugfix: fomod parser quit installing filelists after one file
- bugfix: function retrieving local appdata path read wrong directory
2014-08-25 20:12:25 +02:00
Tannin 02973be652 - bugfix: mods were specified by internal name in archive and data tab 2014-08-19 18:44:35 +02:00
Tannin fc2591e028 - new plugin-api to determine the origin of a file 2014-08-18 23:01:25 +02:00
Tannin 9a97098cc3 - bugfix: text files weren't displayed in the mod-info-dialog 2014-08-18 23:01:02 +02:00
Tannin 4b1e6683d2 - can now filter by mod content
- all files/directories that require write access can now be placed in AppData instead of the MO directory
2014-08-18 23:00:25 +02:00
Tannin 06701856f8 - login package now also uses a "proper" user-agent 2014-08-18 22:57:00 +02:00
Tannin 5d4a55c3a6 - performance optimizations for detection of file changes in mod directories
- added a workaround for download-link handling in chrome
- MO will now create a profile even if the game-launcher has never been run
- bugfix: files weren't cleanly removed from vfs file register
2014-08-01 12:10:49 +02:00
Tannin 470b6ed0bf - browser dialog now has a hidden url-field (for testing only)
- loot_cli is no longer part of this project. I will probably create a fork of loot that allows command-line usage instead
- loot integration now works with such a modified loot version
- integrated loot will now also integrate incompatibility messages in the MO UI
- overwrite-markers are now updated as the list order is changed
- fnis checker will now always allow the user to ignore fnis errors
- plugin interface now has a function to wait for handles returned from startApplication (which can be job or process handles)
- bugfix: non-mo mods sharing the name with regular mods now have a different internal name
- bugfix: using hotkeys the vanilla game-plugins could be moved
2014-07-27 18:34:32 +02:00
Tannin 0050cb0740 - download-list will no longer show a file as having incomplete data if there is no file version
- added a new mod column with icons displaying the content of the mod
- MO now differentiates between mods using an internal name that disambiguates between foreign and regular mods
2014-07-21 19:14:24 +02:00
Tannin f6ef5477e7 normalized eol style (all files should now have windows line endings) 2014-07-17 22:02:15 +02:00
Tannin e24f3fef77 - bugfix: broke qt4 compatibility in trying to support qt5
- bugfix: overwrite dialog displayed system drives if the overwrite directory didn't exist
- bugfix: ini tweak activation wasn't saved
2014-07-17 20:04:22 +02:00
Tannin 0a152ceadf Merge 2014-07-15 20:45:29 +02:00
Tannin 5718af3510 - Disabled compilation of loot_cli as the current loot version can't be compiled or linked against with vs 2010
- bugfix: some incompatibilities with non-skyrim games
- bugfix: incorrect handling of plurals in translateable strings
2014-07-15 20:37:10 +02:00
Tannin 434b6be69d merged changes by TheBloke 2014-07-15 17:48:43 +02:00
Tannin d412060d59 - qt 5 compatibility fixes
- detection for support of optimized find no longer depends on deprecated api
2014-07-15 17:31:44 +02:00
Tannin 84c66727bf - when highlighting a mod the overwritten and overwriting mods are now highlighted in the list
- when starting an external application MO now wraps the process in a job and waits on that instead. This way MO is not unlocked early when skyrim is started through skse
- mod info dialog no longer offers the esp tab for foreign mods because that caused confusion
- updated translation files
- download directory and mod directory are now created if necessary
- bugfix: staging script created unnecessary copies of translation files
- bugfix: potential invalid array access when trying to determine best mod order
- bugfix: deleter file wasn't removed after esp hiding was disabled
- bugfix: potential access to to un-initialized login reply
- bugfix: changed the initialization order to allow more ui controls to be localized
2014-07-14 21:22:44 +02:00
TheBloke bfb3385e49 deleteSavegame:
- Confirmation question shows number of saves to be deleted, when more than 1
2014-07-13 16:11:30 +01:00
TheBloke f59f52501c savegameList: more minor changes
- Context Menu - can do same job with fewer variables and assignments
- deleteSaveGame_clicked - const reference, not new value, in foreach loop
2014-07-13 15:45:19 +01:00
TheBloke 9b67e338e1 savegameList:
- Context menu bugfix, previous method of getting rows didn't work when items
 were selected in certain ways, e.g. Control-A
- Context menu now uses selectedIndexes(), which always works with all selections.
- Renamed enableFixMods to multipleSelected so same value can be used to decide
 whether to show single or plural version of "Delete save(s)"
2014-07-13 15:24:46 +01:00
TheBloke 7944bacfd9 savegameList: A few cleanups and minor code improvements
- Slight improvements over previous commits, using more appropriate methods and
 removing some unnecessary code. No functional changes.
2014-07-12 11:15:34 +01:00
TheBloke 1b4c07eb20 - savegameList: Improved save game handling from MainWindow
-- Save game deletion now does Recycle Bin delete (wishlist #675)
-- Save game deletion now also deletes .skse file (bug #687)
-- Can select and delete multiple save games (ExtendedSelection) (wishlist #675)
-- Uses new SaveGame->saveFiles() method to get filenames (eg .ess & .skse)
-- Context menu - "Fix Mods.." option only appears if 1 save is selected
-- Context menu - delete menu option labelled "Delete save" or "Delete saves",
 according to 1 or >1 saves selected.
-- Context menu - delete menu confirmation shows list of all selected saves
2014-07-11 01:46:42 +01:00
TheBloke d93df95dcf - Save game management: re-factored getting of filenames including .skse
-- New - SaveGame->saveFiles(), returns all filenames for save (eg. ess + skse)
-- Moved - SaveGameGameBryo->attachedFiles() to SaveGame->attachedFiles()
-- This allows the getting of save file names with just a SaveGame object, not
 a GameBryo object, which would do a full file read including plugins and image etc.
-- Therefore SaveGame is no longer abstract.

- Transfer Saves: re-factored to use new SaveGame->saveFiles() method
-- Removed - TransferSavesDialog->getFilesToProcess, now redundant as information
 is now provided by SaveGame class itself.
2014-07-11 01:29:33 +01:00
TheBloke 46a32ff3b7 Additional 'make install' step - install boost_python DLL to output(d)\DLLs
Extended the new ModOrganizer.pro 'make install' steps, to now also copy
  $$(BOOSTPATH)\stage\lib\boost_python-vc*-mt-1*.dll
 This is the final install step required, so that now ModOrganizer.exe works
  fully when a Qt-Creator "Run" step is performed.
 The wildcard should pick up the right version of the library regardless of
  MSVC compiler version used.

Updated Qt5 version check to the standardised greaterThan check.
2014-07-08 04:05:33 +01:00
TheBloke 0046d8710e Compilation dependency tracking enabled for organizer, hook, bsaExtractor, shared
Previously, qmake did not detect when code was changed in the static libraries
 So for example, changing code in shared/*.cpp and then Build, would not cause
  a re-link and re-deploy of ModOrganizer.exe.
 This has been fixed by adding PRE_TARGETDEPS references to each project that
  depend on static libraries provided by other sub-projects.
 These checks are conditional on debug|release, to point to the correct lib.

 List of currently configured static library dependency checks -
  organizer - mo_shared.lib, bsatk.lib
  hookdll - mo_shared.lib, bsatk.lib
  shared - bsatk.lib
  bsaExtractor - bsatk.lib

 I have tested to confirm that changing a shared file results in re-linking and
  re-deplomyent of both ModOrganizer.exe and hook.dll.

 Note that dependencies have not been configured for DLLs, as these are
  loaded dynamically and so recompilation is not required.
  But there could be an argument for configuring DLLs as dependencies too -
   as if you make a change in DLL code, you might want all clients of the DLL to
    be recompiled to check that they have not been broken by the changes?
  The downside of that would be extra re-compilation every time.
2014-07-08 04:01:24 +01:00
TheBloke 2b5748003d .pro files - formatting/consistency fixes
Many small formatting changes to the majority of .pro files
 Consistent style for Qt version checking, using greaterThan(QT_MAJOR_VERSION, 4)
  This seems safest, as would continue to work for a future Qt 6 etc.
  Note that this makes redudundant the commit before this one, to organizer.pro
 Consistent indenting
 Moved some file configuration sections to be together with related sections
 Moved some installation-related sections (e.g. OUTDIR/DSTDIR) to be at the bottom,
  immediately before the related POST_LINK install lines.
 Similarly, in some cases separated out CONFIG(debug,.. checks into separate
  LIB/INCLUDE sections (high in file) and installation directory sections (low
   in file)
2014-07-07 23:32:18 +01:00
TheBloke a49ed5c33c organizer.pro - tiny tweak to Qt5 version check
Directly checking QT_MAJOR_VERSION instead of pattern matching on QT_VERSION
2014-07-07 21:51:35 +01:00
TheBloke 62b0c07a93 Added 'make install' steps in ModOrganizer.pro -
Added config to install required libraries to output(d) directory
 If the user adds a Deploy step, that runs 'jom install', he will have the
  necessary libraries copied to output(d)\dlls
 These libraries are -
  7z.dll
  Qt4 Core Declarative Gui Network OpenGL Script Sql Svg Webkit Xml XmlPatterns
   Different set configured for Qt5, e.g. adding Widgets, Qml, Quick
   In a debug build, the 'd' DLLs will be used instead.
   Qt4 libraries are copied from system Qt4 installation directory.
 This allows the Qt-Creator user to hit "Run" in Qt-C and end up with a complete
  install, including all DLLs; no manual Exporer copying required.
 This therefore removes the need for post-build steps 10 & 11 in Readme.txt.
 Future thought - Update all current POST_LINK (x)copy steps to make install?

Fixed DESTDIR in ModOrganizer.pro
 It was pointing to source/output(d) before, should be ..\output(d)
 It was not used before so didn't matter, but is now referenced for install.
2014-07-07 21:39:27 +01:00
tomjobbins 05c58c8b3d Added tag release v1.2.9 for changeset d70ead9aea95 2014-07-07 20:23:52 +01:00
Tannin 9b33e0a970 Merge 2014-07-03 17:42:56 +02:00
Tannin a5b6556d67 slight fixes to qt5 compatibility 2014-07-03 17:42:31 +02:00
186 changed files with 22686 additions and 14926 deletions
+12
View File
@@ -0,0 +1,12 @@
*.user
Thumbs.db
src/moc_*.cpp
src/ui_*.h
src/*.qrc.depends
src/Modorganizer.*
CMakeLists.txt.user
edit
stderr.log
stdout.log
build
.idea
+10
View File
@@ -1,4 +1,6 @@
syntax: glob
scons_configure.py
scons-ModOrganizer-*
ModOrganizer-build-desktop*
outputd/*
output/*
@@ -31,6 +33,14 @@ html
*.log
*.filters
*.lib
source/organizer/resources/contents/icons
source/plugins/build-*
*/GeneratedFiles/*
translations/*
source/LocalPaths.pri
source/*/Win32/Debug/*
source/plugins/*/Win32/Debug/*
*~
syntax: regexp
Makefile\.(Debug|Release)
source/.*/debug/.*
+14
View File
@@ -0,0 +1,14 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
PROJECT(organizer)
SET(DEPENDENCIES_DIR CACHE PATH "")
# hint to find qt in dependencies path
LIST(APPEND CMAKE_PREFIX_PATH ${DEPENDENCIES_DIR}/qt5/lib/cmake)
FILE(GLOB_RECURSE BOOST_ROOT ${DEPENDENCIES_DIR}/boost*/project-config.jam)
GET_FILENAME_COMPONENT(BOOST_ROOT ${BOOST_ROOT} DIRECTORY)
SET(ZLIB_ROOT ${DEPENDENCIES_DIR}/zlib)
ADD_SUBDIRECTORY(src)
-228
View File
@@ -1,228 +0,0 @@
HOW TO BUILD
============
Intro:
------
Building Mod Organizer can be a rather daunting task especially if you're not very comfortable with C++ development under windows.
Please note that if you only want to work on and build a plugin you can save yourself a lot of trouble
Overview:
---------
As of Juli 2014 MO consists of the following subprojects:
- organizer: The main userinterface. heavy usage of various libraries
- hookdll: core library of the virtual file system
- uibase: interop between plugins and the main application as well as some reusable functionality
- shared: functionality shared between organizer and hookdll. I'm attempting to get rid of this library over time
- nxmhandler: tool to pass handling of nxm links to MO or other applications
- helper: tool for doing operations requiring elevated priviledges if MO doesn't have them
- proxydll: dll used in the "proxy dll" load mechanism
- esptk: small library containing functionality to work with esps/esms
- bsatk: small library containing functionality to work with bsas. Requires zlib to extract files. Requires boost_thread to provide multi-threaded extraction
- archive: small wrapper library around 7zip for dealing with mod archives. Requires 7zip
- NCC: extension to NMM to provide a binary with command line interface for fomod installation. This is c# code and does not build with the rest of the project. Requires the rest of NMM
- bossdummy: dummy dll that looks like the boss.dll. This is used instead of the real boss dlls in NCC to save some disk space
- pythonrunner: library for embedding python code. Requires boost_python, python 2.7 and pyqt4
- loot_cli: this is a command line client of loot. This can be better integrated with MO than the official loot client.
And various plugins:
- bsaExtractor: offers to extract bsas after a mod has been installed
- checkFNIS: Activates each time an application is started from MO and runs fnis if necessary
- diagnoseBasic: Various diagnostic checks on the game
- inieditor: minimalistic file editor for ini files
- installerBain: handles non-scripted bain installers
- installerBundle: handles installation of archives wrapped in archives
- installerFomod: handles installation of xml fomods
- installerManual: handles installations of archives that aren't supported by any other plugin (or if the user chooses to do the installation manually)
- installerNCC: handles installation of any fomod (requires NCC)
- installerQuick: handles very simple one-click installations
- NMMImport: importer from existing nmm installation
- proxyPython: integrates pythonrunner as a plugin into MO
- pyniEdit: more user-friendly ini editor. python code
- previewBase: used for file previews. this plugin covers image formats supported by the qt installation (usually at least jpg, gif, png) and text files
- previewDDS: used to preview dds textures. uses code from the nif file format library
There are a few more plugins that are either broken or samples
- installerBCF: this was intended to use .bcf (bain conversion file) files as installation instructions but currently it is completely function-less
- helloWorldCpp: sample for cpp plugins. This should compile even without fulfilling most dependencies below
- pageTESAlliance: integrates the tes alliance page into MO. This integration is not nearly as tight as that of nexus.
Requirements:
-------------
Visual C++ compiler 2010 (VC 10.0) or up
- Included in visual c++ express 2010 or windows sdk 7.x
- Do install windows sdk too if only for the cdb debugger which is included in that package
Note: If you're having trouble installing the windows sdk, you may be affected by this bug: http://support.microsoft.com/kb/2717426
Qt Libraries 4.8.x (http://qt-project.org/downloads)
- i.e. "Qt libraries 4.8.6 for Windows (VS 2010, 235 MB)"
- tested: 4.8.6
- Install according to instruction
Qt 5 Compatibility:
MO compiles and mostly runs correctly built with Qt 5.3 and VC++ 2013 but
- python plugins haven't been rewritten to use qt5 yet
- pyqt5 isn't distributed as binaries for python 2.7 so this needs to be set up and built first
- tutorial doesn't work because it seems to be impossible to create a transparent Qt Quick control...
- the previewdds plugin only compiles with the opengl variant of the qt 5 distribution
- Qt5 is a bi*** to distribute
boost libraries (http://www.boost.org/)
- tested: 1.55
- Build according to their instructions (using vc++): http://www.boost.org/doc/libs/1_54_0/more/getting_started/windows.html
- A few of the boost libraries need to be built (the rest is header-only). The only compiled libs MO needs (at the time of writing) are
boost_thread (for everything that links agains bsatk) and boost_python (for pythonrunner). You can disable the others to save yourself compile time (even on a modern system compiling boost can easily take an hour)
zlib (http://www.zlib.net/)
- Compile static library according to their instructions
- Depending on the version of zlib and how you built you should have a file called zlibstatic.lib or zlibstat.lib in "build" or "x86\ZLibStatRelease".
- Please copy that lib file to "build\zlibstatic.lib" (if it doesn't exist) so MO finds it.
7z sourcecode (http://www.7-zip.org/download.html)
- only for "archive" subproject
- no need to compile, will be linked into project
Python 2.7 (32-bit)
- only for pythonrunner
PyQt4 for Python 2.7
- tested: 4.10
- only for pythonrunner
Recommended:
------------
Qt Creator
- http://qt-project.org/downloads#qt-creator
- I.e. "Qt Creator 2.8.1 for Windows (53 MB)"
- With Qt Creator usually the rule is "the newer the better"
- Start Qt Creator and check if things are set up correctly:
1) Go to Tools > Options > Build & Run > Qt Versions
2.1) If the QtSDK 4.8.x you installed earlier is not auto-detected, click "Add" to add it manually
2.2) Navigate to your <your qt4 installation>\bin\qmake.exe
2.3) Restart qt creator
3) Go to Tools > Options > Build & Run > Kits
3.1) If no Kit is auto-detected (or the auto-detected ones have picked up the wrong qt or vc++ installation) click "Add"
3.2) Enter a Name (i.e. "Qt 4.8.5 MSVC2010 32bit")
3.3) In Compiler select the visual studio compiler installed earlier (may show up as "Microsoft Windows SDK for Windows x). Make sure you select the x86 variant
3.4) CDB should be auto-detected
3.5) Select the qt version set up earlier
4) Apply and close the options
Set up (using Qt Creator):
--------------------------
1. Using Qt Creator open source/ModOrganizer.pro from your working copy
2. Open the "Projects" tab, open the "Details" for "Build Environment"
3a. Click "Add" to add a variable called "BOOSTPATH" with the path of your boost installation as the value (i.e. C:\code\boost_1_49_0)
3b. Click "Add" to add a variable called "ZLIBPATH" with the path of your zlib installation as the value (i.e. C:\code\zlib-1.2.7)
3c. Click "Add" to add a variable called "SEVENZIPPATH" with the path of your 7zip installation as the value (i.e. C:\code\7zip)
3d. Click "Add" to add a variable called "PYTHONPATH" with the path of your python installation as the value (i.e. C:\code\python)
4. Switch the build configuration at the very top of the same page from "debug" to "release" (or vice versa) and repeat step 3
5. Compile the configuration(s) you want to use (debug and/or release) (Build All). This should compile correctly.
6. <reserved for future use. Maybe grab a coffee?>
7. return to the "projects" tab and switch to "Run Settings"
8. Determine the folder of the qt binaries in the package you downloaded. This could be "QtSDK\Desktop\Qt\4.8.5\msvc2010\bin" or "Qt4.8.5\bin"
For Release build:
9r. Add a "Run configuration" that points to <your working copy>\output\ModOrganizer.exe
10r. Copy "7z.dll" to <your working copy>\output\dlls
11r. From the qt binaries directory, copy the following files to <your working copy>\output\dlls: QtCore4.dll, QtDeclarative4.dll, QtGui4.dll, QtNetwork4.dll, QtScript4.dll, QtSql4.dll, QtWebkit4.dll, QtXml4.dll, QtXmlPatterns4.dll
For Debug build:
9d. Add a "Run configuration" that points to <your working copy>\outputd\ModOrganizer.exe
10d. Copy "7z.dll" to <your working copy>\outputd\dlls
11d. From the qt binaries copy the following files to <your working copy>\outputd\dlls: QtCored4.dll, QtDeclaratived4.dll, QtGuid4.dll, QtNetworkd4.dll, QtScriptd4.dll, QtSqld4.dll, QtWebkitd4.dll, QtXmld4.dll, QtXmlPatternsd4.dll
Now you should be able to compile and run Mod Organizer.
Please note that when you change anything apart from the "organizer" subproject, qt creator may not pick up on the changes
and not recompile the modified subproject. the "organizer" project on the other hand is always re-linked. If anyone knowledgeable enough with qmake
can fix that that would be awesome.
Set up (without Qt Creator):
----------------------------
1. open a command line shell and navigate to <your working copy>\source
2. run "qmake -tp vc" to create a visual c++ solution
3. Open that solution
4. - 98. A miracle happens
99. You can now compile MO using VC
I'm not using this workflow so I can't give more detailed instructions.
Please note that the primary project format of MO remains qmake, if you work with visual studio and make changes to the project (like adding
source files) you have to manually transfer those changes to the .pro file.
-----------------
Troubleshooting (thanks to Ross):
-----------------
1) When I try to build, I am seeing the error "error: LNK1104: cannot open file 'zlibstatic.lib'"
a) Make sure you have the following files
{ZLIBPATH}\build\zconf.h
{ZLIBPATH}\build\zlib.h
{ZLIBPATH}\build\zlibstatic.lib
b) make sure "zlibstat.lib" was renamed to "zlibstatic.lib"
c) currently, there are references to zlibstatic in the following 2 project files:
./bsatk/bsatk.pro
./hookdll/hookdll.pro
2) After building, I try to open {MOPROJECTPATH}\outputd\ModOragnizer.exe and get this error
"The program can't start because QtDeclaratived4.dll is missing from your computer. Try reinstalling the program to fix this problem."
-> When setting up Qt4.8.x, make sure you copied the "d" (debug) versions of the dll files to {MOPROJECTPATH}\outputd\dlls
If you copied the release version or did not copy the dlls at all, you may see this error.
The *.dll files can be found in {QT48xPATH}\bin
Similiar:
http://stackoverflow.com/questions/11196416/cant-start-qt-exe-file-on-windows-7
3) I am getting one or more of the the following compiler warnings...
"{MOPROJECTPATH}\source\bsatk\bsaexception.cpp:32: warning: C4996: 'vsnprintf': This function or variable may be unsafe.
Consider using vsnprintf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details."
-> Ignore/suppress warning like this and make be ultra-careful using printf-style functions. vsnprintf_s is a visual-c++ only function so using those would make porting (i.e. to mingw) harder
"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\INCLUDE\stdio.h:354: see declaration of 'vsnprintf'"
-> see previous
"debug\bsaarchive.obj:-1: warning: LNK4042: object specified more than once; extras ignored"
-> This appears to be an issue when using VC++ 2010 as the compiler. There are some posts on StackOverflow
which suggest fixes when using VC++ as the IDE, but not sure how to apply them to Qt Creator.
http://stackoverflow.com/questions/3729515
http://stackoverflow.com/questions/3695174
-> Also, not sure if this affects VC++ 2012 / VC++ 2013 / GCC via cygwin/mingw.
Not even sure if the project would successfully compile on these.
"{MOPROJECTPATH}\source\organizer\mainwindow.cpp:3995: warning: C4428: universal-character-name encountered in source"
-> very pointless warning.
http://stackoverflow.com/questions/11589571
http://stackoverflow.com/questions/7078013
the best solution I saw was to just disable the warning altogether...
#pragma warning( disable : 4428 )
"warning: LNK4098: defaultlib 'LIBCMT' conflicts with use of other libs; use /NODEFAULTLIB:library"
-> You can always add a #pragma to ignore them :P
http://msdn.microsoft.com/en-us/library/2c8f766e%28v=vs.80%29.aspx
4) I got the following error while building...
"error: LNK1201: error writing to program database
'{MOPROJECTPATH}\{whatever-your-build-directory-name-is}\organizer\debug\ModOrganizer.pdb';
check for insufficient disk space, invalid path, or insufficient privilege"
-> I had this happen after trying to look at something in memory via Process Explorer.
To resolve, I killed and restarted PE. Alternatively, you could probably use the
Unlocker utility. After unlocking, I manually deleted everything in the directory.
Unlocker: http://www.filehippo.com/download_unlocker/ or http://www.emptyloop.com/unlocker/
Warning: With Unlocker v1.9.2, you must select "Advanced" then uncheck everything to
avoid having some Delta toolbar garbage installed...
+524
View File
File diff suppressed because it is too large Load Diff
+40
View File
@@ -0,0 +1,40 @@
# Mod Organizer
Mod Organizer (MO) is a tool for managing mod collections of arbitrary size. It is specifically designed for people who like to experiment with mods and thus need an easy and reliable way to install and uninstall them.
## Building
Please refer to [TanninOne/modorganizer-umbrella](https://github.com/TanninOne/modorganizer-umbrella) for build instructions.
## Other Repositories
MO consists of multiple repositories on github. The Umbrella project will download them automatically as required. They should however also be buildable individually.
Here is a complete list:
* https://github.com/TanninOne/modorganizer
* https://github.com/TanninOne/modorganizer-uibase
* https://github.com/TanninOne/modorganizer-hookdll
* https://github.com/TanninOne/modorganizer-bsatk
* https://github.com/TanninOne/modorganizer-esptk
* https://github.com/TanninOne/modorganizer-archive
* https://github.com/TanninOne/modorganizer-nxmhandler
* https://github.com/TanninOne/modorganizer-lootcli
* https://github.com/TanninOne/modorganizer-helper
* https://github.com/TanninOne/modorganizer-tool_nmmimport
* https://github.com/TanninOne/modorganizer-tool_pyniedit
* https://github.com/TanninOne/modorganizer-tool_inieditor
* https://github.com/TanninOne/modorganizer-preview_base
* https://github.com/TanninOne/modorganizer-diagnose_basic
* https://github.com/TanninOne/modorganizer-installer_quick
* https://github.com/TanninOne/modorganizer-installer_manual
* https://github.com/TanninOne/modorganizer-installer_fomod
* https://github.com/TanninOne/modorganizer-installer_bundle
* https://github.com/TanninOne/modorganizer-installer_bain
* https://github.com/TanninOne/modorganizer-game_skyrim
* https://github.com/TanninOne/modorganizer-game_oblivion
* https://github.com/TanninOne/modorganizer-game_fallout3
* https://github.com/TanninOne/modorganizer-game_falloutnv
* https://github.com/TanninOne/modorganizer-game_gamebryo
* https://github.com/TanninOne/modorganizer-game_features
* https://github.com/TanninOne/modorganizer-check_fnis
* https://github.com/TanninOne/modorganizer-plugin_python
* https://github.com/TanninOne/modorganizer-bsa_extractor
+33
View File
@@ -0,0 +1,33 @@
# This python script contains the configuration for scons
# Copy this to scons_configure.py and adjust to taste.
# Path to your boost install - it should have a boost/ subdirectory and a stage/
# subdirectory. The scons script will use stage/lib if there, or the appropriate
# version for your compiler, if you installed the multiple-build version
BOOSTPATH = r"C:\Apps\boost_1_55_0"
# Version of Visual Studio to use, if you wish to use a specific version. If you
# don't specify a version, the latest will be picked.. See the scons manual for
# supported values.
#MSVC_VERSION = '10.0Exp'
# Path to your python install
# You don't really need to set this up but you might if (say) you have a 32- and
# 64-bit python install and scons has been installed for the 64 bit version
#PYTHONPATH=r"C:\Apps\Python"
# Path to your QT install. This might constrain the version of MSVC you can use.
# This seems to be set by QTCreator
#QTDIR = r"C:\Apps\Qt\4.8.6"
# Path to 7-zip sources
SEVENZIPPATH = r"C:\Apps\7-Zip\7z920"
# Path to zlib. Please read the README file for more information about how this
# needs to be set up
ZLIBPATH = r"C:\Apps\zlib-1.2.8"
# Source control programs. Sadly I can't get this information from qt, even
# though you have to set it up in the configuration
GIT = r"C:\Program Files\git\bin\git.exe"
MERCURIAL = r"C:\Program Files\TortoiseHg\hg.exe"
+351
View File
@@ -0,0 +1,351 @@
CMAKE_MINIMUM_REQUIRED (VERSION 2.8)
CMAKE_POLICY(SET CMP0020 NEW)
#CMAKE_POLICY(SET CMP0043 NEW)
SET(PROJ_AUTHOR Tannin)
SET(PROJ_ARCH x86)
IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
SET(PROJ_ARCH x64)
ENDIF()
SET(organizer_SRCS
transfersavesdialog.cpp
syncoverwritedialog.cpp
spawn.cpp
singleinstance.cpp
settingsdialog.cpp
settings.cpp
selfupdater.cpp
selectiondialog.cpp
savegameinfowidgetgamebryo.cpp
savegameinfowidget.cpp
savegamegamebryo.cpp
savegame.cpp
queryoverwritedialog.cpp
profilesdialog.cpp
profile.cpp
pluginlistsortproxy.cpp
pluginlist.cpp
overwriteinfodialog.cpp
nxmaccessmanager.cpp
nexusinterface.cpp
motddialog.cpp
modlistsortproxy.cpp
modlist.cpp
modinfodialog.cpp
modinfo.cpp
messagedialog.cpp
mainwindow.cpp
main.cpp
loghighlighter.cpp
logbuffer.cpp
lockeddialog.cpp
loadmechanism.cpp
installationmanager.cpp
helper.cpp
filedialogmemory.cpp
executableslist.cpp
editexecutablesdialog.cpp
downloadmanager.cpp
downloadlistwidgetcompact.cpp
downloadlistwidget.cpp
downloadlistsortproxy.cpp
downloadlist.cpp
directoryrefresher.cpp
credentialsdialog.cpp
categoriesdialog.cpp
categories.cpp
bbcode.cpp
activatemodsdialog.cpp
moapplication.cpp
profileinputdialog.cpp
icondelegate.cpp
gameinfoimpl.cpp
csvbuilder.cpp
savetextasdialog.cpp
qtgroupingproxy.cpp
modlistview.cpp
problemsdialog.cpp
serverinfo.cpp
browserview.cpp
browserdialog.cpp
persistentcookiejar.cpp
noeditdelegate.cpp
previewgenerator.cpp
previewdialog.cpp
aboutdialog.cpp
json.cpp
safewritefile.cpp
modflagicondelegate.cpp
genericicondelegate.cpp
organizerproxy.cpp
viewmarkingscrollbar.cpp
plugincontainer.cpp
organizercore.cpp
usvfsconnector.cpp
shared/inject.cpp
shared/windows_error.cpp
shared/error_report.cpp
shared/directoryentry.cpp
shared/gameinfo.cpp
shared/oblivioninfo.cpp
shared/fallout3info.cpp
shared/fallout4info.cpp
shared/falloutnvinfo.cpp
shared/util.cpp
shared/skyriminfo.cpp
shared/appconfig.cpp
shared/leaktrace.cpp
shared/stackdata.cpp
)
SET(organizer_HDRS
transfersavesdialog.h
syncoverwritedialog.h
spawn.h
singleinstance.h
settingsdialog.h
settings.h
selfupdater.h
selectiondialog.h
savegameinfowidgetgamebryo.h
savegameinfowidget.h
savegamegamebyro.h
savegame.h
queryoverwritedialog.h
profilesdialog.h
profile.h
pluginlistsortproxy.h
pluginlist.h
overwriteinfodialog.h
nxmaccessmanager.h
nexusinterface.h
motddialog.h
modlistsortproxy.h
modlist.h
modinfodialog.h
modinfo.h
messagedialog.h
mainwindow.h
loghighlighter.h
logbuffer.h
lockeddialog.h
loadmechanism.h
installationmanager.h
helper.h
filedialogmemory.h
executableslist.h
editexecutablesdialog.h
downloadmanager.h
downloadlistwidgetcompact.h
downloadlistwidget.h
downloadlistsortproxy.h
downloadlist.h
directoryrefresher.h
credentialsdialog.h
categoriesdialog.h
categories.h
bbcode.h
activatemodsdialog.h
moapplication.h
profileinputdialog.h
icondelegate.h
gameinfoimpl.h
csvbuilder.h
savetextasdialog.h
qtgroupingproxy.h
modlistview.h
problemsdialog.h
serverinfo.h
browserview.h
browserdialog.h
persistentcookiejar.h
noeditdelegate.h
previewgenerator.h
previewdialog.h
aboutdialog.h
json.h
safewritefile.h
modflagicondelegate.h
genericicondelegate.h
organizerproxy.h
viewmarkingscrollbar.h
plugincontainer.h
organizercore.h
iuserinterface.h
usvfsconnector.h
shared/inject.h
shared/windows_error.h
shared/error_report.h
shared/directoryentry.h
shared/gameinfo.h
shared/oblivioninfo.h
shared/fallout3info.h
shared/fallout4info.h
shared/falloutnvinfo.h
shared/util.h
shared/skyriminfo.h
shared/appconfig.h
shared/appconfig.inc
shared/leaktrace.h
shared/stackdata.h
)
SET(organizer_UIS
transfersavesdialog.ui
syncoverwritedialog.ui
simpleinstalldialog.ui
settingsdialog.ui
selectiondialog.ui
savegameinfowidget.ui
queryoverwritedialog.ui
profilesdialog.ui
overwriteinfodialog.ui
motddialog.ui
modinfodialog.ui
messagedialog.ui
mainwindow.ui
lockeddialog.ui
installdialog.ui
finddialog.ui
editexecutablesdialog.ui
downloadlistwidgetcompact.ui
downloadlistwidget.ui
credentialsdialog.ui
categoriesdialog.ui
activatemodsdialog.ui
profileinputdialog.ui
savetextasdialog.ui
problemsdialog.ui
previewdialog.ui
browserdialog.ui
aboutdialog.ui
)
SET(organizer_QRCS
resources.qrc
stylesheet_resource.qrc
)
SET(organizer_RCS
app_icon.rc
version.rc
)
SOURCE_GROUP(Source FILES ${organizer_SRCS})
SOURCE_GROUP(Headers FILES ${organizer_HDRS})
SOURCE_GROUP(UI FILES ${organizer_UIS})
# Qt5
SET(CMAKE_INCLUDE_CURRENT_DIR ON)
SET(CMAKE_AUTOMOC ON)
SET(CMAKE_AUTOUIC ON)
FIND_PACKAGE(Qt5Widgets REQUIRED)
FIND_PACKAGE(Qt5Declarative REQUIRED)
FIND_PACKAGE(Qt5Network REQUIRED)
FIND_PACKAGE(Qt5WinExtras REQUIRED)
FIND_PACKAGE(Qt5WebKitWidgets REQUIRED)
QT5_WRAP_UI(organizer_UIHDRS ${organizer_UIS})
QT5_ADD_RESOURCES(organizer_RCCPPS ${organizer_QRCS})
INCLUDE_DIRECTORIES(${Qt5Declarative_INCLUDES})
ADD_DEFINITIONS(-DQT_MESSAGELOGCONTEXT)
# Boost
SET(Boost_USE_STATIC_LIBS ON)
SET(Boost_USE_MULTITHREADED ON)
SET(Boost_USE_STATIC_RUNTIME OFF)
FIND_PACKAGE(Boost REQUIRED)
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
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")
SET(lib_path "${project_path}/../../install/libs")
MESSAGE(STATUS ${lib_path})
MESSAGE(STATUS ${project_path})
INCLUDE_DIRECTORIES(${project_path}/uibase/src
${project_path}/bsatk/src
${project_path}/esptk/src
${project_path}/archive/src
${project_path}/../usvfs/usvfs
${project_path}/game_features/src)
INCLUDE_DIRECTORIES(shared ${ZLIB_INCLUDE_DIRS})
LINK_DIRECTORIES(${lib_path}
${project_path}/../zlib/lib)
ADD_DEFINITIONS(-D_UNICODE -DUNICODE -DNOMINMAX -D_CRT_SECURE_NO_WARNINGS)
IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
SET(usvfs_name usvfs_x64)
ELSE()
SET(usvfs_name usvfs_x86)
ENDIF()
ADD_EXECUTABLE(ModOrganizer WIN32 ${organizer_HDRS} ${organizer_SRCS} ${organizer_UIHDRS} ${organizer_RCS} ${organizer_RCCPPS})
TARGET_LINK_LIBRARIES(ModOrganizer
Qt5::Widgets Qt5::WinExtras Qt5::WebKitWidgets
${Boost_LIBRARIES}
zlibstatic
uibase esptk bsatk
${usvfs_name}
Dbghelp advapi32 Version Shlwapi)
SET_TARGET_PROPERTIES(ModOrganizer PROPERTIES COMPILE_FLAGS /GL)
SET_TARGET_PROPERTIES(ModOrganizer PROPERTIES LINK_FLAGS_RELWITHDEBINFO
"/LTCG /INCREMENTAL:NO /LARGEADDRESSAWARE /OPT:REF /OPT:ICF")
QT5_USE_MODULES(ModOrganizer Widgets Declarative Network WebKitWidgets)
###############
## Installation
SET(qt5bin ${Qt5Core_DIR}/../../../bin)
FIND_PROGRAM(WINDEPLOYQT_COMMAND windeployqt PATHS ${qt5bin} NO_DEFAULT_PATH)
INSTALL(TARGETS ModOrganizer
RUNTIME DESTINATION bin)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/ModOrganizer.pdb
DESTINATION pdb)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dlls.manifest.qt5
DESTINATION bin/dlls
RENAME dlls.manifest)
# use windeployqt.exe to install all required libraries
SET(windeploy_parameters --no-translations --no-plugins --libdir dlls --release-with-debug-info --no-compiler-runtime)
INSTALL(
CODE
"EXECUTE_PROCESS(
COMMAND
${qt5bin}/windeployqt.exe ModOrganizer.exe ${windeploy_parameters}
COMMAND
${qt5bin}/windeployqt.exe uibase.dll ${windeploy_parameters}
WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin
)"
)
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/stylesheets
${CMAKE_CURRENT_SOURCE_DIR}/tutorials
DESTINATION bin)
+1566 -1059
View File
File diff suppressed because it is too large Load Diff
+7 -2
View File
@@ -3,16 +3,16 @@ TEMPLATE = subdirs
SUBDIRS = bsatk \
shared \
uibase \
esptk \
organizer \
hookdll \
archive \
helper \
plugins \
proxydll \
nxmhandler \
BossDummy \
pythonRunner \
esptk
loot_cli
pythonRunner.depends = uibase
plugins.depends = pythonRunner uibase
@@ -49,3 +49,8 @@ for(QTNAME, QTLIBNAMES) {
}
INSTALLS += qtlibs otherlibs
OTHER_FILES +=\
../SConstruct\
../scons_configure.py\
SConscript
+169
View File
@@ -0,0 +1,169 @@
import ctypes
import os
import subprocess
def resolve_name(source):
# Get the actual name of the file, after reparse points and symlinks are
# taken into account.
GENERIC_READ = 0x80000000
FILE_SHARE_READ = 0x1
OPEN_EXISTING = 0x3
FILE_FLAG_BACKUP_SEMANTICS = 0x02000000
handle = ctypes.windll.kernel32.CreateFileA(source,
GENERIC_READ,
FILE_SHARE_READ,
None,
OPEN_EXISTING,
FILE_FLAG_BACKUP_SEMANTICS,
None)
# get the target
FILE_NAME_NORMALIZED = 0x0
FILE_NAME_OPENED = 0x8
buff = ctypes.create_string_buffer(1024)
res = ctypes.windll.kernel32.GetFinalPathNameByHandleA(handle,
buff,
ctypes.sizeof(buff),
FILE_NAME_NORMALIZED)
target = buff.value
ctypes.windll.kernel32.CloseHandle(handle)
return target
def search_up(path, target):
while True:
if os.path.exists(os.path.join(path, target)):
return True
npath = os.path.dirname(path)
if npath == path:
break
path = npath
return False
Import('qt_env')
env = qt_env.Clone()
modules = [
'Core',
'Gui',
'Network',
'Script',
'Sql',
'WebKit',
'Xml',
'XmlPatterns',
'Declarative'
]
if env['QT_MAJOR_VERSION'] > 4:
modules += [
'Widgets',
'Qml',
'WebKitWidgets'
]
env.EnableQtModules(*modules)
env.Uic(env.Glob('*.ui'))
env.RequireLibraries('uibase', 'shared', 'bsatk', 'esptk')
env.AppendUnique(LIBS = [
'shell32',
'user32',
'ole32',
'advapi32',
'gdi32',
'shlwapi',
'Psapi',
'Version'
])
# We have to 'persuade' moc to generate certain other targets and inject them
# into the list of cpps
other_sources = env.AddExtraMoc(env.Glob('*.h'))
for file in env.Glob('*.rc'):
other_sources.append(env.RES(file))
# Note the order of this is important, or you can pick up the wrong report.h...
# Doing appendunique seems to throw the moc code into a tizzy
env['CPPPATH'] += [
'../archive',
'../plugins/gamefeatures',
'.', # Why is this necessary?
'${LOOTPATH}',
'${BOOSTPATH}',
]
env.AppendUnique(CPPDEFINES = [
'_UNICODE',
'_CRT_SECURE_NO_WARNINGS',
'_SCL_SECURE_NO_WARNINGS',
'BOOST_DISABLE_ASSERTS',
'NDEBUG',
'QT_MESSAGELOGCONTEXT'
])
env.AppendUnique(CPPFLAGS = [ '-wd4100', '-wd4127', '-wd4512', '-wd4189' ])
env.AppendUnique(LINKFLAGS = [
'/SUBSYSTEM:WINDOWS',
'${EXE_MANIFEST_DEPENDENCY}'
])
# modeltest is optional and it doesn't compile anyway...
cpp_files = [
x for x in Glob('*.cpp')
if x.name != 'modeltest.cpp' and x.name != 'aboutdialog.cpp'
]
about_env = env.Clone()
# This is somewhat of a hack until I can work out a way of setting up a build
# with all the repos without using millions of junction points
try:
target = resolve_name(Dir('.').srcnode().abspath)
if search_up(target, '.hg'):
hgid = subprocess.check_output([env['MERCURIAL'], 'id', '-i']).rstrip()
elif search_up(target, '.git'):
hgid = subprocess.check_output([env['GIT'], '-C', target, 'describe',
'--tag']).rstrip()
else:
hgid = "Unknown"
except:
hgid = "Problem determining version"
# FIXME: It'd be much easier to stringify this in the source code
about_env.AppendUnique(CPPDEFINES = [ 'HGID=\\"%s\\"' % hgid ])
other_sources.append(about_env.StaticObject('aboutdialog.cpp'))
env.AppendUnique(LIBPATH = "${ZLIBPATH}/build")
env.AppendUnique(LIBS = 'zlibstatic')
prog = env.Program('ModOrganizer',
cpp_files + env.Glob('*.qrc') + other_sources)
env.InstallModule(prog)
for subdir in ('tutorials', 'stylesheets'):
env.Install(os.path.join(env['INSTALL_PATH'], subdir),
env.Glob(os.path.join(subdir, '*')))
# FIXME Sort the translations. Except they don't exist on the 1.2 branch
res = env['QT_USED_MODULES']
Return('res')
"""
CONFIG(debug, debug|release) {
} else {
QMAKE_CXXFLAGS += /Zi /GL
QMAKE_LFLAGS += /DEBUG /LTCG /OPT:REF /OPT:ICF
}
TRANSLATIONS = organizer_en.ts
QMAKE_POST_LINK += xcopy /y /s /I $$quote($$BASEDIR\\*.qm) $$quote($$DSTDIR)\\translations $$escape_expand(\\n)
"""
+4 -6
View File
@@ -37,16 +37,14 @@ AboutDialog::AboutDialog(const QString &version, QWidget *parent)
m_LicenseFiles[LICENSE_ZLIB] = "zlib.txt";
m_LicenseFiles[LICENSE_APACHE2] = "apache-license-2.0.txt";
addLicense("Qt 4.8.5", LICENSE_LGPL3);
addLicense("Qt", LICENSE_LGPL3);
addLicense("Qt Json", LICENSE_GPL3);
addLicense("Boost Library", LICENSE_BOOST);
addLicense("Tango Icon Theme", LICENSE_NONE);
addLicense("RRZE Icon Set", LICENSE_CCBY3);
addLicense("7-zip", LICENSE_LGPL3);
addLicense("ZLib", LICENSE_ZLIB);
addLicense("NIF File Format Library", LICENSE_BSD3);
addLicense("BOSS (modified)", LICENSE_GPL3);
addLicense("Alphanum Algorithm", LICENSE_ZLIB);
addLicense("Tango Icon Theme", LICENSE_NONE);
addLicense("RRZE Icon Set", LICENSE_CCBY3);
addLicense("Icons by Lorc, Delapouite and sbed available on http://game-icons.net", LICENSE_CCBY3);
addLicense("Castle Core", LICENSE_APACHE2);
ui->nameLabel->setText(QString("<span style=\"font-size:12pt; font-weight:600;\">%1 %2</span>").arg(ui->nameLabel->text()).arg(version));
+21 -5
View File
@@ -83,14 +83,14 @@
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string notr="true">Copyright 2011-2014 Sebastian Herbord</string>
<string notr="true">Copyright 2011-2015 Sebastian Herbord</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.&lt;/p&gt;&lt;p&gt;See the GNU General Public License for more details.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.&lt;/p&gt;&lt;p&gt;See the GNU General Public License for more details.&lt;/p&gt;&lt;p&gt;Source code can be found at &lt;a href=&quot;https://github.com/TanninOne/modorganizer&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#007af4;&quot;&gt;GitHub&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="wordWrap">
<bool>true</bool>
@@ -180,7 +180,18 @@
</item>
<item>
<property name="text">
<string>Ren (Korean)</string>
<string notr="true">Ren (Korean)</string>
</property>
<property name="toolTip">
<string/>
</property>
</item>
<item>
<property name="text">
<string>... more (Can't track)</string>
</property>
<property name="toolTip">
<string/>
</property>
</item>
</widget>
@@ -221,12 +232,12 @@
</item>
<item>
<property name="text">
<string>GamerPoet</string>
<string notr="true">GamerPoet</string>
</property>
</item>
<item>
<property name="text">
<string>Gopher</string>
<string notr="true">Gopher</string>
</property>
</item>
<item>
@@ -249,6 +260,11 @@
<string notr="true">z929669</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">thosrtanner</string>
</property>
</item>
</widget>
</item>
</layout>
+2 -2
View File
@@ -72,7 +72,7 @@ std::set<QString> ActivateModsDialog::getModsToActivate()
for (int row = 0; row < modsTable->rowCount(); ++row) {
QComboBox *comboBox = dynamic_cast<QComboBox*>(modsTable->cellWidget(row, 1));
if (comboBox != NULL) {
if (comboBox != nullptr) {
result.insert(comboBox->currentText());
}
}
@@ -87,7 +87,7 @@ std::set<QString> ActivateModsDialog::getESPsToActivate()
for (int row = 0; row < modsTable->rowCount(); ++row) {
QComboBox *comboBox = dynamic_cast<QComboBox*>(modsTable->cellWidget(row, 1));
if (comboBox != NULL) {
if (comboBox != nullptr) {
QLabel *espName = dynamic_cast<QLabel*>(modsTable->cellWidget(row, 0));
result.insert(espName->text());
+1 -3
View File
@@ -1,3 +1 @@
#include "version.rc"
IDI_ICON1 ICON DISCARDABLE "mo_icon.ico"
IDI_ICON1 ICON DISCARDABLE "mo_icon.ico"
-113
View File
@@ -1,113 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>BainComplexInstallerDialog</class>
<widget class="QDialog" name="BainComplexInstallerDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>398</width>
<height>365</height>
</rect>
</property>
<property name="windowTitle">
<string>BAIN Package Installer</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Name</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="nameEdit"/>
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>This looks like a Package prepared for Installation through BAIN. You can select options from the list below. If there is a package.txt file, it should contain detailed information about the options.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QListWidget" name="optionsList">
<property name="toolTip">
<string>Components of this package.</string>
</property>
<property name="whatsThis">
<string>Components of this package.
If there is a component called &quot;00 Core&quot; it is usually required. Options are ordered by priority as set up by the author.</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="packageBtn">
<property name="toolTip">
<string>The package.txt is often part of BAIN packages and contains details about the options available.</string>
</property>
<property name="whatsThis">
<string>The package.txt is often part of BAIN packages and contains details about the options available.</string>
</property>
<property name="text">
<string>Package.txt</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="manualBtn">
<property name="toolTip">
<string>Opens a Dialog that allows custom modifications.</string>
</property>
<property name="whatsThis">
<string>Opens a Dialog that allows custom modifications.</string>
</property>
<property name="text">
<string>Manual</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="okBtn">
<property name="text">
<string>Ok</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="cancelBtn">
<property name="text">
<string>Cancel</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>
+1 -1
View File
@@ -80,7 +80,7 @@ public:
if (tagName == "color") {
QString color = tagIter->second.first.cap(1);
QString content = tagIter->second.first.cap(2);
if (color.at(0) == '#') {
if (color.at(0) == "#") {
return temp.replace(tagIter->second.first, QString("<font style=\"color: %1;\">%2</font>").arg(color, content));
} else {
auto colIter = m_ColorMap.find(color.toLower());
+1 -1
View File
@@ -29,7 +29,7 @@ namespace BBCode {
/**
* @brief convert a string with BB Code-Tags to HTML
* @param input the input string with BB tags
* @param replaceOccured if not NULL, this parameter will be set to true if any bb tags were replaced
* @param replaceOccured if not nullptr, this parameter will be set to true if any bb tags were replaced
* @return the same string in html representation
**/
QString convertToHTML(const QString &input);
+11 -11
View File
@@ -19,16 +19,17 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
#include "browserdialog.h"
#include "ui_browserdialog.h"
#include "browserview.h"
#include "messagedialog.h"
#include "report.h"
#include "persistentcookiejar.h"
#include <gameinfo.h>
#include "json.h"
#include <utility.h>
#include <gameinfo.h>
#include "settings.h"
#include <QNetworkCookieJar>
#include <QNetworkCookie>
#include <QMenu>
@@ -49,7 +50,7 @@ BrowserDialog::BrowserDialog(QWidget *parent)
ui->setupUi(this);
m_AccessManager->setCookieJar(new PersistentCookieJar(
QDir::fromNativeSeparators(MOBase::ToQString(MOShared::GameInfo::instance().getCacheDir())) + "/cookies.dat", this));
QDir::fromNativeSeparators(Settings::instance().getCacheDirectory() + "/cookies.dat")));
Qt::WindowFlags flags = windowFlags() | Qt::WindowMaximizeButtonHint | Qt::WindowMinimizeButtonHint;
Qt::WindowFlags helpFlag = Qt::WindowContextHelpButtonHint;
@@ -115,7 +116,7 @@ BrowserView *BrowserDialog::getCurrentView()
void BrowserDialog::urlChanged(const QUrl &url)
{
BrowserView *currentView = getCurrentView();
if (currentView != NULL) {
if (currentView != nullptr) {
ui->backBtn->setEnabled(currentView->history()->canGoBack());
ui->fwdBtn->setEnabled(currentView->history()->canGoForward());
}
@@ -192,17 +193,16 @@ void BrowserDialog::unsupportedContent(QNetworkReply *reply)
{
try {
QWebPage *page = qobject_cast<QWebPage*>(sender());
if (page == NULL) {
if (page == nullptr) {
qCritical("sender not a page");
return;
}
BrowserView *view = qobject_cast<BrowserView*>(page->view());
if (view == NULL) {
if (view == nullptr) {
qCritical("no view?");
return;
}
qDebug("unsupported: %s - %s", view->url().toString().toUtf8().constData(), reply->url().toString().toUtf8().constData());
emit requestDownload(view->url(), reply);
} catch (const std::exception &e) {
if (isVisible()) {
@@ -232,7 +232,7 @@ void BrowserDialog::tabCloseRequested(int index)
void BrowserDialog::on_backBtn_clicked()
{
BrowserView *currentView = getCurrentView();
if (currentView != NULL) {
if (currentView != nullptr) {
currentView->back();
}
}
@@ -240,7 +240,7 @@ void BrowserDialog::on_backBtn_clicked()
void BrowserDialog::on_fwdBtn_clicked()
{
BrowserView *currentView = getCurrentView();
if (currentView != NULL) {
if (currentView != nullptr) {
currentView->forward();
}
}
@@ -255,7 +255,7 @@ void BrowserDialog::startSearch()
void BrowserDialog::on_searchEdit_returnPressed()
{
BrowserView *currentView = getCurrentView();
if (currentView != NULL) {
if (currentView != nullptr) {
currentView->findText(ui->searchEdit->text(), QWebPage::FindWrapsAroundDocument);
}
}
@@ -268,7 +268,7 @@ void BrowserDialog::on_refreshBtn_clicked()
void BrowserDialog::on_browserTabWidget_currentChanged(int index)
{
BrowserView *currentView = qobject_cast<BrowserView*>(ui->browserTabWidget->widget(index));
if (currentView != NULL) {
if (currentView != nullptr) {
ui->backBtn->setEnabled(currentView->history()->canGoBack());
ui->fwdBtn->setEnabled(currentView->history()->canGoForward());
}
@@ -277,7 +277,7 @@ void BrowserDialog::on_browserTabWidget_currentChanged(int index)
void BrowserDialog::on_urlEdit_returnPressed()
{
QWebView *currentView = getCurrentView();
if (currentView != NULL) {
if (currentView != nullptr) {
currentView->setUrl(QUrl(ui->urlEdit->text()));
}
}
+1 -3
View File
@@ -20,10 +20,7 @@ along with Mod Organizer. If not, see <http://www.gnu.org/licenses/>.
#ifndef BROWSERDIALOG_H
#define BROWSERDIALOG_H
#include "browserview.h"
#include "tutorialcontrol.h"
#include <QDialog>
#include <QProgressBar>
#include <QNetworkRequest>
#include <QNetworkReply>
#include <QTimer>
@@ -37,6 +34,7 @@ namespace Ui {
class BrowserDialog;
}
class BrowserView;
/**
* @brief a dialog containing a webbrowser that is intended to browse the nexus network

Some files were not shown because too many files have changed in this diff Show More