Merge branch 'powertab:master' into patch-1

Author: sbonaime

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Install Apt Dependencies
       run: sudo apt update && sudo apt install ninja-build qt6-base-dev libglx-dev libgl1-mesa-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libboost-dev libboost-date-time-dev libboost-iostreams-dev nlohmann-json3-dev libasound2-dev librtmidi-dev libpugixml-dev libminizip-dev doctest-dev
     - name: Create Build Directory
@@ -31,10 +31,10 @@ jobs:
 
   build-osx:
 
-    runs-on: macos-13
+    runs-on: macos-15-intel
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Version number
       id: version
@@ -66,7 +66,7 @@ jobs:
     # Skip building the installer for PRs, since code signing / notarizing requires access to the repo's secrets.
     - name: Add Certificates to Keychain
       if: github.event_name != 'pull_request'
-      uses: apple-actions/import-codesign-certs@v5
+      uses: apple-actions/import-codesign-certs@v6
       with:
         p12-file-base64: ${{ secrets.MAC_CERTS_BASE64 }}
         p12-password: ${{ secrets.MAC_CERTS_PASSWORD }}
@@ -79,7 +79,7 @@ jobs:
 
     - name: Upload Installer
       if: github.event_name != 'pull_request'
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v6
       with:
         name: powertabeditor-osx-${{ steps.version.outputs.VERSION_ID }}.dmg
         path: ${{runner.workspace}}/build/powertabeditor-osx.dmg
@@ -90,7 +90,7 @@ jobs:
     runs-on: windows-2022
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Version number
       id: version
@@ -121,7 +121,7 @@ jobs:
         mv installer/windows/powertabeditor.exe installer/windows/powertabeditor-windows-${{ steps.version.outputs.VERSION_ID }}.exe
 
     - name: Upload Installer
-      uses: actions/upload-artifact@v5
+      uses: actions/upload-artifact@v6
       with:
         name: powertabeditor-windows-${{ steps.version.outputs.VERSION_ID }}.exe
         path: installer/windows/powertabeditor-windows-${{ steps.version.outputs.VERSION_ID }}.exe

.github/workflows/snap.yml

@@ -16,7 +16,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         ref:  ${{ github.event.inputs.branch }}
 

CHANGELOG.md

@@ -5,8 +5,10 @@ All notable changes to this project will be documented in this file.
 
 Thanks to the following contributors who worked on this release:
 - @cameronwhite
+- @sbonaime
 
 ### Added
+- Added preference for whether the outline around each system is drawn (#550)
 
 ### Changed
 
@@ -24,6 +26,7 @@ Thanks to the following contributors who worked on this release:
 - Fixed issues with overriding the application's language on macOS via the system settings (#507)
 - Fixed an issue which could cause a secondary language to be used for translations rather than the primary system language (#527, #528)
 - Added missing German and Chinese (Simplified) translations which previously were not being packaged
+- Fixed crash when loading an invalid tuning dictionary file (#543, #535)
 
 ## [2.0.21] - 2024-11-20
 

source/app/scorearea.cpp

@@ -14,7 +14,7 @@
   * You should have received a copy of the GNU General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-  
+
 #include "scorearea.h"
 
 #include <app/documentmanager.h>
@@ -65,11 +65,13 @@ ScoreArea::ScoreArea(SettingsManager &settings_manager, QWidget *parent)
     // changes.
     loadTheme(settings_manager, /* redraw */ false);
     loadSystemSpacing(settings_manager, false);
+    loadDrawSystemOutline(settings_manager, false);
     mySettingsListener = settings_manager.subscribeToChanges(
         [&]()
         {
             loadTheme(settings_manager);
             loadSystemSpacing(settings_manager);
+            loadDrawSystemOutline(settings_manager);
         });
 
     // Connect the click event handler to our public signals.
@@ -371,3 +373,18 @@ ScoreArea::loadSystemSpacing(const SettingsManager &settings_manager, bool redra
     if (redraw && mySystemSpacing != prev_spacing)
         this->renderDocument(*myDocument);
 }
+
+void
+ScoreArea::loadDrawSystemOutline(const SettingsManager &settings_manager, bool redraw)
+{
+    auto settings = settings_manager.getReadHandle();
+    const bool prev_value = myDrawSystemOutline;
+    myDrawSystemOutline = settings->get(Settings::DrawSystemOutline);
+    if (redraw && myDrawSystemOutline != prev_value)
+        this->renderDocument(*myDocument);
+}
+
+bool ScoreArea::getDrawSystemOutline() const
+{
+    return myDrawSystemOutline;
+}

source/app/scorearea.h

@@ -14,7 +14,7 @@
   * You should have received a copy of the GNU General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-  
+
 #ifndef APP_SCOREAREA_H
 #define APP_SCOREAREA_H
 
@@ -65,6 +65,9 @@ class ScoreArea : public QGraphicsView
     /// returns the palette used by scorearea
     const QPalette *getPalette() const;
 
+    /// Check if system outline should be drawn
+    bool getDrawSystemOutline() const;
+
 signals:
     void itemClicked(ScoreItem item, const ConstScoreLocation &location,
                      ScoreItemAction action);
@@ -81,13 +84,15 @@ class ScoreArea : public QGraphicsView
     /// Load the user's preferred color scheme for the score.
     void loadTheme(const SettingsManager &settings_manager, bool redraw = true);
     void loadSystemSpacing(const SettingsManager &settings_manager, bool redraw = true);
+    void loadDrawSystemOutline(const SettingsManager &settings_manager, bool redraw = true);
 
     Scene myScene;
     const Document *myDocument;
     QGraphicsItem *myScoreInfoBlock;
     QGraphicsItem *myChordDiagramList;
     double myHeaderSize = 0;
     double mySystemSpacing = 0;
+    bool myDrawSystemOutline = true;
     QList<QGraphicsItem *> myRenderedSystems;
     CaretPainter *myCaretPainter;
     /// The color palette from the parent widget.

source/app/settings.cpp

@@ -39,6 +39,8 @@ const Setting<std::vector<std::string>> RecentFiles("app/recent_files", {});
 const Setting<bool> OpenFilesInNewWindow("app/open_files_in_new_window",
                                          false);
 
+const Setting<bool> DrawSystemOutline("app/draw_system_outline", true);
+
 const Setting<int> SystemSpacing("app/system_spacing", 50);
 
 const Setting<ScoreTheme> Theme("app/score_theme", ScoreTheme::SystemDefault);

source/app/settings.h

@@ -42,6 +42,7 @@ namespace Settings
     extern const Setting<std::vector<std::string>> RecentFiles;
     extern const Setting<ScoreTheme> Theme;
     extern const Setting<bool> OpenFilesInNewWindow;
+    extern const Setting<bool> DrawSystemOutline;
     extern const Setting<int> SystemSpacing;
 
     extern const Setting<std::string> DefaultInstrumentName;

source/app/tuningdictionary.cpp

@@ -20,6 +20,7 @@
 #include <algorithm>
 #include <app/appinfo.h>
 #include <app/paths.h>
+#include <exception>
 #include <filesystem>
 #include <fstream>
 #include <iostream>
@@ -51,7 +52,16 @@ TuningDictionary::load()
         std::ifstream file(path);
 
         std::vector<Tuning> tunings;
-        ScoreUtils::load(file, "tunings", tunings);
+        try
+        {
+            ScoreUtils::load(file, "tunings", tunings);
+        }
+        catch (const std::exception &e)
+        {
+            std::cerr << "Failed to load tunings from file " << path << std::endl;
+            std::cerr << "Error: " << e.what() << std::endl;
+            continue;
+        }
 
         const bool writeable = (dir == user_data_dir);
         for (const Tuning &tuning: tunings)

source/dialogs/preferencesdialog.cpp

@@ -14,7 +14,7 @@
   * You should have received a copy of the GNU General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-  
+
 #include "preferencesdialog.h"
 #include "ui_preferencesdialog.h"
 
@@ -134,6 +134,9 @@ void PreferencesDialog::loadCurrentSettings()
     ui->openInNewWindowCheckBox->setChecked(
         settings->get(Settings::OpenFilesInNewWindow));
 
+    ui->drawSystemOutlineCheckBox->setChecked(
+        settings->get(Settings::DrawSystemOutline));
+
     ui->systemSpacingSpinBox->setValue(
       settings->get(Settings::SystemSpacing));
 
@@ -198,6 +201,9 @@ void PreferencesDialog::accept()
     settings->set(Settings::OpenFilesInNewWindow,
                   ui->openInNewWindowCheckBox->isChecked());
 
+    settings->set(Settings::DrawSystemOutline,
+                  ui->drawSystemOutlineCheckBox->isChecked());
+
     settings->set(Settings::SystemSpacing,
                   ui->systemSpacingSpinBox->value());
 

source/dialogs/preferencesdialog.ui

@@ -9,7 +9,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>404</width>
+    <width>550</width>
     <height>574</height>
    </rect>
   </property>
@@ -41,9 +41,15 @@
          <layout class="QVBoxLayout" name="verticalLayout_3">
           <item>
            <layout class="QFormLayout" name="formLayout">
-            <property name="fieldGrowthPolicy">
+<property name="fieldGrowthPolicy">
              <enum>QFormLayout::FieldGrowthPolicy::ExpandingFieldsGrow</enum>
             </property>
+              <property name="formAlignment">
+               <set>Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
+              </property>
+<property name="labelAlignment">
+              <set>Qt::AlignmentFlag::AlignLeft</set>
+             </property>
             <item row="0" column="0">
              <widget class="QLabel" name="midiOutputDeviceLabel">
               <property name="text">
@@ -103,9 +109,15 @@
          <layout class="QVBoxLayout" name="verticalLayout_2">
           <item>
            <layout class="QFormLayout" name="formLayout_2">
-            <property name="fieldGrowthPolicy">
+<property name="fieldGrowthPolicy">
              <enum>QFormLayout::FieldGrowthPolicy::ExpandingFieldsGrow</enum>
             </property>
+              <property name="formAlignment">
+               <set>Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
+              </property>
+<property name="labelAlignment">
+              <set>Qt::AlignmentFlag::AlignLeft</set>
+             </property>
             <item row="0" column="0">
              <widget class="QLabel" name="metronomeEnabledLabel">
               <property name="text">
@@ -165,9 +177,15 @@
          <layout class="QVBoxLayout" name="verticalLayout_5">
           <item>
            <layout class="QFormLayout" name="formLayout_4">
-            <property name="fieldGrowthPolicy">
+<property name="fieldGrowthPolicy">
              <enum>QFormLayout::FieldGrowthPolicy::ExpandingFieldsGrow</enum>
             </property>
+              <property name="formAlignment">
+               <set>Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
+              </property>
+<property name="labelAlignment">
+              <set>Qt::AlignmentFlag::AlignLeft</set>
+             </property>
             <item row="0" column="0">
              <widget class="QLabel" name="countInEnabledLabel">
               <property name="minimumSize">
@@ -179,9 +197,6 @@
               <property name="text">
                <string>Enabled:</string>
               </property>
-              <property name="alignment">
-               <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
-              </property>
              </widget>
             </item>
             <item row="0" column="1">
@@ -227,6 +242,12 @@
          <layout class="QVBoxLayout" name="verticalLayout_7">
           <item>
            <layout class="QFormLayout" name="formLayout_5">
+              <property name="formAlignment">
+               <set>Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
+              </property>
+<property name="labelAlignment">
+              <set>Qt::AlignmentFlag::AlignLeft</set>
+             </property>
             <item row="1" column="0">
              <widget class="QLabel" name="openInNewWindowLabel">
               <property name="minimumSize">
@@ -285,6 +306,16 @@
             <item row="2" column="1">
              <widget class="QSpinBox" name="systemSpacingSpinBox"/>
             </item>
+            <item row="3" column="0">
+             <widget class="QLabel" name="drawSystemOutlineLabel">
+              <property name="text">
+               <string>Draw System Outline:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="1">
+             <widget class="QCheckBox" name="drawSystemOutlineCheckBox"/>
+            </item>
            </layout>
           </item>
          </layout>
@@ -298,6 +329,12 @@
          <layout class="QVBoxLayout" name="verticalLayout_8">
           <item>
            <layout class="QFormLayout" name="formLayout_6">
+              <property name="formAlignment">
+               <set>Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
+              </property>
+<property name="labelAlignment">
+              <set>Qt::AlignmentFlag::AlignLeft</set>
+             </property>
             <item row="0" column="0">
              <widget class="QLabel" name="enableAutoBackupLabel">
               <property name="text">
@@ -339,6 +376,12 @@
         </rect>
        </property>
        <layout class="QFormLayout" name="formLayout_3">
+              <property name="formAlignment">
+               <set>Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
+              </property>
+<property name="labelAlignment">
+          <set>Qt::AlignmentFlag::AlignLeft</set>
+         </property>
         <item row="0" column="0">
          <widget class="QLabel" name="defaultInstrumentNameLabel">
           <property name="text">