Merge branch 'rochade' into master
[alioth/musescore.git] / debian / patches / upstream / prefs-radio.diff
index 911c7b5..bac684d 100644 (file)
@@ -14,25 +14,25 @@ Description: Fix #304466: The “I/O” tab of the “Preferences” dialog shou
 
 --- a/mscore/CMakeLists.txt
 +++ b/mscore/CMakeLists.txt
-@@ -221,6 +221,7 @@ add_executable ( ${ExecutableName}
-       ${resource_file}
-       ${INCS}
+@@ -332,6 +332,7 @@ add_executable ( ${ExecutableName}
+       pathlistdialog.h piano.h pianolevels.h pianolevelschooser.h  pianolevelsfilter.h
+       pianokeyboard.h pianoroll.h pianoruler.h pianotools.h pianoview.h
+       playpanel.h pm.h preferences.h preferenceslistwidget.h prefsdialog.h
 +      radiobuttongroupbox.h
-       recordbutton.h greendotbutton prefsdialog.h
-       stringutils.h stringutils.cpp
-       scoreview.cpp editinstrument.cpp editstyle.cpp
-@@ -233,6 +234,7 @@ add_executable ( ${ExecutableName}
-       mixer.cpp playpanel.cpp selectionwindow.cpp preferences.cpp measureproperties.cpp
+       recordbutton.h resourceManager.h revision.h ruler.h scoreaccessibility.h
+       scoreBrowser.h scoreInfo.h scorePreview.h scoretab.h scoreview.h searchComboBox.h
+       sectionbreakprop.h selectdialog.h selectionwindow.h selectnotedialog.h selinstrument.h
+@@ -357,6 +358,7 @@ add_executable ( ${ExecutableName}
+       preferences.cpp measureproperties.cpp
        seq.cpp textpalette.cpp
        timedialog.cpp symboldialog.cpp shortcutcapturedialog.cpp
 +      radiobuttongroupbox.cpp
        simplebutton.cpp musedata.cpp
-       editdrumset.cpp editstaff.cpp voltaproperties.cpp
+       editdrumset.cpp editstaff.cpp
        timesigproperties.cpp newwizard.cpp transposedialog.cpp
 --- a/mscore/prefsdialog.ui
 +++ b/mscore/prefsdialog.ui
-@@ -2711,7 +2711,7 @@
+@@ -2659,7 +2659,7 @@
        </attribute>
        <layout class="QVBoxLayout" name="verticalLayout_8">
         <item>
@@ -41,7 +41,7 @@ Description: Fix #304466: The “I/O” tab of the “Preferences” dialog shou
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
             <horstretch>0</horstretch>
-@@ -2736,7 +2736,7 @@
+@@ -2684,7 +2684,7 @@
          </widget>
         </item>
         <item>
@@ -50,7 +50,7 @@ Description: Fix #304466: The “I/O” tab of the “Preferences” dialog shou
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
             <horstretch>0</horstretch>
-@@ -2922,7 +2922,7 @@ Adjusting latency can help synchronize y
+@@ -2864,7 +2864,7 @@ Adjusting latency can help synchronize y
          </widget>
         </item>
         <item>
@@ -59,7 +59,7 @@ Description: Fix #304466: The “I/O” tab of the “Preferences” dialog shou
           <property name="sizePolicy">
            <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
             <horstretch>0</horstretch>
-@@ -3144,7 +3144,7 @@ Adjusting latency can help synchronize y
+@@ -3080,7 +3080,7 @@ Adjusting latency can help synchronize y
          </widget>
         </item>
         <item>
@@ -68,7 +68,7 @@ Description: Fix #304466: The “I/O” tab of the “Preferences” dialog shou
           <property name="sizePolicy">
            <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
             <horstretch>0</horstretch>
-@@ -4232,6 +4232,11 @@ Adjusting latency can help synchronize y
+@@ -4161,6 +4161,11 @@ Adjusting latency can help synchronize y
     <extends>QToolButton</extends>
     <header>recordbutton.h</header>
    </customwidget>