Merge

3 files changed, 8 insertions, 7 deletions

diff --git a/src/editexecutablesdialog.ui b/src/editexecutablesdialog.ui
index 708d512c..5a1137c9 100644
--- a/src/editexecutablesdialog.ui
+++ b/src/editexecutablesdialog.ui
@@ -26,7 +26,7 @@
       <enum>QAbstractItemView::InternalMove</enum>

      </property>

      <property name="defaultDropAction">

-      <enum>Qt::MoveAction</enum>

+      <enum>Qt::TargetMoveAction</enum>

      </property>

      <property name="selectionMode">

       <enum>QAbstractItemView::ExtendedSelection</enum>

diff --git a/src/main.cpp b/src/main.cpp
index ac0582bf..549de4a9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -170,6 +170,8 @@ void cleanupDir()
     "proxy.dll"

   };

 

+  qDebug("removing obsolete files");

+

   for (const QString &fileName : fileNames) {

     QString fullPath = qApp->applicationDirPath() + "/" + fileName;

     if (QFile::exists(fullPath)

@@ -430,9 +432,9 @@ int main(int argc, char *argv[])
     } // we continue for the primary instance OR if MO has been called with parameters

 

     QSettings settings(dataPath + "/" + QString::fromStdWString(AppConfig::iniFileName()), QSettings::IniFormat);

-

+    qDebug("initializing core");

     OrganizerCore organizer(settings);

-

+    qDebug("initialize plugins");

     PluginContainer pluginContainer(&organizer);

     pluginContainer.loadPlugins();

 

diff --git a/src/modinfodialog.cpp b/src/modinfodialog.cpp
index f1bb97c7..5f79a9e2 100644
--- a/src/modinfodialog.cpp
+++ b/src/modinfodialog.cpp
@@ -395,7 +395,6 @@ const int ModInfoDialog::getModID() const
   return m_Settings->value("modid", 0).toInt();

 }

 

-

 void ModInfoDialog::openTab(int tab)

 {

   QTabWidget *tabWidget = findChild<QTabWidget*>("tabWidget");

@@ -407,16 +406,16 @@ void ModInfoDialog::openTab(int tab)
 void ModInfoDialog::thumbnailClicked(const QString &fileName)

 {

   QLabel *imageLabel = findChild<QLabel*>("imageLabel");

+  imageLabel->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);

   QImage image(fileName);

   if (static_cast<float>(image.width()) / static_cast<float>(image.height()) > 1.34) {

-    image = image.scaledToWidth(imageLabel->width());

+    image = image.scaledToWidth(imageLabel->geometry().width());

   } else {

-    image = image.scaledToHeight(imageLabel->height());

+    image = image.scaledToHeight(imageLabel->geometry().height());

   }

   imageLabel->setPixmap(QPixmap::fromImage(image));

 }

 

-

 bool ModInfoDialog::allowNavigateFromTXT()

 {

   if (ui->saveTXTButton->isEnabled()) {