1 files changed, 48 insertions, 32 deletions

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index f0e576fe..abf91d8f 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -165,7 +165,7 @@ MainWindow::MainWindow(const QString &exeName
   , m_ArchiveListWriter(std::bind(&MainWindow::saveArchiveList, this))

 {

   ui->setupUi(this);

-  this->setWindowTitle(ToQString(GameInfo::instance().getGameName()) + " Mod Organizer v" + m_OrganizerCore.getVersion().displayString());

+  updateWindowTitle(QString(), false);

   languageChange(m_OrganizerCore.settings().language());

 

   ui->logList->setModel(LogBuffer::instance());

@@ -175,8 +175,10 @@ MainWindow::MainWindow(const QString &exeName
   ui->logList->addAction(ui->actionCopy_Log_to_Clipboard);

   int splitterSize = this->size().height(); // actually total window size, but the splitter doesn't seem to return the true value

   ui->topLevelSplitter->setSizes(QList<int>() << splitterSize - 100 << 100);

-  connect(ui->logList->model(), SIGNAL(rowsInserted(const QModelIndex &, int, int)), ui->logList, SLOT(scrollToBottom()));

-  connect(ui->logList->model(), SIGNAL(dataChanged(QModelIndex,QModelIndex)), ui->logList, SLOT(scrollToBottom()));

+  connect(ui->logList->model(), SIGNAL(rowsInserted(const QModelIndex &, int, int)),

+          ui->logList, SLOT(scrollToBottom()));

+  connect(ui->logList->model(), SIGNAL(dataChanged(QModelIndex,QModelIndex)),

+          ui->logList, SLOT(scrollToBottom()));

 

   m_RefreshProgress = new QProgressBar(statusBar());

   m_RefreshProgress->setTextVisible(true);

@@ -286,6 +288,11 @@ MainWindow::MainWindow(const QString &exeName
   connect(NexusInterface::instance(), SIGNAL(nxmDownloadURLsAvailable(int,int,QVariant,QVariant,int)), this, SLOT(nxmDownloadURLs(int,int,QVariant,QVariant,int)));

   connect(NexusInterface::instance(), SIGNAL(needLogin()), &m_OrganizerCore, SLOT(nexusLogin()));

   connect(NexusInterface::instance()->getAccessManager(), SIGNAL(loginFailed(QString)), this, SLOT(loginFailed(QString)));

+  connect(NexusInterface::instance()->getAccessManager(), &NXMAccessManager::credentialsReceived,

+          [this] (const QString &accountName, bool premium) {

+    qDebug("user %s premium", premium ? "is" : "is not");

+    updateWindowTitle(accountName, premium);

+  });

 

   connect(&TutorialManager::instance(), SIGNAL(windowTutorialFinished(QString)), this, SLOT(windowTutorialFinished(QString)));

   connect(ui->tabWidget, SIGNAL(currentChanged(int)), &TutorialManager::instance(), SIGNAL(tabChanged(int)));

@@ -349,6 +356,22 @@ MainWindow::~MainWindow()
 }

 

 

+void MainWindow::updateWindowTitle(const QString &accountName, bool premium)

+{

+  QString title = QString("%1 Mod Organizer v%2").arg(

+        ToQString(GameInfo::instance().getGameName()),

+        m_OrganizerCore.getVersion().displayString());

+

+  if (accountName.isEmpty()) {

+    title.append(" (not logged in)");

+  } else {

+    title.append(QString(" (%1%2)").arg(accountName, premium ? "*" : ""));

+  }

+

+  this->setWindowTitle(title);

+}

+

+

 void MainWindow::disconnectPlugins()

 {

   if (ui->actionTool->menu() != nullptr) {

@@ -908,7 +931,8 @@ void MainWindow::modPagePluginInvoke()
       m_IntegratedBrowser.setWindowTitle(plugin->displayName());

       m_IntegratedBrowser.openUrl(plugin->pageURL());

     } else {

-      ::ShellExecuteW(nullptr, L"open", ToWString(plugin->pageURL().toString()).c_str(), nullptr, nullptr, SW_SHOWNORMAL);

+      ::ShellExecuteW(nullptr, L"open", ToWString(plugin->pageURL().toString()).c_str(),

+                      nullptr, nullptr, SW_SHOWNORMAL);

     }

   }

 }

@@ -2307,8 +2331,9 @@ void MainWindow::unendorse_clicked()
   }

 }

 

-void MainWindow::loginFailed(const QString&)

+void MainWindow::loginFailed(const QString &error)

 {

+  qDebug("login failed: %s", qPrintable(error));

   statusBar()->hide();

 }

 

@@ -3426,36 +3451,26 @@ void MainWindow::languageChange(const QString &newLanguage)
 

 void MainWindow::writeDataToFile(QFile &file, const QString &directory, const DirectoryEntry &directoryEntry)

 {

-  { // list files

-//    std::set<FileEntry>::const_iterator current, end;

-//    directoryEntry.getFiles(current, end);

-//    for (; current != end; ++current) {

-

-    std::vector<FileEntry::Ptr> files = directoryEntry.getFiles();

-    for (auto iter = files.begin(); iter != files.end(); ++iter) {

-      FileEntry::Ptr current = *iter;

-      bool isArchive = false;

-      int origin = current->getOrigin(isArchive);

-      if (isArchive) {

-        // TODO: don't list files from archives. maybe make this an option?

-        continue;

-      }

-      QString fullName = directory;

-      fullName.append("\\").append(ToQString(current->getName()));

-      file.write(fullName.toUtf8());

-

-      file.write("\t(");

-      file.write(ToQString(m_OrganizerCore.directoryStructure()->getOriginByID(origin).getName()).toUtf8());

-      file.write(")\r\n");

+  for (FileEntry::Ptr current : directoryEntry.getFiles()) {

+    bool isArchive = false;

+    int origin = current->getOrigin(isArchive);

+    if (isArchive) {

+      // TODO: don't list files from archives. maybe make this an option?

+      continue;

     }

+    QString fullName = directory + "\\" + ToQString(current->getName());

+    file.write(fullName.toUtf8());

+

+    file.write("\t(");

+    file.write(ToQString(m_OrganizerCore.directoryStructure()->getOriginByID(origin).getName()).toUtf8());

+    file.write(")\r\n");

   }

 

-  { // recurse into subdirectories

-    std::vector<DirectoryEntry*>::const_iterator current, end;

-    directoryEntry.getSubDirectories(current, end);

-    for (; current != end; ++current) {

-      writeDataToFile(file, directory.mid(0).append("\\").append(ToQString((*current)->getName())), **current);

-    }

+  // recurse into subdirectories

+  std::vector<DirectoryEntry*>::const_iterator current, end;

+  directoryEntry.getSubDirectories(current, end);

+  for (; current != end; ++current) {

+    writeDataToFile(file, directory + "\\" + ToQString((*current)->getName()), **current);

   }

 }

 

@@ -4735,3 +4750,4 @@ void MainWindow::dropEvent(QDropEvent *event)
   }

   event->accept();

 }

+