Merge pull request #497 from Modorganizer2/Develop

Fix possible crash during write to disk error

src/aboutdialog.ui

@@ -189,6 +189,11 @@
                <property name="text">
                 <string notr="true">Silarn</string>
                </property>
+              </item>
+			  <item>
+               <property name="text">
+                <string notr="true">LostDragonist</string>
+               </property>
               </item>
              </widget>
             </item>
@@ -208,7 +213,7 @@
               </property>
               <item>
                <property name="text">
-                <string notr="true">AnyOldName3 (Python Plugins)</string>
+                <string notr="true">AnyOldName3</string>
                </property>
               </item>
              </widget>

src/downloadlist.cpp

@@ -40,7 +40,7 @@ int DownloadList::rowCount(const QModelIndex&) const
 
 int DownloadList::columnCount(const QModelIndex&) const
 {
-  return 3;
+  return 4;
 }
 
 
@@ -63,6 +63,7 @@ QVariant DownloadList::headerData(int section, Qt::Orientation orientation, int
     switch (section) {
       case COL_NAME: return tr("Name");
       case COL_FILETIME: return tr("Filetime");
+      case COL_SIZE: return tr("Size");
       default: return tr("Done");
     }
   } else {

src/downloadlist.h

@@ -39,7 +39,8 @@ public:
   enum EColumn {
     COL_NAME = 0,
     COL_FILETIME,
-    COL_STATUS
+    COL_STATUS,
+    COL_SIZE
   };
 
 public:

src/downloadlistsortproxy.cpp

@@ -47,6 +47,8 @@ bool DownloadListSortProxy::lessThan(const QModelIndex &left,
       return m_Manager->getFileTime(leftIndex) < m_Manager->getFileTime(rightIndex);
     } else if (left.column() == DownloadList::COL_STATUS) {
       return m_Manager->getState(leftIndex) < m_Manager->getState(rightIndex);
+    } else if(left.column() == DownloadList::COL_SIZE){
+      return m_Manager->getFileSize(leftIndex) < m_Manager->getFileSize(rightIndex);
     } else {
       return leftIndex < rightIndex;
     }

src/downloadlistwidget.cpp

@@ -82,11 +82,30 @@ void DownloadListWidgetDelegate::drawCache(QPainter *painter, const QStyleOption
 {
   QRect rect = option.rect;
   rect.setLeft(0);
-  rect.setWidth(m_View->columnWidth(0) + m_View->columnWidth(1) + m_View->columnWidth(2));
+  rect.setWidth(m_View->columnWidth(0) + m_View->columnWidth(1) + m_View->columnWidth(2) + m_View->columnWidth(3));
   painter->drawPixmap(rect, cache);
 }
 
 
+QString DownloadListWidgetDelegate::sizeFormat(quint64 size) const
+{
+	qreal calc = size;
+	QStringList list;
+	list << "KB" << "MB" << "GB" << "TB";
+
+	QStringListIterator i(list);
+	QString unit("byte(s)");
+
+	while (calc >= 1024.0 && i.hasNext())
+	{
+		unit = i.next();
+		calc /= 1024.0;
+	}
+
+	return QString().setNum(calc, 'f', 2) + " " + unit;
+}
+
+
 void DownloadListWidgetDelegate::paintPendingDownload(int downloadIndex) const
 {
   std::tuple<QString, int, int> nexusids = m_Manager->getPendingDownload(downloadIndex);
@@ -106,9 +125,9 @@ void DownloadListWidgetDelegate::paintRegularDownload(int downloadIndex) const
     name.append("...");
   }
   m_NameLabel->setText(name);
-  m_SizeLabel->setText(QString::number(m_Manager->getFileSize(downloadIndex) / 1024));
+  m_SizeLabel->setText(sizeFormat(m_Manager->getFileSize(downloadIndex) ));
   DownloadManager::DownloadState state = m_Manager->getState(downloadIndex);
-  if ((state == DownloadManager::STATE_PAUSED) || (state == DownloadManager::STATE_ERROR)) {
+  if ((state == DownloadManager::STATE_PAUSED) || (state == DownloadManager::STATE_ERROR) || (state == DownloadManager::STATE_PAUSING)) {
     QPalette labelPalette;
     m_InstallLabel->setVisible(true);
     m_Progress->setVisible(false);
@@ -174,7 +193,7 @@ void DownloadListWidgetDelegate::paint(QPainter *painter, const QStyleOptionView
       return;
     }
 
-    m_ItemWidget->resize(QSize(m_View->columnWidth(0) + m_View->columnWidth(1) + m_View->columnWidth(2), option.rect.height()));
+    m_ItemWidget->resize(QSize(m_View->columnWidth(0) + m_View->columnWidth(1) + m_View->columnWidth(2) + m_View->columnWidth(3), option.rect.height()));
 
     int downloadIndex = index.data().toInt();
 
@@ -226,7 +245,11 @@ void DownloadListWidgetDelegate::issueQueryInfo()
 
 void DownloadListWidgetDelegate::issueDelete()
 {
-  emit removeDownload(m_ContextRow, true);
+	if (QMessageBox::question(nullptr, tr("Delete Files?"),
+		tr("This will permanently delete the selected download."),
+		QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
+		emit removeDownload(m_ContextRow, true);
+	}
 }
 
 void DownloadListWidgetDelegate::issueRemoveFromView()
@@ -236,7 +259,27 @@ void DownloadListWidgetDelegate::issueRemoveFromView()
 
 void DownloadListWidgetDelegate::issueRestoreToView()
 {
-  emit restoreDownload(m_ContextRow);
+		emit restoreDownload(m_ContextRow);
+}
+
+void DownloadListWidgetDelegate::issueRestoreToViewAll()
+{
+	emit restoreDownload(-1);
+}
+
+void DownloadListWidgetDelegate::issueVisitOnNexus()
+{
+	emit visitOnNexus(m_ContextRow);
+}
+
+void DownloadListWidgetDelegate::issueOpenFile()
+{
+  emit openFile(m_ContextRow);
+}
+
+void DownloadListWidgetDelegate::issueOpenInDownloadsFolder()
+{
+  emit openInDownloadsFolder(m_ContextRow);
 }
 
 void DownloadListWidgetDelegate::issueCancel()
@@ -256,7 +299,7 @@ void DownloadListWidgetDelegate::issueResume()
 
 void DownloadListWidgetDelegate::issueDeleteAll()
 {
-  if (QMessageBox::question(nullptr, tr("Are you sure?"),
+  if (QMessageBox::question(nullptr, tr("Delete Files?"),
                             tr("This will remove all finished downloads from this list and from disk."),
                             QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
     emit removeDownload(-1, true);
@@ -265,13 +308,22 @@ void DownloadListWidgetDelegate::issueDeleteAll()
 
 void DownloadListWidgetDelegate::issueDeleteCompleted()
 {
-  if (QMessageBox::question(nullptr, tr("Are you sure?"),
+  if (QMessageBox::question(nullptr, tr("Delete Files?"),
                             tr("This will remove all installed downloads from this list and from disk."),
                             QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
     emit removeDownload(-2, true);
   }
 }
 
+void DownloadListWidgetDelegate::issueDeleteUninstalled()
+{
+  if (QMessageBox::question(nullptr, tr("Delete Files?"),
+    tr("This will remove all uninstalled downloads from this list and from disk."),
+    QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
+    emit removeDownload(-3, true);
+  }
+}
+
 void DownloadListWidgetDelegate::issueRemoveFromViewAll()
 {
   if (QMessageBox::question(nullptr, tr("Are you sure?"),
@@ -290,6 +342,15 @@ void DownloadListWidgetDelegate::issueRemoveFromViewCompleted()
   }
 }
 
+void DownloadListWidgetDelegate::issueRemoveFromViewUninstalled()
+{
+  if (QMessageBox::question(nullptr, tr("Are you sure?"),
+    tr("This will remove all uninstalled downloads from this list (but NOT from disk)."),
+    QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
+    emit removeDownload(-3, false);
+  }
+}
+
 bool DownloadListWidgetDelegate::editorEvent(QEvent *event, QAbstractItemModel *model,
                                    const QStyleOptionViewItem &option, const QModelIndex &index)
 {
@@ -298,7 +359,7 @@ bool DownloadListWidgetDelegate::editorEvent(QEvent *event, QAbstractItemModel *
       QModelIndex sourceIndex = qobject_cast<QSortFilterProxyModel*>(model)->mapToSource(index);
       if (m_Manager->getState(sourceIndex.row()) >= DownloadManager::STATE_READY) {
         emit installDownload(sourceIndex.row());
-      } else if (m_Manager->getState(sourceIndex.row()) >= DownloadManager::STATE_PAUSED) {
+      } else if ((m_Manager->getState(sourceIndex.row()) >= DownloadManager::STATE_PAUSED) || (m_Manager->getState(sourceIndex.row()) == DownloadManager::STATE_PAUSING)) {
         emit resumeDownload(sourceIndex.row());
       }
       return true;
@@ -315,7 +376,15 @@ bool DownloadListWidgetDelegate::editorEvent(QEvent *event, QAbstractItemModel *
             menu.addAction(tr("Install"), this, SLOT(issueInstall()));
             if (m_Manager->isInfoIncomplete(m_ContextRow)) {
               menu.addAction(tr("Query Info"), this, SLOT(issueQueryInfo()));
+            }else {
+              menu.addAction(tr("Visit on Nexus"), this,SLOT(issueVisitOnNexus()));
             }
+
+            menu.addAction(tr("Open File"), this, SLOT(issueOpenFile()));
+            menu.addAction(tr("Show in Folder"), this, SLOT(issueOpenInDownloadsFolder()));
+            
+            menu.addSeparator();
+
             menu.addAction(tr("Delete"), this, SLOT(issueDelete()));
             if (hidden) {
               menu.addAction(tr("Un-Hide"), this, SLOT(issueRestoreToView()));
@@ -325,20 +394,30 @@ bool DownloadListWidgetDelegate::editorEvent(QEvent *event, QAbstractItemModel *
           } else if (state == DownloadManager::STATE_DOWNLOADING){
             menu.addAction(tr("Cancel"), this, SLOT(issueCancel()));
             menu.addAction(tr("Pause"), this, SLOT(issuePause()));
-          } else if ((state == DownloadManager::STATE_PAUSED) || (state == DownloadManager::STATE_ERROR)) {
-            menu.addAction(tr("Remove"), this, SLOT(issueDelete()));
+            menu.addAction(tr("Show in Folder"), this, SLOT(issueOpenInDownloadsFolder()));
+          } else if ((state == DownloadManager::STATE_PAUSED) || (state == DownloadManager::STATE_ERROR) || (state == DownloadManager::STATE_PAUSING)) {
+            menu.addAction(tr("Delete"), this, SLOT(issueDelete()));
             menu.addAction(tr("Resume"), this, SLOT(issueResume()));
+            menu.addAction(tr("Show in Folder"), this, SLOT(issueOpenInDownloadsFolder()));
           }
 
           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()));
-        if (!hidden) {
-          menu.addSeparator();
-          menu.addAction(tr("Hide Installed..."), this, SLOT(issueRemoveFromViewCompleted()));
-          menu.addAction(tr("Hide All..."), this, SLOT(issueRemoveFromViewAll()));
-        }
+
+				if (!hidden) {
+					menu.addSeparator();
+					menu.addAction(tr("Hide Installed..."), this, SLOT(issueRemoveFromViewCompleted()));
+          menu.addAction(tr("Hide Uninstalled..."), this, SLOT(issueRemoveFromViewUninstalled()));
+					menu.addAction(tr("Hide All..."), this, SLOT(issueRemoveFromViewAll()));
+				}
+				if (hidden) {
+					menu.addSeparator();
+					menu.addAction(tr("Un-Hide All..."), this, SLOT(issueRestoreToViewAll()));
+				}
+
         menu.exec(mouseEvent->globalPos());
 
         event->accept();

src/downloadlistwidget.h

@@ -71,14 +71,19 @@ signals:
   void cancelDownload(int index);
   void pauseDownload(int index);
   void resumeDownload(int index);
+  void visitOnNexus(int index);
+  void openFile(int index);
+  void openInDownloadsFolder(int index);
 
 protected:
 
+	QString sizeFormat(quint64 size) const;
   bool editorEvent(QEvent *event, QAbstractItemModel *model,
                    const QStyleOptionViewItem &option, const QModelIndex &index);
 
 private:
 
+
   void drawCache(QPainter *painter, const QStyleOptionViewItem &option, const QPixmap &cache) const;
 
 private slots:
@@ -87,13 +92,19 @@ private slots:
   void issueDelete();
   void issueRemoveFromView();
   void issueRestoreToView();
+  void issueRestoreToViewAll();
+  void issueVisitOnNexus();
+  void issueOpenFile();
+  void issueOpenInDownloadsFolder();
   void issueCancel();
   void issuePause();
   void issueResume();
   void issueDeleteAll();
   void issueDeleteCompleted();
+  void issueDeleteUninstalled();
   void issueRemoveFromViewAll();
   void issueRemoveFromViewCompleted();
+  void issueRemoveFromViewUninstalled();
   void issueQueryInfo();
 
   void stateChanged(int row, DownloadManager::DownloadState);

src/downloadlistwidget.ui

@@ -86,6 +86,9 @@
          <widget class="QLabel" name="label_2">
           <property name="text">
            <string notr="true">KB</string>
+          </property>
+		  <property name="visible">
+           <bool>false</bool>
           </property>
          </widget>
         </item>

src/downloadlistwidgetcompact.cpp

@@ -81,18 +81,35 @@ void DownloadListWidgetCompactDelegate::drawCache(QPainter *painter, const QStyl
 {
   QRect rect = option.rect;
   rect.setLeft(0);
-  rect.setWidth(m_View->columnWidth(0) + m_View->columnWidth(1) + m_View->columnWidth(2));
+  rect.setWidth(m_View->columnWidth(0) + m_View->columnWidth(1) + m_View->columnWidth(2) + m_View->columnWidth(3));
   painter->drawPixmap(rect, cache);
 }
 
+QString DownloadListWidgetCompactDelegate::sizeFormat(quint64 size) const
+{
+  qreal calc = size;
+  QStringList list;
+  list << "KB" << "MB" << "GB" << "TB";
+
+  QStringListIterator i(list);
+  QString unit("byte(s)");
+
+  while (calc >= 1024.0 && i.hasNext())
+  {
+    unit = i.next();
+    calc /= 1024.0;
+  }
+
+  return QString().setNum(calc, 'f', 2) + " " + unit;
+}
 
 void DownloadListWidgetCompactDelegate::paintPendingDownload(int downloadIndex) const
 {
   std::tuple<QString, int, int> nexusids = m_Manager->getPendingDownload(downloadIndex);
   m_NameLabel->setText(tr("< game %1 mod %2 file %3 >").arg(std::get<0>(nexusids)).arg(std::get<1>(nexusids)).arg(std::get<2>(nexusids)));
-  if (m_SizeLabel != nullptr) {
-    m_SizeLabel->setText("???");
-  }
+  //if (m_SizeLabel != nullptr) {
+  //  m_SizeLabel->setText("???");
+  //}
   m_DoneLabel->setVisible(true);
   m_DoneLabel->setText(tr("Pending"));
   m_Progress->setVisible(false);
@@ -110,11 +127,15 @@ void DownloadListWidgetCompactDelegate::paintRegularDownload(int downloadIndex)
 
   DownloadManager::DownloadState state = m_Manager->getState(downloadIndex);
 
-  if ((m_SizeLabel != nullptr) && (state >= DownloadManager::STATE_READY)) {
-    m_SizeLabel->setText(QString::number(m_Manager->getFileSize(downloadIndex) / 1048576));
+  if (m_SizeLabel != nullptr) {
+    m_SizeLabel->setText(sizeFormat(m_Manager->getFileSize(downloadIndex)) + "  ");
+    m_SizeLabel->setVisible(true);
   }
+  //else {
+  //  m_SizeLabel->setVisible(false);
+  //}
 
-  if ((state == DownloadManager::STATE_PAUSED) || (state == DownloadManager::STATE_ERROR)) {
+  if ((state == DownloadManager::STATE_PAUSED) || (state == DownloadManager::STATE_ERROR) || (state == DownloadManager::STATE_PAUSING)) {
     m_DoneLabel->setVisible(true);
     m_Progress->setVisible(false);
     m_DoneLabel->setText(QString("%1<img src=\":/MO/gui/inactive\">").arg(tr("Paused")));
@@ -153,7 +174,7 @@ void DownloadListWidgetCompactDelegate::paint(QPainter *painter, const QStyleOpt
       return;
     }
 
-    m_ItemWidget->resize(QSize(m_View->columnWidth(0) + m_View->columnWidth(1) + m_View->columnWidth(2), option.rect.height()));
+    m_ItemWidget->resize(QSize(m_View->columnWidth(0) + m_View->columnWidth(1) + m_View->columnWidth(2) + m_View->columnWidth(3), option.rect.height()));
     if (index.row() % 2 == 1) {
       m_ItemWidget->setBackgroundRole(QPalette::AlternateBase);
     } else {
@@ -209,7 +230,11 @@ void DownloadListWidgetCompactDelegate::issueQueryInfo()
 
 void DownloadListWidgetCompactDelegate::issueDelete()
 {
-  emit removeDownload(m_ContextIndex.row(), true);
+	if (QMessageBox::question(nullptr, tr("Are you sure?"),
+		tr("This will permanently delete the selected download."),
+		QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
+		emit removeDownload(m_ContextIndex.row(), true);
+	}
 }
 
 void DownloadListWidgetCompactDelegate::issueRemoveFromView()
@@ -217,11 +242,32 @@ void DownloadListWidgetCompactDelegate::issueRemoveFromView()
   emit removeDownload(m_ContextIndex.row(), false);
 }
 
+void DownloadListWidgetCompactDelegate::issueVisitOnNexus()
+{
+	emit visitOnNexus(m_ContextIndex.row());
+}
+
+void DownloadListWidgetCompactDelegate::issueOpenFile()
+{
+  emit openFile(m_ContextIndex.row());
+}
+
+void DownloadListWidgetCompactDelegate::issueOpenInDownloadsFolder()
+{
+  emit openInDownloadsFolder(m_ContextIndex.row());
+}
+
 void DownloadListWidgetCompactDelegate::issueRestoreToView()
 {
-  emit restoreDownload(m_ContextIndex.row());
+		emit restoreDownload(m_ContextIndex.row());
 }
 
+void DownloadListWidgetCompactDelegate::issueRestoreToViewAll()
+{
+	emit restoreDownload(-1);
+}
+
+
 void DownloadListWidgetCompactDelegate::issueCancel()
 {
   emit cancelDownload(m_ContextIndex.row());
@@ -255,6 +301,15 @@ void DownloadListWidgetCompactDelegate::issueDeleteCompleted()
   }
 }
 
+void DownloadListWidgetCompactDelegate::issueDeleteUninstalled()
+{
+  if (QMessageBox::question(nullptr, tr("Are you sure?"),
+    tr("This will remove all uninstalled downloads from this list and from disk."),
+    QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
+    emit removeDownload(-3, true);
+  }
+}
+
 void DownloadListWidgetCompactDelegate::issueRemoveFromViewAll()
 {
   if (QMessageBox::question(nullptr, tr("Are you sure?"),
@@ -273,6 +328,15 @@ void DownloadListWidgetCompactDelegate::issueRemoveFromViewCompleted()
   }
 }
 
+void DownloadListWidgetCompactDelegate::issueRemoveFromViewUninstalled()
+{
+  if (QMessageBox::question(nullptr, tr("Are you sure?"),
+    tr("This will permanently remove all uninstalled downloads from this list (but NOT from disk)."),
+    QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
+    emit removeDownload(-3, false);
+  }
+}
+
 
 bool DownloadListWidgetCompactDelegate::editorEvent(QEvent *event, QAbstractItemModel *model,
                                    const QStyleOptionViewItem &option, const QModelIndex &index)
@@ -282,7 +346,7 @@ bool DownloadListWidgetCompactDelegate::editorEvent(QEvent *event, QAbstractItem
       QModelIndex sourceIndex = qobject_cast<QSortFilterProxyModel*>(model)->mapToSource(index);
       if (m_Manager->getState(sourceIndex.row()) >= DownloadManager::STATE_READY) {
         emit installDownload(sourceIndex.row());
-      } else if (m_Manager->getState(sourceIndex.row()) >= DownloadManager::STATE_PAUSED) {
+      } else if ((m_Manager->getState(sourceIndex.row()) >= DownloadManager::STATE_PAUSED) || (m_Manager->getState(sourceIndex.row()) == DownloadManager::STATE_PAUSING)) {
         emit resumeDownload(sourceIndex.row());
       }
       return true;
@@ -299,7 +363,12 @@ bool DownloadListWidgetCompactDelegate::editorEvent(QEvent *event, QAbstractItem
             menu.addAction(tr("Install"), this, SLOT(issueInstall()));
             if (m_Manager->isInfoIncomplete(m_ContextIndex.row())) {
               menu.addAction(tr("Query Info"), this, SLOT(issueQueryInfo()));
+            }else {
+              menu.addAction(tr("Visit on Nexus"), this, SLOT(issueVisitOnNexus()));
             }
+            menu.addAction(tr("Open File"), this, SLOT(issueOpenFile()));
+            menu.addAction(tr("Show in Folder"), this, SLOT(issueOpenInDownloadsFolder()));
+            menu.addSeparator();
             menu.addAction(tr("Delete"), this, SLOT(issueDelete()));
             if (hidden) {
               menu.addAction(tr("Un-Hide"), this, SLOT(issueRestoreToView()));
@@ -309,20 +378,27 @@ bool DownloadListWidgetCompactDelegate::editorEvent(QEvent *event, QAbstractItem
           } else if (state == DownloadManager::STATE_DOWNLOADING){
             menu.addAction(tr("Cancel"), this, SLOT(issueCancel()));
             menu.addAction(tr("Pause"), this, SLOT(issuePause()));
-          } else if ((state == DownloadManager::STATE_PAUSED) || (state == DownloadManager::STATE_ERROR)) {
+            menu.addAction(tr("Show in Folder"), this, SLOT(issueOpenInDownloadsFolder()));
+          } else if ((state == DownloadManager::STATE_PAUSED) || (state == DownloadManager::STATE_ERROR) || (state == DownloadManager::STATE_PAUSING)) {
             menu.addAction(tr("Remove"), this, SLOT(issueDelete()));
             menu.addAction(tr("Resume"), this, SLOT(issueResume()));
+            menu.addAction(tr("Show in Folder"), this, SLOT(issueOpenInDownloadsFolder()));
           }
-
           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()));
         if (!hidden) {
           menu.addSeparator();
           menu.addAction(tr("Hide Installed..."), this, SLOT(issueRemoveFromViewCompleted()));
+          menu.addAction(tr("Hide Uninstalled..."), this, SLOT(issueRemoveFromViewUninstalled()));
           menu.addAction(tr("Hide All..."), this, SLOT(issueRemoveFromViewAll()));
         }
+        if (hidden) {
+          menu.addSeparator();
+          menu.addAction(tr("Un-Hide All..."), this, SLOT(issueRestoreToViewAll()));
+        }
         menu.exec(mouseEvent->globalPos());
 
         event->accept();
@@ -335,4 +411,3 @@ bool DownloadListWidgetCompactDelegate::editorEvent(QEvent *event, QAbstractItem
 
   return QItemDelegate::editorEvent(event, model, option, index);
 }
-

src/downloadlistwidgetcompact.h

@@ -35,7 +35,7 @@ class DownloadListWidgetCompact;
 class DownloadListWidgetCompact : public QWidget
 {
   Q_OBJECT
-  
+
 public:
   explicit DownloadListWidgetCompact(QWidget *parent = 0);
   ~DownloadListWidgetCompact();
@@ -69,9 +69,13 @@ signals:
   void cancelDownload(int index);
   void pauseDownload(int index);
   void resumeDownload(int index);
+  void visitOnNexus(int index);
+  void openFile(int index);
+  void openInDownloadsFolder(int index);
 
 protected:
 
+  QString sizeFormat(quint64 size) const;
   bool editorEvent(QEvent *event, QAbstractItemModel *model,
                    const QStyleOptionViewItem &option, const QModelIndex &index);
 
@@ -87,13 +91,19 @@ private slots:
   void issueDelete();
   void issueRemoveFromView();
   void issueRestoreToView();
+  void issueRestoreToViewAll();
+  void issueVisitOnNexus();
+  void issueOpenFile();
+  void issueOpenInDownloadsFolder();
   void issueCancel();
   void issuePause();
   void issueResume();
   void issueDeleteAll();
   void issueDeleteCompleted();
+  void issueDeleteUninstalled();
   void issueRemoveFromViewAll();
   void issueRemoveFromViewCompleted();
+  void issueRemoveFromViewUninstalled();
   void issueQueryInfo();
 
   void stateChanged(int row, DownloadManager::DownloadState);
@@ -119,4 +129,3 @@ private:
 };
 
 #endif // DOWNLOADLISTWIDGETCOMPACT_H
-

src/downloadlistwidgetcompact.ui

@@ -19,7 +19,7 @@
   <property name="autoFillBackground">
    <bool>true</bool>
   </property>
-  <layout class="QHBoxLayout" name="horizontalLayout">
+  <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,0,0,0">
    <property name="spacing">
     <number>2</number>
    </property>
@@ -58,18 +58,25 @@
     </widget>
    </item>
    <item>
-    <spacer name="horizontalSpacer">
+    <spacer name="horizontalSpacer_2">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
-       <width>40</width>
+       <width>10</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
+   <item>
+    <widget class="QLabel" name="sizeLabel">
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
    <item>
     <widget class="QLabel" name="doneLabel">
      <property name="sizePolicy">

src/downloadmanager.h

@@ -29,6 +29,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <QFile>
 #include <QNetworkReply>
 #include <QTime>
+#include <QTimer>
 #include <QVector>
 #include <QMap>
 #include <QStringList>
@@ -77,6 +78,7 @@ private:
     qint64 m_PreResumeSize;
     std::pair<int, QString> m_Progress;
     std::tuple<int, int, int, int, int> m_SpeedDiff;
+    bool m_HasData;
     DownloadState m_State;
     int m_CurrentUrl;
     QStringList m_Urls;
@@ -114,7 +116,7 @@ private:
   private:
     static unsigned int s_NextDownloadID;
   private:
-    DownloadInfo() : m_TotalSize(0), m_ReQueried(false), m_Hidden(false), m_SpeedDiff(std::tuple<int,int,int,int,int>(0,0,0,0,0)) {}
+    DownloadInfo() : m_TotalSize(0), m_ReQueried(false), m_Hidden(false), m_SpeedDiff(std::tuple<int,int,int,int,int>(0,0,0,0,0)), m_HasData(false) {}
   };
 
 public:
@@ -136,6 +138,13 @@ public:
    **/
   bool downloadsInProgress();
 
+  /**
+  * @brief determine if a download is currently in progress, does not count paused ones.
+  *
+  * @return true if there is currently a download in progress (that is not paused already).
+  **/
+  bool downloadsInProgressNoPause();
+
   /**
    * @brief set the output directory to write to
    *
@@ -143,6 +152,17 @@ public:
    **/
   void setOutputDirectory(const QString &outputDirectory);
 
+	/**
+	* @brief disables feedback from the downlods fileSystemWhatcher untill disableDownloadsWatcherEnd() is called
+	* 
+	**/
+	static void startDisableDirWatcher();
+
+	/**
+	* @brief re-enables feedback from the downlods fileSystemWhatcher after disableDownloadsWatcherStart() was called
+	**/
+	static void endDisableDirWatcher();
+
   /**
    * @return current download directory
    **/
@@ -423,6 +443,12 @@ public slots:
 
   void queryInfo(int index);
 
+	void visitOnNexus(int index);
+
+  void openFile(int index);
+
+  void openInDownloadsFolder(int index);
+
   void nxmDescriptionAvailable(QString gameName, int modID, QVariant userData, QVariant resultData, int requestID);
 
   void nxmFilesAvailable(QString gameName, int modID, QVariant userData, QVariant resultData, int requestID);
@@ -443,6 +469,7 @@ private slots:
   void downloadError(QNetworkReply::NetworkError error);
   void metaDataChanged();
   void directoryChanged(const QString &dirctory);
+  void checkDownloadTimeout();
 
 private:
 
@@ -497,6 +524,8 @@ private:
 
   static QString getFileTypeString(int fileType);
 
+  void writeData(DownloadInfo *info);
+
 private:
 
   static const int AUTOMATIC_RETRIES = 3;
@@ -517,6 +546,12 @@ private:
 
   QFileSystemWatcher m_DirWatcher;
 
+	//The dirWatcher is actually triggering off normal Mo operations such as deleting downloads or editing .meta files
+	//so it needs to be disabled during operations that are known to cause the creation or deletion of files in the Downloads folder.
+	//Notably using QSettings to edit a file creates a temporarily .lock file that causes the Watcher to trigger multiple listRefreshes freezing the ui. 
+	static int m_DirWatcherDisabler;
+
+
   std::map<QString, int> m_DownloadFails;
 
   bool m_ShowHidden;
@@ -524,6 +559,8 @@ private:
   QRegExp m_DateExpression;
 
   MOBase::IPluginGame const *m_ManagedGame;
+
+  QTimer m_TimeoutTimer;
 };
 
 

src/instancemanager.cpp

@@ -131,11 +131,12 @@ QString InstanceManager::manageInstances(const QStringList &instanceList) const
 QString InstanceManager::queryInstanceName(const QStringList &instanceList) const
 {
   QString instanceId;
+  QString dialogText;
   while (instanceId.isEmpty()) {
     QInputDialog dialog;
 
-	dialog.setWindowTitle(QObject::tr("Enter a Name for the new Instance"));
-    dialog.setLabelText(QObject::tr("Enter a new name or select one from the sugested list (only letters and numbers allowed):"));
+	  dialog.setWindowTitle(QObject::tr("Enter a Name for the new Instance"));
+    dialog.setLabelText(QObject::tr("Enter a new name or select one from the suggested list:"));
     // would be neat if we could take the names from the game plugins but
     // the required initialization order requires the ini file to be
     // available *before* we load plugins
@@ -146,7 +147,17 @@ QString InstanceManager::queryInstanceName(const QStringList &instanceList) cons
     if (dialog.exec() == QDialog::Rejected) {
       throw MOBase::MyException(QObject::tr("Canceled"));
     }
-    instanceId = dialog.textValue().replace(QRegExp("[^0-9a-zA-Z ]"), "");
+    dialogText = dialog.textValue();
+    instanceId = sanitizeInstanceName(dialogText);
+    if (instanceId != dialogText) {
+      if (QMessageBox::question( nullptr, 
+                                QObject::tr("Invalid instance name"),
+                                QObject::tr("The instance name \"%1\" is invalid.  Use the name \"%2\" instead?").arg(dialogText,instanceId),
+                                QMessageBox::Yes | QMessageBox::No) == QMessageBox::No) {
+        instanceId="";
+        continue;
+        }
+    }
 
     bool alreadyExists=false;
     for (const QString &instance : instanceList) {
@@ -296,3 +307,21 @@ QString InstanceManager::determineDataPath()
   }
 }
 
+
+QString InstanceManager::sanitizeInstanceName(const QString &name) const
+{
+  QString new_name = name;
+
+  // Restrict the allowed characters
+  new_name = new_name.remove(QRegExp("[^A-Za-z0-9 _=+;!@#$%^'\\-\\.\\[\\]\\{\\}\\(\\)]"));
+
+  // Don't end in spaces and periods
+  new_name = new_name.remove(QRegExp("\\.*$"));
+  new_name = new_name.remove(QRegExp(" *$"));
+  
+  // Recurse until stuff stops changing
+  if (new_name != name) {
+    return sanitizeInstanceName(new_name);
+  }
+  return new_name;
+}

src/instancemanager.h

@@ -50,6 +50,7 @@ private:
 
   QString manageInstances(const QStringList &instanceList) const;
 
+  QString sanitizeInstanceName(const QString &name) const;
   void setCurrentInstance(const QString &name);
 
   QString queryInstanceName(const QStringList &instanceList) const;

src/main.cpp

@@ -446,11 +446,7 @@ static void preloadSsl()
 
 static QString getVersionDisplayString()
 {
-  VS_FIXEDFILEINFO version = GetFileVersion(ToWString(QApplication::applicationFilePath()));
-  return VersionInfo(version.dwFileVersionMS >> 16,
-    version.dwFileVersionMS & 0xFFFF,
-    version.dwFileVersionLS >> 16,
-    version.dwFileVersionLS & 0xFFFF).displayString();
+  return createVersionInfo().displayString();
 }
 
 int runApplication(MOApplication &application, SingleInstance &instance,

src/mainwindow.h

@@ -304,6 +304,8 @@ private:
 
   Ui::MainWindow *ui;
 
+  QAction *m_Sep; // Executable Shortcuts are added after this. Non owning.
+
   bool m_WasVisible;
 
   MOBase::TutorialControl m_Tutorial;
@@ -415,6 +417,8 @@ private slots:
   void visitWebPage_clicked();
   void openExplorer_clicked();
   void information_clicked();
+  void enableSelectedMods_clicked();
+  void disableSelectedMods_clicked();
   // savegame context menu
   void deleteSavegame_clicked();
   void fixMods_clicked(SaveGameInfo::MissingAssets const &missingAssets);
@@ -426,6 +430,10 @@ private slots:
   void hideFile();
   void unhideFile();
 
+  // pluginlist context menu
+  void enableSelectedPlugins_clicked();
+  void disableSelectedPlugins_clicked();
+
   void linkToolbar();
   void linkDesktop();
   void linkMenu();
@@ -498,7 +506,9 @@ private slots:
   void openInstanceFolder();
   void openLogsFolder();
   void openInstallFolder();
+	void openPluginsFolder();
   void openDownloadsFolder();
+  void openModsFolder();
   void openProfileFolder();
   void openGameFolder();
   void openMyGamesFolder();
@@ -571,6 +581,7 @@ private slots: // ui slots
   void on_executablesListBox_currentIndexChanged(int index);
   void on_modList_customContextMenuRequested(const QPoint &pos);
   void on_modList_doubleClicked(const QModelIndex &index);
+  void on_espList_doubleClicked(const QModelIndex &index);
   void on_profileBox_currentIndexChanged(int index);
   void on_savegameList_customContextMenuRequested(const QPoint &pos);
   void on_startButton_clicked();

src/mainwindow.ui

@@ -96,9 +96,9 @@
              </item>
              <item>
               <widget class="QPushButton" name="clickBlankButton">
-				      <property name="enabled">
-                 <bool>false</bool>
-               </property>							  
+               <property name="enabled">
+                <bool>false</bool>
+               </property>
                <property name="sizePolicy">
                 <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
                  <horstretch>0</horstretch>
@@ -194,7 +194,7 @@
                </widget>
               </item>
               <item>
-               <widget class="QComboBox" name="profileBox">						 
+               <widget class="QComboBox" name="profileBox">
                 <property name="toolTip">
                  <string>Pick a module collection</string>
                 </property>
@@ -248,7 +248,7 @@ p, li { white-space: pre-wrap; }
                   <height>16</height>
                  </size>
                 </property>
-				 </widget>
+               </widget>
               </item>
               <item>
                <widget class="QPushButton" name="openFolderMenu">
@@ -265,16 +265,6 @@ p, li { white-space: pre-wrap; }
                </widget>
               </item>
               <item>
-																 
-										 
-														  
-						   
-									  
-						  
-						   
-						
-					 
-					
                <widget class="QPushButton" name="restoreModsButton">
                 <property name="toolTip">
                  <string>Restore Backup...</string>
@@ -509,7 +499,7 @@ p, li { white-space: pre-wrap; }
                 </property>
                </widget>
               </item>
-			  <item>
+              <item>
                <spacer name="horizontalSpacer_5">
                 <property name="orientation">
                  <enum>Qt::Horizontal</enum>
@@ -521,7 +511,7 @@ p, li { white-space: pre-wrap; }
                  </size>
                 </property>
                </spacer>
-              </item>		
+              </item>
               <item alignment="Qt::AlignLeft">
                <widget class="QPushButton" name="clearFiltersButton">
                 <property name="sizePolicy">
@@ -536,12 +526,12 @@ p, li { white-space: pre-wrap; }
                   <height>22</height>
                  </size>
                 </property>
-				 <property name="baseSize">
+                <property name="baseSize">
                  <size>
                   <width>95</width>
                   <height>0</height>
                  </size>
-                </property>						  
+                </property>
                 <property name="visible">
                  <bool>false</bool>
                 </property>
@@ -567,7 +557,7 @@ p, li { white-space: pre-wrap; }
                </widget>
               </item>
               <item>
-				<spacer name="horizontalSpacer_4">
+               <spacer name="horizontalSpacer_4">
                 <property name="orientation">
                  <enum>Qt::Horizontal</enum>
                 </property>
@@ -579,14 +569,14 @@ p, li { white-space: pre-wrap; }
                 </property>
                </spacer>
               </item>
-              <item>								 
-               <widget class="QComboBox" name="groupCombo">					 
-				<property name="baseSize">
+              <item>
+               <widget class="QComboBox" name="groupCombo">
+                <property name="baseSize">
                  <size>
                   <width>220</width>
                   <height>0</height>
                  </size>
-                </property>						  
+                </property>
                 <property name="focusPolicy">
                  <enum>Qt::ClickFocus</enum>
                 </property>
@@ -608,13 +598,13 @@ p, li { white-space: pre-wrap; }
                </widget>
               </item>
               <item>
-               <widget class="MOBase::LineEditClear" name="modFilterEdit">					
-			    <property name="baseSize">
+               <widget class="MOBase::LineEditClear" name="modFilterEdit">
+                <property name="baseSize">
                  <size>
                   <width>220</width>
                   <height>0</height>
                  </size>
-                </property>					  
+                </property>
                 <property name="placeholderText">
                  <string>Namefilter</string>
                 </property>
@@ -835,12 +825,12 @@ p, li { white-space: pre-wrap; }
                  <layout class="QHBoxLayout" name="horizontalLayout_7">
                   <item>
                    <widget class="QPushButton" name="bossButton">
-					<property name="visible">
-                      <bool>true</bool>
-                    </property>									   																 
+                    <property name="visible">
+                     <bool>true</bool>
+                    </property>
                     <property name="text">
                      <string>Sort</string>
-                    </property>              
+                    </property>
                     <property name="icon">
                      <iconset resource="resources.qrc">
                       <normaloff>:/MO/gui/sort</normaloff>:/MO/gui/sort</iconset>
@@ -954,6 +944,9 @@ p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;This list contains the esps, esms, and esls contained in the active mods. These require their own load order. Use drag&amp;amp;drop to modify this load order. Please note that MO will only save the load order for mods that are active/checked.&lt;br /&gt;There is a great tool named &amp;quot;BOSS&amp;quot; to automatically sort these files.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                   </property>
+                  <property name="editTriggers">
+                   <set>QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked</set>
+                  </property>
                   <property name="dragEnabled">
                    <bool>true</bool>
                   </property>
@@ -987,6 +980,9 @@ p, li { white-space: pre-wrap; }
                   <property name="sortingEnabled">
                    <bool>true</bool>
                   </property>
+                  <property name="expandsOnDoubleClick">
+                   <bool>false</bool>
+                  </property>
                   <attribute name="headerStretchLastSection">
                    <bool>false</bool>
                   </attribute>
@@ -1009,15 +1005,12 @@ p, li { white-space: pre-wrap; }
                </layout>
               </widget>
               <widget class="QWidget" name="bsaTab">
-										
-								  
-						  
+               <property name="visible">
+                <bool>false</bool>
+               </property>
                <attribute name="title">
                 <string>Archives</string>
                </attribute>
-			   <property name="visible">
-				<bool>true</bool>
-               </property>
                <layout class="QVBoxLayout" name="verticalLayout_9">
                 <property name="leftMargin">
                  <number>6</number>
@@ -1032,17 +1025,7 @@ p, li { white-space: pre-wrap; }
                  <number>6</number>
                 </property>
                 <item>
-                 <layout class="QHBoxLayout" name="horizontalLayout_9" stretch="0,1">
-                  <!--<item>-->
-                   <!--<widget class="QCheckBox" name="manageArchivesBox">-->
-                    <!--<property name="text">-->
-                     <!--<string/>-->
-                    <!--</property>-->
-                    <!--<property name="checked">-->
-                     <!--<bool>true</bool>-->
-                    <!--</property>-->
-                   <!--</widget>-->
-                  <!--</item>-->
+                 <layout class="QHBoxLayout" name="horizontalLayout_9" stretch="0">
                   <item>
                    <widget class="QLabel" name="managedArchiveLabel">
                     <property name="toolTip">
@@ -1072,50 +1055,24 @@ p, li { white-space: pre-wrap; }
 
                     BSAs checked here are loaded in such a way that your installation order is obeyed properly.</string>
                   </property>
-                  <property name="editTriggers">
-                   <set>QAbstractItemView::NoEditTriggers</set>
-                  </property>
                   <property name="showDropIndicator" stdset="0">
                    <bool>false</bool>
                   </property>
-                  <property name="dragEnabled">
+                  <property name="dragEnabled" stdset="0">
                    <bool>false</bool>
                   </property>
-                  <property name="dragDropOverwriteMode">
+                  <property name="dragDropOverwriteMode" stdset="0">
                    <bool>false</bool>
                   </property>
-                  <property name="dragDropMode">
-                   <enum>QAbstractItemView::NoDragDrop</enum>
-                  </property>
-                  <property name="defaultDropAction">
-                   <enum>Qt::IgnoreAction</enum>
-                  </property>
-                  <property name="selectionMode">
-                   <enum>QAbstractItemView::SingleSelection</enum>
-                  </property>
-                  <property name="selectionBehavior">
-                   <enum>QAbstractItemView::SelectRows</enum>
-                  </property>
-                  <property name="indentation">
+                  <property name="indentation" stdset="0">
                    <number>20</number>
                   </property>
-                  <property name="itemsExpandable">
+                  <property name="itemsExpandable" stdset="0">
                    <bool>true</bool>
                   </property>
-                  <property name="columnCount">
+                  <property name="columnCount" stdset="0">
                    <number>1</number>
                   </property>
-                  <attribute name="headerVisible">
-                   <bool>false</bool>
-                  </attribute>
-                  <attribute name="headerDefaultSectionSize">
-                   <number>200</number>
-                  </attribute>
-                  <column>
-                   <property name="text">
-                    <string>File</string>
-                   </property>
-                  </column>
                  </widget>
                 </item>
                </layout>
@@ -1286,7 +1243,7 @@ p, li { white-space: pre-wrap; }
                      <enum>Qt::ScrollBarAlwaysOn</enum>
                     </property>
                     <property name="horizontalScrollBarPolicy">
-                     <enum>Qt::ScrollBarAlwaysOff</enum>
+                      <enum>Qt::ScrollBarAsNeeded</enum>
                     </property>
                     <property name="dragEnabled">
                      <bool>true</bool>
@@ -1319,7 +1276,10 @@ p, li { white-space: pre-wrap; }
                      <bool>true</bool>
                     </property>
                     <attribute name="headerDefaultSectionSize">
-                     <number>100</number>
+                     <number>50</number>
+                    </attribute>
+					<attribute name="headerMinimumSectionSize">
+                     <number>15</number>
                     </attribute>
                     <attribute name="headerStretchLastSection">
                      <bool>true</bool>
@@ -1601,9 +1561,6 @@ Right now this has very limited functionality</string>
    <property name="text">
     <string>Copy Log to Clipboard</string>
    </property>
-   <property name="shortcut">
-    <string>Ctrl+C</string>
-   </property>
   </action>
   <action name="actionChange_Game">
    <property name="icon">

src/modinfo.cpp

@@ -102,6 +102,7 @@ QString ModInfo::getContentTypeName(int contentType)
     case CONTENT_SKSE:      return tr("Script Extender");
     case CONTENT_SKYPROC:   return tr("SkyProc Tools");
     case CONTENT_MCM:       return tr("MCM Data");
+    case CONTENT_INI:       return tr("INI files");
     default: throw MyException(tr("invalid content type %1").arg(contentType));
   }
 }
@@ -286,9 +287,9 @@ int ModInfo::checkAllForUpdate(PluginContainer *pluginContainer, QObject *receiv
   int result = 0;
   std::vector<int> modIDs;
 
-  //I ought to store this, it's used elsewhere
-  IPluginGame const *game = qApp->property("managed_game").value<IPluginGame *>();
-  if (game->nexusModOrganizerID()) {
+  // Normally this would be the managed game but MO2 is only uploaded to the Skyrim SE site right now
+  IPluginGame const *game = pluginContainer->managedGame("Skyrim Special Edition");
+  if (game && game->nexusModOrganizerID()) {
     modIDs.push_back(game->nexusModOrganizerID());
     checkChunkForUpdate(pluginContainer, modIDs, receiver, game->gameShortName());
     modIDs.clear();

src/modinfo.h

@@ -84,10 +84,11 @@ public:
     CONTENT_SCRIPT,
     CONTENT_SKSE,
     CONTENT_SKYPROC,
-    CONTENT_MCM
+    CONTENT_MCM,
+    CONTENT_INI
   };
 
-  static const int NUM_CONTENT_TYPES = CONTENT_MCM + 1;
+  static const int NUM_CONTENT_TYPES = CONTENT_INI + 1;
 
   enum EHighlight {
     HIGHLIGHT_NONE = 0,