Commented split action temporarily - AntiMicroX#93

Gallxz · Apr 16, 2020 · ac7d0bb · ac7d0bb
1 parent 4fe993c
commit ac7d0bb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/advancebuttondialog.cpp b/src/advancebuttondialog.cpp
@@ -58,6 +58,8 @@ AdvanceButtonDialog::AdvanceButtonDialog(JoyButton *button, QWidget *parent) :
 
     PadderCommon::inputDaemonMutex.lock();
 
+    ui->splitSlotButton->hide();
+
     m_button = button;
     oldRow = 0;
     int interval = m_button->getTurboInterval() / 10;
@@ -228,7 +230,7 @@ AdvanceButtonDialog::AdvanceButtonDialog(JoyButton *button, QWidget *parent) :
 
     connect(ui->insertSlotButton, &QPushButton::clicked, this, &AdvanceButtonDialog::insertSlot);
     connect(ui->joinSlotButton, &QPushButton::clicked, this, &AdvanceButtonDialog::joinSlot);
-    connect(ui->splitSlotButton, &QPushButton::clicked, this, &AdvanceButtonDialog::splitSlot);
+  //  connect(ui->splitSlotButton, &QPushButton::clicked, this, &AdvanceButtonDialog::splitSlot);
     connect(ui->deleteSlotButton, &QPushButton::clicked, this, &AdvanceButtonDialog::deleteSlot);
     connect(ui->clearAllPushButton, &QPushButton::clicked, this, &AdvanceButtonDialog::clearAllSlots);
 
@@ -604,7 +606,6 @@ void AdvanceButtonDialog::joinSlot()
         deleteSlot();
 
         blankButton->setValues(text, blankButton->getValue()->getMixSlots(), JoyButtonSlot::JoyMix);
-        blankButton->getValue()->setMixSlots(blankButton->getValue()->getMixSlots());
 
         QListWidgetItem *joinedItem = new QListWidgetItem();
         ui->slotListWidget->insertItem(index, joinedItem);
@@ -632,7 +633,7 @@ void AdvanceButtonDialog::joinSlot()
 }
 
 
-void AdvanceButtonDialog::splitSlot()
+/*void AdvanceButtonDialog::splitSlot()
 {
     int index = ui->slotListWidget->currentRow();
 
@@ -703,7 +704,7 @@ void AdvanceButtonDialog::splitSlot()
             index++;
         }
     }
-}
+}*/
 
 
 void AdvanceButtonDialog::insertKindOfSlot(QListWidgetItem* item, int slotProperty, JoyButtonSlot::JoySlotInputAction inputAction)

diff --git a/src/advancebuttondialog.h b/src/advancebuttondialog.h
@@ -84,7 +84,7 @@ private slots:
     void deleteSlot();  // AdvanceBtnDlgAssign class
     void insertSlot(); // AdvanceBtnDlgAssign class
     void joinSlot(); // AdvanceBtnDlgAssign class
-    void splitSlot(); // AdvanceBtnDlgAssign class
+   // void splitSlot(); // AdvanceBtnDlgAssign class
 
     void insertCycleSlot(QListWidgetItem* item); // AdvanceBtnDlgAssign class
     void insertTextEntrySlot(QListWidgetItem* item); // AdvanceBtnDlgAssign class