fixes, see changelog

4 files changed, 22 insertions, 17 deletions

diff --git a/muse2/muse/widgets/gensetbase.ui b/muse2/muse/widgets/gensetbase.ui
index 4d937ecb..cdbaea2c 100644
--- a/muse2/muse/widgets/gensetbase.ui
+++ b/muse2/muse/widgets/gensetbase.ui
@@ -7,19 +7,13 @@
     <x>0</x>
     <y>0</y>
     <width>522</width>
-    <height>518</height>
+    <height>528</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>MusE: Global Settings</string>
   </property>
-  <layout class="QVBoxLayout">
-   <property name="spacing">
-    <number>6</number>
-   </property>
-   <property name="margin">
-    <number>11</number>
-   </property>
+  <layout class="QVBoxLayout" name="verticalLayout_4">
    <item>
     <widget class="QTabWidget" name="TabWidget2">
      <property name="sizePolicy">
@@ -29,7 +23,7 @@
       </sizepolicy>
      </property>
      <property name="currentIndex">
-      <number>3</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="TabPage">
       <attribute name="title">
@@ -755,6 +749,7 @@
               <property name="font">
                <font>
                 <pointsize>8</pointsize>
+                <italic>true</italic>
                </font>
               </property>
               <property name="text">
@@ -907,7 +902,7 @@ Shorter periods are desirable.</string>
          <property name="title">
           <string>Ticks</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout9">
+         <layout class="QGridLayout" name="gridLayout_2">
           <item row="0" column="0">
            <widget class="QLabel" name="TextLabel3">
             <property name="text">
@@ -1103,6 +1098,19 @@ Shorter periods are desirable.</string>
             </property>
            </widget>
           </item>
+          <item row="4" column="1">
+           <spacer name="verticalSpacer_3">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>40</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
          </layout>
         </widget>
        </item>
@@ -1241,13 +1249,7 @@ Shorter periods are desirable.</string>
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout">
-     <property name="spacing">
-      <number>6</number>
-     </property>
-     <property name="margin">
-      <number>0</number>
-     </property>
+    <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <spacer name="Spacer1">
        <property name="orientation">
diff --git a/muse2/muse/widgets/noteinfo.cpp b/muse2/muse/widgets/noteinfo.cpp
index 4f0e0c8c..f6d40857 100644
--- a/muse2/muse/widgets/noteinfo.cpp
+++ b/muse2/muse/widgets/noteinfo.cpp
@@ -26,6 +26,7 @@
 NoteInfo::NoteInfo(QWidget* parent)
    : QToolBar(tr("Note Info"), parent)
       {
+      setObjectName("Note Info");
       deltaMode = false;
 
       //QLabel* label = new QLabel(tr("Start"), this, "Start");
diff --git a/muse2/muse/widgets/tb1.cpp b/muse2/muse/widgets/tb1.cpp
index 0380b795..917e6ae2 100644
--- a/muse2/muse/widgets/tb1.cpp
+++ b/muse2/muse/widgets/tb1.cpp
@@ -53,6 +53,7 @@ static const char* quantStrings[] = {
 Toolbar1::Toolbar1(QWidget* parent, int r, int q, bool sp)    
    : QToolBar(QString("Quant'n'Snap-tools"), parent)
       {
+      setObjectName("Quant'n'Snap-tools");
       pitch = 0;
       showPitch = sp;
       // ORCAN - FIXME: Check this:
diff --git a/muse2/muse/widgets/tools.cpp b/muse2/muse/widgets/tools.cpp
index 268a03d5..40b0a328 100644
--- a/muse2/muse/widgets/tools.cpp
+++ b/muse2/muse/widgets/tools.cpp
@@ -57,6 +57,7 @@ ToolB toolList[] = {
 EditToolBar::EditToolBar(QWidget* parent, int tools, const char*)
    : QToolBar(tr("Edit Tools"), parent)
       {
+      setObjectName("Edit Tools");
       QActionGroup* action = new QActionGroup(parent);  // Parent needed.
       action->setExclusive(true);