Merge pull request #1660 from yestalgia/add/fixturegroupeditor-up-left-buttons

Add missing "Up" and "Left" Buttons to Fixture Group Editor

Author: mcallegari

ui/src/fixturegroupeditor.cpp

@@ -58,8 +58,12 @@ FixtureGroupEditor::FixtureGroupEditor(FixtureGroup* grp, Doc* doc, QWidget* par
 
     connect(m_rightButton, SIGNAL(clicked()),
             this, SLOT(slotRightClicked()));
+    connect(m_leftButton, SIGNAL(clicked()),
+            this, SLOT(slotLeftClicked()));
     connect(m_downButton, SIGNAL(clicked()),
             this, SLOT(slotDownClicked()));
+    connect(m_upButton, SIGNAL(clicked()),
+            this, SLOT(slotUpClicked())),
     connect(m_removeButton, SIGNAL(clicked()),
             this, SLOT(slotRemoveFixtureClicked()));
 
@@ -162,11 +166,22 @@ void FixtureGroupEditor::slotRightClicked()
     addFixtureHeads(Qt::RightArrow);
 }
 
+void FixtureGroupEditor::slotLeftClicked()
+{
+    addFixtureHeads(Qt::LeftArrow);
+}
+
 void FixtureGroupEditor::slotDownClicked()
 {
     addFixtureHeads(Qt::DownArrow);
 }
 
+void FixtureGroupEditor::slotUpClicked()
+{
+    addFixtureHeads(Qt::UpArrow);
+}
+
+
 void FixtureGroupEditor::slotRemoveFixtureClicked()
 {
     QTableWidgetItem* item = m_table->currentItem();
@@ -267,8 +282,12 @@ void FixtureGroupEditor::addFixtureHeads(Qt::ArrowType direction)
             m_grp->assignHead(QLCPoint(col, row), gh);
             if (direction == Qt::RightArrow)
                 col++;
-            else
+            else if (direction == Qt::DownArrow)
                 row++;
+            else if (direction == Qt::LeftArrow)
+                col--;
+            else if (direction == Qt::UpArrow)
+                row--;
         }
 
         updateTable();

ui/src/fixturegroupeditor.h

@@ -49,6 +49,8 @@ private slots:
     void slotYSpinValueChanged(int value);
 
     void slotRightClicked();
+    void slotLeftClicked(); 
+    void slotUpClicked();
     void slotDownClicked();
     void slotRemoveFixtureClicked();
 

ui/src/fixturegroupeditor.ui

@@ -52,7 +52,7 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="6">
+   <item row="5" column="6">
     <widget class="QToolButton" name="m_removeButton">
      <property name="toolTip">
       <string>Remove selected fixture/head</string>
@@ -138,7 +138,7 @@
    <item row="1" column="6">
     <widget class="QToolButton" name="m_rightButton">
      <property name="toolTip">
-      <string>Add/replace fixtures to current row, starting from selected cell</string>
+      <string>Add/replace fixtures to current row, going right starting from selected cell</string>
      </property>
      <property name="icon">
       <iconset resource="qlcui.qrc">
@@ -153,9 +153,26 @@
     </widget>
    </item>
    <item row="2" column="6">
+    <widget class="QToolButton" name="m_leftButton">
+     <property name="toolTip">
+      <string>Add/replace fixtures to current row, going backwards starting from selected cell</string>
+     </property>
+     <property name="icon">
+      <iconset resource="qlcui.qrc">
+       <normaloff>:/back.png</normaloff>:/back.png</iconset>
+     </property>
+     <property name="iconSize">
+      <size>
+       <width>32</width>
+       <height>32</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="6">
     <widget class="QToolButton" name="m_downButton">
      <property name="toolTip">
-      <string>Add/replace fixtures to current column, starting from selected cell</string>
+      <string>Add/replace fixtures to current column, going down starting from selected cell</string>
      </property>
      <property name="icon">
       <iconset resource="qlcui.qrc">
@@ -169,6 +186,23 @@
      </property>
     </widget>
    </item>
+   <item row="4" column="6">
+    <widget class="QToolButton" name="m_upButton">
+     <property name="toolTip">
+      <string>Add/replace fixtures to current column, going up starting from selected cell</string>
+     </property>
+     <property name="icon">
+      <iconset resource="qlcui.qrc">
+       <normaloff>:/up.png</normaloff>:/up.png</iconset>
+     </property>
+     <property name="iconSize">
+      <size>
+       <width>32</width>
+       <height>32</height>
+      </size>
+     </property>
+    </widget>
+   </item>
    <item row="0" column="0" colspan="7">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>