Merge pull request #276 from Al12rs/Develop

 Disabled iniTweaks, added resources, a few ui fixes and text changes.

9 files changed, 18 insertions, 3 deletions

diff --git a/src/instancemanager.cpp b/src/instancemanager.cpp
index d12ec119..43ae152b 100644
--- a/src/instancemanager.cpp
+++ b/src/instancemanager.cpp
@@ -105,7 +105,7 @@ QString InstanceManager::manageInstances(const QStringList &instanceList) const
 		nullptr);
 	for (const QString &instance : instanceList)
 	{
-		selection.addChoice(instance, "", instance);
+		selection.addChoice(QIcon(":/MO/gui/multiply_red"), instance, "", instance);
 	}
 
 	if (selection.exec() == QDialog::Rejected) {
@@ -120,7 +120,7 @@ QString InstanceManager::manageInstances(const QStringList &instanceList) const
 				if (!deleteLocalInstance(choice))
 				{
 					QMessageBox::warning(nullptr, QObject::tr("Failed to delete Instance"),
-						QObject::tr("Could not delete Instance \"%1\"").arg(choice), QMessageBox::Ok);
+						QObject::tr("Could not delete Instance \"%1\". \nIf the folder was still in use, restart MO and try again.").arg(choice), QMessageBox::Ok);
 				}
 			}
 		}
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 5be5cef3..2bf25b05 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -3079,6 +3079,10 @@ void MainWindow::exportModListCSV()
 	QGridLayout *grid = new QGridLayout;

 	selection.setWindowTitle(tr("Export to csv"));

 

+	QLabel *csvDescription = new QLabel();

+	csvDescription->setText(tr("CSV (Comma Separated Values) is a format that can be imported in programs like Excel to create a spreadsheet.\nYou can also use online editors and converters instead."));

+	grid->addWidget(csvDescription);

+

 	QGroupBox *groupBoxRows = new QGroupBox(tr("Select what mods you want export:"));

 	QRadioButton *all = new QRadioButton(tr("All installed mods"));

 	QRadioButton *active = new QRadioButton(tr("Only active (checked) mods from your current profile"));

diff --git a/src/modinfodialog.ui b/src/modinfodialog.ui
index 25822fd0..b5331424 100644
--- a/src/modinfodialog.ui
+++ b/src/modinfodialog.ui
@@ -110,13 +110,19 @@
          </item>

          <item>

           <widget class="QLabel" name="label_5">

+		   <property name="enabled">

+            <bool>false</bool>

+           </property>						

            <property name="text">

-            <string>Ini Tweaks</string>

+           <string>Ini Tweaks *This feature is non-functional*</string>

            </property>

           </widget>

          </item>

          <item>

           <widget class="QListWidget" name="iniTweaksList">

+			<property name="enabled">

+            <bool>false</bool>

+           </property>						

            <property name="maximumSize">

             <size>

              <width>228</width>

diff --git a/src/resources.qrc b/src/resources.qrc
index 618d3cfc..14c8e533 100644
--- a/src/resources.qrc
+++ b/src/resources.qrc
@@ -72,6 +72,11 @@
         <file alias="package">resources/package.png</file>
         <file alias="instance_switch">resources/switch-instance-icon.png</file>
         <file alias="open_folder">resources/open-Folder-Icon.png</file>
+        <file alias="multiply_red">resources/multiply-red.png</file>
+        <file alias="archive_conflict_loser">resources/archive-conflict-loser.png</file>
+        <file alias="archive_conflict_mixed">resources/archive-conflict-mixed.png</file>
+        <file alias="archive_conflict_neutral">resources/archive-conflict-neutral.png</file>
+        <file alias="archive_conflict_winner">resources/archive-conflict-winner.png</file>
     </qresource>
     <qresource prefix="/MO/gui/content">
         <file alias="plugin">resources/contents/jigsaw-piece.png</file>
diff --git a/src/resources/archive-conflict-loser.png b/src/resources/archive-conflict-loser.png
new file mode 100644
index 00000000..77d2e0fa
--- /dev/null
+++ b/src/resources/archive-conflict-loser.png
diff --git a/src/resources/archive-conflict-mixed.png b/src/resources/archive-conflict-mixed.png
new file mode 100644
index 00000000..e71e0167
--- /dev/null
+++ b/src/resources/archive-conflict-mixed.png
diff --git a/src/resources/archive-conflict-neutral.png b/src/resources/archive-conflict-neutral.png
new file mode 100644
index 00000000..aba45314
--- /dev/null
+++ b/src/resources/archive-conflict-neutral.png
diff --git a/src/resources/archive-conflict-winner.png b/src/resources/archive-conflict-winner.png
new file mode 100644
index 00000000..f6260575
--- /dev/null
+++ b/src/resources/archive-conflict-winner.png
diff --git a/src/resources/multiply-red.png b/src/resources/multiply-red.png
new file mode 100644
index 00000000..c238f07f
--- /dev/null
+++ b/src/resources/multiply-red.png