From 734e2e9f46b10e825f0c8c195f10196658205df6 Mon Sep 17 00:00:00 2001
From: Ungeziefi <163609976+Ungeziefi@users.noreply.github.com>
Date: Wed, 5 Jun 2024 20:35:28 +0200
Subject: [PATCH] Ok button and version
---
src/organizer_en.ts | 99 ++++++++++++++++++++++++++++-----------------
src/pluginlist.cpp | 17 ++++----
src/version.rc | 2 +-
3 files changed, 72 insertions(+), 46 deletions(-)
diff --git a/src/organizer_en.ts b/src/organizer_en.ts
index d553da659..b947be88d 100644
--- a/src/organizer_en.ts
+++ b/src/organizer_en.ts
@@ -17,7 +17,6 @@
USVFS:
- usvfs:
@@ -6228,158 +6227,187 @@ Continue?
PluginList
-
+ Name
-
+ Priority
-
+ Mod Index
-
+ Flags
-
-
+
+ unknown
-
+ Name of the plugin
-
+ Emblems to highlight things that might require attention.
-
+ Load priority of plugins. The higher, the more "important" it is and thus overwrites data from plugins with lower priority.
-
+ Determines the formids of objects originating from this mods.
-
+ failed to update esp info for file %1 (source id: %2), error: %3
-
+ Plugin not found: %1
-
+ Origin
-
+ This plugin can't be disabled or moved (enforced by the game).
-
+ This plugin can't be disabled (enforced by the game).
-
+ Author
-
+ Description
-
+ Missing Masters
-
+ Enabled Masters
-
+ Loads Archives
-
+ There are Archives connected to this plugin. Their assets will be added to your game, overwriting in case of conflicts following the plugin order. Loose files will always overwrite assets from Archives. (This flag only checks for Archives from the same mod as the plugin)
-
+ Loads INI settings
-
+ There is an ini file connected to this plugin. Its settings will be added to your game settings, overwriting in case of conflicts.
-
+ This %1 is flagged as an ESL. It will adhere to the %1 load order but the records will be loaded in ESL space.
-
+ This is a dummy plugin. It contains no records and is typically used to load a paired archive file.
-
+ Light plugins (ESL) are not supported by this game.
-
+ This game does not currently permit custom plugin loading. There may be manual workarounds.
-
+ Incompatible with %1
-
+ Depends on missing %1
-
+ Warning
-
+ Error
-
+
+
+
+
+ Invalid plugin load order
+
+
+
+
+ Plugins cannot be loaded among master plugins.
+ Plugins cannot be loaded among master plugins.<br><br>Acknowledge?
+
+
+
+
+ Master plugins cannot be loaded among plugins.
+
+
+
+
+ Plugins cannot be loaded before their masters.
+
+
+
+
+ Masters cannot be moved below ones that require them.
+
+
+
+ failed to restore load order for %1
@@ -7733,12 +7761,12 @@ Destination:
-
+ failed to access %1
-
+ failed to set file time %1
@@ -8789,7 +8817,6 @@ p, li { white-space: pre-wrap; }
Use the file name as default during installation, instead of the mod's.
- Use the file name as default instead of the mod's.
diff --git a/src/pluginlist.cpp b/src/pluginlist.cpp
index 55ed0feed..0fa6dfab9 100644
--- a/src/pluginlist.cpp
+++ b/src/pluginlist.cpp
@@ -1635,9 +1635,8 @@ void PluginList::setPluginPriority(int row, int& newPriority, bool isForced)
QDialogButtonBox::StandardButton response = QuestionBoxMemory::query(
QApplication::activeModalWidget(), "dontAllowESPAboveESM",
tr("Invalid plugin load order"),
- tr("Plugins cannot be loaded among master plugins.
Acknowledge?"),
- QDialogButtonBox::Yes,
- QDialogButtonBox::Yes);
+ tr("Plugins cannot be loaded among master plugins."),
+ QDialogButtonBox::Ok);
qWarning("Plugins cannot be loaded among master plugins.");
++newPriorityTemp;
}
@@ -1650,8 +1649,8 @@ void PluginList::setPluginPriority(int row, int& newPriority, bool isForced)
QDialogButtonBox::StandardButton response = QuestionBoxMemory::query(
QApplication::activeModalWidget(), "dontAllowESMBelowESP",
- tr("Invalid plugin load order"), tr("Master plugins cannot be loaded among plugins.
Acknowledge?"),
- QDialogButtonBox::Yes, QDialogButtonBox::Yes);
+ tr("Invalid plugin load order"), tr("Master plugins cannot be loaded among plugins."),
+ QDialogButtonBox::Ok);
qWarning("Master plugins cannot be loaded among plugins.");
--newPriorityTemp;
}
@@ -1680,8 +1679,8 @@ void PluginList::setPluginPriority(int row, int& newPriority, bool isForced)
QDialogButtonBox::StandardButton response = QuestionBoxMemory::query(
QApplication::activeModalWidget(), "dontAllowChildrenAboveMaster",
- tr("Invalid plugin load order"), tr("Plugins cannot be loaded before their masters.
Acknowledge?"),
- QDialogButtonBox::Yes, QDialogButtonBox::Yes);
+ tr("Invalid plugin load order"), tr("Plugins cannot be loaded before their masters."),
+ QDialogButtonBox::Ok);
qWarning("Plugins cannot be loaded before their masters.");
newPriorityTemp = masterPriority + 1;
}
@@ -1695,8 +1694,8 @@ void PluginList::setPluginPriority(int row, int& newPriority, bool isForced)
if (master.compare(m_ESPs[row].name, Qt::CaseInsensitive) == 0) {
QDialogButtonBox::StandardButton response = QuestionBoxMemory::query(
QApplication::activeModalWidget(), "dontAllowMasterBelowChildren",
- tr("Invalid plugin load order"), tr("Masters cannot be moved below ones that require them.
Acknowledge?"),
- QDialogButtonBox::Yes, QDialogButtonBox::Yes);
+ tr("Invalid plugin load order"), tr("Masters cannot be moved below ones that require them."),
+ QDialogButtonBox::Ok);
qWarning("Masters cannot be moved below ones that require them.");
newPriorityTemp = otherInfo->priority - 1;
break;
diff --git a/src/version.rc b/src/version.rc
index 4ad14fc49..a601ff89a 100644
--- a/src/version.rc
+++ b/src/version.rc
@@ -4,7 +4,7 @@
// Otherwise, if letters are used in VER_FILEVERSION_STR, uses the full MOBase::VersionInfo parser
// Otherwise, uses the numbers from VER_FILEVERSION and sets the release type as pre-alpha
#define VER_FILEVERSION 2,5,1
-#define VER_FILEVERSION_STR "2.5.1rc2-ML1.3\0"
+#define VER_FILEVERSION_STR "2.5.1rc2-ML1.4\0"
VS_VERSION_INFO VERSIONINFO
FILEVERSION VER_FILEVERSION