From 2fa1b04cd430315f3abf45dcdd4975c0117ac98a Mon Sep 17 00:00:00 2001 From: Al12rs Date: Fri, 16 Mar 2018 18:02:57 +0100 Subject: Various text and ui changes: Added description to CSV export. Added line to delete instance error message. Changed delete instance icon for the list of instances. Added red X in the resources, thanks to twizz0r. --- src/instancemanager.cpp | 4 ++-- src/mainwindow.cpp | 4 ++++ src/resources.qrc | 1 + src/resources/multiply-red.png | Bin 0 -> 16018 bytes 4 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 src/resources/multiply-red.png (limited to 'src') 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/resources.qrc b/src/resources.qrc index 618d3cfc..1cfc58a3 100644 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -72,6 +72,7 @@ resources/package.png resources/switch-instance-icon.png resources/open-Folder-Icon.png + resources/multiply-red.png resources/contents/jigsaw-piece.png diff --git a/src/resources/multiply-red.png b/src/resources/multiply-red.png new file mode 100644 index 00000000..c238f07f Binary files /dev/null and b/src/resources/multiply-red.png differ -- cgit v1.3.1 From 8095be550f65b77f36c06cc731c8bfb0b9dad8c4 Mon Sep 17 00:00:00 2001 From: Al12rs Date: Sat, 17 Mar 2018 00:58:55 +0100 Subject: Added archive-conflict icons to resources. --- src/resources.qrc | 4 ++++ src/resources/archive-conflict-loser.png | Bin 0 -> 18052 bytes src/resources/archive-conflict-mixed.png | Bin 0 -> 18052 bytes src/resources/archive-conflict-neutral.png | Bin 0 -> 18052 bytes src/resources/archive-conflict-winner.png | Bin 0 -> 18052 bytes 5 files changed, 4 insertions(+) create mode 100644 src/resources/archive-conflict-loser.png create mode 100644 src/resources/archive-conflict-mixed.png create mode 100644 src/resources/archive-conflict-neutral.png create mode 100644 src/resources/archive-conflict-winner.png (limited to 'src') diff --git a/src/resources.qrc b/src/resources.qrc index 1cfc58a3..0197b606 100644 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -73,6 +73,10 @@ resources/switch-instance-icon.png resources/open-Folder-Icon.png resources/multiply-red.png + resources/archive-conflict-looser.png + resources/archive-conflict-mixed.png + resources/archive-conflict-neutral.png + resources/archive-conflict-winner.png resources/contents/jigsaw-piece.png diff --git a/src/resources/archive-conflict-loser.png b/src/resources/archive-conflict-loser.png new file mode 100644 index 00000000..77d2e0fa Binary files /dev/null and b/src/resources/archive-conflict-loser.png differ diff --git a/src/resources/archive-conflict-mixed.png b/src/resources/archive-conflict-mixed.png new file mode 100644 index 00000000..e71e0167 Binary files /dev/null and b/src/resources/archive-conflict-mixed.png differ diff --git a/src/resources/archive-conflict-neutral.png b/src/resources/archive-conflict-neutral.png new file mode 100644 index 00000000..aba45314 Binary files /dev/null and b/src/resources/archive-conflict-neutral.png differ diff --git a/src/resources/archive-conflict-winner.png b/src/resources/archive-conflict-winner.png new file mode 100644 index 00000000..f6260575 Binary files /dev/null and b/src/resources/archive-conflict-winner.png differ -- cgit v1.3.1 From 90165b02ab8686015d41c1fee79e5c6314a65357 Mon Sep 17 00:00:00 2001 From: Al12rs Date: Sat, 17 Mar 2018 01:08:02 +0100 Subject: Disabled iniTweaks part of modinfodialog until it is not fixed. --- src/modinfodialog.ui | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src') 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 @@ + + false + - Ini Tweaks + Ini Tweaks *This feature is non-functional* + + false + 228 -- cgit v1.3.1 From 2def87a143cae7521bc8da898fddda73f213d473 Mon Sep 17 00:00:00 2001 From: Al12rs Date: Sat, 17 Mar 2018 12:42:15 +0100 Subject: Fixed a typo of the added resource. --- src/resources.qrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/resources.qrc b/src/resources.qrc index 0197b606..1c7c92e1 100644 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -73,7 +73,7 @@ resources/switch-instance-icon.png resources/open-Folder-Icon.png resources/multiply-red.png - resources/archive-conflict-looser.png + resources/archive-conflict-loser.png resources/archive-conflict-mixed.png resources/archive-conflict-neutral.png resources/archive-conflict-winner.png -- cgit v1.3.1 From bbce6506cdf15b5965e12ca2b10063fa8d3b85c0 Mon Sep 17 00:00:00 2001 From: Al12rs Date: Sat, 17 Mar 2018 14:41:43 +0100 Subject: Fixed another typo in the same resource --- src/resources.qrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/resources.qrc b/src/resources.qrc index 1c7c92e1..14c8e533 100644 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -73,7 +73,7 @@ resources/switch-instance-icon.png resources/open-Folder-Icon.png resources/multiply-red.png - resources/archive-conflict-loser.png + resources/archive-conflict-loser.png resources/archive-conflict-mixed.png resources/archive-conflict-neutral.png resources/archive-conflict-winner.png -- cgit v1.3.1