From 54a743faea566d9040a1f972aef6d077ff68b198 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Sat, 25 May 2019 03:23:08 -0400
Subject: reordered action variables to match the order in the context menu,
 added a few missing initializations

---
 src/modinfodialog.cpp | 16 +++++++++-------
 src/modinfodialog.h   |  6 +++---
 2 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/modinfodialog.cpp b/src/modinfodialog.cpp
index 5fb3e9cf..9bd36f7e 100644
--- a/src/modinfodialog.cpp
+++ b/src/modinfodialog.cpp
@@ -322,7 +322,8 @@ bool ExpanderWidget::opened() const
 ModInfoDialog::ModInfoDialog(ModInfo::Ptr modInfo, const DirectoryEntry *directory, bool unmanaged, OrganizerCore *organizerCore, PluginContainer *pluginContainer, QWidget *parent)
   : TutorableDialog("ModInfoDialog", parent), ui(new Ui::ModInfoDialog), m_ModInfo(modInfo),
   m_ThumbnailMapper(this), m_RequestStarted(false),
-  m_DeleteAction(nullptr), m_RenameAction(nullptr), m_OpenAction(nullptr),
+  m_NewFolderAction(nullptr), m_OpenAction(nullptr), m_RenameAction(nullptr),
+  m_DeleteAction(nullptr), m_HideAction(nullptr), m_UnhideAction(nullptr),
   m_Directory(directory), m_Origin(nullptr),
   m_OrganizerCore(organizerCore), m_PluginContainer(pluginContainer)
 {
@@ -480,16 +481,17 @@ void ModInfoDialog::initFiletree(ModInfo::Ptr modInfo)
   ui->fileTree->setRootIndex(m_FileSystemModel->index(m_RootPath));
   ui->fileTree->setColumnWidth(0, 300);
 
-  m_DeleteAction = new QAction(tr("&Delete"), ui->fileTree);
+  m_NewFolderAction = new QAction(tr("&New Folder"), ui->fileTree);
+  m_OpenAction = new QAction(tr("&Open"), ui->fileTree);
   m_RenameAction = new QAction(tr("&Rename"), ui->fileTree);
+  m_DeleteAction = new QAction(tr("&Delete"), ui->fileTree);
   m_HideAction = new QAction(tr("&Hide"), ui->fileTree);
   m_UnhideAction = new QAction(tr("&Unhide"), ui->fileTree);
-  m_OpenAction = new QAction(tr("&Open"), ui->fileTree);
-  m_NewFolderAction = new QAction(tr("&New Folder"), ui->fileTree);
-  QObject::connect(m_DeleteAction, SIGNAL(triggered()), this, SLOT(deleteTriggered()));
-  QObject::connect(m_RenameAction, SIGNAL(triggered()), this, SLOT(renameTriggered()));
-  QObject::connect(m_OpenAction, SIGNAL(triggered()), this, SLOT(openTriggered()));
+
   QObject::connect(m_NewFolderAction, SIGNAL(triggered()), this, SLOT(createDirectoryTriggered()));
+  QObject::connect(m_OpenAction, SIGNAL(triggered()), this, SLOT(openTriggered()));
+  QObject::connect(m_RenameAction, SIGNAL(triggered()), this, SLOT(renameTriggered()));
+  QObject::connect(m_DeleteAction, SIGNAL(triggered()), this, SLOT(deleteTriggered()));
   QObject::connect(m_HideAction, SIGNAL(triggered()), this, SLOT(hideTriggered()));
   connect(m_UnhideAction, SIGNAL(triggered()), this, SLOT(unhideTriggered()));
 }
diff --git a/src/modinfodialog.h b/src/modinfodialog.h
index fdea2d4d..6bf30a52 100644
--- a/src/modinfodialog.h
+++ b/src/modinfodialog.h
@@ -414,10 +414,10 @@ private:
   std::set<int> m_RequestIDs;
   bool m_RequestStarted;
 
-  QAction *m_DeleteAction;
-  QAction *m_RenameAction;
-  QAction *m_OpenAction;
   QAction *m_NewFolderAction;
+  QAction *m_OpenAction;
+  QAction *m_RenameAction;
+  QAction *m_DeleteAction;
   QAction *m_HideAction;
   QAction *m_UnhideAction;
 
-- 
cgit v1.3.1