Gui updated, many keyset changes
[pierogi] / mainwindow.cpp
index d0ffd63..25a348a 100644 (file)
 
 //#define DEBUGGING
 
+// Some ugly globals used for thread communications:
+
+// A global to show that a command is being processed:
+bool commandInFlight = false;
+QMutex commandIFMutex;
+
+// The stopRepeatingFlag boolean is the method used to tell running commands
+// in the worker thread to stop:
+bool stopRepeatingFlag = false;
+QMutex stopRepeatingMutex;
+
 extern PIRMakeMgr makeManager;
 
 
 MainWindow::MainWindow(QWidget *parent)
   : QMainWindow(parent),
     ui(new Ui::MainWindow),
-    mySelectionWindow(0),
+    selectKeysetForm(0),
+    secondaryForm(0),
     documentationForm(0),
     aboutForm(0),
     currentKeyset(0)
@@ -35,38 +47,48 @@ MainWindow::MainWindow(QWidget *parent)
   myKeysets = new PIRKeysetManager(this);
 
   // Set up the keyset selection window:
-  mySelectionWindow = new SelectionWindow(this);
+  selectKeysetForm = new PIRSelectKeysetForm(this);
 
-  myKeysets->populateGuiWidget(mySelectionWindow);
+  // Set up the secondary buttons window:
+  secondaryForm = new PIRSecondaryForm(this);
+
+  myKeysets->populateGuiWidget(selectKeysetForm);
 
   // Remember any favorites the user has already set:
   populateFavorites();
 
   QSettings settings("pietrzak.org", "Pierogi");
-  if (settings.contains("currentKeyset"))
+  if (settings.contains("currentKeysetName"))
   {
-    currentKeyset = settings.value("currentKeyset").toInt();
+    myKeysets->findKeysetID(
+      settings.value("currentKeysetMake").toString(),
+      settings.value("currentKeysetName").toString(),
+      currentKeyset);
+//    currentKeyset = settings.value("currentKeyset").toInt();
   }
 
   enableButtons();
+  secondaryForm->enableButtons(myKeysets, currentKeyset);
 
   connect(
     ui->favoriteKeysetsWidget,
-    SIGNAL(itemActivated(QListWidgetItem *)),
+//    SIGNAL(itemActivated(QListWidgetItem *)),
+    SIGNAL(currentItemChanged(QListWidgetItem *, QListWidgetItem *)),
     this,
     SLOT(keysetSelectionChanged(QListWidgetItem *)),
     Qt::QueuedConnection);
 
   // Make sure the two selection lists don't show different selections:
+  QListWidget *klw = selectKeysetForm->getKeysetListWidget();
   connect(
     ui->favoriteKeysetsWidget,
     SIGNAL(itemActivated(QListWidgetItem *)),
-    mySelectionWindow->nameListWidget,
+    klw,
     SLOT(clearSelection()),
     Qt::QueuedConnection);
 
   connect(
-    mySelectionWindow->nameListWidget,
+    klw,
     SIGNAL(itemActivated(QListWidgetItem *)),
     ui->favoriteKeysetsWidget,
     SLOT(clearSelection()),
@@ -92,7 +114,7 @@ MainWindow::MainWindow(QWidget *parent)
 MainWindow::~MainWindow()
 {
   delete myKeysets;
-  delete mySelectionWindow;
+  if (selectKeysetForm) delete selectKeysetForm;
   if (documentationForm) delete documentationForm;
   if (aboutForm) delete aboutForm;
   delete ui;
@@ -164,6 +186,11 @@ void MainWindow::enableButtons()
   emit channelUpEnabled(myKeysets->hasKey(currentKeyset, ChannelUp_Key));
   emit channelDownEnabled(myKeysets->hasKey(currentKeyset, ChannelDown_Key));
 
+  // Main tab labels:
+  emit keysetMakeChanged(
+    makeManager.getMakeString(myKeysets->getMake(currentKeyset)));
+  emit keysetNameChanged(myKeysets->getDisplayName(currentKeyset));
+
   // Utility keys:
   emit redEnabled(myKeysets->hasKey(currentKeyset, Red_Key));
   emit greenEnabled(myKeysets->hasKey(currentKeyset, Green_Key));
@@ -171,8 +198,8 @@ void MainWindow::enableButtons()
   emit blueEnabled(myKeysets->hasKey(currentKeyset, Blue_Key));
   emit aspectRatioEnabled(myKeysets->hasKey(currentKeyset, AspectRatio_Key));
   emit surroundEnabled(myKeysets->hasKey(currentKeyset, Surround_Key));
-  emit languageEnabled(myKeysets->hasKey(currentKeyset, Language_Key));
-  emit favoritesEnabled(myKeysets->hasKey(currentKeyset, Favorites_Key));
+  emit audioEnabled(myKeysets->hasKey(currentKeyset, Audio_Key));
+  emit infoEnabled(myKeysets->hasKey(currentKeyset, Info_Key));
   emit captionsEnabled(myKeysets->hasKey(currentKeyset, Captions_Key));
   emit sleepEnabled(myKeysets->hasKey(currentKeyset, Sleep_Key));
   emit inputEnabled(myKeysets->hasKey(currentKeyset, Input_Key));
@@ -197,52 +224,67 @@ void MainWindow::enableButtons()
   emit prevChannelEnabled(myKeysets->hasKey(currentKeyset, PrevChannel_Key));
 
   // Menu keys:
-  emit menuEnabled(myKeysets->hasKey(currentKeyset, Menu_Key));
   emit upEnabled(myKeysets->hasKey(currentKeyset, Up_Key));
   emit downEnabled(myKeysets->hasKey(currentKeyset, Down_Key));
   emit leftEnabled(myKeysets->hasKey(currentKeyset, Left_Key));
   emit rightEnabled(myKeysets->hasKey(currentKeyset, Right_Key));
   emit selectEnabled(myKeysets->hasKey(currentKeyset, Select_Key));
+  emit menuEnabled(myKeysets->hasKey(currentKeyset, Menu_Key));
   emit exitEnabled(myKeysets->hasKey(currentKeyset, Exit_Key));
-  emit infoEnabled(myKeysets->hasKey(currentKeyset, Info_Key));
   emit guideEnabled(myKeysets->hasKey(currentKeyset, Guide_Key));
+  emit discMenuEnabled(myKeysets->hasKey(currentKeyset, DiscMenu_Key));
 
   // Media keys:
-  emit playEnabled(myKeysets->hasKey(currentKeyset, Play_Key));
-  emit pauseEnabled(myKeysets->hasKey(currentKeyset, Pause_Key));
-  emit stopEnabled(myKeysets->hasKey(currentKeyset, Stop_Key));
-  emit fastForwardEnabled(myKeysets->hasKey(currentKeyset, FastForward_Key));
-  emit reverseEnabled(myKeysets->hasKey(currentKeyset, Rewind_Key));
   emit nextEnabled(myKeysets->hasKey(currentKeyset, Next_Key));
   emit previousEnabled(myKeysets->hasKey(currentKeyset, Previous_Key));
-  emit stepForwardEnabled(myKeysets->hasKey(currentKeyset, StepForward_Key));
-  emit stepBackEnabled(myKeysets->hasKey(currentKeyset, StepBack_Key));
   emit advanceEnabled(myKeysets->hasKey(currentKeyset, Advance_Key));
   emit replayEnabled(myKeysets->hasKey(currentKeyset, Replay_Key));
+  emit stepForwardEnabled(myKeysets->hasKey(currentKeyset, StepForward_Key));
+  emit stepBackEnabled(myKeysets->hasKey(currentKeyset, StepBack_Key));
+  emit fastForwardEnabled(myKeysets->hasKey(currentKeyset, FastForward_Key));
+  emit reverseEnabled(myKeysets->hasKey(currentKeyset, Rewind_Key));
+  emit playEnabled(myKeysets->hasKey(currentKeyset, Play_Key));
+  emit pauseEnabled(myKeysets->hasKey(currentKeyset, Pause_Key));
+  emit stopEnabled(myKeysets->hasKey(currentKeyset, Stop_Key));
   emit ejectEnabled(myKeysets->hasKey(currentKeyset, Eject_Key));
 
-  // Other keys:
-  emit pipEnabled(myKeysets->hasKey(currentKeyset, PIP_Key));
-  emit pipSwapEnabled(myKeysets->hasKey(currentKeyset, PIPSwap_Key));
-  emit pipMoveEnabled(myKeysets->hasKey(currentKeyset, PIPMove_Key));
-  emit pipSourceEnabled(myKeysets->hasKey(currentKeyset, PIPSource_Key));
-  emit scanEnabled(myKeysets->hasKey(currentKeyset, Scan_Key));
-  emit programEnabled(myKeysets->hasKey(currentKeyset, Program_Key));
-  emit pictureModeEnabled(myKeysets->hasKey(currentKeyset, PictureMode_Key));
-  emit soundModeEnabled(myKeysets->hasKey(currentKeyset, SoundMode_Key));
+/*
+  // Media2 keys:
   emit discTitleEnabled(myKeysets->hasKey(currentKeyset, DiscTitle_Key));
-  emit discMenuEnabled(myKeysets->hasKey(currentKeyset, DiscMenu_Key));
-  emit discSelectEnabled(myKeysets->hasKey(currentKeyset, DiscSelect_Key));
-  emit recordEnabled(myKeysets->hasKey(currentKeyset, Record_Key));
+  emit discSelectEnabled(myKeysets->hasKey(currentKeyset, NextDisc_Key));
+  emit vhsSpeedEnabled(myKeysets->hasKey(currentKeyset, VHSSpeed_Key));
   emit trackingMinusEnabled(myKeysets->hasKey(currentKeyset, TrackingMinus_Key));
   emit trackingPlusEnabled(myKeysets->hasKey(currentKeyset, TrackingPlus_Key));
   emit autoTrackingEnabled(myKeysets->hasKey(currentKeyset, AutoTracking_Key));
-  emit vhsSpeedEnabled(myKeysets->hasKey(currentKeyset, VHSSpeed_Key));
-
-  emit keysetMakeChanged(
-    makeManager.getMakeString(myKeysets->getMake(currentKeyset)));
+  emit pageUpEnabled(myKeysets->hasKey(currentKeyset, PageUp_Key));
+  emit pageDownEnabled(myKeysets->hasKey(currentKeyset, PageDown_Key));
+  emit slowEnabled(myKeysets->hasKey(currentKeyset, Slow_Key));
+  emit slowMinusEnabled(myKeysets->hasKey(currentKeyset, SlowMinus_Key));
+  emit slowPlusEnabled(myKeysets->hasKey(currentKeyset, SlowPlus_Key));
+  emit programEnabled(myKeysets->hasKey(currentKeyset, Program_Key));
+  emit tunerBandEnabled(myKeysets->hasKey(currentKeyset, TunerBand_Key));
+  emit repeatEnabled(myKeysets->hasKey(currentKeyset, Repeat_Key));
+  emit repeatABEnabled(myKeysets->hasKey(currentKeyset, RepeatAB_Key));
+  emit randomEnabled(myKeysets->hasKey(currentKeyset, Random_Key));
 
-  emit keysetNameChanged(myKeysets->getDisplayName(currentKeyset));
+  // TV Keys:
+  emit pictureModeEnabled(myKeysets->hasKey(currentKeyset, PictureMode_Key));
+  emit soundModeEnabled(myKeysets->hasKey(currentKeyset, SoundMode_Key));
+  emit liveTVEnabled(myKeysets->hasKey(currentKeyset, LiveTV_Key));
+  emit favoritesEnabled(myKeysets->hasKey(currentKeyset, Favorites_Key));
+  emit teletextEnabled(myKeysets->hasKey(currentKeyset, Teletext_Key));
+  emit teletextHoldEnabled(myKeysets->hasKey(currentKeyset, TeletextHold_Key));
+  emit teletextRevealEnabled(myKeysets->hasKey(currentKeyset, TeletextReveal_Key));
+  emit teletextSizeEnabled(myKeysets->hasKey(currentKeyset, TeletextSize_Key));
+  emit pipEnabled(myKeysets->hasKey(currentKeyset, PIP_Key));
+  emit pipSwapEnabled(myKeysets->hasKey(currentKeyset, PIPSwap_Key));
+  emit pipMoveEnabled(myKeysets->hasKey(currentKeyset, PIPMove_Key));
+  emit pipSourceEnabled(myKeysets->hasKey(currentKeyset, PIPSource_Key));
+  emit pipChannelUpEnabled(myKeysets->hasKey(currentKeyset, PIPChannelUp_Key));
+  emit pipChannelDownEnabled(myKeysets->hasKey(currentKeyset, PIPChannelDown_Key));
+  emit pipPauseEnabled(myKeysets->hasKey(currentKeyset, PIPPause_Key));
+  emit pipSizeEnabled(myKeysets->hasKey(currentKeyset, PIPSize_Key));
+*/
 }
 
 
@@ -260,7 +302,7 @@ void MainWindow::receivedExternalWarning(
 
 void MainWindow::on_powerButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Power_Key);
+  startRepeating(Power_Key);
 }
 
 void MainWindow::on_powerButton_released()
@@ -270,7 +312,7 @@ void MainWindow::on_powerButton_released()
 
 void MainWindow::on_mainChannelUpButton_pressed()
 {
-  emit buttonPressed(currentKeyset, ChannelUp_Key);
+  startRepeating(ChannelUp_Key);
 }
 
 void MainWindow::on_mainChannelUpButton_released()
@@ -280,7 +322,7 @@ void MainWindow::on_mainChannelUpButton_released()
 
 void MainWindow::on_mainChannelDownButton_pressed()
 {
-  emit buttonPressed(currentKeyset, ChannelDown_Key);
+  startRepeating(ChannelDown_Key);
 }
 
 void MainWindow::on_mainChannelDownButton_released()
@@ -290,7 +332,7 @@ void MainWindow::on_mainChannelDownButton_released()
 
 void MainWindow::on_mainVolumeUp_pressed()
 {
-  emit buttonPressed(currentKeyset, VolumeUp_Key);
+  startRepeating(VolumeUp_Key);
 }
 
 void MainWindow::on_mainVolumeUp_released()
@@ -300,7 +342,7 @@ void MainWindow::on_mainVolumeUp_released()
 
 void MainWindow::on_mainVolumeDownButton_pressed()
 {
-  emit buttonPressed(currentKeyset, VolumeDown_Key);
+  startRepeating(VolumeDown_Key);
 }
 
 void MainWindow::on_mainVolumeDownButton_released()
@@ -313,7 +355,7 @@ void MainWindow::on_mainVolumeDownButton_released()
 
 void MainWindow::on_redButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Red_Key);
+  startRepeating(Red_Key);
 }
 
 void MainWindow::on_redButton_released()
@@ -323,7 +365,7 @@ void MainWindow::on_redButton_released()
 
 void MainWindow::on_greenButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Green_Key);
+  startRepeating(Green_Key);
 }
 
 void MainWindow::on_greenButton_released()
@@ -333,7 +375,7 @@ void MainWindow::on_greenButton_released()
 
 void MainWindow::on_yellowButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Yellow_Key);
+  startRepeating(Yellow_Key);
 }
 
 void MainWindow::on_yellowButton_released()
@@ -343,7 +385,7 @@ void MainWindow::on_yellowButton_released()
 
 void MainWindow::on_blueButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Blue_Key);
+  startRepeating(Blue_Key);
 }
 
 void MainWindow::on_blueButton_released()
@@ -353,7 +395,7 @@ void MainWindow::on_blueButton_released()
 
 void MainWindow::on_aspectRatioButton_pressed()
 {
-  emit buttonPressed(currentKeyset, AspectRatio_Key);
+  startRepeating(AspectRatio_Key);
 }
 
 void MainWindow::on_aspectRatioButton_released()
@@ -363,7 +405,7 @@ void MainWindow::on_aspectRatioButton_released()
 
 void MainWindow::on_surroundButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Surround_Key);
+  startRepeating(Surround_Key);
 }
 
 void MainWindow::on_surroundButton_released()
@@ -371,29 +413,29 @@ void MainWindow::on_surroundButton_released()
   stopRepeating();
 }
 
-void MainWindow::on_languageButton_pressed()
+void MainWindow::on_audioButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Language_Key);
+  startRepeating(Audio_Key);
 }
 
-void MainWindow::on_languageButton_released()
+void MainWindow::on_audioButton_released()
 {
   stopRepeating();
 }
 
-void MainWindow::on_favoritesButton_pressed()
+void MainWindow::on_infoButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Favorites_Key);
+  startRepeating(Info_Key);
 }
 
-void MainWindow::on_favoritesButton_released()
+void MainWindow::on_infoButton_released()
 {
   stopRepeating();
 }
 
 void MainWindow::on_captionButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Captions_Key);
+  startRepeating(Captions_Key);
 }
 
 void MainWindow::on_captionButton_released()
@@ -403,7 +445,7 @@ void MainWindow::on_captionButton_released()
 
 void MainWindow::on_inputButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Input_Key);
+  startRepeating(Input_Key);
 }
 
 void MainWindow::on_inputButton_released()
@@ -413,7 +455,7 @@ void MainWindow::on_inputButton_released()
 
 void MainWindow::on_sleepButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Sleep_Key);
+  startRepeating(Sleep_Key);
 }
 
 void MainWindow::on_sleepButton_released()
@@ -423,7 +465,7 @@ void MainWindow::on_sleepButton_released()
 
 void MainWindow::on_muteButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Mute_Key);
+  startRepeating(Mute_Key);
 }
 
 void MainWindow::on_muteButton_released()
@@ -436,7 +478,7 @@ void MainWindow::on_muteButton_released()
 
 void MainWindow::on_oneButton_pressed()
 {
-  emit buttonPressed(currentKeyset, One_Key);
+  startRepeating(One_Key);
 }
 
 void MainWindow::on_oneButton_released()
@@ -446,7 +488,7 @@ void MainWindow::on_oneButton_released()
 
 void MainWindow::on_twoButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Two_Key);
+  startRepeating(Two_Key);
 }
 
 void MainWindow::on_twoButton_released()
@@ -456,7 +498,7 @@ void MainWindow::on_twoButton_released()
 
 void MainWindow::on_threeButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Three_Key);
+  startRepeating(Three_Key);
 }
 
 void MainWindow::on_threeButton_released()
@@ -466,7 +508,7 @@ void MainWindow::on_threeButton_released()
 
 void MainWindow::on_fourButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Four_Key);
+  startRepeating(Four_Key);
 }
 
 void MainWindow::on_fourButton_released()
@@ -476,7 +518,7 @@ void MainWindow::on_fourButton_released()
 
 void MainWindow::on_fiveButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Five_Key);
+  startRepeating(Five_Key);
 }
 
 void MainWindow::on_fiveButton_released()
@@ -486,7 +528,7 @@ void MainWindow::on_fiveButton_released()
 
 void MainWindow::on_sixButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Six_Key);
+  startRepeating(Six_Key);
 }
 
 void MainWindow::on_sixButton_released()
@@ -496,7 +538,7 @@ void MainWindow::on_sixButton_released()
 
 void MainWindow::on_sevenButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Seven_Key);
+  startRepeating(Seven_Key);
 }
 
 void MainWindow::on_sevenButton_released()
@@ -506,7 +548,7 @@ void MainWindow::on_sevenButton_released()
 
 void MainWindow::on_eightButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Eight_Key);
+  startRepeating(Eight_Key);
 }
 
 void MainWindow::on_eightButton_released()
@@ -516,7 +558,7 @@ void MainWindow::on_eightButton_released()
 
 void MainWindow::on_nineButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Nine_Key);
+  startRepeating(Nine_Key);
 }
 
 void MainWindow::on_nineButton_released()
@@ -526,7 +568,7 @@ void MainWindow::on_nineButton_released()
 
 void MainWindow::on_zeroButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Zero_Key);
+  startRepeating(Zero_Key);
 }
 
 void MainWindow::on_zeroButton_released()
@@ -536,7 +578,7 @@ void MainWindow::on_zeroButton_released()
 
 void MainWindow::on_enterButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Enter_Key);
+  startRepeating(Enter_Key);
 }
 
 void MainWindow::on_enterButton_released()
@@ -546,7 +588,7 @@ void MainWindow::on_enterButton_released()
 
 void MainWindow::on_clearButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Clear_Key);
+  startRepeating(Clear_Key);
 }
 
 void MainWindow::on_clearButton_released()
@@ -556,7 +598,7 @@ void MainWindow::on_clearButton_released()
 
 void MainWindow::on_prevChannelButton_pressed()
 {
-  emit buttonPressed(currentKeyset, PrevChannel_Key);
+  startRepeating(PrevChannel_Key);
 }
 
 void MainWindow::on_prevChannelButton_released()
@@ -566,7 +608,7 @@ void MainWindow::on_prevChannelButton_released()
 
 void MainWindow::on_plusOneHundredButton_pressed()
 {
-  emit buttonPressed(currentKeyset, PlusOneHundred_Key);
+  startRepeating(PlusOneHundred_Key);
 }
 
 void MainWindow::on_plusOneHundredButton_released()
@@ -576,7 +618,7 @@ void MainWindow::on_plusOneHundredButton_released()
 
 void MainWindow::on_dashButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Dash_Key);
+  startRepeating(Dash_Key);
 }
 
 void MainWindow::on_dashButton_released()
@@ -586,7 +628,7 @@ void MainWindow::on_dashButton_released()
 
 void MainWindow::on_doubleDigitButton_pressed()
 {
-  emit buttonPressed(currentKeyset, DoubleDigit_Key);
+  startRepeating(DoubleDigit_Key);
 }
 
 void MainWindow::on_doubleDigitButton_released()
@@ -599,7 +641,7 @@ void MainWindow::on_doubleDigitButton_released()
 
 void MainWindow::on_upButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Up_Key);
+  startRepeating(Up_Key);
 }
 
 void MainWindow::on_upButton_released()
@@ -609,7 +651,7 @@ void MainWindow::on_upButton_released()
 
 void MainWindow::on_leftButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Left_Key);
+  startRepeating(Left_Key);
 }
 
 void MainWindow::on_leftButton_released()
@@ -619,7 +661,7 @@ void MainWindow::on_leftButton_released()
 
 void MainWindow::on_rightButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Right_Key);
+  startRepeating(Right_Key);
 }
 
 void MainWindow::on_rightButton_released()
@@ -629,7 +671,7 @@ void MainWindow::on_rightButton_released()
 
 void MainWindow::on_downButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Down_Key);
+  startRepeating(Down_Key);
 }
 
 void MainWindow::on_downButton_released()
@@ -639,7 +681,7 @@ void MainWindow::on_downButton_released()
 
 void MainWindow::on_selectButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Select_Key);
+  startRepeating(Select_Key);
 }
 
 void MainWindow::on_selectButton_released()
@@ -649,7 +691,7 @@ void MainWindow::on_selectButton_released()
 
 void MainWindow::on_menuButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Menu_Key);
+  startRepeating(Menu_Key);
 }
 
 void MainWindow::on_menuButton_released()
@@ -659,7 +701,7 @@ void MainWindow::on_menuButton_released()
 
 void MainWindow::on_exitButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Exit_Key);
+  startRepeating(Exit_Key);
 }
 
 void MainWindow::on_exitButton_released()
@@ -667,13 +709,32 @@ void MainWindow::on_exitButton_released()
   stopRepeating();
 }
 
+void MainWindow::on_guideButton_pressed()
+{
+  startRepeating(Guide_Key);
+}
+
+void MainWindow::on_guideButton_released()
+{
+  stopRepeating();
+}
+
+void MainWindow::on_discMenuButton_pressed()
+{
+  startRepeating(DiscMenu_Key);
+}
+
+void MainWindow::on_discMenuButton_released()
+{
+  stopRepeating();
+}
 
 
 // Media tab buttons:
 
 void MainWindow::on_mediaPreviousButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Previous_Key);
+  startRepeating(Previous_Key);
 }
 
 void MainWindow::on_mediaPreviousButton_released()
@@ -683,7 +744,7 @@ void MainWindow::on_mediaPreviousButton_released()
 
 void MainWindow::on_mediaNextButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Next_Key);
+  startRepeating(Next_Key);
 }
 
 void MainWindow::on_mediaNextButton_released()
@@ -693,7 +754,7 @@ void MainWindow::on_mediaNextButton_released()
 
 void MainWindow::on_replayButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Replay_Key);
+  startRepeating(Replay_Key);
 }
 
 void MainWindow::on_replayButton_released()
@@ -703,7 +764,7 @@ void MainWindow::on_replayButton_released()
 
 void MainWindow::on_advanceButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Advance_Key);
+  startRepeating(Advance_Key);
 }
 
 void MainWindow::on_advanceButton_released()
@@ -713,7 +774,7 @@ void MainWindow::on_advanceButton_released()
 
 void MainWindow::on_stepBackButton_pressed()
 {
-  emit buttonPressed(currentKeyset, StepBack_Key);
+  startRepeating(StepBack_Key);
 }
 
 void MainWindow::on_stepBackButton_released()
@@ -723,7 +784,7 @@ void MainWindow::on_stepBackButton_released()
 
 void MainWindow::on_stepForwardButton_pressed()
 {
-  emit buttonPressed(currentKeyset, StepForward_Key);
+  startRepeating(StepForward_Key);
 }
 
 void MainWindow::on_stepForwardButton_released()
@@ -733,7 +794,7 @@ void MainWindow::on_stepForwardButton_released()
 
 void MainWindow::on_reverseButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Rewind_Key);
+  startRepeating(Rewind_Key);
 }
 
 void MainWindow::on_reverseButton_released()
@@ -743,7 +804,7 @@ void MainWindow::on_reverseButton_released()
 
 void MainWindow::on_fastForwardButton_pressed()
 {
-  emit buttonPressed(currentKeyset, FastForward_Key);
+  startRepeating(FastForward_Key);
 }
 
 void MainWindow::on_fastForwardButton_released()
@@ -753,7 +814,7 @@ void MainWindow::on_fastForwardButton_released()
 
 void MainWindow::on_playButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Play_Key);
+  startRepeating(Play_Key);
 }
 
 void MainWindow::on_playButton_released()
@@ -763,7 +824,7 @@ void MainWindow::on_playButton_released()
 
 void MainWindow::on_pauseButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Pause_Key);
+  startRepeating(Pause_Key);
 }
 
 void MainWindow::on_pauseButton_released()
@@ -773,7 +834,7 @@ void MainWindow::on_pauseButton_released()
 
 void MainWindow::on_stopButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Stop_Key);
+  startRepeating(Stop_Key);
 }
 
 void MainWindow::on_stopButton_released()
@@ -783,7 +844,7 @@ void MainWindow::on_stopButton_released()
 
 void MainWindow::on_ejectButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Eject_Key);
+  startRepeating(Eject_Key);
 }
 
 void MainWindow::on_ejectButton_released()
@@ -792,61 +853,122 @@ void MainWindow::on_ejectButton_released()
 }
 
 
-// Misc tab slots:
+/*
+// Media2 tab slots:
 
-void MainWindow::on_pipOnOffButton_pressed()
+void MainWindow::on_discTitleButton_pressed()
 {
-  emit buttonPressed(currentKeyset, PIP_Key);
+  startRepeating(DiscTitle_Key);
 }
 
-void MainWindow::on_pipOnOffButton_released()
+void MainWindow::on_discTitleButton_released()
 {
   stopRepeating();
 }
 
-void MainWindow::on_pipSwapButton_pressed()
+void MainWindow::on_discSelectButton_pressed()
 {
-  emit buttonPressed(currentKeyset, PIPSwap_Key);
+  startRepeating(NextDisc_Key);
 }
 
-void MainWindow::on_pipSwapButton_released()
+void MainWindow::on_discSelectButton_released()
 {
   stopRepeating();
 }
 
-void MainWindow::on_pipPositionButton_pressed()
+void MainWindow::on_vhsSpeedButton_pressed()
 {
-  emit buttonPressed(currentKeyset, PIPMove_Key);
+  startRepeating(VHSSpeed_Key);
 }
 
-void MainWindow::on_pipPositionButton_released()
+void MainWindow::on_vhsSpeedButton_released()
 {
   stopRepeating();
 }
 
-void MainWindow::on_pipSourceButton_pressed()
+void MainWindow::on_trackingPlusButton_pressed()
 {
-  emit buttonPressed(currentKeyset, PIPSource_Key);
+  startRepeating(TrackingPlus_Key);
 }
 
-void MainWindow::on_pipSourceButton_released()
+void MainWindow::on_trackingPlusButton_released()
+{
+  stopRepeating();
+}
+
+void MainWindow::on_trackingMinusButton_pressed()
+{
+  startRepeating(TrackingMinus_Key);
+}
+
+void MainWindow::on_trackingMinusButton_released()
+{
+  stopRepeating();
+}
+
+void MainWindow::on_autoTrackingButton_pressed()
+{
+  startRepeating(AutoTracking_Key);
+}
+
+void MainWindow::on_autoTrackingButton_released()
+{
+  stopRepeating();
+}
+
+void MainWindow::on_pageUpButton_pressed()
+{
+  startRepeating(PageUp_Key);
+}
+
+void MainWindow::on_pageUpButton_released()
 {
   stopRepeating();
 }
 
-void MainWindow::on_scanButton_pressed()
+void MainWindow::on_pageDownButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Scan_Key);
+  startRepeating(PageDown_Key);
 }
 
-void MainWindow::on_scanButton_released()
+void MainWindow::on_pageDownButton_released()
+{
+  stopRepeating();
+}
+
+void MainWindow::on_slowButton_pressed()
+{
+  startRepeating(Slow_Key);
+}
+
+void MainWindow::on_slowButton_released()
+{
+  stopRepeating();
+}
+
+void MainWindow::on_slowMinusButton_pressed()
+{
+  startRepeating(SlowMinus_Key);
+}
+
+void MainWindow::on_slowMinusButton_released()
+{
+  stopRepeating();
+}
+
+void MainWindow::on_slowPlusButton_pressed()
+{
+  startRepeating(SlowPlus_Key);
+}
+
+void MainWindow::on_slowPlusButton_released()
 {
   stopRepeating();
 }
 
 void MainWindow::on_programButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Program_Key);
+  startRepeating(Program_Key);
 }
 
 void MainWindow::on_programButton_released()
@@ -854,9 +976,52 @@ void MainWindow::on_programButton_released()
   stopRepeating();
 }
 
+void MainWindow::on_tunerBandButton_pressed()
+{
+  startRepeating(TunerBand_Key);
+}
+
+void MainWindow::on_tunerBandButton_released()
+{
+  stopRepeating();
+}
+
+void MainWindow::on_repeatButton_pressed()
+{
+  startRepeating(Repeat_Key);
+}
+
+void MainWindow::on_repeatButton_released()
+{
+  stopRepeating();
+}
+
+void MainWindow::on_repeatABButton_pressed()
+{
+  startRepeating(RepeatAB_Key);
+}
+
+void MainWindow::on_repeatABButton_released()
+{
+  stopRepeating();
+}
+
+void MainWindow::on_randomButton_pressed()
+{
+  startRepeating(Random_Key);
+}
+
+void MainWindow::on_randomButton_released()
+{
+  stopRepeating();
+}
+
+
+// TV Slots:
+
 void MainWindow::on_pictureModeButton_pressed()
 {
-  emit buttonPressed(currentKeyset, PictureMode_Key);
+  startRepeating(PictureMode_Key);
 }
 
 void MainWindow::on_pictureModeButton_released()
@@ -866,7 +1031,7 @@ void MainWindow::on_pictureModeButton_released()
 
 void MainWindow::on_soundModeButton_pressed()
 {
-  emit buttonPressed(currentKeyset, SoundMode_Key);
+  startRepeating(SoundMode_Key);
 }
 
 void MainWindow::on_soundModeButton_released()
@@ -874,92 +1039,164 @@ void MainWindow::on_soundModeButton_released()
   stopRepeating();
 }
 
-void MainWindow::on_discTitleButton_pressed()
+void MainWindow::on_liveTVButton_pressed()
 {
-  emit buttonPressed(currentKeyset, DiscTitle_Key);
+  startRepeating(LiveTV_Key);
 }
 
-void MainWindow::on_discTitleButton_released()
+void MainWindow::on_liveTVButton_released()
 {
   stopRepeating();
 }
 
-void MainWindow::on_discMenuButton_pressed()
+void MainWindow::on_favoritesButton_pressed()
 {
-  emit buttonPressed(currentKeyset, DiscMenu_Key);
+  startRepeating(Favorites_Key);
 }
 
-void MainWindow::on_discMenuButton_released()
+void MainWindow::on_favoritesButton_released()
 {
   stopRepeating();
 }
 
-void MainWindow::on_discSelectButton_pressed()
+void MainWindow::on_teletextButton_pressed()
 {
-  emit buttonPressed(currentKeyset, DiscSelect_Key);
+  startRepeating(Teletext_Key);
 }
 
-void MainWindow::on_discSelectButton_released()
+void MainWindow::on_teletextButton_released()
 {
   stopRepeating();
 }
 
-void MainWindow::on_trackingPlusButton_pressed()
+void MainWindow::on_teletextHoldButton_pressed()
 {
-  emit buttonPressed(currentKeyset, TrackingPlus_Key);
+  startRepeating(TeletextHold_Key);
 }
 
-void MainWindow::on_trackingPlusButton_released()
+void MainWindow::on_teletextHoldButton_released()
 {
   stopRepeating();
 }
 
-void MainWindow::on_trackingMinusButton_pressed()
+void MainWindow::on_teletextRevealButton_pressed()
 {
-  emit buttonPressed(currentKeyset, TrackingMinus_Key);
+  startRepeating(TeletextReveal_Key);
 }
 
-void MainWindow::on_trackingMinusButton_released()
+void MainWindow::on_teletextRevealButton_released()
 {
   stopRepeating();
 }
 
-void MainWindow::on_autoTrackingButton_pressed()
+void MainWindow::on_teletextSizeButton_pressed()
 {
-  emit buttonPressed(currentKeyset, AutoTracking_Key);
+  startRepeating(TeletextSize_Key);
 }
 
-void MainWindow::on_autoTrackingButton_released()
+void MainWindow::on_teletextSizeButton_released()
 {
   stopRepeating();
 }
 
-void MainWindow::on_vhsSpeedButton_pressed()
+void MainWindow::on_pipOnOffButton_pressed()
 {
-  emit buttonPressed(currentKeyset, VHSSpeed_Key);
+  startRepeating(PIP_Key);
 }
 
-void MainWindow::on_vhsSpeedButton_released()
+void MainWindow::on_pipOnOffButton_released()
 {
   stopRepeating();
 }
 
-void MainWindow::on_recordButton_pressed()
+void MainWindow::on_pipSwapButton_pressed()
 {
-  emit buttonPressed(currentKeyset, Record_Key);
+  startRepeating(PIPSwap_Key);
 }
 
-void MainWindow::on_recordButton_released()
+void MainWindow::on_pipSwapButton_released()
 {
   stopRepeating();
 }
 
+void MainWindow::on_pipPositionButton_pressed()
+{
+  startRepeating(PIPMove_Key);
+}
+
+void MainWindow::on_pipPositionButton_released()
+{
+  stopRepeating();
+}
+
+void MainWindow::on_pipSourceButton_pressed()
+{
+  startRepeating(PIPSource_Key);
+}
+
+void MainWindow::on_pipSourceButton_released()
+{
+  stopRepeating();
+}
+
+void MainWindow::on_pipChannelUpButton_pressed()
+{
+  startRepeating(PIPChannelUp_Key);
+}
+
+void MainWindow::on_pipChannelUpButton_released()
+{
+  stopRepeating();
+}
+
+void MainWindow::on_pipChannelDownButton_pressed()
+{
+  startRepeating(PIPChannelDown_Key);
+}
+
+void MainWindow::on_pipChannelDownButton_released()
+{
+  stopRepeating();
+}
+
+void MainWindow::on_pipPauseButton_pressed()
+{
+  startRepeating(PIPPause_Key);
+}
+
+void MainWindow::on_pipPauseButton_released()
+{
+  stopRepeating();
+}
+
+void MainWindow::on_pipSizeButton_pressed()
+{
+  startRepeating(PIPSize_Key);
+}
+
+void MainWindow::on_pipSizeButton_released()
+{
+  stopRepeating();
+}
+*/
+
+
 
 // Menu actions:
 
 void MainWindow::on_actionSelectKeyset_triggered()
 {
-  mySelectionWindow->show();
+  selectKeysetForm->show();
+}
+
+void MainWindow::on_actionSecondary_Buttons_triggered()
+{
+  if (!secondaryForm)
+  {
+    secondaryForm = new PIRSecondaryForm(this);
+  }
+
+  secondaryForm->show();
 }
 
 void MainWindow::on_actionAbout_triggered()
@@ -997,15 +1234,33 @@ void MainWindow::keysetSelectionChanged(
   currentKeyset = kwi->getID();
 
   QSettings settings("pietrzak.org", "Pierogi");
-  settings.setValue("currentKeyset", currentKeyset);
+//  settings.setValue("currentKeyset", currentKeyset);
+
+  settings.setValue(
+    "currentKeysetMake",
+    makeManager.getMakeString(kwi->getMake()));
+
+  settings.setValue(
+    "currentKeysetName",
+    myKeysets->getDisplayName(currentKeyset));
 
   enableButtons();
+  secondaryForm->enableButtons(myKeysets, currentKeyset);
+}
+
+
+void MainWindow::finalCleanup()
+{
+  // Perform any necessary cleanup work here.
+
+  // Make certain that the thread stops repeating:
+  stopRepeating();
 }
 
 
 void MainWindow::on_addKeysetButton_clicked()
 {
-  // Is the current keylist already a favorite?
+  // Is the current keyset already a favorite?
   int count = ui->favoriteKeysetsWidget->count();
   int index = 0;
   PIRKeysetWidgetItem *kwi = NULL;
@@ -1022,7 +1277,7 @@ void MainWindow::on_addKeysetButton_clicked()
     ++index;
   }
 
-  // Ok, add the current keylist to the favorites:
+  // Ok, add the current keyset to the favorites:
   PIRMakeName make = myKeysets->getMake(currentKeyset);
 
   QString name = makeManager.getMakeString(make);
@@ -1032,7 +1287,7 @@ void MainWindow::on_addKeysetButton_clicked()
   ui->favoriteKeysetsWidget->addItem(
     new PIRKeysetWidgetItem(name, currentKeyset, make));
 
-  // And, add the keylist id to the persistent list:
+  // And, add the keyset id to the persistent list:
   QSettings settings("pietrzak.org", "Pierogi");
 
   int favSettingsSize = settings.beginReadArray("favorites");
@@ -1040,7 +1295,14 @@ void MainWindow::on_addKeysetButton_clicked()
 
   settings.beginWriteArray("favorites");
   settings.setArrayIndex(favSettingsSize);
-  settings.setValue("keylistID", currentKeyset);
+//  settings.setValue("keysetID", currentKeyset);
+
+  settings.setValue(
+    "keysetMake",
+    makeManager.getMakeString(myKeysets->getMake(currentKeyset)));
+
+  settings.setValue("keysetName", myKeysets->getDisplayName(currentKeyset));
+
   settings.endArray();
 }
 
@@ -1067,6 +1329,7 @@ void MainWindow::on_removeKeysetButton_clicked()
   if (count == 0) return;
 
   int index = 0;
+  unsigned int id;
   PIRKeysetWidgetItem *kwi = NULL;
   settings.beginWriteArray("favorites");
   while (index < count)
@@ -1075,7 +1338,15 @@ void MainWindow::on_removeKeysetButton_clicked()
       ui->favoriteKeysetsWidget->item(index));
 
     settings.setArrayIndex(index);
-    settings.setValue("keylistID", kwi->getID());
+//    settings.setValue("keysetID", kwi->getID());
+    id = kwi->getID();
+
+    settings.setValue(
+      "keysetMake",
+      makeManager.getMakeString(myKeysets->getMake(id)));
+
+    settings.setValue("keysetName", myKeysets->getDisplayName(id));
+
     ++index;
   }
   settings.endArray();
@@ -1087,22 +1358,57 @@ void MainWindow::populateFavorites()
 
   int size = settings.beginReadArray("favorites");
   int index = 0;
-  PIRMakeName make;
+  QString make;
   QString name;
-  unsigned int id;
+//  unsigned int id;
+  PIRKeysetWidgetItem *kwi;
 
   while (index < size)
   {
     settings.setArrayIndex(index);
-    id = settings.value("keylistID").toInt();
-    make = myKeysets->getMake(id);
-    name = makeManager.getMakeString(make);
-    name.append(" ");
-    name.append(myKeysets->getDisplayName(id));
-    ui->favoriteKeysetsWidget->addItem(
-      new PIRKeysetWidgetItem(name, id, make));
+//    id = settings.value("keysetID").toInt();
+    make = settings.value("keysetMake").toString();
+    name = settings.value("keysetName").toString();
+
+    kwi = myKeysets->makeKeysetItem(make, name);
+
+    // Did the item creation work?
+//    if (myKeysets->keysetExists(id))
+    if (kwi)
+    {
+      // Keyset does exist, so continue:
+//      make = myKeysets->getMake(id);
+//      name = makeManager.getMakeString(make);
+//      name.append(" ");
+//      name.append(myKeysets->getDisplayName(id));
+//    kwi = new PIRKeysetWidgetItem(name, id, make);
+//    myKeysets->populateDeviceTypes(kwi, id);
+//      ui->favoriteKeysetsWidget->addItem(new PIRKeysetWidgetItem(name, id, make));
+      ui->favoriteKeysetsWidget->addItem(kwi);
+    }
+
     ++index;
   }
 
   settings.endArray();
 }
+
+
+void MainWindow::startRepeating(
+  PIRKeyName name)
+{
+  QMutexLocker locker(&commandIFMutex);
+  if (!commandInFlight)
+  {
+    commandInFlight = true;
+    emit buttonPressed(currentKeyset, name);
+  }
+}
+
+
+void MainWindow::stopRepeating()
+{
+  QMutexLocker locker(&stopRepeatingMutex);
+  stopRepeatingFlag = true;
+}
+