diff options
| author | Silarn <jrim@rimpo.org> | 2019-07-05 16:28:33 -0500 |
|---|---|---|
| committer | Silarn <jrim@rimpo.org> | 2019-07-05 16:28:33 -0500 |
| commit | 5feff2f997f10724739ca12754f99806dfc61980 (patch) | |
| tree | 95b7ddb3c77e20c104cc18903c304aed405d7aee /src | |
| parent | 9a795c3ce90bc221574e909db1665f2bc64800ed (diff) | |
| parent | 7e760c700a89114909e607bd94a7c4ea5ed8319c (diff) | |
Merge remote-tracking branch 'origin/Develop' into qt-5.13
Diffstat (limited to 'src')
| -rw-r--r-- | src/downloadlistwidget.cpp | 6 | ||||
| -rw-r--r-- | src/organizer_en.ts | 219 | ||||
| -rw-r--r-- | src/tutorials/tutorial_conflictresolution_main.js | 4 | ||||
| -rw-r--r-- | src/tutorials/tutorial_conflictresolution_modinfo.js | 2 | ||||
| -rw-r--r-- | src/tutorials/tutorial_firststeps_main.js | 2 | ||||
| -rw-r--r-- | src/tutorials/tutorial_firststeps_settings.js | 10 | ||||
| -rw-r--r-- | src/tutorials/tutorial_primer_main.js | 12 |
7 files changed, 174 insertions, 81 deletions
diff --git a/src/downloadlistwidget.cpp b/src/downloadlistwidget.cpp index be3adc5f..c75ecdd2 100644 --- a/src/downloadlistwidget.cpp +++ b/src/downloadlistwidget.cpp @@ -235,9 +235,9 @@ void DownloadListWidget::onCustomContextMenu(const QPoint &point) menu.addSeparator();
}
- menu.addAction(tr("Delete Installed..."), this, SLOT(issueDeleteCompleted()));
- menu.addAction(tr("Delete Uninstalled..."), this, SLOT(issueDeleteUninstalled()));
- menu.addAction(tr("Delete All..."), this, SLOT(issueDeleteAll()));
+ menu.addAction(tr("Delete Installed Downloads..."), this, SLOT(issueDeleteCompleted()));
+ menu.addAction(tr("Delete Uninstalled Downloads..."), this, SLOT(issueDeleteUninstalled()));
+ menu.addAction(tr("Delete All Downloads..."), this, SLOT(issueDeleteAll()));
menu.addSeparator();
if (!hidden) {
diff --git a/src/organizer_en.ts b/src/organizer_en.ts index 7e824cc2..2a47fc18 100644 --- a/src/organizer_en.ts +++ b/src/organizer_en.ts @@ -17,7 +17,6 @@ <message> <location filename="aboutdialog.ui" line="156"/> <source><html><head/><body><p>Source code can be found at <a href="https://github.com/ModOrganizer2/modorganizer"><span style=" text-decoration: underline; color:#007af4;">GitHub</span></a>.</p></body></html></source> - <oldsource><html><head/><body><p>Source code can be found at <a href="https://github.com/Modorganizer2/modorganizer"><span style=" text-decoration: underline; color:#007af4;">GitHub</span></a>.</p></body></html></oldsource> <translation type="unfinished"></translation> </message> <message> @@ -33,7 +32,6 @@ <message> <location filename="aboutdialog.ui" line="183"/> <source>Lead Developers && Maintainers</source> - <oldsource>Lead Developers/ Maintainers</oldsource> <translation type="unfinished"></translation> </message> <message> @@ -72,6 +70,11 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="aboutdialog.ui" line="325"/> + <source>yohru (Japanese)</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="aboutdialog.ui" line="330"/> <source>Mordan (Greek)</source> <translation type="unfinished"></translation> @@ -112,11 +115,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="aboutdialog.ui" line="325"/> - <source>yohru (Japanese)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="aboutdialog.ui" line="407"/> <source>Tannin (Original Creator)</source> <translation type="unfinished"></translation> @@ -544,17 +542,20 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="downloadlistwidget.cpp" line="238"/> - <source>Delete Installed...</source> + <source>Delete Installed Downloads...</source> + <oldsource>Delete Installed...</oldsource> <translation type="unfinished"></translation> </message> <message> <location filename="downloadlistwidget.cpp" line="239"/> - <source>Delete Uninstalled...</source> + <source>Delete Uninstalled Downloads...</source> + <oldsource>Delete Uninstalled...</oldsource> <translation type="unfinished"></translation> </message> <message> <location filename="downloadlistwidget.cpp" line="240"/> - <source>Delete All...</source> + <source>Delete All Downloads...</source> + <oldsource>Delete All...</oldsource> <translation type="unfinished"></translation> </message> <message> @@ -1573,7 +1574,7 @@ This is likely due to a corrupted or incompatible download or unrecognized archi <context> <name>MOBase::TutorialControl</name> <message> - <location filename="../../uibase/src/tutorialcontrol.cpp" line="145"/> + <location filename="../../uibase/src/tutorialcontrol.cpp" line="146"/> <source>Tutorial failed to start, please check "mo_interface.log" for details.</source> <translation type="unfinished"></translation> </message> @@ -4163,123 +4164,123 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location filename="modlist.cpp" line="1101"/> + <location filename="modlist.cpp" line="1103"/> <source>drag&drop failed: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="modlist.cpp" line="1180"/> + <location filename="modlist.cpp" line="1182"/> <source>Confirm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="modlist.cpp" line="1181"/> + <location filename="modlist.cpp" line="1183"/> <source>Are you sure you want to remove "%1"?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="modlist.cpp" line="1248"/> + <location filename="modlist.cpp" line="1250"/> <source>Flags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="modlist.cpp" line="1249"/> + <location filename="modlist.cpp" line="1251"/> <source>Content</source> <translation type="unfinished"></translation> </message> <message> - <location filename="modlist.cpp" line="1250"/> + <location filename="modlist.cpp" line="1252"/> <source>Mod Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="modlist.cpp" line="1251"/> + <location filename="modlist.cpp" line="1253"/> <source>Version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="modlist.cpp" line="1252"/> + <location filename="modlist.cpp" line="1254"/> <source>Priority</source> <translation type="unfinished"></translation> </message> <message> - <location filename="modlist.cpp" line="1253"/> + <location filename="modlist.cpp" line="1255"/> <source>Category</source> <translation type="unfinished"></translation> </message> <message> - <location filename="modlist.cpp" line="1254"/> + <location filename="modlist.cpp" line="1256"/> <source>Source Game</source> <translation type="unfinished"></translation> </message> <message> - <location filename="modlist.cpp" line="1255"/> + <location filename="modlist.cpp" line="1257"/> <source>Nexus ID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="modlist.cpp" line="1256"/> + <location filename="modlist.cpp" line="1258"/> <source>Installation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="modlist.cpp" line="1257"/> + <location filename="modlist.cpp" line="1259"/> <source>Notes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="modlist.cpp" line="1258"/> - <location filename="modlist.cpp" line="1294"/> + <location filename="modlist.cpp" line="1260"/> + <location filename="modlist.cpp" line="1296"/> <source>unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="modlist.cpp" line="1266"/> + <location filename="modlist.cpp" line="1268"/> <source>Name of your mods</source> <translation type="unfinished"></translation> </message> <message> - <location filename="modlist.cpp" line="1267"/> + <location filename="modlist.cpp" line="1269"/> <source>Version of the mod (if available)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="modlist.cpp" line="1268"/> + <location filename="modlist.cpp" line="1270"/> <source>Installation priority of your mod. The higher, the more "important" it is and thus overwrites files from mods with lower priority.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="modlist.cpp" line="1270"/> + <location filename="modlist.cpp" line="1272"/> <source>Category of the mod.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="modlist.cpp" line="1271"/> + <location filename="modlist.cpp" line="1273"/> <source>The source game which was the origin of this mod.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="modlist.cpp" line="1272"/> + <location filename="modlist.cpp" line="1274"/> <source>Id of the mod as used on Nexus.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="modlist.cpp" line="1273"/> + <location filename="modlist.cpp" line="1275"/> <source>Emblemes to highlight things that might require attention.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="modlist.cpp" line="1274"/> + <location filename="modlist.cpp" line="1276"/> <source>Depicts the content of the mod:<br><table cellspacing=7><tr><td><img src=":/MO/gui/content/plugin" width=32/></td><td>Game plugins (esp/esm/esl)</td></tr><tr><td><img src=":/MO/gui/content/interface" width=32/></td><td>Interface</td></tr><tr><td><img src=":/MO/gui/content/mesh" width=32/></td><td>Meshes</td></tr><tr><td><img src=":/MO/gui/content/bsa" width=32/></td><td>BSA</td></tr><tr><td><img src=":/MO/gui/content/texture" width=32/></td><td>Textures</td></tr><tr><td><img src=":/MO/gui/content/sound" width=32/></td><td>Sounds</td></tr><tr><td><img src=":/MO/gui/content/music" width=32/></td><td>Music</td></tr><tr><td><img src=":/MO/gui/content/string" width=32/></td><td>Strings</td></tr><tr><td><img src=":/MO/gui/content/script" width=32/></td><td>Scripts (Papyrus)</td></tr><tr><td><img src=":/MO/gui/content/skse" width=32/></td><td>Script Extender plugins</td></tr><tr><td><img src=":/MO/gui/content/skyproc" width=32/></td><td>SkyProc Patcher</td></tr><tr><td><img src=":/MO/gui/content/menu" width=32/></td><td>Mod Configuration Menu</td></tr><tr><td><img src=":/MO/gui/content/inifile" width=32/></td><td>INI files</td></tr><tr><td><img src=":/MO/gui/content/modgroup" width=32/></td><td>ModGroup files</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="modlist.cpp" line="1292"/> + <location filename="modlist.cpp" line="1294"/> <source>Time this mod was installed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="modlist.cpp" line="1293"/> + <location filename="modlist.cpp" line="1295"/> <source>User notes about the mod</source> <translation type="unfinished"></translation> </message> @@ -5825,33 +5826,33 @@ If the folder was still in use, restart MO and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main.cpp" line="577"/> + <location filename="main.cpp" line="582"/> <source>Please select the game edition you have (MO can't start the game correctly if this is set incorrectly!)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main.cpp" line="614"/> + <location filename="main.cpp" line="619"/> <source>failed to start shortcut: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main.cpp" line="636"/> + <location filename="main.cpp" line="641"/> <source>failed to start application: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main.cpp" line="784"/> + <location filename="main.cpp" line="789"/> <location filename="settings.cpp" line="1186"/> <source>Mod Organizer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main.cpp" line="785"/> + <location filename="main.cpp" line="790"/> <source>An instance of Mod Organizer is already running</source> <translation type="unfinished"></translation> </message> <message> - <location filename="main.cpp" line="800"/> + <location filename="main.cpp" line="805"/> <source>Failed to set up instance</source> <translation type="unfinished"></translation> </message> @@ -7525,114 +7526,204 @@ Please open the "Nexus"-tab</source> </message> <message> <location filename="tutorials/tutorial_firststeps_settings.js" line="19"/> - <source>You can also store your Nexus-credentials here for automatic login. The password is stored unencrypted on your disk!</source> + <source>Use this interface to obtain an API key from NexusMods.This is used for all API connections - downloads, updatesetc. MO2 uses the Windows Credential Manager to storethis data securely. If the SSO page on Nexus is failing,use the manual entry and copy the API key from your profile.</source> <translation type="unfinished"></translation> </message> </context> <context> <name>tutorial_primer_main</name> <message> - <location filename="tutorials/tutorial_primer_main.js" line="71"/> + <location filename="tutorials/tutorial_primer_main.js" line="72"/> <source>This window shows all the mods that are installed. The column headers can be used for sorting. Only checked mods are active in the current profile.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="tutorials/tutorial_primer_main.js" line="72"/> + <location filename="tutorials/tutorial_primer_main.js" line="73"/> <source>Each profile is a separate set of enabled mods and ini settings.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="tutorials/tutorial_primer_main.js" line="73"/> + <location filename="tutorials/tutorial_primer_main.js" line="74"/> + <source>Perform various actions on your mod list, such as refreshing data and checking for mod updates.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="tutorials/tutorial_primer_main.js" line="75"/> + <source>Quick access to various directories, such as your MO2 mods, profiles, saves, and your active game location.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="tutorials/tutorial_primer_main.js" line="76"/> + <source>Restore a mod list backup.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="tutorials/tutorial_primer_main.js" line="77"/> + <source>Create a backup of your current mod list.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="tutorials/tutorial_primer_main.js" line="78"/> + <source>Running counter of your active mods. Hover to see a more detailed breakdown.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="tutorials/tutorial_primer_main.js" line="79"/> <source>The dropdown allows various ways of grouping the mods shown in the mod list.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="tutorials/tutorial_primer_main.js" line="74"/> + <location filename="tutorials/tutorial_primer_main.js" line="80"/> <source>Show/hide the category pane.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="tutorials/tutorial_primer_main.js" line="75"/> + <location filename="tutorials/tutorial_primer_main.js" line="81"/> <source>Quickly filter the mod list as you type.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="tutorials/tutorial_primer_main.js" line="76"/> + <location filename="tutorials/tutorial_primer_main.js" line="82"/> <source>Switch between information views.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="tutorials/tutorial_primer_main.js" line="77"/> + <location filename="tutorials/tutorial_primer_main.js" line="83"/> <source>This shows mod categories and some meta categories (in angle-brackets). Select some to filter the mod list. For example select "<Checked>" to show only active mods.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="tutorials/tutorial_primer_main.js" line="78"/> + <location filename="tutorials/tutorial_primer_main.js" line="84"/> <source>Customizable list for choosing the program to run.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="tutorials/tutorial_primer_main.js" line="79"/> + <location filename="tutorials/tutorial_primer_main.js" line="85"/> <source>When this button is clicked, Mod Organizer creates a virtual directory structure then runs the program selected to the left.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="tutorials/tutorial_primer_main.js" line="80"/> + <location filename="tutorials/tutorial_primer_main.js" line="86"/> <source>Will create a shortcut for quick access. The shortcut can be placed in the toolbar at the top, in the Start Menu or on the Windows Desktop.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="tutorials/tutorial_primer_main.js" line="81"/> + <location filename="tutorials/tutorial_primer_main.js" line="87"/> <source>Log messages produced by MO. Please note that messages with a light bulb usually don't require your attention.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="tutorials/tutorial_primer_main.js" line="83"/> + <location filename="tutorials/tutorial_primer_main.js" line="88"/> + <source>Indicator of your current NexusMods API request limits.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="tutorials/tutorial_primer_main.js" line="90"/> + <source>Change/manage MO2 instances or switch to portable mode.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="tutorials/tutorial_primer_main.js" line="91"/> + <source>Browse to and manually install a mod from an archive on your computer.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="tutorials/tutorial_primer_main.js" line="92"/> + <source>Automatically open NexusMods to browse and install mods via the API.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="tutorials/tutorial_primer_main.js" line="93"/> + <source>Manage your MO2 profiles.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="tutorials/tutorial_primer_main.js" line="94"/> + <source>Open the executable editor to add and modify applications you wish to run with MO2.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="tutorials/tutorial_primer_main.js" line="95"/> + <source>Select from a collection of additional tools, such as an INI editor, integrated FNIS updater, and more.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="tutorials/tutorial_primer_main.js" line="96"/> <source>Configure Mod Organizer.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="tutorials/tutorial_primer_main.js" line="84"/> + <location filename="tutorials/tutorial_primer_main.js" line="97"/> + <source>See the status of and/or endorse MO2 on NexusMods.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="tutorials/tutorial_primer_main.js" line="98"/> <source>Notifications about the current setup.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="tutorials/tutorial_primer_main.js" line="85"/> + <location filename="tutorials/tutorial_primer_main.js" line="99"/> <source>Activates if there is an update for MO. Please note that if, for any reason, MO can't communicate with NMM, this will not work either.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="tutorials/tutorial_primer_main.js" line="89"/> + <location filename="tutorials/tutorial_primer_main.js" line="100"/> + <source>Access more information about MO2, including these tutorials, a link to the development discord, information about the devs and dependencies.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="tutorials/tutorial_primer_main.js" line="104"/> <source>Plugins (esp/esm/esl files) of the mods in the current profile. They need to be checked to be loaded.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="tutorials/tutorial_primer_main.js" line="90"/> + <location filename="tutorials/tutorial_primer_main.js" line="105"/> <source>Automatically sort plugins using the bundled LOOT application.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="tutorials/tutorial_primer_main.js" line="91"/> + <location filename="tutorials/tutorial_primer_main.js" line="106"/> + <source>Restore a backup of your plugin list order.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="tutorials/tutorial_primer_main.js" line="107"/> + <source>Save a backup of your plugin list order.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="tutorials/tutorial_primer_main.js" line="108"/> + <source>Counter of your total active plugins. Hover to see a breakdown of plugin types.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="tutorials/tutorial_primer_main.js" line="109"/> <source>Quickly filter plugin list as you type.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="tutorials/tutorial_primer_main.js" line="97"/> + <location filename="tutorials/tutorial_primer_main.js" line="112"/> + <source>All the asset archives (.bsa files) for all active mods.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="tutorials/tutorial_primer_main.js" line="115"/> <source>The directory tree and all files that the program will see.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="tutorials/tutorial_primer_main.js" line="100"/> + <location filename="tutorials/tutorial_primer_main.js" line="118"/> <source>Save game browser. Shows all the saves for the current profile and whether or not the current mod-load status is correct.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="tutorials/tutorial_primer_main.js" line="103"/> + <location filename="tutorials/tutorial_primer_main.js" line="121"/> <source>Shows the mods that have been downloaded and if they’ve been installed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="tutorials/tutorial_primer_main.js" line="111"/> + <location filename="tutorials/tutorial_primer_main.js" line="129"/> <source>Click to quit</source> <translation type="unfinished"></translation> </message> diff --git a/src/tutorials/tutorial_conflictresolution_main.js b/src/tutorials/tutorial_conflictresolution_main.js index 404afe5d..a2aa278d 100644 --- a/src/tutorials/tutorial_conflictresolution_main.js +++ b/src/tutorials/tutorial_conflictresolution_main.js @@ -65,7 +65,7 @@ function getTutorialSteps() { },
function() {
tutorial.text = qsTr("Option A: Switch to the \"Data\"-tab if necessary")
- if (!tutorialControl.waitForTabOpen("tabWidget", 2)) {
+ if (!tutorialControl.waitForTabOpen("tabWidget", "dataTab")) {
highlightItem("tabWidget", false)
waitForClick()
} else {
@@ -107,7 +107,7 @@ function getTutorialSteps() { function() {
tutorial.text = qsTr("Please open the \"Plugins\"-tab...")
highlightItem("tabWidget", true)
- if (!tutorialControl.waitForTabOpen("tabWidget", 0)) {
+ if (!tutorialControl.waitForTabOpen("tabWidget", "espTab")) {
nextStep()
}
},
diff --git a/src/tutorials/tutorial_conflictresolution_modinfo.js b/src/tutorials/tutorial_conflictresolution_modinfo.js index b5ef461e..04691ef6 100644 --- a/src/tutorials/tutorial_conflictresolution_modinfo.js +++ b/src/tutorials/tutorial_conflictresolution_modinfo.js @@ -3,7 +3,7 @@ function getTutorialSteps() { function() {
tutorial.text = qsTr("Please switch to the \"Conflicts\"-Tab.")
highlightItem("tabWidget", true)
- if (!tutorialControl.waitForTabOpen("tabWidget", 4)) {
+ if (!tutorialControl.waitForTabOpen("tabWidget", "tabConflicts")) {
nextStep()
}
},
diff --git a/src/tutorials/tutorial_firststeps_main.js b/src/tutorials/tutorial_firststeps_main.js index 45e7e649..47545d24 100644 --- a/src/tutorials/tutorial_firststeps_main.js +++ b/src/tutorials/tutorial_firststeps_main.js @@ -122,7 +122,7 @@ function getTutorialSteps() tutorial.text = qsTr("...but most contain plugins. These are plugins for the game and are required "
+"to add stuff to the game (new weapons, armors, quests, areas, ...). "
+"Please open the \"Plugins\"-tab to get a list of plugins.")
- if (tutorialControl.waitForTabOpen("tabWidget", 0)) {
+ if (tutorialControl.waitForTabOpen("tabWidget", "espTab")) {
highlightItem("tabWidget", true)
} else {
waitForClick()
diff --git a/src/tutorials/tutorial_firststeps_settings.js b/src/tutorials/tutorial_firststeps_settings.js index 1dd77d2e..ed49d97f 100644 --- a/src/tutorials/tutorial_firststeps_settings.js +++ b/src/tutorials/tutorial_firststeps_settings.js @@ -4,7 +4,7 @@ function getTutorialSteps() function() {
highlightItem("tabWidget", true)
tutorial.text = qsTr("You can use your regular browser to download from Nexus.\nPlease open the \"Nexus\"-tab")
- tutorialControl.waitForTabOpen("tabWidget", 2)
+ tutorialControl.waitForTabOpen("tabWidget", "tabNexus")
},
function() {
@@ -16,9 +16,11 @@ function getTutorialSteps() function() {
highlightItem("nexusBox", false)
- tutorial.text = qsTr("You can also store your Nexus-credentials "
- +"here for automatic login. The password is "
- +"stored unencrypted on your disk!")
+ tutorial.text = qsTr("Use this interface to obtain an API key from NexusMods."
+ +"This is used for all API connections - downloads, updates"
+ +"etc. MO2 uses the Windows Credential Manager to store"
+ +"this data securely. If the SSO page on Nexus is failing,"
+ +"use the manual entry and copy the API key from your profile.")
waitForClick()
}
]
diff --git a/src/tutorials/tutorial_primer_main.js b/src/tutorials/tutorial_primer_main.js index dd305c0c..7972cca4 100644 --- a/src/tutorials/tutorial_primer_main.js +++ b/src/tutorials/tutorial_primer_main.js @@ -99,8 +99,8 @@ function setupTooptips() { tooltipAction("actionUpdate", qsTr("Activates if there is an update for MO. Please note that if, for any reason, MO can't communicate with NMM, this will not work either."))
tooltipAction("actionHelp", qsTr("Access more information about MO2, including these tutorials, a link to the development discord, information about the devs and dependencies."))
- switch (manager.findControl("tabWidget").currentIndex) {
- case 0:
+ switch (tutorialControl.getTabName("tabWidget")) {
+ case "espTab":
tooltipWidget("espList", qsTr("Plugins (esp/esm/esl files) of the mods in the current profile. They need to be checked to be loaded."))
tooltipWidget("bossButton", qsTr("Automatically sort plugins using the bundled LOOT application."))
tooltipWidget("restoreButton", qsTr("Restore a backup of your plugin list order."))
@@ -108,16 +108,16 @@ function setupTooptips() { tooltipWidget("activePluginsCounter", qsTr("Counter of your total active plugins. Hover to see a breakdown of plugin types."))
tooltipWidget("espFilterEdit", qsTr("Quickly filter plugin list as you type."))
break
- case 1:
+ case "bsaTab":
tooltipWidget("bsaList", qsTr("All the asset archives (.bsa files) for all active mods."))
break
- case 2:
+ case "dataTab":
tooltipWidget("dataTree", qsTr("The directory tree and all files that the program will see."))
break
- case 3:
+ case "savesTab":
tooltipWidget("savegameList", qsTr("Save game browser. Shows all the saves for the current profile and whether or not the current mod-load status is correct."))
break
- case 4:
+ case "downloadTab":
tooltipWidget("downloadView", qsTr("Shows the mods that have been downloaded and if they’ve been installed."))
break
}
|
