small bugfixes

5 files changed, 199 insertions, 233 deletions

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; }
              <string/>

             </property>

             <property name="icon">

-             <iconset resource="resources.qrc">

+             <iconset>

               <normaloff>:/MO/gui/resources/view-refresh.png</normaloff>:/MO/gui/resources/view-refresh.png</iconset>

             </property>

            </widget>

@@ -173,161 +173,182 @@ p, li { white-space: pre-wrap; }
          </layout>

         </item>

         <item>

-         <widget class="ModListView" name="modList">

-          <property name="minimumSize">

-           <size>

-            <width>330</width>

-            <height>400</height>

-           </size>

-          </property>

-          <property name="palette">

-           <palette>

-            <active>

-             <colorrole role="ButtonText">

-              <brush brushstyle="SolidPattern">

-               <color alpha="255">

-                <red>64</red>

-                <green>64</green>

-                <blue>64</blue>

-               </color>

-              </brush>

-             </colorrole>

-             <colorrole role="Link">

-              <brush brushstyle="SolidPattern">

-               <color alpha="255">

-                <red>255</red>

-                <green>0</green>

-                <blue>0</blue>

-               </color>

-              </brush>

-             </colorrole>

-             <colorrole role="LinkVisited">

-              <brush brushstyle="SolidPattern">

-               <color alpha="255">

-                <red>0</red>

-                <green>170</green>

-                <blue>0</blue>

-               </color>

-              </brush>

-             </colorrole>

-            </active>

-            <inactive>

-             <colorrole role="ButtonText">

-              <brush brushstyle="SolidPattern">

-               <color alpha="255">

-                <red>64</red>

-                <green>64</green>

-                <blue>64</blue>

-               </color>

-              </brush>

-             </colorrole>

-             <colorrole role="Link">

-              <brush brushstyle="SolidPattern">

-               <color alpha="255">

-                <red>255</red>

-                <green>0</green>

-                <blue>0</blue>

-               </color>

-              </brush>

-             </colorrole>

-             <colorrole role="LinkVisited">

-              <brush brushstyle="SolidPattern">

-               <color alpha="255">

-                <red>0</red>

-                <green>170</green>

-                <blue>0</blue>

-               </color>

-              </brush>

-             </colorrole>

-            </inactive>

-            <disabled>

-             <colorrole role="ButtonText">

-              <brush brushstyle="SolidPattern">

-               <color alpha="255">

-                <red>120</red>

-                <green>120</green>

-                <blue>120</blue>

-               </color>

-              </brush>

-             </colorrole>

-             <colorrole role="Link">

-              <brush brushstyle="SolidPattern">

-               <color alpha="255">

-                <red>255</red>

-                <green>0</green>

-                <blue>0</blue>

-               </color>

-              </brush>

-             </colorrole>

-             <colorrole role="LinkVisited">

-              <brush brushstyle="SolidPattern">

-               <color alpha="255">

-                <red>0</red>

-                <green>170</green>

-                <blue>0</blue>

-               </color>

-              </brush>

-             </colorrole>

-            </disabled>

-           </palette>

-          </property>

-          <property name="contextMenuPolicy">

-           <enum>Qt::CustomContextMenu</enum>

-          </property>

-          <property name="toolTip">

-           <string>List of available mods.</string>

-          </property>

-          <property name="whatsThis">

-           <string>This is a list of installed mods. Use the checkboxes to activate/deactivate mods and drag &amp; drop mods to change their &quot;installation&quot; orders.</string>

-          </property>

-          <property name="styleSheet">

-           <string notr="true"/>

-          </property>

-          <property name="editTriggers">

-           <set>QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked</set>

-          </property>

-          <property name="showDropIndicator" stdset="0">

-           <bool>true</bool>

-          </property>

-          <property name="dragEnabled">

-           <bool>true</bool>

-          </property>

-          <property name="dragDropMode">

-           <enum>QAbstractItemView::DragDrop</enum>

-          </property>

-          <property name="defaultDropAction">

-           <enum>Qt::MoveAction</enum>

+         <widget class="QGroupBox" name="groupBox">

+          <property name="title">

+           <string>Mods</string>

           </property>

-          <property name="alternatingRowColors">

-           <bool>true</bool>

-          </property>

-          <property name="selectionMode">

-           <enum>QAbstractItemView::ExtendedSelection</enum>

-          </property>

-          <property name="selectionBehavior">

-           <enum>QAbstractItemView::SelectRows</enum>

-          </property>

-          <property name="indentation">

-           <number>20</number>

-          </property>

-          <property name="itemsExpandable">

-           <bool>true</bool>

-          </property>

-          <property name="sortingEnabled">

-           <bool>true</bool>

-          </property>

-          <property name="expandsOnDoubleClick">

-           <bool>false</bool>

-          </property>

-          <attribute name="headerDefaultSectionSize">

-           <number>20</number>

-          </attribute>

-          <attribute name="headerShowSortIndicator" stdset="0">

-           <bool>true</bool>

-          </attribute>

-          <attribute name="headerStretchLastSection">

-           <bool>false</bool>

-          </attribute>

+          <layout class="QVBoxLayout" name="verticalLayout_6">

+           <property name="leftMargin">

+            <number>4</number>

+           </property>

+           <property name="topMargin">

+            <number>4</number>

+           </property>

+           <property name="rightMargin">

+            <number>4</number>

+           </property>

+           <property name="bottomMargin">

+            <number>4</number>

+           </property>

+           <item>

+            <widget class="ModListView" name="modList">

+             <property name="minimumSize">

+              <size>

+               <width>330</width>

+               <height>400</height>

+              </size>

+             </property>

+             <property name="palette">

+              <palette>

+               <active>

+                <colorrole role="ButtonText">

+                 <brush brushstyle="SolidPattern">

+                  <color alpha="255">

+                   <red>64</red>

+                   <green>64</green>

+                   <blue>64</blue>

+                  </color>

+                 </brush>

+                </colorrole>

+                <colorrole role="Link">

+                 <brush brushstyle="SolidPattern">

+                  <color alpha="255">

+                   <red>255</red>

+                   <green>0</green>

+                   <blue>0</blue>

+                  </color>

+                 </brush>

+                </colorrole>

+                <colorrole role="LinkVisited">

+                 <brush brushstyle="SolidPattern">

+                  <color alpha="255">

+                   <red>0</red>

+                   <green>170</green>

+                   <blue>0</blue>

+                  </color>

+                 </brush>

+                </colorrole>

+               </active>

+               <inactive>

+                <colorrole role="ButtonText">

+                 <brush brushstyle="SolidPattern">

+                  <color alpha="255">

+                   <red>64</red>

+                   <green>64</green>

+                   <blue>64</blue>

+                  </color>

+                 </brush>

+                </colorrole>

+                <colorrole role="Link">

+                 <brush brushstyle="SolidPattern">

+                  <color alpha="255">

+                   <red>255</red>

+                   <green>0</green>

+                   <blue>0</blue>

+                  </color>

+                 </brush>

+                </colorrole>

+                <colorrole role="LinkVisited">

+                 <brush brushstyle="SolidPattern">

+                  <color alpha="255">

+                   <red>0</red>

+                   <green>170</green>

+                   <blue>0</blue>

+                  </color>

+                 </brush>

+                </colorrole>

+               </inactive>

+               <disabled>

+                <colorrole role="ButtonText">

+                 <brush brushstyle="SolidPattern">

+                  <color alpha="255">

+                   <red>120</red>

+                   <green>120</green>

+                   <blue>120</blue>

+                  </color>

+                 </brush>

+                </colorrole>

+                <colorrole role="Link">

+                 <brush brushstyle="SolidPattern">

+                  <color alpha="255">

+                   <red>255</red>

+                   <green>0</green>

+                   <blue>0</blue>

+                  </color>

+                 </brush>

+                </colorrole>

+                <colorrole role="LinkVisited">

+                 <brush brushstyle="SolidPattern">

+                  <color alpha="255">

+                   <red>0</red>

+                   <green>170</green>

+                   <blue>0</blue>

+                  </color>

+                 </brush>

+                </colorrole>

+               </disabled>

+              </palette>

+             </property>

+             <property name="contextMenuPolicy">

+              <enum>Qt::CustomContextMenu</enum>

+             </property>

+             <property name="toolTip">

+              <string>List of available mods.</string>

+             </property>

+             <property name="whatsThis">

+              <string>This is a list of installed mods. Use the checkboxes to activate/deactivate mods and drag &amp; drop mods to change their &quot;installation&quot; orders.</string>

+             </property>

+             <property name="styleSheet">

+              <string notr="true"/>

+             </property>

+             <property name="editTriggers">

+              <set>QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked</set>

+             </property>

+             <property name="showDropIndicator" stdset="0">

+              <bool>true</bool>

+             </property>

+             <property name="dragEnabled">

+              <bool>true</bool>

+             </property>

+             <property name="dragDropMode">

+              <enum>QAbstractItemView::DragDrop</enum>

+             </property>

+             <property name="defaultDropAction">

+              <enum>Qt::MoveAction</enum>

+             </property>

+             <property name="alternatingRowColors">

+              <bool>true</bool>

+             </property>

+             <property name="selectionMode">

+              <enum>QAbstractItemView::ExtendedSelection</enum>

+             </property>

+             <property name="selectionBehavior">

+              <enum>QAbstractItemView::SelectRows</enum>

+             </property>

+             <property name="indentation">

+              <number>20</number>

+             </property>

+             <property name="itemsExpandable">

+              <bool>true</bool>

+             </property>

+             <property name="sortingEnabled">

+              <bool>true</bool>

+             </property>

+             <property name="expandsOnDoubleClick">

+              <bool>false</bool>

+             </property>

+             <attribute name="headerDefaultSectionSize">

+              <number>20</number>

+             </attribute>

+             <attribute name="headerShowSortIndicator" stdset="0">

+              <bool>true</bool>

+             </attribute>

+             <attribute name="headerStretchLastSection">

+              <bool>false</bool>

+             </attribute>

+            </widget>

+           </item>

+          </layout>

          </widget>

         </item>

         <item>

@@ -504,7 +525,7 @@ p, li { white-space: pre-wrap; }
                 <string>Run</string>

                </property>

                <property name="icon">

-                <iconset resource="resources.qrc">

+                <iconset>

                  <normaloff>:/MO/gui/run</normaloff>:/MO/gui/run</iconset>

                </property>

                <property name="iconSize">

@@ -555,7 +576,7 @@ p, li { white-space: pre-wrap; }
                 <string>Shortcut</string>

                </property>

                <property name="icon">

-                <iconset resource="resources.qrc">

+                <iconset>

                  <normaloff>:/MO/gui/link</normaloff>:/MO/gui/link</iconset>

                </property>

               </widget>

@@ -854,7 +875,7 @@ BSAs checked here are loaded in such a way that your installation order is obeye
                <string>Refresh</string>

               </property>

               <property name="icon">

-               <iconset resource="resources.qrc">

+               <iconset>

                 <normaloff>:/MO/gui/resources/view-refresh.png</normaloff>:/MO/gui/resources/view-refresh.png</iconset>

               </property>

              </widget>

@@ -1105,7 +1126,7 @@ p, li { white-space: pre-wrap; }
   <widget class="QStatusBar" name="statusBar"/>

   <action name="actionInstallMod">

    <property name="icon">

-    <iconset resource="resources.qrc">

+    <iconset>

      <normaloff>:/MO/gui/resources/system-installer.png</normaloff>:/MO/gui/resources/system-installer.png</iconset>

    </property>

    <property name="text">

@@ -1123,7 +1144,7 @@ p, li { white-space: pre-wrap; }
   </action>

   <action name="actionAdd_Profile">

    <property name="icon">

-    <iconset resource="resources.qrc">

+    <iconset>

      <normaloff>:/MO/gui/profiles</normaloff>:/MO/gui/profiles</iconset>

    </property>

    <property name="text">

@@ -1141,7 +1162,7 @@ p, li { white-space: pre-wrap; }
   </action>

   <action name="actionModify_Executables">

    <property name="icon">

-    <iconset resource="resources.qrc">

+    <iconset>

      <normaloff>:/MO/gui/icon_executable</normaloff>:/MO/gui/icon_executable</iconset>

    </property>

    <property name="text">

@@ -1159,7 +1180,7 @@ p, li { white-space: pre-wrap; }
   </action>

   <action name="actionTool">

    <property name="icon">

-    <iconset resource="resources.qrc">

+    <iconset>

      <normaloff>:/MO/gui/plugins</normaloff>:/MO/gui/plugins</iconset>

    </property>

    <property name="text">

@@ -1177,7 +1198,7 @@ p, li { white-space: pre-wrap; }
   </action>

   <action name="actionSettings">

    <property name="icon">

-    <iconset resource="resources.qrc">

+    <iconset>

      <normaloff>:/MO/gui/settings</normaloff>:/MO/gui/settings</iconset>

    </property>

    <property name="text">

@@ -1195,7 +1216,7 @@ p, li { white-space: pre-wrap; }
   </action>

   <action name="actionNexus">

    <property name="icon">

-    <iconset resource="resources.qrc">

+    <iconset>

      <normaloff>:/MO/gui/resources/internet-web-browser.png</normaloff>:/MO/gui/resources/internet-web-browser.png</iconset>

    </property>

    <property name="text">

@@ -1213,7 +1234,7 @@ p, li { white-space: pre-wrap; }
     <bool>false</bool>

    </property>

    <property name="icon">

-    <iconset resource="resources.qrc">

+    <iconset>

      <normaloff>:/MO/gui/update</normaloff>:/MO/gui/update</iconset>

    </property>

    <property name="text">

@@ -1228,7 +1249,7 @@ p, li { white-space: pre-wrap; }
     <bool>false</bool>

    </property>

    <property name="icon">

-    <iconset resource="resources.qrc">

+    <iconset>

      <normaloff>:/MO/gui/warning</normaloff>:/MO/gui/warning</iconset>

    </property>

    <property name="text">

@@ -1243,7 +1264,7 @@ Right now this has very limited functionality</string>
   </action>

   <action name="actionHelp">

    <property name="icon">

-    <iconset resource="resources.qrc">

+    <iconset>

      <normaloff>:/MO/gui/help</normaloff>:/MO/gui/help</iconset>

    </property>

    <property name="text">

@@ -1258,7 +1279,7 @@ Right now this has very limited functionality</string>
   </action>

   <action name="actionEndorseMO">

    <property name="icon">

-    <iconset resource="resources.qrc">

+    <iconset>

      <normaloff>:/MO/gui/icon_favorite</normaloff>:/MO/gui/icon_favorite</iconset>

    </property>

    <property name="text">

@@ -1287,8 +1308,6 @@ Right now this has very limited functionality</string>
    <header>sortabletreewidget.h</header>

   </customwidget>

  </customwidgets>

- <resources>

-  <include location="resources.qrc"/>

- </resources>

+ <resources/>

  <connections/>

 </ui>

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<IModList::ModStates> state;
+    QFlags<IModList::ModState> 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"