Advanced Settings Panel
[pierogi] / mainwindow.cpp
index d0ffd63..bd556f3 100644 (file)
@@ -1,19 +1,55 @@
+// mainwindow.cpp
+//
+// For the Pierogi IR remote control app.
+//
+// Copyright (C) 2012 by John Pietrzak  (john@pietrzak.org)
+//
+// Licensed under the GNU GPL version 2.0 or later.
+
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
-#include "pirkeysetwidgetitem.h"
-
-//#include "pirexception.h"
 
 #include <QtCore/QCoreApplication>
 #include <QMutex>
 #include <QtGui/QMessageBox>
+#include <QPushButton>
+#include <QDialog>
+#include <QDialogButtonBox>
+#include <QScrollArea>
 #include <QSettings>
-//#include <QDesktopServices>
-//#include <QUrl>
+#include <QKeyEvent>
+
+//#include "pirtabwidget.h"
 
-//#include <iostream>
+#include "pirkeysetmetadata.h"
+
+#include "pirkeysetwidgetitem.h"
+#include "pirselectkeysetform.h"
+#include "pirselectdeviceform.h"
+#include "pirpreferencesform.h"
+#include "pirdocumentationform.h"
+#include "piraboutform.h"
+#include "dialogs/pirtabschoicedialog.h"
+#include "dialogs/pirfavoritesdialog.h"
+
+#include "pirkeysetmanager.h"
+#include "pirpanelmanager.h"
+#include "macros/pirmacromanager.h"
 
 //#define DEBUGGING
+#include <iostream>
+
+// 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;
 
@@ -21,54 +57,80 @@ extern PIRMakeMgr makeManager;
 MainWindow::MainWindow(QWidget *parent)
   : QMainWindow(parent),
     ui(new Ui::MainWindow),
-    mySelectionWindow(0),
+    selectKeysetForm(0),
+    selectDeviceForm(0),
+    preferencesForm(0),
     documentationForm(0),
     aboutForm(0),
-    currentKeyset(0)
+    favoritesDialog(0),
+    myKeysets(0),
+    myPanels(0),
+    myMacros(0),
+    currentKeyset(1) // Zero is not a valid keyset any more
 {
+  // Create the tab widget:
+//  myTabWidget = new PIRTabWidget(ui->centralWidget, this);
+
   ui->setupUi(this);
 
   // Make this a Maemo 5 stacked widget:
   setAttribute(Qt::WA_Maemo5StackedWindow);
 
-  // Collect the keysets:
-  myKeysets = new PIRKeysetManager(this);
+  // Create the managers:
+  myKeysets = new PIRKeysetManager();
+  myMacros = new PIRMacroManager(this);
+  myPanels = new PIRPanelManager(this);
+
+  // Display the panels:
+  myPanels->updateTabSet();
 
-  // Set up the keyset selection window:
-  mySelectionWindow = new SelectionWindow(this);
+  // Construct the rest of the forms:
+  selectKeysetForm = new PIRSelectKeysetForm(this);
+  favoritesDialog = new PIRFavoritesDialog(this);
+  myKeysets->populateListWidgets(selectKeysetForm, favoritesDialog);
+  selectKeysetForm->populateKeysetComboBox(myPanels->getKeysetComboBox());
 
-  myKeysets->populateGuiWidget(mySelectionWindow);
+  selectDeviceForm = new PIRSelectDeviceForm(this);
+  PIRKeysetMetaData::populateDevices(selectDeviceForm);
 
-  // Remember any favorites the user has already set:
-  populateFavorites();
+  preferencesForm = new PIRPreferencesForm(this, myKeysets);
 
+  // Retrieve the user's preferences:
   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);
   }
 
+  selectKeysetForm->selectKeyset(currentKeyset);
+
+  // Add the corner buttons:
+  insertCornerButtons();
+
+  // Set up all the buttons:
   enableButtons();
+  myPanels->updateUserButtons();
 
-  connect(
-    ui->favoriteKeysetsWidget,
-    SIGNAL(itemActivated(QListWidgetItem *)),
-    this,
-    SLOT(keysetSelectionChanged(QListWidgetItem *)),
-    Qt::QueuedConnection);
+  // Make sure the three selection lists don't show different selections:
+  QListWidget *klw = selectKeysetForm->getKeysetListWidget();
+  QListWidget *dlw = selectDeviceForm->getDeviceListWidget();
 
-  // Make sure the two selection lists don't show different selections:
+  // keyset name -> device name
   connect(
-    ui->favoriteKeysetsWidget,
+    klw,
     SIGNAL(itemActivated(QListWidgetItem *)),
-    mySelectionWindow->nameListWidget,
+    dlw,
     SLOT(clearSelection()),
     Qt::QueuedConnection);
 
+  // device name -> keyset name
   connect(
-    mySelectionWindow->nameListWidget,
+    dlw,
     SIGNAL(itemActivated(QListWidgetItem *)),
-    ui->favoriteKeysetsWidget,
+    klw,
     SLOT(clearSelection()),
     Qt::QueuedConnection);
 
@@ -91,10 +153,16 @@ MainWindow::MainWindow(QWidget *parent)
 
 MainWindow::~MainWindow()
 {
-  delete myKeysets;
-  delete mySelectionWindow;
-  if (documentationForm) delete documentationForm;
   if (aboutForm) delete aboutForm;
+  if (documentationForm) delete documentationForm;
+  if (preferencesForm) delete preferencesForm;
+  if (selectDeviceForm) delete selectDeviceForm;
+  if (favoritesDialog) delete favoritesDialog;
+  if (selectKeysetForm) delete selectKeysetForm;
+
+  if (myPanels) delete myPanels;
+  if (myMacros) delete myMacros;
+  if (myKeysets) delete myKeysets;
   delete ui;
 }
 
@@ -156,953 +224,686 @@ void MainWindow::showExpanded()
 
 void MainWindow::enableButtons()
 {
-  // This is going to be a little painful...
-  // Main keys
-  emit powerEnabled(myKeysets->hasKey(currentKeyset, Power_Key));
-  emit volumeUpEnabled(myKeysets->hasKey(currentKeyset, VolumeUp_Key));
-  emit volumeDownEnabled(myKeysets->hasKey(currentKeyset, VolumeDown_Key));
-  emit channelUpEnabled(myKeysets->hasKey(currentKeyset, ChannelUp_Key));
-  emit channelDownEnabled(myKeysets->hasKey(currentKeyset, ChannelDown_Key));
-
-  // Utility keys:
-  emit redEnabled(myKeysets->hasKey(currentKeyset, Red_Key));
-  emit greenEnabled(myKeysets->hasKey(currentKeyset, Green_Key));
-  emit yellowEnabled(myKeysets->hasKey(currentKeyset, Yellow_Key));
-  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 captionsEnabled(myKeysets->hasKey(currentKeyset, Captions_Key));
-  emit sleepEnabled(myKeysets->hasKey(currentKeyset, Sleep_Key));
-  emit inputEnabled(myKeysets->hasKey(currentKeyset, Input_Key));
-  emit muteEnabled(myKeysets->hasKey(currentKeyset, Mute_Key));
-
-  // Keypad keys
-  emit zeroEnabled(myKeysets->hasKey(currentKeyset, Zero_Key));
-  emit oneEnabled(myKeysets->hasKey(currentKeyset, One_Key));
-  emit twoEnabled(myKeysets->hasKey(currentKeyset, Two_Key));
-  emit threeEnabled(myKeysets->hasKey(currentKeyset, Three_Key));
-  emit fourEnabled(myKeysets->hasKey(currentKeyset, Four_Key));
-  emit fiveEnabled(myKeysets->hasKey(currentKeyset, Five_Key));
-  emit sixEnabled(myKeysets->hasKey(currentKeyset, Six_Key));
-  emit sevenEnabled(myKeysets->hasKey(currentKeyset, Seven_Key));
-  emit eightEnabled(myKeysets->hasKey(currentKeyset, Eight_Key));
-  emit nineEnabled(myKeysets->hasKey(currentKeyset, Nine_Key));
-  emit enterEnabled(myKeysets->hasKey(currentKeyset, Enter_Key));
-  emit clearEnabled(myKeysets->hasKey(currentKeyset, Clear_Key));
-  emit dashEnabled(myKeysets->hasKey(currentKeyset, Dash_Key));
-  emit plusOneHundredEnabled(myKeysets->hasKey(currentKeyset, PlusOneHundred_Key));
-  emit doubleDigitEnabled(myKeysets->hasKey(currentKeyset, DoubleDigit_Key));
-  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 exitEnabled(myKeysets->hasKey(currentKeyset, Exit_Key));
-  emit infoEnabled(myKeysets->hasKey(currentKeyset, Info_Key));
-  emit guideEnabled(myKeysets->hasKey(currentKeyset, Guide_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 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));
-  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 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 keysetNameChanged(myKeysets->getDisplayName(currentKeyset));
-}
-
-
-void MainWindow::receivedExternalWarning(
-  const char *warning)
-{
-  QMessageBox errBox;
-  errBox.setText(warning);
-  errBox.setIcon(QMessageBox::Warning);
-  errBox.exec();
-}
+  // Just to be sure, check to see if the keyset has been populated:
+  myKeysets->populateKeyset(this, currentKeyset);
 
-
-// Main tab buttons:
-
-void MainWindow::on_powerButton_pressed()
-{
-  emit buttonPressed(currentKeyset, Power_Key);
+  if (preferencesForm)
+  {
+    unsigned int dk = preferencesForm->getDefaultKeyset();
+    if (preferencesForm->defaultControlsVolume() && dk)
+    {
+      myKeysets->populateKeyset(this, dk);
+      myPanels->enableButtons(myKeysets, currentKeyset, dk);
+    }
+    else
+    {
+      myPanels->enableButtons(myKeysets, currentKeyset);
+    }
+  }
+  else
+  {
+    myPanels->enableButtons(myKeysets, currentKeyset);
+  }
 }
 
-void MainWindow::on_powerButton_released()
-{
-  stopRepeating();
-}
 
-void MainWindow::on_mainChannelUpButton_pressed()
+void MainWindow::useMainPanel()
 {
-  emit buttonPressed(currentKeyset, ChannelUp_Key);
+  myPanels->useMainPanel();
 }
 
-void MainWindow::on_mainChannelUpButton_released()
-{
-  stopRepeating();
-}
 
-void MainWindow::on_mainChannelDownButton_pressed()
+void MainWindow::useAltMainPanel()
 {
-  emit buttonPressed(currentKeyset, ChannelDown_Key);
+  myPanels->useAltMainPanel();
 }
 
-void MainWindow::on_mainChannelDownButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_mainVolumeUp_pressed()
-{
-  emit buttonPressed(currentKeyset, VolumeUp_Key);
-}
 
-void MainWindow::on_mainVolumeUp_released()
+QString MainWindow::getCurrentMake()
 {
-  stopRepeating();
+  return makeManager.getMakeString(myKeysets->getMake(currentKeyset));
 }
 
-void MainWindow::on_mainVolumeDownButton_pressed()
-{
-  emit buttonPressed(currentKeyset, VolumeDown_Key);
-}
 
-void MainWindow::on_mainVolumeDownButton_released()
+QString MainWindow::getCurrentName()
 {
-  stopRepeating();
+  return myKeysets->getDisplayName(currentKeyset);
 }
 
 
-// Utility tab buttons:
-
-void MainWindow::on_redButton_pressed()
-{
-  emit buttonPressed(currentKeyset, Red_Key);
-}
-
-void MainWindow::on_redButton_released()
+QString MainWindow::getCurrentFullName()
 {
-  stopRepeating();
+  return selectKeysetForm->getCurrentKeysetName();
 }
 
-void MainWindow::on_greenButton_pressed()
-{
-  emit buttonPressed(currentKeyset, Green_Key);
-}
 
-void MainWindow::on_greenButton_released()
+QString MainWindow::getKeysetMake(
+  unsigned int id)
 {
-  stopRepeating();
+  return makeManager.getMakeString(myKeysets->getMake(id));
 }
 
-void MainWindow::on_yellowButton_pressed()
-{
-  emit buttonPressed(currentKeyset, Yellow_Key);
-}
 
-void MainWindow::on_yellowButton_released()
+QString MainWindow::getKeysetName(
+  unsigned int id)
 {
-  stopRepeating();
+  return myKeysets->getDisplayName(id);
 }
 
-void MainWindow::on_blueButton_pressed()
-{
-  emit buttonPressed(currentKeyset, Blue_Key);
-}
 
-void MainWindow::on_blueButton_released()
+QString MainWindow::getFullKeysetName(
+  unsigned int id)
 {
-  stopRepeating();
+  return selectKeysetForm->getKeysetName(id);
 }
 
-void MainWindow::on_aspectRatioButton_pressed()
-{
-  emit buttonPressed(currentKeyset, AspectRatio_Key);
-}
 
-void MainWindow::on_aspectRatioButton_released()
+bool MainWindow::findKeysetID(
+  QString make,
+  QString name,
+  unsigned int &id)
 {
-  stopRepeating();
+  return myKeysets->findKeysetID(make, name, id);
 }
 
-void MainWindow::on_surroundButton_pressed()
-{
-  emit buttonPressed(currentKeyset, Surround_Key);
-}
 
-void MainWindow::on_surroundButton_released()
+void MainWindow::receivedExternalWarning(
+  const char *warning)
 {
-  stopRepeating();
+  QMessageBox errBox;
+  errBox.setText(warning);
+  errBox.setIcon(QMessageBox::Warning);
+  errBox.exec();
 }
 
-void MainWindow::on_languageButton_pressed()
-{
-  emit buttonPressed(currentKeyset, Language_Key);
-}
 
-void MainWindow::on_languageButton_released()
-{
-  stopRepeating();
-}
+// Menu actions:
 
-void MainWindow::on_favoritesButton_pressed()
+void MainWindow::on_actionSelectKeyset_triggered()
 {
-  emit buttonPressed(currentKeyset, Favorites_Key);
+  selectKeysetForm->show();
 }
 
-void MainWindow::on_favoritesButton_released()
+void MainWindow::on_actionBrowse_Device_List_triggered()
 {
-  stopRepeating();
+  selectDeviceForm->show();
 }
 
-void MainWindow::on_captionButton_pressed()
+void MainWindow::on_actionPreferences_triggered()
 {
-  emit buttonPressed(currentKeyset, Captions_Key);
+  preferencesForm->show();
 }
 
-void MainWindow::on_captionButton_released()
+void MainWindow::on_actionAbout_triggered()
 {
-  stopRepeating();
-}
+  if (!aboutForm)
+  {
+    aboutForm = new PIRAboutForm(this);
+  }
 
-void MainWindow::on_inputButton_pressed()
-{
-  emit buttonPressed(currentKeyset, Input_Key);
+  aboutForm->show();
 }
 
-void MainWindow::on_inputButton_released()
+void MainWindow::on_actionDocumentation_triggered()
 {
-  stopRepeating();
-}
+  if (!documentationForm)
+  {
+    documentationForm = new PIRDocumentationForm(this);
+  }
 
-void MainWindow::on_sleepButton_pressed()
-{
-  emit buttonPressed(currentKeyset, Sleep_Key);
+  documentationForm->show();
 }
 
-void MainWindow::on_sleepButton_released()
-{
-  stopRepeating();
-}
 
-void MainWindow::on_muteButton_pressed()
-{
-  emit buttonPressed(currentKeyset, Mute_Key);
-}
+// Other actions:
 
-void MainWindow::on_muteButton_released()
+void MainWindow::keysetSelectionChanged(
+  QListWidgetItem *item)
 {
-  stopRepeating();
-}
-
+  if (!item) return;  // Should probably display error message here!
 
-// Keypad tab buttons:
+  PIRKeysetWidgetItem *kwi = dynamic_cast<PIRKeysetWidgetItem *>(item);
 
-void MainWindow::on_oneButton_pressed()
-{
-  emit buttonPressed(currentKeyset, One_Key);
-}
+  if (!kwi) return; // Also need to say something here
 
-void MainWindow::on_oneButton_released()
-{
-  stopRepeating();
-}
+  if (currentKeyset == kwi->getID())
+  {
+    // We're already on that keyset, so nothing to do:
+    return;
+  }
 
-void MainWindow::on_twoButton_pressed()
-{
-  emit buttonPressed(currentKeyset, Two_Key);
-}
+  // Clean up and remove the current keyset:
+  myKeysets->clearKeyset(currentKeyset);
+  
+  currentKeyset = kwi->getID();
 
-void MainWindow::on_twoButton_released()
-{
-  stopRepeating();
-}
+  QSettings settings("pietrzak.org", "Pierogi");
 
-void MainWindow::on_threeButton_pressed()
-{
-  emit buttonPressed(currentKeyset, Three_Key);
-}
+  settings.setValue(
+    "currentKeysetMake",
+    makeManager.getMakeString(kwi->getMake()));
 
-void MainWindow::on_threeButton_released()
-{
-  stopRepeating();
-}
+  settings.setValue(
+    "currentKeysetName",
+    myKeysets->getDisplayName(currentKeyset));
 
-void MainWindow::on_fourButton_pressed()
-{
-  emit buttonPressed(currentKeyset, Four_Key);
+  enableButtons();
 }
 
-void MainWindow::on_fourButton_released()
-{
-  stopRepeating();
-}
 
-void MainWindow::on_fiveButton_pressed()
+void MainWindow::finalCleanup()
 {
-  emit buttonPressed(currentKeyset, Five_Key);
-}
+  // Perform any necessary cleanup work here.
 
-void MainWindow::on_fiveButton_released()
-{
+  // Make certain that the thread stops repeating:
   stopRepeating();
 }
 
-void MainWindow::on_sixButton_pressed()
-{
-  emit buttonPressed(currentKeyset, Six_Key);
-}
-
-void MainWindow::on_sixButton_released()
-{
-  stopRepeating();
-}
 
-void MainWindow::on_sevenButton_pressed()
+void MainWindow::addToFavorites(
+  PIRKeysetWidgetItem *kwi)
 {
-  emit buttonPressed(currentKeyset, Seven_Key);
-}
+  //Add keyset to the favorites:
+  favoritesDialog->addItem(new PIRKeysetWidgetItem(kwi));
 
-void MainWindow::on_sevenButton_released()
-{
-  stopRepeating();
-}
+  // And, add the keyset id to the persistent list:
+  QSettings settings("pietrzak.org", "Pierogi");
 
-void MainWindow::on_eightButton_pressed()
-{
-  emit buttonPressed(currentKeyset, Eight_Key);
-}
+  int favSettingsSize = settings.beginReadArray("favorites");
+  settings.endArray();
 
-void MainWindow::on_eightButton_released()
-{
-  stopRepeating();
-}
+  settings.beginWriteArray("favorites");
+  settings.setArrayIndex(favSettingsSize);
 
-void MainWindow::on_nineButton_pressed()
-{
-  emit buttonPressed(currentKeyset, Nine_Key);
-}
+  settings.setValue(
+    "keysetMake",
+    makeManager.getMakeString(kwi->getMake()));
 
-void MainWindow::on_nineButton_released()
-{
-  stopRepeating();
-}
+  settings.setValue("keysetName", kwi->getInternalName());
 
-void MainWindow::on_zeroButton_pressed()
-{
-  emit buttonPressed(currentKeyset, Zero_Key);
+  settings.endArray();
 }
 
-void MainWindow::on_zeroButton_released()
-{
-  stopRepeating();
-}
 
-void MainWindow::on_enterButton_pressed()
+void MainWindow::removeFromFavorites(
+  unsigned int keysetID)
 {
-  emit buttonPressed(currentKeyset, Enter_Key);
-}
+  favoritesDialog->removeItem(keysetID);
 
-void MainWindow::on_enterButton_released()
-{
-  stopRepeating();
-}
+  // Remove this item from the persistent list.  Well, actually, it seems a
+  // little more convenient to just blow away the existing list of favorites
+  // and rewrite it, as modifying an existing QSettings array in the middle
+  // seems a bit hard...
+  QSettings settings("pietrzak.org", "Pierogi");
 
-void MainWindow::on_clearButton_pressed()
-{
-  emit buttonPressed(currentKeyset, Clear_Key);
-}
+  settings.remove("favorites");
 
-void MainWindow::on_clearButton_released()
-{
-  stopRepeating();
-}
+  int count = favoritesDialog->getCount();
 
-void MainWindow::on_prevChannelButton_pressed()
-{
-  emit buttonPressed(currentKeyset, PrevChannel_Key);
-}
+  // If the count is empty, we can stop right here:
+  if (count == 0) return;
 
-void MainWindow::on_prevChannelButton_released()
-{
-  stopRepeating();
-}
+  int index = 0;
+  unsigned int id;
+  PIRKeysetWidgetItem *kwi = NULL;
+  settings.beginWriteArray("favorites");
+  while (index < count)
+  {
+    kwi = favoritesDialog->getItem(index);
 
-void MainWindow::on_plusOneHundredButton_pressed()
-{
-  emit buttonPressed(currentKeyset, PlusOneHundred_Key);
-}
+    settings.setArrayIndex(index);
+    id = kwi->getID();
 
-void MainWindow::on_plusOneHundredButton_released()
-{
-  stopRepeating();
-}
+    settings.setValue(
+      "keysetMake",
+      makeManager.getMakeString(myKeysets->getMake(id)));
 
-void MainWindow::on_dashButton_pressed()
-{
-  emit buttonPressed(currentKeyset, Dash_Key);
-}
+    settings.setValue("keysetName", myKeysets->getDisplayName(id));
 
-void MainWindow::on_dashButton_released()
-{
-  stopRepeating();
+    ++index;
+  }
+  settings.endArray();
 }
 
-void MainWindow::on_doubleDigitButton_pressed()
-{
-  emit buttonPressed(currentKeyset, DoubleDigit_Key);
-}
 
-void MainWindow::on_doubleDigitButton_released()
+/*
+void MainWindow::populateFavorites()
 {
-  stopRepeating();
-}
+  QSettings settings("pietrzak.org", "Pierogi");
 
+  int size = settings.beginReadArray("favorites");
+  int index = 0;
+  QString make;
+  QString name;
+  PIRKeysetWidgetItem *kwi;
 
-// Menu tab buttons:
+  while (index < size)
+  {
+    settings.setArrayIndex(index);
+    make = settings.value("keysetMake").toString();
+    name = settings.value("keysetName").toString();
 
-void MainWindow::on_upButton_pressed()
-{
-  emit buttonPressed(currentKeyset, Up_Key);
-}
+    kwi = myKeysets->makeKeysetItem(make, name);
 
-void MainWindow::on_upButton_released()
-{
-  stopRepeating();
-}
+    // Did the item creation work?
+    if (kwi)
+    {
+      // Keyset does exist, so continue:
+      favoritesDialog->addItem(kwi);
+    }
 
-void MainWindow::on_leftButton_pressed()
-{
-  emit buttonPressed(currentKeyset, Left_Key);
-}
+    ++index;
+  }
 
-void MainWindow::on_leftButton_released()
-{
-  stopRepeating();
+  settings.endArray();
 }
+*/
 
-void MainWindow::on_rightButton_pressed()
-{
-  emit buttonPressed(currentKeyset, Right_Key);
-}
 
-void MainWindow::on_rightButton_released()
+bool MainWindow::startRepeating(
+  PIRKeyName name)
 {
-  stopRepeating();
+  QMutexLocker locker(&commandIFMutex);
+  if (!commandInFlight)
+  {
+    commandInFlight = true;
+    emit buttonPressed(currentKeyset, name);
+    return true;
+  }
+  else
+  {
+    return false;
+  }
 }
 
-void MainWindow::on_downButton_pressed()
-{
-  emit buttonPressed(currentKeyset, Down_Key);
-}
 
-void MainWindow::on_downButton_released()
+bool MainWindow::startRepeating(
+  PIRKeyName name,
+  unsigned int keysetID)
 {
-  stopRepeating();
+  QMutexLocker locker(&commandIFMutex);
+  if (!commandInFlight)
+  {
+    commandInFlight = true;
+    emit buttonPressed(keysetID, name);
+    return true;
+  }
+  else
+  {
+    return false;
+  }
 }
 
-void MainWindow::on_selectButton_pressed()
-{
-  emit buttonPressed(currentKeyset, Select_Key);
-}
 
-void MainWindow::on_selectButton_released()
+void MainWindow::stopRepeating()
 {
-  stopRepeating();
+  QMutexLocker locker(&stopRepeatingMutex);
+  stopRepeatingFlag = true;
 }
 
-void MainWindow::on_menuButton_pressed()
-{
-  emit buttonPressed(currentKeyset, Menu_Key);
-}
 
-void MainWindow::on_menuButton_released()
+void MainWindow::selectPrevFavKeyset()
 {
-  stopRepeating();
+  favoritesDialog->selectPrevFavKeyset();
 }
 
-void MainWindow::on_exitButton_pressed()
-{
-  emit buttonPressed(currentKeyset, Exit_Key);
-}
 
-void MainWindow::on_exitButton_released()
+void MainWindow::selectNextFavKeyset()
 {
-  stopRepeating();
+  favoritesDialog->selectNextFavKeyset();
 }
 
 
-
-// Media tab buttons:
-
-void MainWindow::on_mediaPreviousButton_pressed()
+void MainWindow::insertCornerButtons()
 {
-  emit buttonPressed(currentKeyset, Previous_Key);
-}
+  // Set up the dialog boxes:
+  PIRTabsChoiceDialog *tcd = new PIRTabsChoiceDialog(this);
+//  favoritesDialog = new PIRFavoritesDialog(this);
 
-void MainWindow::on_mediaPreviousButton_released()
-{
-  stopRepeating();
-}
+  // Next, set up the corner buttons:
+  QPushButton *button =
+    new QPushButton(QIcon(":/icons/folder_plus_icon&32.png"), "");
 
-void MainWindow::on_mediaNextButton_pressed()
-{
-  emit buttonPressed(currentKeyset, Next_Key);
-}
+  button->setFlat(true);
 
-void MainWindow::on_mediaNextButton_released()
-{
-  stopRepeating();
-}
+  connect(
+    button,
+    SIGNAL(clicked()),
+    tcd,
+    SLOT(exec()),
+    Qt::QueuedConnection);
 
-void MainWindow::on_replayButton_pressed()
-{
-  emit buttonPressed(currentKeyset, Replay_Key);
-}
+  ui->mainTabWidget->setCornerWidget(button, Qt::TopRightCorner);
+//  myTabWidget->setCornerWidget(button, Qt::TopRightCorner);
 
-void MainWindow::on_replayButton_released()
-{
-  stopRepeating();
-}
+  button =
+    new QPushButton(QIcon(":/icons/align_just_icon&32.png"), "");
 
-void MainWindow::on_advanceButton_pressed()
-{
-  emit buttonPressed(currentKeyset, Advance_Key);
-}
+  button->setFlat(true);
 
-void MainWindow::on_advanceButton_released()
-{
-  stopRepeating();
-}
+  connect(
+    button,
+    SIGNAL(clicked()),
+    favoritesDialog,
+    SLOT(exec()),
+    Qt::QueuedConnection);
 
-void MainWindow::on_stepBackButton_pressed()
-{
-  emit buttonPressed(currentKeyset, StepBack_Key);
+  ui->mainTabWidget->setCornerWidget(button, Qt::TopLeftCorner);
+//  myTabWidget->setCornerWidget(button, Qt::TopLeftCorner);
 }
 
-void MainWindow::on_stepBackButton_released()
-{
-  stopRepeating();
-}
 
-void MainWindow::on_stepForwardButton_pressed()
+void MainWindow::disableUpdates()
 {
-  emit buttonPressed(currentKeyset, StepForward_Key);
+  ui->mainTabWidget->setUpdatesEnabled(false);
+//  myTabWidget->setUpdatesEnabled(false);
 }
 
-void MainWindow::on_stepForwardButton_released()
-{
-  stopRepeating();
-}
 
-void MainWindow::on_reverseButton_pressed()
+void MainWindow::enableUpdates()
 {
-  emit buttonPressed(currentKeyset, Rewind_Key);
+  ui->mainTabWidget->setUpdatesEnabled(true);
+//  myTabWidget->setUpdatesEnabled(true);
 }
 
-void MainWindow::on_reverseButton_released()
-{
-  stopRepeating();
-}
 
-void MainWindow::on_fastForwardButton_pressed()
+void MainWindow::clearTabs()
 {
-  emit buttonPressed(currentKeyset, FastForward_Key);
+  ui->mainTabWidget->clear();
+//  myTabWidget->clear();
 }
 
-void MainWindow::on_fastForwardButton_released()
-{
-  stopRepeating();
-}
 
-void MainWindow::on_playButton_pressed()
+void MainWindow::addTab(
+  QWidget *page,
+  QString label)
 {
-  emit buttonPressed(currentKeyset, Play_Key);
+  ui->mainTabWidget->addTab(page, label);
+//  myTabWidget->addTab(page, label);
 }
 
-void MainWindow::on_playButton_released()
+void MainWindow::setupTabs(
+  PIRTabBarName name)
 {
-  stopRepeating();
+  myPanels->setupTabs(name);
 }
 
-void MainWindow::on_pauseButton_pressed()
-{
-  emit buttonPressed(currentKeyset, Pause_Key);
-}
 
-void MainWindow::on_pauseButton_released()
+bool MainWindow::selectNextKeyset()
 {
-  stopRepeating();
+  return selectKeysetForm->selectNextKeyset();
 }
 
-void MainWindow::on_stopButton_pressed()
-{
-  emit buttonPressed(currentKeyset, Stop_Key);
-}
 
-void MainWindow::on_stopButton_released()
+bool MainWindow::selectPrevKeyset()
 {
-  stopRepeating();
+  return selectKeysetForm->selectPrevKeyset();
 }
 
-void MainWindow::on_ejectButton_pressed()
-{
-  emit buttonPressed(currentKeyset, Eject_Key);
-}
 
-void MainWindow::on_ejectButton_released()
+bool MainWindow::selectFirstKeyset()
 {
-  stopRepeating();
+  return selectKeysetForm->selectFirstKeyset();
 }
 
 
-// Misc tab slots:
-
-void MainWindow::on_pipOnOffButton_pressed()
+void MainWindow::openCurrentKeysetDialog()
 {
-  emit buttonPressed(currentKeyset, PIP_Key);
+  selectKeysetForm->openCurrentKeysetDialog();
 }
 
-void MainWindow::on_pipOnOffButton_released()
-{
-  stopRepeating();
-}
 
-void MainWindow::on_pipSwapButton_pressed()
+void MainWindow::updateKeysetSelection(
+  unsigned int targetID)
 {
-  emit buttonPressed(currentKeyset, PIPSwap_Key);
+  selectKeysetForm->selectKeyset(targetID);
 }
 
-void MainWindow::on_pipSwapButton_released()
-{
-  stopRepeating();
-}
 
-void MainWindow::on_pipPositionButton_pressed()
+PIRMacroPack *MainWindow::getUserPack()
 {
-  emit buttonPressed(currentKeyset, PIPMove_Key);
+  return myMacros->getUserPack();
 }
 
-void MainWindow::on_pipPositionButton_released()
-{
-  stopRepeating();
-}
 
-void MainWindow::on_pipSourceButton_pressed()
+PIRMacroPack *MainWindow::getMultitapPack()
 {
-  emit buttonPressed(currentKeyset, PIPSource_Key);
+  return myMacros->getMultitapPack();
 }
 
-void MainWindow::on_pipSourceButton_released()
-{
-  stopRepeating();
-}
 
-void MainWindow::on_scanButton_pressed()
+void MainWindow::handleKeypress(
+  char key)
 {
-  emit buttonPressed(currentKeyset, Scan_Key);
+  myMacros->handleKeypress(key);
 }
 
-void MainWindow::on_scanButton_released()
-{
-  stopRepeating();
-}
 
-void MainWindow::on_programButton_pressed()
+/*
+void MainWindow::handleKeyRelease(
+  char key)
 {
-  emit buttonPressed(currentKeyset, Program_Key);
 }
+*/
 
-void MainWindow::on_programButton_released()
-{
-  stopRepeating();
-}
 
-void MainWindow::on_pictureModeButton_pressed()
+void MainWindow::gotoPreviousTabs()
 {
-  emit buttonPressed(currentKeyset, PictureMode_Key);
+  myPanels->gotoPreviousTabs();
 }
 
-void MainWindow::on_pictureModeButton_released()
-{
-  stopRepeating();
-}
 
-void MainWindow::on_soundModeButton_pressed()
+void MainWindow::gotoNextTabs()
 {
-  emit buttonPressed(currentKeyset, SoundMode_Key);
+  myPanels->gotoNextTabs();
 }
 
-void MainWindow::on_soundModeButton_released()
+/*
+void MainWindow::keyPressEvent(
+  QKeyEvent *event)
 {
-  stopRepeating();
+  switch(event->key())
+  {
+  case Qt::Key_A:
+    myMacros->handleKeypress('A');
+    break;
+  case Qt::Key_B:
+    myMacros->handleKeypress('B');
+    break;
+  case Qt::Key_C:
+    myMacros->handleKeypress('C');
+    break;
+  case Qt::Key_D:
+    myMacros->handleKeypress('D');
+    break;
+  case Qt::Key_E:
+    myMacros->handleKeypress('E');
+    break;
+  case Qt::Key_F:
+    myMacros->handleKeypress('F');
+    break;
+  case Qt::Key_G:
+    myMacros->handleKeypress('G');
+    break;
+  case Qt::Key_H:
+    myMacros->handleKeypress('H');
+    break;
+  case Qt::Key_I:
+    myMacros->handleKeypress('I');
+    break;
+  case Qt::Key_J:
+    myMacros->handleKeypress('J');
+    break;
+  case Qt::Key_K:
+    myMacros->handleKeypress('K');
+    break;
+  case Qt::Key_L:
+    myMacros->handleKeypress('L');
+    break;
+  case Qt::Key_M:
+    myMacros->handleKeypress('M');
+    break;
+  case Qt::Key_N:
+    myMacros->handleKeypress('N');
+    break;
+  case Qt::Key_O:
+    myMacros->handleKeypress('O');
+    break;
+  case Qt::Key_P:
+    myMacros->handleKeypress('P');
+    break;
+  case Qt::Key_Q:
+    myMacros->handleKeypress('Q');
+    break;
+  case Qt::Key_R:
+    myMacros->handleKeypress('R');
+    break;
+  case Qt::Key_S:
+    myMacros->handleKeypress('S');
+    break;
+  case Qt::Key_T:
+    myMacros->handleKeypress('T');
+    break;
+  case Qt::Key_U:
+    myMacros->handleKeypress('U');
+    break;
+  case Qt::Key_V:
+    myMacros->handleKeypress('V');
+    break;
+  case Qt::Key_W:
+    myMacros->handleKeypress('W');
+    break;
+  case Qt::Key_X:
+    myMacros->handleKeypress('X');
+    break;
+  case Qt::Key_Y:
+    myMacros->handleKeypress('Y');
+    break;
+  case Qt::Key_Z:
+    myMacros->handleKeypress('Z');
+    break;
+  case Qt::Key_Space:
+    myMacros->handleKeypress(' ');
+    break;
+
+  case Qt::Key_Up:
+    myPanels->gotoPreviousTabs();
+    break;
+  case Qt::Key_Down:
+    myPanels->gotoNextTabs();
+    break;
+
+
+  case Qt::Key_Left:
+    startRepeating(VolumeDown_Key);
+    break;
+  case Qt::Key_Right:
+    startRepeating(VolumeUp_Key);
+    break;
+
+  case Qt::Key_Backspace:
+    startRepeating(Power_Key);
+    break;
+  case Qt::Key_Return:
+    startRepeating(Mute_Key);
+    break;
+
+  default:
+    QMainWindow::keyPressEvent(event);
+    break;
+  }
 }
+*/
 
-void MainWindow::on_discTitleButton_pressed()
-{
-  emit buttonPressed(currentKeyset, DiscTitle_Key);
-}
 
-void MainWindow::on_discTitleButton_released()
+/*
+void MainWindow::keyReleaseEvent(
+  QKeyEvent *event)
 {
-  stopRepeating();
-}
+  switch(event->key())
+  {
 
-void MainWindow::on_discMenuButton_pressed()
-{
-  emit buttonPressed(currentKeyset, DiscMenu_Key);
-}
+  case Qt::Key_Up:
+  case Qt::Key_Down:
+  case Qt::Key_Left:
+  case Qt::Key_Right:
 
-void MainWindow::on_discMenuButton_released()
-{
-  stopRepeating();
-}
+  case Qt::Key_Backspace:
+  case Qt::Key_Return:
+    stopRepeating();
+    break;
 
-void MainWindow::on_discSelectButton_pressed()
-{
-  emit buttonPressed(currentKeyset, DiscSelect_Key);
+  default:
+    QMainWindow::keyReleaseEvent(event);
+    break;
+  }
 }
+*/
 
-void MainWindow::on_discSelectButton_released()
-{
-  stopRepeating();
-}
 
-void MainWindow::on_trackingPlusButton_pressed()
+bool MainWindow::hasMacroButton(
+  unsigned int buttonID)
 {
-  emit buttonPressed(currentKeyset, TrackingPlus_Key);
+  return myMacros->hasMacroButton(buttonID);
 }
 
-void MainWindow::on_trackingPlusButton_released()
-{
-  stopRepeating();
-}
 
-void MainWindow::on_trackingMinusButton_pressed()
+QString MainWindow::getMacroButtonText(
+  unsigned int buttonID)
 {
-  emit buttonPressed(currentKeyset, TrackingMinus_Key);
+  return myMacros->getMacroButtonText(buttonID);
 }
 
-void MainWindow::on_trackingMinusButton_released()
-{
-  stopRepeating();
-}
 
-void MainWindow::on_autoTrackingButton_pressed()
+void MainWindow::executeMacroButton(
+  unsigned int buttonID)
 {
-  emit buttonPressed(currentKeyset, AutoTracking_Key);
+  myMacros->executeMacroButton(buttonID);
 }
 
-void MainWindow::on_autoTrackingButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_vhsSpeedButton_pressed()
-{
-  emit buttonPressed(currentKeyset, VHSSpeed_Key);
-}
 
-void MainWindow::on_vhsSpeedButton_released()
+void MainWindow::updateUserButtons()
 {
-  stopRepeating();
+  myPanels->updateUserButtons();
 }
 
-void MainWindow::on_recordButton_pressed()
-{
-  emit buttonPressed(currentKeyset, Record_Key);
-}
 
-void MainWindow::on_recordButton_released()
+void MainWindow::storeMacros()
 {
-  stopRepeating();
+  myMacros->storeSettings();
 }
 
 
-// Menu actions:
-
-void MainWindow::on_actionSelectKeyset_triggered()
+void MainWindow::setMacroKbdFocus(
+  int index)
 {
-  mySelectionWindow->show();
+  myMacros->setKbdFocus(index);
 }
 
-void MainWindow::on_actionAbout_triggered()
-{
-  if (!aboutForm)
-  {
-    aboutForm = new PIRAboutForm(this);
-  }
 
-  aboutForm->show();
-}
-
-void MainWindow::on_actionDocumentation_triggered()
+void MainWindow::setMacroBtnFocus(
+  int index)
 {
-  if (!documentationForm)
-  {
-    documentationForm = new PIRDocumentationForm(this);
-  }
-
-  documentationForm->show();
+  myMacros->setBtnFocus(index);
 }
 
 
-// Other actions:
-
-void MainWindow::keysetSelectionChanged(
-  QListWidgetItem *item)
+void MainWindow::switchToTab(
+  int tabNumber)
 {
-  if (!item) return;  // Should probably say something here!
-
-  PIRKeysetWidgetItem *kwi = dynamic_cast<PIRKeysetWidgetItem *>(item);
+  int count = ui->mainTabWidget->count();
 
-  if (!kwi) return; // Also need to say something here
-  
-  currentKeyset = kwi->getID();
-
-  QSettings settings("pietrzak.org", "Pierogi");
-  settings.setValue("currentKeyset", currentKeyset);
-
-  enableButtons();
-}
-
-
-void MainWindow::on_addKeysetButton_clicked()
-{
-  // Is the current keylist already a favorite?
-  int count = ui->favoriteKeysetsWidget->count();
-  int index = 0;
-  PIRKeysetWidgetItem *kwi = NULL;
-  while (index < count)
+  if (tabNumber < 0)
   {
-    kwi = dynamic_cast<PIRKeysetWidgetItem *>(
-      ui->favoriteKeysetsWidget->item(index));
-
-    if (kwi && (kwi->getID() == currentKeyset))
-    {
-      // Current keyset already in list!  No need to continue.
-      return;
-    }
-    ++index;
+    ui->mainTabWidget->setCurrentIndex(0);
   }
-
-  // Ok, add the current keylist to the favorites:
-  PIRMakeName make = myKeysets->getMake(currentKeyset);
-
-  QString name = makeManager.getMakeString(make);
-  name.append(" ");
-  name.append(myKeysets->getDisplayName(currentKeyset));
-
-  ui->favoriteKeysetsWidget->addItem(
-    new PIRKeysetWidgetItem(name, currentKeyset, make));
-
-  // And, add the keylist id to the persistent list:
-  QSettings settings("pietrzak.org", "Pierogi");
-
-  int favSettingsSize = settings.beginReadArray("favorites");
-  settings.endArray();
-
-  settings.beginWriteArray("favorites");
-  settings.setArrayIndex(favSettingsSize);
-  settings.setValue("keylistID", currentKeyset);
-  settings.endArray();
-}
-
-
-void MainWindow::on_removeKeysetButton_clicked()
-{
-  // Deleting an item removes it from the list, so just grab the currently
-  // selected item and delete it:
-  QListWidgetItem *item = ui->favoriteKeysetsWidget->currentItem();
-
-  if (item) delete item;
-
-  // Remove this item from the persistent list.  Well, actually, it seems a
-  // little more convenient to just blow away the existing list of favorites
-  // and rewrite it, as modifying an existing QSettings array in the middle
-  // seems a bit hard...
-  QSettings settings("pietrzak.org", "Pierogi");
-
-  settings.remove("favorites");
-
-  int count = ui->favoriteKeysetsWidget->count();
-
-  // If the count is empty, we can stop right here:
-  if (count == 0) return;
-
-  int index = 0;
-  PIRKeysetWidgetItem *kwi = NULL;
-  settings.beginWriteArray("favorites");
-  while (index < count)
+  else if (tabNumber >= count)
   {
-    kwi = dynamic_cast<PIRKeysetWidgetItem *>(
-      ui->favoriteKeysetsWidget->item(index));
-
-    settings.setArrayIndex(index);
-    settings.setValue("keylistID", kwi->getID());
-    ++index;
+    ui->mainTabWidget->setCurrentIndex(count-1);
   }
-  settings.endArray();
-}
-
-void MainWindow::populateFavorites()
-{
-  QSettings settings("pietrzak.org", "Pierogi");
-
-  int size = settings.beginReadArray("favorites");
-  int index = 0;
-  PIRMakeName make;
-  QString name;
-  unsigned int id;
-
-  while (index < size)
+  else
   {
-    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));
-    ++index;
+    ui->mainTabWidget->setCurrentIndex(tabNumber);
   }
-
-  settings.endArray();
 }