add accidental properties to inspector

musescore · Mar 12, 2013 · 2b1c52b · 2b1c52b
1 parent a3c9bc1
commit 2b1c52b
Show file tree

Hide file tree

Showing 4 changed files with 131 additions and 1 deletion.
diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt
@@ -61,7 +61,7 @@ QT4_WRAP_UI (ui_headers
       inspector_volta.ui inspector_ottava.ui inspector_trill.ui inspector_hairpin.ui
       box.ui pluginManager.ui inspector_jump.ui inspector_marker.ui inspector_glissando.ui
       inspector_clef.ui inspector_timesig.ui inspector_keysig.ui inspector_barline.ui
-      inspector_tuplet.ui
+      inspector_tuplet.ui inspector_accidental.ui
       ${SCRIPT_UI}
       )
 

diff --git a/mscore/inspector.cpp b/mscore/inspector.cpp
@@ -164,6 +164,9 @@ void Inspector::setElements(const QList<Element*>& l)
                         case Element::NOTE:
                               ie = new InspectorNote(this);
                               break;
+                        case Element::ACCIDENTAL:
+                              ie = new InspectorAccidental(this);
+                              break;
                         case Element::REST:
                               ie = new InspectorRest(this);
                               break;
@@ -411,6 +414,26 @@ InspectorTuplet::InspectorTuplet(QWidget* parent)
       mapSignals();
       }
 
+//---------------------------------------------------------
+//   InspectorAccidental
+//---------------------------------------------------------
+
+InspectorAccidental::InspectorAccidental(QWidget* parent)
+   : InspectorBase(parent)
+      {
+      e.setupUi(addWidget());
+      a.setupUi(addWidget());
+
+      iList = {
+            { P_COLOR,        0, 0, e.color,       e.resetColor       },
+            { P_VISIBLE,      0, 0, e.visible,     e.resetVisible     },
+            { P_USER_OFF,     0, 0, e.offsetX,     e.resetX           },
+            { P_USER_OFF,     1, 0, e.offsetY,     e.resetY           },
+            { P_SMALL,        0, 0, a.small,       a.resetSmall       }
+            };
+      mapSignals();
+      }
+
 //---------------------------------------------------------
 //   InspectorClef
 //---------------------------------------------------------

diff --git a/mscore/inspector.h b/mscore/inspector.h
@@ -30,6 +30,7 @@
 #include "ui_inspector_volta.h"
 #include "ui_inspector_barline.h"
 #include "ui_inspector_tuplet.h"
+#include "ui_inspector_accidental.h"
 
 class Element;
 class Note;
@@ -172,6 +173,20 @@ class InspectorTuplet : public InspectorBase {
       InspectorTuplet(QWidget* parent);
       };
 
+//---------------------------------------------------------
+//   InspectorAccidental
+//---------------------------------------------------------
+
+class InspectorAccidental : public InspectorBase {
+      Q_OBJECT
+
+      Ui::InspectorElement e;
+      Ui::InspectorAccidental a;
+
+   public:
+      InspectorAccidental(QWidget* parent);
+      };
+
 //---------------------------------------------------------
 //   InspectorBarLine
 //---------------------------------------------------------

diff --git a/mscore/inspector_accidental.ui b/mscore/inspector_accidental.ui
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>InspectorAccidental</class>
+ <widget class="QWidget" name="InspectorAccidental">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>197</width>
+    <height>47</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QLabel" name="elementName">
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>Accidental</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QFrame" name="frame">
+     <property name="frameShape">
+      <enum>QFrame::HLine</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <property name="lineWidth">
+      <number>2</number>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QGridLayout" name="gridLayout">
+     <property name="spacing">
+      <number>0</number>
+     </property>
+     <item row="0" column="2">
+      <widget class="QToolButton" name="resetSmall">
+       <property name="toolTip">
+        <string>reset value</string>
+       </property>
+       <property name="text">
+        <string>...</string>
+       </property>
+       <property name="icon">
+        <iconset resource="musescore.qrc">
+         <normaloff>:/data/icons-dark/resetproperty.png</normaloff>:/data/icons-dark/resetproperty.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>14</width>
+         <height>10</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0" colspan="2">
+      <widget class="QCheckBox" name="small">
+       <property name="text">
+        <string>Small</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="musescore.qrc"/>
+ </resources>
+ <connections/>
+</ui>