From 2a31eb40fbc9f68cb23755349b8c4c976d8a2bb7 Mon Sep 17 00:00:00 2001 From: Tannin Date: Wed, 28 May 2014 14:14:28 +0200 Subject: small bugfixes --- src/ModOrganizer.pro | 27 ---- src/directoryrefresher.cpp | 4 +- src/mainwindow.ui | 361 ++++++++++++++++++++++++--------------------- src/modlist.h | 2 +- src/organizer.pro | 38 +---- 5 files changed, 199 insertions(+), 233 deletions(-) delete mode 100644 src/ModOrganizer.pro (limited to 'src') diff --git a/src/ModOrganizer.pro b/src/ModOrganizer.pro deleted file mode 100644 index 05b05855..00000000 --- a/src/ModOrganizer.pro +++ /dev/null @@ -1,27 +0,0 @@ -TEMPLATE = subdirs - - -SUBDIRS = bsatk \ - shared \ - uibase \ - organizer \ - hookdll \ - archive \ - helper \ - plugins \ - proxydll \ - nxmhandler \ - BossDummy \ - pythonRunner \ - boss_modified \ - esptk - -plugins.depends = pythonRunner -hookdll.depends = shared -organizer.depends = shared uibase plugins boss_modified - -CONFIG(debug, debug|release) { - DESTDIR = outputd -} else { - DESTDIR = output -} diff --git a/src/directoryrefresher.cpp b/src/directoryrefresher.cpp index 70bcf5b6..db68601b 100644 --- a/src/directoryrefresher.cpp +++ b/src/directoryrefresher.cpp @@ -61,8 +61,8 @@ void DirectoryRefresher::cleanStructure(DirectoryEntry *structure) } static wchar_t *dirs[] = { L"fomod" }; - for (int i = 0; i < sizeof(files) / sizeof(wchar_t*); ++i) { - structure->removeDir(dirs[i]); + for (int i = 0; i < sizeof(dirs) / sizeof(wchar_t*); ++i) { + structure->removeDir(std::wstring(dirs[i])); } } diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 26cbbf83..5d02a6f5 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -165,7 +165,7 @@ p, li { white-space: pre-wrap; } - + :/MO/gui/resources/view-refresh.png:/MO/gui/resources/view-refresh.png @@ -173,161 +173,182 @@ p, li { white-space: pre-wrap; } - - - - 330 - 400 - - - - - - - - - 64 - 64 - 64 - - - - - - - 255 - 0 - 0 - - - - - - - 0 - 170 - 0 - - - - - - - - - 64 - 64 - 64 - - - - - - - 255 - 0 - 0 - - - - - - - 0 - 170 - 0 - - - - - - - - - 120 - 120 - 120 - - - - - - - 255 - 0 - 0 - - - - - - - 0 - 170 - 0 - - - - - - - - Qt::CustomContextMenu - - - List of available mods. - - - This is a list of installed mods. Use the checkboxes to activate/deactivate mods and drag & drop mods to change their "installation" orders. - - - - - - QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked - - - true - - - true - - - QAbstractItemView::DragDrop - - - Qt::MoveAction + + + Mods - - true - - - QAbstractItemView::ExtendedSelection - - - QAbstractItemView::SelectRows - - - 20 - - - true - - - true - - - false - - - 20 - - - true - - - false - + + + 4 + + + 4 + + + 4 + + + 4 + + + + + + 330 + 400 + + + + + + + + + 64 + 64 + 64 + + + + + + + 255 + 0 + 0 + + + + + + + 0 + 170 + 0 + + + + + + + + + 64 + 64 + 64 + + + + + + + 255 + 0 + 0 + + + + + + + 0 + 170 + 0 + + + + + + + + + 120 + 120 + 120 + + + + + + + 255 + 0 + 0 + + + + + + + 0 + 170 + 0 + + + + + + + + Qt::CustomContextMenu + + + List of available mods. + + + This is a list of installed mods. Use the checkboxes to activate/deactivate mods and drag & drop mods to change their "installation" orders. + + + + + + QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked + + + true + + + true + + + QAbstractItemView::DragDrop + + + Qt::MoveAction + + + true + + + QAbstractItemView::ExtendedSelection + + + QAbstractItemView::SelectRows + + + 20 + + + true + + + true + + + false + + + 20 + + + true + + + false + + + + @@ -504,7 +525,7 @@ p, li { white-space: pre-wrap; } Run - + :/MO/gui/run:/MO/gui/run @@ -555,7 +576,7 @@ p, li { white-space: pre-wrap; } Shortcut - + :/MO/gui/link:/MO/gui/link @@ -854,7 +875,7 @@ BSAs checked here are loaded in such a way that your installation order is obeye Refresh - + :/MO/gui/resources/view-refresh.png:/MO/gui/resources/view-refresh.png @@ -1105,7 +1126,7 @@ p, li { white-space: pre-wrap; } - + :/MO/gui/resources/system-installer.png:/MO/gui/resources/system-installer.png @@ -1123,7 +1144,7 @@ p, li { white-space: pre-wrap; } - + :/MO/gui/profiles:/MO/gui/profiles @@ -1141,7 +1162,7 @@ p, li { white-space: pre-wrap; } - + :/MO/gui/icon_executable:/MO/gui/icon_executable @@ -1159,7 +1180,7 @@ p, li { white-space: pre-wrap; } - + :/MO/gui/plugins:/MO/gui/plugins @@ -1177,7 +1198,7 @@ p, li { white-space: pre-wrap; } - + :/MO/gui/settings:/MO/gui/settings @@ -1195,7 +1216,7 @@ p, li { white-space: pre-wrap; } - + :/MO/gui/resources/internet-web-browser.png:/MO/gui/resources/internet-web-browser.png @@ -1213,7 +1234,7 @@ p, li { white-space: pre-wrap; } false - + :/MO/gui/update:/MO/gui/update @@ -1228,7 +1249,7 @@ p, li { white-space: pre-wrap; } false - + :/MO/gui/warning:/MO/gui/warning @@ -1243,7 +1264,7 @@ Right now this has very limited functionality - + :/MO/gui/help:/MO/gui/help @@ -1258,7 +1279,7 @@ Right now this has very limited functionality - + :/MO/gui/icon_favorite:/MO/gui/icon_favorite @@ -1287,8 +1308,6 @@ Right now this has very limited functionality
sortabletreewidget.h
- - - + diff --git a/src/modlist.h b/src/modlist.h index cc5955d0..054c8cca 100644 --- a/src/modlist.h +++ b/src/modlist.h @@ -255,7 +255,7 @@ private: struct TModInfoChange { QString name; - QFlags state; + QFlags state; }; private: diff --git a/src/organizer.pro b/src/organizer.pro index 2f34c1c1..073d2906 100644 --- a/src/organizer.pro +++ b/src/organizer.pro @@ -256,6 +256,8 @@ TRANSLATIONS = organizer_de.ts \ LIBS += -lmo_shared -luibase -lshell32 -lole32 -luser32 -ladvapi32 -lgdi32 -lPsapi -lVersion -lbsatk -lshlwapi +LIBS += -L"$(ZLIBPATH)/build" -lzlibstatic + DEFINES += UNICODE _UNICODE _CRT_SECURE_NO_WARNINGS NOMINMAX DEFINES += BOOST_DISABLE_ASSERTS NDEBUG @@ -264,6 +266,10 @@ DEFINES += BOOST_DISABLE_ASSERTS NDEBUG HGID = $$system(hg id -i) DEFINES += HGID=\\\"$${HGID}\\\" +load(moc) +include(../common.pri) +QMAKE_MOC += $$MOCDEFINES + SRCDIR = $$PWD SRCDIR ~= s,/,$$QMAKE_DIR_SEP,g OUTDIR ~= s,/,$$QMAKE_DIR_SEP,g @@ -312,38 +318,6 @@ OTHER_FILES += \ tutorials/tutorials_installdialog.qml -load(moc) - -# for each Boost header you include... -QMAKE_MOC += \ - -DBOOST_MPL_IF_HPP_INCLUDED \ - -DBOOST_TT_TYPE_WITH_ALIGNMENT_INCLUDED \ - -DBOOST_MPL_VOID_HPP_INCLUDED \ - -DBOOST_MPL_NOT_HPP_INCLUDED \ - -DBOOST_MPL_IDENTITY_HPP_INCLUDED \ - -DBOOST_VARIANT_VARIANT_FWD_HPP \ - -DBOOST_MPL_NEXT_PRIOR_HPP_INCLUDED \ - -DBOOST_MPL_O1_SIZE_HPP_INCLUDED \ - -DBOOST_MPL_DEREF_HPP_INCLUDED \ - -DBOOST_MPL_PAIR_HPP_INCLUDED \ - -DBOOST_MPL_ITER_FOLD_HPP_INCLUDED \ - -DBOOST_MPL_PROTECT_HPP_INCLUDED \ - -DBOOST_MPL_EVAL_IF_HPP_INCLUDED \ - -DBOOST_MPL_SEQUENCE_TAG_HPP_INCLUDED \ - -DBOOST_MPL_EMPTY_HPP_INCLUDED \ - -DBOOST_MPL_ALWAYS_HPP_INCLUDED \ - -DBOOST_MPL_TRANSFORM_HPP_INCLUDED \ - -DBOOST_MPL_CLEAR_HPP_INCLUDED \ - -DBOOST_MPL_BEGIN_END_HPP_INCLUDED \ - -DBOOST_MPL_FOLD_HPP_INCLUDED \ - -DBOOST_MPL_FRONT_HPP_INCLUDED \ - -DBOOST_MPL_IS_SEQUENCE_HPP_INCLUDED \ - -DBOOST_MPL_ITERATOR_RANGE_HPP_INCLUDED \ - -DBOOST_MPL_MAX_ELEMENT_HPP_INCLUDED \ - -DBOOST_MPL_PUSH_FRONT_HPP_INCLUDED \ - -DBOOST_RESULT_OF_HPP \ - -DBOOST_MPL_ITER_FOLD_IF_HPP_INCLUDED - # leak detection with vld #INCLUDEPATH += "E:/Visual Leak Detector/include" #LIBS += -L"E:/Visual Leak Detector/lib/Win32" -- cgit v1.3.1