Various compatibility updates

bcdialog.cpp

@@ -177,7 +177,7 @@ QString BCDialog::getSaveFileName(QWidget  *parent, QSettings *settings, const Q
             name = QStringLiteral("vgsCard");
         }
         QString ext = dialog.defaultSuffix().isEmpty() ? QString() : QStringLiteral(".%1").arg(dialog.defaultSuffix());
-        dialog.selectFile(QStringLiteral("%1%2%3%4").arg(dialog.directory().path(), QDir::separator(), name, ext));
+        dialog.selectFile(QStringLiteral("%1%2").arg(name, ext));
     });
 
     if(dialog.exec() == QFileDialog::Accepted) {

blackchocobo.appdata.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component type="desktop">
+  <id>Black_Chocobo.desktop</id>
+  <name>Black Chocobo</name>
+  <summary>A Save Editor for Final Fantasy VII</summary>
+  <description>
+    <p>
+        Black Chocobo is a save editor for Final Fantasy VII.
+    </p>
+    <p>
+        Do alot of things with ff7 saves, Including Convert Region or Format. Start New Game+ and more.
+        Supports PC (98 + Steam), Emulators, PS3, PSP/ PsVita and Switch versions.
+    </p>
+  </description>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-3.0+</project_license>
+  <url type="homepage">https://github.com/sithlord48/blackchocobo</url>
+  <url type="bugtracker">https://github.com/sithlord48/blackchocobo/issues</url>
+  <url type="donation">http://sourceforge.net/p/blackchocobo/donate/</url>
+  <project_group>Games</project_group>
+</component>

ff7tk/widgets/CharEditor.cpp

@@ -391,7 +391,7 @@ void CharEditor::updateText()
     if (!list_limits) {
         list_limits = new QListWidget();
         list_limits->addItems(FF7Char::instance()->limits(0));
-        list_limits->setFixedHeight( (list_limits->sizeHintForRow(0) * 7) + list_limits->contentsMargins().top() + list_limits->contentsMargins().bottom());
+        list_limits->setFixedHeight( (list_limits->sizeHintForRow(0) * 7) + list_limits->contentsMargins().top() + list_limits->contentsMargins().bottom() + 4);
     } else {
         for (int i = 0; i < list_limits->count(); i++)
             list_limits->item(i)->setText(FF7Char::instance()->limits(data.id).at(i));

ff7tk/widgets/ItemList.cpp

@@ -138,7 +138,7 @@ ItemList::ItemList(qreal Scale, QWidget *parent) : QTableWidget(parent)
         itemlist.append(FF7Item::EmptyItemData);   //initlize the data.
     }
     itemSelector->setFixedHeight(fontMetrics().height());
-    setFixedWidth(itemSelector->width() + (verticalScrollBar()->width() / 4) + contentsMargins().left() + contentsMargins().right());
+    setFixedWidth(itemSelector->width() + verticalScrollBar()->sizeHint().width() + 7);
     itemSelector->close();
     createdSelector = false;
     itemupdate();// redraw Display After data init.

ff7tk/widgets/ItemSelector.cpp

@@ -29,6 +29,7 @@ void ItemSelector::init_display()
     QSize iconSize = QSize(fontMetrics().height(), fontMetrics().height());
     combo_type = new QComboBox;
     combo_type->setIconSize(iconSize);
+
     combo_item = new QComboBox;
     combo_item->setIconSize(iconSize);
 
@@ -43,19 +44,22 @@ void ItemSelector::init_display()
     btn_remove->setIconSize(iconSize);
     btn_remove->setIcon(QIcon::fromTheme(QStringLiteral("edit-clear"), QPixmap(":/common/edit-clear")));
     btn_remove->setToolTip(tr("Empty Item"));
-    btn_remove->setFixedWidth(fontMetrics().horizontalAdvance(QStringLiteral("WW")));
     btn_remove->setShortcut(QKeySequence::Delete);
 
     init_data(); //before setting layout set dat
+    btn_remove->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
+    combo_type->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
+    combo_item->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
+    combo_type->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
     QHBoxLayout *layout = new QHBoxLayout;
     layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
     layout->addWidget(combo_type);
     layout->addWidget(combo_item);
     layout->addWidget(sb_qty);
     layout->addWidget(btn_remove);
-    this->setLayout(layout);
-    this->adjustSize();
+    setLayout(layout);
+    adjustSize();
 }
 void ItemSelector::setMaximumQty(int maxQty)
 {
@@ -232,21 +236,22 @@ int ItemSelector::type_offset(int type)
     }
     return offset;
 }
+
 int ItemSelector::id(void)
 {
     return int(FF7Item::instance()->itemId(current_item));
 }
 int ItemSelector::combo_item_width()
 {
-    return combo_item->width();
+    return combo_item->sizeHint().width();
 }
 int ItemSelector::combo_type_width()
 {
-    return int(combo_type->width() * 0.2);
+    return combo_type->sizeHint().width();
 }
 int ItemSelector::qty_width()
 {
-    return int((sb_qty->width() + btn_remove->width()) * 0.55);
+    return sb_qty->sizeHint().width() + btn_remove->sizeHint().width();
 }
 
 void ItemSelector::setFixedHeight(int h)

main.cpp

@@ -45,6 +45,9 @@ int main(int argc, char *argv[])
     //Start application init.
     Q_INIT_RESOURCE(images);
     QApplication a(argc, argv);
+#ifndef Q_OS_LINUX
+    a.setStyle(QStyleFactory::create("Fusion"));
+#endif
     a.setAttribute(Qt::AA_DontUseNativeDialogs);
     a.setApplicationName("Black Chocobo");
     a.setApplicationVersion(version.toString());

mainwindow.cpp

@@ -407,30 +407,43 @@ void MainWindow::loadBasicSettings()
 #endif
     //are any empty? if so set them accordingly.
 
+    if (settings->value(SETTINGS::SIDEBARURLS).isNull()) {
+        QStringList defaultBarUrls;
+        defaultBarUrls.append(QDir::rootPath());
+        defaultBarUrls.append(QStandardPaths::writableLocation(QStandardPaths::HomeLocation));
+        if (!settings->value(SETTINGS::LOADPATH).toString().isEmpty())
+            defaultBarUrls.append(settings->value(SETTINGS::LOADPATH).toString());
+        if (!settings->value(SETTINGS::PCSAVEPATH).toString().isEmpty())
+            defaultBarUrls.append(settings->value(SETTINGS::PCSAVEPATH).toString());
+        if (!settings->value(SETTINGS::EMUSAVEPATH).toString().isEmpty())
+            defaultBarUrls.append(settings->value(SETTINGS::EMUSAVEPATH).toString());
+        if (!settings->value(SETTINGS::STATFOLDER).toString().isEmpty())
+            defaultBarUrls.append(settings->value(SETTINGS::STATFOLDER).toString());
+        settings->setValue(SETTINGS::SIDEBARURLS, defaultBarUrls);
+    }
     if (settings->value(SETTINGS::SCALE).isNull())
+#ifndef Q_OS_MAC
+        settings->setValue(SETTINGS::SCALE, std::max(double(qApp->desktop()->logicalDpiX() / 96.0f), 1.0));
+#else
         settings->setValue(SETTINGS::SCALE, std::max(double(qApp->desktop()->logicalDpiX() / 72.0f), 1.0));
-
+#endif
     if (settings->value(SETTINGS::EDITABLECOMBOS).isNull())
         settings->setValue(SETTINGS::EDITABLECOMBOS, true);
 
     if (settings->value(SETTINGS::REGION).isNull())
         settings->setValue(SETTINGS::REGION, QStringLiteral("NTSC-U"));
 
+    if (settings->value(SETTINGS::MAINGEOMETRY).isNull()) {
+        setGeometry(x(), y(), minimumWidth(), minimumHeight());
+        saveGeometry();
+    }
     restoreGeometry(settings->value(SETTINGS::MAINGEOMETRY).toByteArray());
 }
 
 void MainWindow::loadChildWidgetSettings()
 {
     QApplication::setAttribute(Qt::AA_DontUseNativeDialogs, !settings->value(SETTINGS::USENATIVEDIALOGS, false).toBool());
-    QStringList defaultBarUrls {
-        QDir::rootPath(),
-        QStandardPaths::writableLocation(QStandardPaths::HomeLocation),
-        settings->value(SETTINGS::LOADPATH).toString(),
-        settings->value(SETTINGS::PCSAVEPATH).toString(),
-        settings->value(SETTINGS::EMUSAVEPATH).toString(),
-        settings->value(SETTINGS::STATFOLDER).toString()
-    };
-    for(const QString &url : settings->value(SETTINGS::SIDEBARURLS, defaultBarUrls).toStringList())
+    for(const QString &url : settings->value(SETTINGS::SIDEBARURLS).toStringList())
         m_sideBarUrls.append(QUrl::fromLocalFile(url));
     char_editor->setEditableComboBoxes(settings->value(SETTINGS::EDITABLECOMBOS, true).toBool());
     materia_editor->setEditableMateriaCombo(settings->value(SETTINGS::EDITABLECOMBOS, true).toBool());