Merge pull request #123 from CarVac/testbuild

Testbuild
CarVac · Nov 22, 2020 · 6f464f8 · 6f464f8
2 parents a544d2d + 678af00
commit 6f464f8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/filmulator-gui/database/dbSetup.cpp b/filmulator-gui/database/dbSetup.cpp
@@ -42,7 +42,11 @@ DBSuccess setupDB(QSqlDatabase *db)
     query.exec("PRAGMA user_version;");
     query.next();
     const int oldVersion = query.value(0).toInt();
-    if (oldVersion > 13)//=================================================================version check here!
+    if (oldVersion == 0)
+    {
+        std::cout << "First initialization." << std::endl;
+    }
+    else if (oldVersion > 13)//=================================================================version check here!
     {
         std::cout << "Newer database format. Aborting." << std::endl;
         return DBSuccess::failure;
@@ -136,14 +140,14 @@ DBSuccess setupDB(QSqlDatabase *db)
                "ProcTbwRmult real,"                         //37
                "ProcTbwGmult real,"                         //38
                "ProcTbwBmult real,"                         //39
-               "ProcTtoeBoundary real"                      //40
+               "ProcTtoeBoundary real,"                     //40
                "ProcTlensfunName varchar,"                  //41
                "ProcTlensfunCa integer,"                    //42
                "ProcTlensfunVign integer,"                  //43
                "ProcTlensfunDist integer,"                  //44
                "ProcTrotationAngle real,"                   //45
                "ProcTrotationPointX real,"                  //46
-               "ProcTrotationPointY real,"                  //47
+               "ProcTrotationPointY real"                   //47
                ");"
                );
 
@@ -192,7 +196,7 @@ DBSuccess setupDB(QSqlDatabase *db)
                "ProfTlensfunDist integer,"                  //39
                "ProfTrotationAngle real,"                   //40
                "ProfTrotationPointX real,"                  //41
-               "ProfTrotationPointY real,"                  //42
+               "ProfTrotationPointY real"                   //42
                ");"
                );
 

diff --git a/filmulator-gui/qml/filmulator-gui/Edit.qml b/filmulator-gui/qml/filmulator-gui/Edit.qml
@@ -2653,7 +2653,7 @@ SlimSplitView {
             anchors.right: rotateRight.left
             y: 0 * uiScale
             notDisabled: root.previewReady && !root.cropping
-            tooltipText: (root.leveling ? qsTr("Click this to apply the rotation.") : qsTr("Click this to begin leveling the image.")) + "\n\n" + qsTr("Click to place the rotation guide on the image, then drag the guide lines to align them with whatever you want to be vertical or horizontal. You can reposition the rotation guide by dragging where the guide lines meet.\n\nReset the rotation to zero by pressing \"Shift+L\".\n\nShortcut: L")
+            tooltipText: (root.leveling ? qsTr("Click this to apply the rotation.") : qsTr("Click this to begin leveling the image.")) + "\n\n" + qsTr("Click to place the rotation guide on the image, then drag the guide lines to align them with whatever you want to be vertical or horizontal. You can reposition the rotation guide by dragging where the guide lines meet.\n\nReset the rotation to zero by pressing \"Shift+L\" or double right clicking.\n\nShortcut: L")
             Image {
                 width: 14 * uiScale
                 height: 14 * uiScale