v1.10.0

sithlord48 · Feb 8, 2020 · e0e6989 · e0e6989
1 parent 31ba048
commit e0e6989
Show file tree

Hide file tree

Showing 13 changed files with 6,434 additions and 6,084 deletions.
diff --git a/Black_Chocobo.pro b/Black_Chocobo.pro
@@ -139,7 +139,7 @@ win32: {
 	QMAKE_CXXFLAGS += -mno-ms-bitfields
 	}
 	#Windows RC Info Below
-	VERSION = 1.9.96
+	VERSION = 1.10.0
 	QMAKE_TARGET_COMPANY = Black Chocobo Devs
 	QMAKE_TARGET_DESCRIPTION = Final Fantasy 7 Save Editor
 	QMAKE_TARGET_COPYRIGHT = 2010 - 2020 Chris Rizzitello

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 project( blackchocobo )
 set(blackchocobo_VERSION_MAJOR 1)
-set(blackchocobo_VERSION_MINOR 9)
-set(blackchocobo_VERSION_PATCH 96)
+set(blackchocobo_VERSION_MINOR 10)
+set(blackchocobo_VERSION_PATCH 0)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_AUTOMOC ON)

diff --git a/about.ui b/about.ui
@@ -258,7 +258,7 @@ p, li { white-space: pre-wrap; }
          </item>
          <item>
           <property name="text">
-           <string>Finalized format Suport PS3 export (psv)</string>
+           <string>Finalized format Support PS3 export (psv)</string>
           </property>
          </item>
          <item>

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,11 @@
+blackchocobo (1.10.0) trusty; urgency=low
+  *New: PSV Signing
+  *New: VMP Signing
+  *New: Switch save Support
+  *New: Common single save types Supported
+  *Many bug fixes.
+ -- Chris Rizzitello <[email protected]>  Fri, 7 Feb 2020 12:00:00 -0400
+
 blackchocobo (1.9.910) trusty; urgency=low
   *New: More HiDpi Adjustments
   *Fixed: track the hex Editor tab's curosr position on tab changes. 

diff --git a/lang/bchoco_de.ts b/lang/bchoco_de.ts
diff --git a/lang/bchoco_en.ts b/lang/bchoco_en.ts
diff --git a/lang/bchoco_es.ts b/lang/bchoco_es.ts
diff --git a/lang/bchoco_fr.ts b/lang/bchoco_fr.ts
diff --git a/lang/bchoco_ja.ts b/lang/bchoco_ja.ts
diff --git a/lang/bchoco_re.ts b/lang/bchoco_re.ts
diff --git a/main.cpp b/main.cpp
@@ -33,7 +33,7 @@ Q_IMPORT_PLUGIN(qkrcodecs)
 
 int main(int argc, char *argv[])
 {
-    QVersionNumber version(1, 9, 96);
+    QVersionNumber version(1, 10, 0);
 
     if(argc >1) {
         if(QString(argv[1]) == "--help" || QString(argv[1]) =="-h")

diff --git a/mainwindow.cpp b/mainwindow.cpp
@@ -22,6 +22,7 @@
 #include "ff7tk/data/FF7Location.h"
 #include "bcdialog.h"
 #include "bcsettings.h"
+#include <QString>
 /*~~~~~~~~GUI Set Up~~~~~~~*/
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
@@ -165,7 +166,7 @@ void MainWindow::initDisplay()
 
 void MainWindow::setScale(double scale)
 {
-    scale = std::max(scale, 1.0);
+    scale = std::max(scale, 0.5);
     setStyleSheet(QString("QCheckBox::indicator{width: %1px; height: %1px; padding: -%2px;}\nQListWidget::indicator{width: %1px; height: %1px; padding: -%2px}").arg(fontMetrics().height()).arg(2 * scale));
     ui->btn_cloud->setFixedSize(int(98 * scale), int(110 * scale));
     ui->btn_cloud->setIconSize(QSize(int(92 * scale), int(104 * scale)));
@@ -386,12 +387,17 @@ void MainWindow::init_connections()
 
 void MainWindow::loadBasicSettings()
 {
-    if (BCSettings::instance()->value(SETTINGS::SCALE).isNull())
-#ifndef Q_OS_MAC
-        BCSettings::instance()->setValue(SETTINGS::SCALE, std::max(double(qApp->desktop()->logicalDpiX() / 96.0f), 1.0));
-#else
-        BCSettings::instance()->setValue(SETTINGS::SCALE, std::max(double(qApp->desktop()->logicalDpiX() / 72.0f), 1.0));
+    if (BCSettings::instance()->value(SETTINGS::SCALE).isNull()) {
+        double stdDPI = 96.0;
+#ifdef Q_OS_MAC
+        stdDPI = 72.0;
 #endif
+        double scale = QString::number(qApp->desktop()->logicalDpiX() / stdDPI, 'f', 2).toDouble();
+        double sy = int(scale * 100) % 25;
+        scale -= (sy / 100);
+        scale = ( sy < 12.49) ? scale : scale + 0.25;
+        BCSettings::instance()->setValue(SETTINGS::SCALE, std::max(scale, 0.5));
+    }
 
     if (BCSettings::instance()->value(SETTINGS::MAINGEOMETRY).isNull()) {
         setGeometry(x(), y(), minimumWidth(), minimumHeight());

diff --git a/mainwindow.ui b/mainwindow.ui
@@ -7288,7 +7288,7 @@ Var And Scrolling Synced To Left Table</string>
     <string>&amp;Configure</string>
    </property>
    <property name="toolTip">
-    <string>Applicaion Preferences</string>
+    <string>Application Preferences</string>
    </property>
    <property name="shortcut">
     <string>F2</string>