diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mainwindow.cpp | 18 | ||||
| -rw-r--r-- | src/mainwindow.ui | 17 |
2 files changed, 16 insertions, 19 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 1d737541..e383006b 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -4717,6 +4717,7 @@ void MainWindow::exportModListCSV() mod_Name->setChecked(true); QCheckBox *mod_Note = new QCheckBox(tr("Notes_column")); QCheckBox *mod_Status = new QCheckBox(tr("Mod_Status")); + mod_Status->setChecked(true); QCheckBox *primary_Category = new QCheckBox(tr("Primary_Category")); QCheckBox *nexus_ID = new QCheckBox(tr("Nexus_ID")); QCheckBox *mod_Nexus_URL = new QCheckBox(tr("Mod_Nexus_URL")); @@ -4764,10 +4765,10 @@ void MainWindow::exportModListCSV() std::vector<std::pair<QString, CSVBuilder::EFieldType> > fields; if (mod_Priority->isChecked()) fields.push_back(std::make_pair(QString("#Mod_Priority"), CSVBuilder::TYPE_STRING)); + if (mod_Status->isChecked()) + fields.push_back(std::make_pair(QString("#Mod_Status"), CSVBuilder::TYPE_STRING)); if (mod_Name->isChecked()) fields.push_back(std::make_pair(QString("#Mod_Name"), CSVBuilder::TYPE_STRING)); - if (mod_Status->isChecked()) - fields.push_back(std::make_pair(QString("#Mod_Status"), CSVBuilder::TYPE_STRING)); if (mod_Note->isChecked()) fields.push_back(std::make_pair(QString("#Note"), CSVBuilder::TYPE_STRING)); if (primary_Category->isChecked()) @@ -4787,9 +4788,10 @@ void MainWindow::exportModListCSV() builder.writeHeader(); - for (unsigned int i = 0; i < numMods; ++i) { - ModInfo::Ptr info = ModInfo::getByIndex(i); - bool enabled = m_OrganizerCore.currentProfile()->modEnabled(i); + auto indexesByPriority = m_OrganizerCore.currentProfile()->getAllIndexesByPriority(); + for (auto& iter : indexesByPriority) { + ModInfo::Ptr info = ModInfo::getByIndex(iter.second); + bool enabled = m_OrganizerCore.currentProfile()->modEnabled(iter.second); if ((selectedRowID == 1) && !enabled) { continue; } @@ -4800,11 +4802,11 @@ void MainWindow::exportModListCSV() if ((std::find(flags.begin(), flags.end(), ModInfo::FLAG_OVERWRITE) == flags.end()) && (std::find(flags.begin(), flags.end(), ModInfo::FLAG_BACKUP) == flags.end())) { if (mod_Priority->isChecked()) - builder.setRowField("#Mod_Priority", QString("%1").arg(m_OrganizerCore.currentProfile()->getModPriority(i), 4, 10, QChar('0'))); + builder.setRowField("#Mod_Priority", QString("%1").arg(iter.first, 4, 10, QChar('0'))); + if (mod_Status->isChecked()) + builder.setRowField("#Mod_Status", (enabled) ? "+" : "-"); if (mod_Name->isChecked()) builder.setRowField("#Mod_Name", info->name()); - if (mod_Status->isChecked()) - builder.setRowField("#Mod_Status", (enabled)? "Enabled" : "Disabled"); if (mod_Note->isChecked()) builder.setRowField("#Note", QString("%1").arg(info->comments().remove(','))); if (primary_Category->isChecked()) diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 98743b7e..0ee74239 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -1358,7 +1358,7 @@ p, li { white-space: pre-wrap; } </property> <addaction name="actionChange_Game"/> <addaction name="actionInstallMod"/> - <addaction name="actionAdd_Profile"/> + <addaction name="actionNexus"/> <addaction name="separator"/> <addaction name="actionExit"/> </widget> @@ -1366,9 +1366,9 @@ p, li { white-space: pre-wrap; } <property name="title"> <string>&Tools</string> </property> - <addaction name="actionNexus"/> - <addaction name="separator"/> + <addaction name="actionAdd_Profile"/> <addaction name="actionModify_Executables"/> + <addaction name="separator"/> <addaction name="actionTool"/> <addaction name="separator"/> <addaction name="actionSettings"/> @@ -1379,14 +1379,9 @@ p, li { white-space: pre-wrap; } </property> <addaction name="actionHelp"/> <addaction name="actionUpdate"/> + <addaction name="separator"/> <addaction name="actionEndorseMO"/> </widget> - <widget class="QMenu" name="menuEdit"> - <property name="title"> - <string>&Edit</string> - </property> - <addaction name="actionCopy_Log_to_Clipboard"/> - </widget> <widget class="QMenu" name="menuView"> <property name="title"> <string>&View</string> @@ -1408,6 +1403,7 @@ p, li { white-space: pre-wrap; } <addaction name="actionToolBarIconsAndText"/> </widget> <addaction name="menuToolbars"/> + <addaction name="separator"/> <addaction name="actionNotifications"/> </widget> <widget class="QMenu" name="menuRun"> @@ -1416,7 +1412,6 @@ p, li { white-space: pre-wrap; } </property> </widget> <addaction name="menuFile"/> - <addaction name="menuEdit"/> <addaction name="menuView"/> <addaction name="menuTools"/> <addaction name="menuRun"/> @@ -1491,7 +1486,7 @@ p, li { white-space: pre-wrap; } <normaloff>:/MO/gui/plugins</normaloff>:/MO/gui/plugins</iconset> </property> <property name="text"> - <string>&Tools</string> + <string>&Tool Plugins</string> </property> <property name="iconText"> <string>&Tools</string> |