another bugfix I’d like to have in before destabilising
authormirabilos <tg@debian.org>
Thu, 7 Nov 2019 16:43:00 +0000 (17:43 +0100)
committermirabilos <mirabilos@evolvis.org>
Thu, 7 Nov 2019 17:14:40 +0000 (18:14 +0100)
(cherry picked from commit fd655d342c3f27c64e516850408570bbedb5ba95)

debian/changelog
debian/patches/experiments/file-dialogues.diff [new file with mode: 0644]
debian/patches/series

index b7b1efa..fbf346b 100644 (file)
@@ -1,6 +1,7 @@
 musescore2 (2.3.2+dfsg3-7) wtf; urgency=low
 
   * Add several more (minor) upstream patches
+  * Apply workaround for broken directory bookmarks in file dialogue
   * Use the Debian packaging of freefont, do not bundle it
 
  -- Thorsten Glaser <tg@mirbsd.de>  Thu, 07 Nov 2019 18:09:15 +0100
diff --git a/debian/patches/experiments/file-dialogues.diff b/debian/patches/experiments/file-dialogues.diff
new file mode 100644 (file)
index 0000000..cdd215d
--- /dev/null
@@ -0,0 +1,29 @@
+Description: fix #292912: use native file dialogues by default also on Linux
+Author: mirabilos <m@mirbsd.org>
+Forwarded: https://github.com/musescore/MuseScore/pull/5461
+
+--- a/mscore/preferences.cpp
++++ b/mscore/preferences.cpp
+@@ -48,13 +48,6 @@ void Preferences::init(bool storeInMemor
+       bool checkExtensionsUpdateStartup = false;
+ #endif
+-#if defined(Q_OS_MAC) || defined(Q_OS_WIN)
+-      // use system native file dialogs
+-      // Qt file dialog is very slow on Windows and Mac
+-      bool nativeDialogs           = true;
+-#else
+-      bool nativeDialogs           = false;    // don't use system native file dialogs
+-#endif
+       bool defaultUsePortAudio = false;
+       bool defaultUsePulseAudio = false;
+       bool defaultUseJackAudio = false;
+@@ -173,7 +166,7 @@ void Preferences::init(bool storeInMemor
+             {PREF_UI_APP_RASTER_HORIZONTAL,                        new IntPreference(2)},
+             {PREF_UI_APP_RASTER_VERTICAL,                          new IntPreference(2)},
+             {PREF_UI_APP_SHOWSTATUSBAR,                            new BoolPreference(true)},
+-            {PREF_UI_APP_USENATIVEDIALOGS,                         new BoolPreference(nativeDialogs)},
++            {PREF_UI_APP_USENATIVEDIALOGS,                         new BoolPreference(true)},
+             {PREF_UI_PIANO_HIGHLIGHTCOLOR,                         new ColorPreference(QColor("#1259d0"))},
+             {PREF_UI_SCORE_NOTE_DROPCOLOR,                         new ColorPreference(QColor("#1778db"))},
+             {PREF_UI_SCORE_DEFAULTCOLOR,                           new ColorPreference(QColor("#000000"))},
index 3cd2ed6..f4ebdcb 100644 (file)
@@ -17,6 +17,7 @@ experiments/lyrics-hyphen-max-8sp.diff
 experiments/musescore-2.1.0-qt-5.12.patch
 experiments/statusline-concert-transposing-pitch.diff
 experiments/element-barbeat.diff
+experiments/file-dialogues.diff
 experiments/revert-restriking-patch.diff
 experiments/log-collisions.diff
 experiments/upstream-backend-fixes.diff