A couple of UI additions

[pierogi] / forms / pirmainform.cpp

diff --git a/forms/pirmainform.cpp b/forms/pirmainform.cpp
index 6fcc2ea..c77ae67 100644 (file)
--- a/forms/pirmainform.cpp
+++ b/forms/pirmainform.cpp
@@ -12,7 +12,8 @@ PIRMainForm::PIRMainForm(
   MainWindow *mw)
   : QWidget(0),
     ui(new Ui::PIRMainForm),
-    mainWindow(mw)
+    mainWindow(mw),
+    defaultID(0)
 {
   ui->setupUi(this);
 }
@@ -27,6 +28,9 @@ void PIRMainForm::enableButtons(
   const PIRKeysetManager *keyset,
   unsigned int id)
 {
+  // No default id:
+  defaultID = 0;
+
   emit powerEnabled(keyset->hasKey(id, Power_Key));
   emit volumeUpEnabled(keyset->hasKey(id, VolumeUp_Key));
   emit volumeDownEnabled(keyset->hasKey(id, VolumeDown_Key));
@@ -39,6 +43,25 @@ void PIRMainForm::enableButtons(
 }
 
 
+void PIRMainForm::enableButtons(
+  const PIRKeysetManager *keyset,
+  unsigned int cID,
+  unsigned int dID)
+{
+  defaultID = dID;
+
+  emit powerEnabled(keyset->hasKey(cID, Power_Key));
+  emit volumeUpEnabled(keyset->hasKey(dID, VolumeUp_Key));
+  emit volumeDownEnabled(keyset->hasKey(dID, VolumeDown_Key));
+  emit channelUpEnabled(keyset->hasKey(cID, ChannelUp_Key));
+  emit channelDownEnabled(keyset->hasKey(cID, ChannelDown_Key));
+  emit muteEnabled(keyset->hasKey(dID, Mute_Key));
+
+  emit keysetMakeChanged(makeManager.getMakeString(keyset->getMake(cID)));
+  emit keysetNameChanged(keyset->getDisplayName(cID));
+}
+
+
 void PIRMainForm::on_powerButton_pressed()
 {
   mainWindow->startRepeating(Power_Key);
@@ -71,7 +94,14 @@ void PIRMainForm::on_mainChannelDownButton_released()
 
 void PIRMainForm::on_mainVolumeUp_pressed()
 {
-  mainWindow->startRepeating(VolumeUp_Key);
+  if (defaultID)
+  {
+    mainWindow->startRepeating(VolumeUp_Key, defaultID);
+  }
+  else
+  {
+    mainWindow->startRepeating(VolumeUp_Key);
+  }
 }
 
 void PIRMainForm::on_mainVolumeUp_released()
@@ -81,7 +111,14 @@ void PIRMainForm::on_mainVolumeUp_released()
 
 void PIRMainForm::on_mainVolumeDownButton_pressed()
 {
-  mainWindow->startRepeating(VolumeDown_Key);
+  if (defaultID)
+  {
+    mainWindow->startRepeating(VolumeDown_Key, defaultID);
+  }
+  else
+  {
+    mainWindow->startRepeating(VolumeDown_Key);
+  }
 }
 
 void PIRMainForm::on_mainVolumeDownButton_released()
@@ -91,7 +128,14 @@ void PIRMainForm::on_mainVolumeDownButton_released()
 
 void PIRMainForm::on_muteButton_pressed()
 {
-  mainWindow->startRepeating(Mute_Key);
+  if (defaultID)
+  {
+    mainWindow->startRepeating(Mute_Key, defaultID);
+  }
+  else
+  {
+    mainWindow->startRepeating(Mute_Key);
+  }
 }
 
 void PIRMainForm::on_muteButton_released()