Adding per-keyset editable data
[pierogi] / mainwindow.cpp
index 405fcff..bdce733 100644 (file)
@@ -1,19 +1,31 @@
 #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 <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"
 
 //#define DEBUGGING
+//#include <iostream>
 
 // Some ugly globals used for thread communications:
 
@@ -26,6 +38,7 @@ QMutex commandIFMutex;
 bool stopRepeatingFlag = false;
 QMutex stopRepeatingMutex;
 
+
 extern PIRMakeMgr makeManager;
 
 
@@ -33,26 +46,37 @@ MainWindow::MainWindow(QWidget *parent)
   : QMainWindow(parent),
     ui(new Ui::MainWindow),
     selectKeysetForm(0),
+    selectDeviceForm(0),
+    preferencesForm(0),
     documentationForm(0),
     aboutForm(0),
-    currentKeyset(0)
+    myKeysets(0),
+    myPanels(0),
+    currentKeyset(1) // Zero is not a valid keyset any more
 {
   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();
+  myPanels = new PIRPanelManager(this);
 
-  // Set up the keyset selection window:
+  // Display the panels:
+  myPanels->updateTabSet();
+
+  // Construct the rest of the forms:
   selectKeysetForm = new PIRSelectKeysetForm(this);
+  favoritesDialog = new PIRFavoritesDialog(this);
+  myKeysets->populateListWidgets(selectKeysetForm, favoritesDialog);
 
-  myKeysets->populateGuiWidget(selectKeysetForm);
+  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("currentKeysetName"))
   {
@@ -60,32 +84,71 @@ MainWindow::MainWindow(QWidget *parent)
       settings.value("currentKeysetMake").toString(),
       settings.value("currentKeysetName").toString(),
       currentKeyset);
-//    currentKeyset = settings.value("currentKeyset").toInt();
   }
 
+  // Add the corner buttons:
+  insertCornerButtons();
+
   enableButtons();
 
+  QListWidget *fkw = favoritesDialog->getFavoritesListWidget();
+
   connect(
-    ui->favoriteKeysetsWidget,
-//    SIGNAL(itemActivated(QListWidgetItem *)),
-    SIGNAL(currentItemChanged(QListWidgetItem *, QListWidgetItem *)),
+    fkw,
+    SIGNAL(itemActivated(QListWidgetItem *)),
     this,
     SLOT(keysetSelectionChanged(QListWidgetItem *)),
     Qt::QueuedConnection);
 
-  // Make sure the two selection lists don't show different selections:
+  // Make sure the three selection lists don't show different selections:
   QListWidget *klw = selectKeysetForm->getKeysetListWidget();
+  QListWidget *dlw = selectDeviceForm->getDeviceListWidget();
+
+  // favorites -> keyset name
+  connect(
+    fkw,
+    SIGNAL(itemActivated(QListWidgetItem *)),
+    klw,
+    SLOT(clearSelection()),
+    Qt::QueuedConnection);
+
+  // favorites -> device name
   connect(
-    ui->favoriteKeysetsWidget,
+    fkw,
     SIGNAL(itemActivated(QListWidgetItem *)),
+    dlw,
+    SLOT(clearSelection()),
+    Qt::QueuedConnection);
+
+  // keyset name -> favorites
+  connect(
     klw,
+    SIGNAL(itemActivated(QListWidgetItem *)),
+    fkw,
     SLOT(clearSelection()),
     Qt::QueuedConnection);
 
+  // device name -> favorites
+  connect(
+    dlw,
+    SIGNAL(itemActivated(QListWidgetItem *)),
+    fkw,
+    SLOT(clearSelection()),
+    Qt::QueuedConnection);
+
+  // keyset name -> device name
   connect(
     klw,
     SIGNAL(itemActivated(QListWidgetItem *)),
-    ui->favoriteKeysetsWidget,
+    dlw,
+    SLOT(clearSelection()),
+    Qt::QueuedConnection);
+
+  // device name -> keyset name
+  connect(
+    dlw,
+    SIGNAL(itemActivated(QListWidgetItem *)),
+    klw,
     SLOT(clearSelection()),
     Qt::QueuedConnection);
 
@@ -110,6 +173,8 @@ MainWindow::~MainWindow()
 {
   delete myKeysets;
   if (selectKeysetForm) delete selectKeysetForm;
+  if (selectDeviceForm) delete selectDeviceForm;
+//  if (panelSelectionForm) delete panelSelectionForm;
   if (documentationForm) delete documentationForm;
   if (aboutForm) delete aboutForm;
   delete ui;
@@ -173,1222 +238,351 @@ 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));
-
-  // 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));
-  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 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));
-  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 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 guideEnabled(myKeysets->hasKey(currentKeyset, Guide_Key));
-  emit discMenuEnabled(myKeysets->hasKey(currentKeyset, DiscMenu_Key));
-
-  // Media keys:
-  emit nextEnabled(myKeysets->hasKey(currentKeyset, Next_Key));
-  emit previousEnabled(myKeysets->hasKey(currentKeyset, Previous_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));
-
-  // Media2 keys:
-  emit discTitleEnabled(myKeysets->hasKey(currentKeyset, DiscTitle_Key));
-  emit discSelectEnabled(myKeysets->hasKey(currentKeyset, DiscSelect_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 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));
-
-  // 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));
+  // Just to be sure, check to see if the keyset has been populated:
+  myKeysets->populateKeyset(this, currentKeyset);
+
+  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::receivedExternalWarning(
-  const char *warning)
+void MainWindow::useMainPanel()
 {
-  QMessageBox errBox;
-  errBox.setText(warning);
-  errBox.setIcon(QMessageBox::Warning);
-  errBox.exec();
+  myPanels->useMainPanel();
 }
 
 
-// Main tab buttons:
-
-void MainWindow::on_powerButton_pressed()
+void MainWindow::useAltMainPanel()
 {
-  startRepeating(currentKeyset, Power_Key);
+  myPanels->useAltMainPanel();
 }
 
-void MainWindow::on_powerButton_released()
-{
-  stopRepeating();
-}
 
-void MainWindow::on_mainChannelUpButton_pressed()
+QString MainWindow::getCurrentMake()
 {
-  startRepeating(currentKeyset, ChannelUp_Key);
+  return makeManager.getMakeString(myKeysets->getMake(currentKeyset));
 }
 
-void MainWindow::on_mainChannelUpButton_released()
+
+QString MainWindow::getCurrentName()
 {
-  stopRepeating();
+  return myKeysets->getDisplayName(currentKeyset);
 }
 
-void MainWindow::on_mainChannelDownButton_pressed()
+
+void MainWindow::receivedExternalWarning(
+  const char *warning)
 {
-  startRepeating(currentKeyset, ChannelDown_Key);
+  QMessageBox errBox;
+  errBox.setText(warning);
+  errBox.setIcon(QMessageBox::Warning);
+  errBox.exec();
 }
 
-void MainWindow::on_mainChannelDownButton_released()
+
+// Menu actions:
+
+void MainWindow::on_actionSelectKeyset_triggered()
 {
-  stopRepeating();
+  selectKeysetForm->show();
 }
 
-void MainWindow::on_mainVolumeUp_pressed()
+void MainWindow::on_actionSelect_Device_By_Name_triggered()
 {
-  startRepeating(currentKeyset, VolumeUp_Key);
+  selectDeviceForm->show();
 }
 
-void MainWindow::on_mainVolumeUp_released()
+void MainWindow::on_actionPreferences_triggered()
 {
-  stopRepeating();
+  preferencesForm->show();
 }
 
-void MainWindow::on_mainVolumeDownButton_pressed()
+void MainWindow::on_actionAbout_triggered()
 {
-  startRepeating(currentKeyset, VolumeDown_Key);
+  if (!aboutForm)
+  {
+    aboutForm = new PIRAboutForm(this);
+  }
+
+  aboutForm->show();
 }
 
-void MainWindow::on_mainVolumeDownButton_released()
+void MainWindow::on_actionDocumentation_triggered()
 {
-  stopRepeating();
+  if (!documentationForm)
+  {
+    documentationForm = new PIRDocumentationForm(this);
+  }
+
+  documentationForm->show();
 }
 
 
-// Utility tab buttons:
+// Other actions:
 
-void MainWindow::on_redButton_pressed()
+void MainWindow::keysetSelectionChanged(
+  QListWidgetItem *item)
 {
-  startRepeating(currentKeyset, Red_Key);
-}
+  if (!item) return;  // Should probably display error message here!
 
-void MainWindow::on_redButton_released()
-{
-  stopRepeating();
-}
+  PIRKeysetWidgetItem *kwi = dynamic_cast<PIRKeysetWidgetItem *>(item);
 
-void MainWindow::on_greenButton_pressed()
-{
-  startRepeating(currentKeyset, Green_Key);
-}
+  if (!kwi) return; // Also need to say something here
 
-void MainWindow::on_greenButton_released()
-{
-  stopRepeating();
-}
+  if (currentKeyset == kwi->getID())
+  {
+    // We're already on that keyset, so nothing to do:
+    return;
+  }
+  
+  currentKeyset = kwi->getID();
 
-void MainWindow::on_yellowButton_pressed()
-{
-  startRepeating(currentKeyset, Yellow_Key);
-}
+  QSettings settings("pietrzak.org", "Pierogi");
 
-void MainWindow::on_yellowButton_released()
-{
-  stopRepeating();
-}
+  settings.setValue(
+    "currentKeysetMake",
+    makeManager.getMakeString(kwi->getMake()));
 
-void MainWindow::on_blueButton_pressed()
-{
-  startRepeating(currentKeyset, Blue_Key);
-}
+  settings.setValue(
+    "currentKeysetName",
+    myKeysets->getDisplayName(currentKeyset));
 
-void MainWindow::on_blueButton_released()
-{
-  stopRepeating();
+  enableButtons();
 }
 
-void MainWindow::on_aspectRatioButton_pressed()
-{
-  startRepeating(currentKeyset, AspectRatio_Key);
-}
 
-void MainWindow::on_aspectRatioButton_released()
+void MainWindow::finalCleanup()
 {
+  // Perform any necessary cleanup work here.
+
+  // Make certain that the thread stops repeating:
   stopRepeating();
 }
 
-void MainWindow::on_surroundButton_pressed()
-{
-  startRepeating(currentKeyset, Surround_Key);
-}
 
-void MainWindow::on_surroundButton_released()
+void MainWindow::addToFavorites(
+  PIRKeysetWidgetItem *kwi)
 {
-  stopRepeating();
-}
+  //Add keyset to the favorites:
+  favoritesDialog->addItem(new PIRKeysetWidgetItem(kwi));
 
-void MainWindow::on_audioButton_pressed()
-{
-  startRepeating(currentKeyset, Audio_Key);
-}
+  // And, add the keyset id to the persistent list:
+  QSettings settings("pietrzak.org", "Pierogi");
 
-void MainWindow::on_audioButton_released()
-{
-  stopRepeating();
-}
+  int favSettingsSize = settings.beginReadArray("favorites");
+  settings.endArray();
 
-void MainWindow::on_infoButton_pressed()
-{
-  startRepeating(currentKeyset, Info_Key);
-}
+  settings.beginWriteArray("favorites");
+  settings.setArrayIndex(favSettingsSize);
 
-void MainWindow::on_infoButton_released()
-{
-  stopRepeating();
+  settings.setValue(
+    "keysetMake",
+    makeManager.getMakeString(kwi->getMake()));
+
+  settings.setValue("keysetName", kwi->getInternalName());
+
+  settings.endArray();
 }
 
-void MainWindow::on_captionButton_pressed()
+
+void MainWindow::removeFromFavorites(
+  unsigned int keysetID)
 {
-  startRepeating(currentKeyset, Captions_Key);
+  favoritesDialog->removeItem(keysetID);
+
+  // 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 = favoritesDialog->getCount();
+
+  // If the count is empty, we can stop right here:
+  if (count == 0) return;
+
+  int index = 0;
+  unsigned int id;
+  PIRKeysetWidgetItem *kwi = NULL;
+  settings.beginWriteArray("favorites");
+  while (index < count)
+  {
+    kwi = favoritesDialog->getItem(index);
+
+    settings.setArrayIndex(index);
+    id = kwi->getID();
+
+    settings.setValue(
+      "keysetMake",
+      makeManager.getMakeString(myKeysets->getMake(id)));
+
+    settings.setValue("keysetName", myKeysets->getDisplayName(id));
+
+    ++index;
+  }
+  settings.endArray();
 }
 
-void MainWindow::on_captionButton_released()
+
+/*
+void MainWindow::populateFavorites()
 {
-  stopRepeating();
+  QSettings settings("pietrzak.org", "Pierogi");
+
+  int size = settings.beginReadArray("favorites");
+  int index = 0;
+  QString make;
+  QString name;
+  PIRKeysetWidgetItem *kwi;
+
+  while (index < size)
+  {
+    settings.setArrayIndex(index);
+    make = settings.value("keysetMake").toString();
+    name = settings.value("keysetName").toString();
+
+    kwi = myKeysets->makeKeysetItem(make, name);
+
+    // Did the item creation work?
+    if (kwi)
+    {
+      // Keyset does exist, so continue:
+      favoritesDialog->addItem(kwi);
+    }
+
+    ++index;
+  }
+
+  settings.endArray();
 }
+*/
+
 
-void MainWindow::on_inputButton_pressed()
+void MainWindow::startRepeating(
+  PIRKeyName name)
 {
-  startRepeating(currentKeyset, Input_Key);
+  QMutexLocker locker(&commandIFMutex);
+  if (!commandInFlight)
+  {
+    commandInFlight = true;
+    emit buttonPressed(currentKeyset, name);
+  }
 }
 
-void MainWindow::on_inputButton_released()
+
+void MainWindow::startRepeating(
+  PIRKeyName name,
+  unsigned int keysetID)
 {
-  stopRepeating();
+  QMutexLocker locker(&commandIFMutex);
+  if (!commandInFlight)
+  {
+    commandInFlight = true;
+    emit buttonPressed(keysetID, name);
+  }
 }
 
-void MainWindow::on_sleepButton_pressed()
+
+void MainWindow::stopRepeating()
 {
-  startRepeating(currentKeyset, Sleep_Key);
+  QMutexLocker locker(&stopRepeatingMutex);
+  stopRepeatingFlag = true;
 }
 
-void MainWindow::on_sleepButton_released()
+
+void MainWindow::selectPrevFavKeyset()
 {
-  stopRepeating();
+  favoritesDialog->selectPrevFavKeyset();
 }
 
-void MainWindow::on_muteButton_pressed()
+
+void MainWindow::selectNextFavKeyset()
 {
-  startRepeating(currentKeyset, Mute_Key);
+  favoritesDialog->selectNextFavKeyset();
 }
 
-void MainWindow::on_muteButton_released()
+
+void MainWindow::insertCornerButtons()
 {
-  stopRepeating();
-}
+  // Set up the dialog boxes:
+  PIRTabsChoiceDialog *tcd = new PIRTabsChoiceDialog(this);
+//  favoritesDialog = new PIRFavoritesDialog(this);
 
+  // Next, set up the corner buttons:
+  QPushButton *button =
+    new QPushButton(QIcon(":/icons/folder_plus_icon&32.png"), "");
 
-// Keypad tab buttons:
+  button->setFlat(true);
 
-void MainWindow::on_oneButton_pressed()
-{
-  startRepeating(currentKeyset, One_Key);
+  connect(
+    button,
+    SIGNAL(clicked()),
+    tcd,
+    SLOT(exec()),
+    Qt::QueuedConnection);
+
+  ui->mainTabWidget->setCornerWidget(button, Qt::TopRightCorner);
+
+  button =
+    new QPushButton(QIcon(":/icons/align_just_icon&32.png"), "");
+
+  button->setFlat(true);
+
+  connect(
+    button,
+    SIGNAL(clicked()),
+    favoritesDialog,
+    SLOT(exec()),
+    Qt::QueuedConnection);
+
+  ui->mainTabWidget->setCornerWidget(button, Qt::TopLeftCorner);
 }
 
-void MainWindow::on_oneButton_released()
+
+void MainWindow::disableUpdates()
 {
-  stopRepeating();
+  ui->mainTabWidget->setUpdatesEnabled(false);
 }
 
-void MainWindow::on_twoButton_pressed()
+
+void MainWindow::enableUpdates()
 {
-  startRepeating(currentKeyset, Two_Key);
+  ui->mainTabWidget->setUpdatesEnabled(true);
 }
 
-void MainWindow::on_twoButton_released()
+
+void MainWindow::clearTabs()
 {
-  stopRepeating();
+  ui->mainTabWidget->clear();
 }
 
-void MainWindow::on_threeButton_pressed()
+
+void MainWindow::addTab(
+  QWidget *page,
+  QString label)
 {
-  startRepeating(currentKeyset, Three_Key);
+  ui->mainTabWidget->addTab(page, label);
 }
 
-void MainWindow::on_threeButton_released()
+void MainWindow::setupTabs(
+  PIRTabBarName name)
 {
-  stopRepeating();
-}
-
-void MainWindow::on_fourButton_pressed()
-{
-  startRepeating(currentKeyset, Four_Key);
-}
-
-void MainWindow::on_fourButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_fiveButton_pressed()
-{
-  startRepeating(currentKeyset, Five_Key);
-}
-
-void MainWindow::on_fiveButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_sixButton_pressed()
-{
-  startRepeating(currentKeyset, Six_Key);
-}
-
-void MainWindow::on_sixButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_sevenButton_pressed()
-{
-  startRepeating(currentKeyset, Seven_Key);
-}
-
-void MainWindow::on_sevenButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_eightButton_pressed()
-{
-  startRepeating(currentKeyset, Eight_Key);
-}
-
-void MainWindow::on_eightButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_nineButton_pressed()
-{
-  startRepeating(currentKeyset, Nine_Key);
-}
-
-void MainWindow::on_nineButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_zeroButton_pressed()
-{
-  startRepeating(currentKeyset, Zero_Key);
-}
-
-void MainWindow::on_zeroButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_enterButton_pressed()
-{
-  startRepeating(currentKeyset, Enter_Key);
-}
-
-void MainWindow::on_enterButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_clearButton_pressed()
-{
-  startRepeating(currentKeyset, Clear_Key);
-}
-
-void MainWindow::on_clearButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_prevChannelButton_pressed()
-{
-  startRepeating(currentKeyset, PrevChannel_Key);
-}
-
-void MainWindow::on_prevChannelButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_plusOneHundredButton_pressed()
-{
-  startRepeating(currentKeyset, PlusOneHundred_Key);
-}
-
-void MainWindow::on_plusOneHundredButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_dashButton_pressed()
-{
-  startRepeating(currentKeyset, Dash_Key);
-}
-
-void MainWindow::on_dashButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_doubleDigitButton_pressed()
-{
-  startRepeating(currentKeyset, DoubleDigit_Key);
-}
-
-void MainWindow::on_doubleDigitButton_released()
-{
-  stopRepeating();
-}
-
-
-// Menu tab buttons:
-
-void MainWindow::on_upButton_pressed()
-{
-  startRepeating(currentKeyset, Up_Key);
-}
-
-void MainWindow::on_upButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_leftButton_pressed()
-{
-  startRepeating(currentKeyset, Left_Key);
-}
-
-void MainWindow::on_leftButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_rightButton_pressed()
-{
-  startRepeating(currentKeyset, Right_Key);
-}
-
-void MainWindow::on_rightButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_downButton_pressed()
-{
-  startRepeating(currentKeyset, Down_Key);
-}
-
-void MainWindow::on_downButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_selectButton_pressed()
-{
-  startRepeating(currentKeyset, Select_Key);
-}
-
-void MainWindow::on_selectButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_menuButton_pressed()
-{
-  startRepeating(currentKeyset, Menu_Key);
-}
-
-void MainWindow::on_menuButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_exitButton_pressed()
-{
-  startRepeating(currentKeyset, Exit_Key);
-}
-
-void MainWindow::on_exitButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_guideButton_pressed()
-{
-  startRepeating(currentKeyset, Guide_Key);
-}
-
-void MainWindow::on_guideButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_discMenuButton_pressed()
-{
-  startRepeating(currentKeyset, DiscMenu_Key);
-}
-
-void MainWindow::on_discMenuButton_released()
-{
-  stopRepeating();
-}
-
-
-// Media tab buttons:
-
-void MainWindow::on_mediaPreviousButton_pressed()
-{
-  startRepeating(currentKeyset, Previous_Key);
-}
-
-void MainWindow::on_mediaPreviousButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_mediaNextButton_pressed()
-{
-  startRepeating(currentKeyset, Next_Key);
-}
-
-void MainWindow::on_mediaNextButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_replayButton_pressed()
-{
-  startRepeating(currentKeyset, Replay_Key);
-}
-
-void MainWindow::on_replayButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_advanceButton_pressed()
-{
-  startRepeating(currentKeyset, Advance_Key);
-}
-
-void MainWindow::on_advanceButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_stepBackButton_pressed()
-{
-  startRepeating(currentKeyset, StepBack_Key);
-}
-
-void MainWindow::on_stepBackButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_stepForwardButton_pressed()
-{
-  startRepeating(currentKeyset, StepForward_Key);
-}
-
-void MainWindow::on_stepForwardButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_reverseButton_pressed()
-{
-  startRepeating(currentKeyset, Rewind_Key);
-}
-
-void MainWindow::on_reverseButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_fastForwardButton_pressed()
-{
-  startRepeating(currentKeyset, FastForward_Key);
-}
-
-void MainWindow::on_fastForwardButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_playButton_pressed()
-{
-  startRepeating(currentKeyset, Play_Key);
-}
-
-void MainWindow::on_playButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_pauseButton_pressed()
-{
-  startRepeating(currentKeyset, Pause_Key);
-}
-
-void MainWindow::on_pauseButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_stopButton_pressed()
-{
-  startRepeating(currentKeyset, Stop_Key);
-}
-
-void MainWindow::on_stopButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_ejectButton_pressed()
-{
-  startRepeating(currentKeyset, Eject_Key);
-}
-
-void MainWindow::on_ejectButton_released()
-{
-  stopRepeating();
-}
-
-
-// Media2 tab slots:
-
-void MainWindow::on_discTitleButton_pressed()
-{
-  startRepeating(currentKeyset, DiscTitle_Key);
-}
-
-void MainWindow::on_discTitleButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_discSelectButton_pressed()
-{
-  startRepeating(currentKeyset, DiscSelect_Key);
-}
-
-void MainWindow::on_discSelectButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_vhsSpeedButton_pressed()
-{
-  startRepeating(currentKeyset, VHSSpeed_Key);
-}
-
-void MainWindow::on_vhsSpeedButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_trackingPlusButton_pressed()
-{
-  startRepeating(currentKeyset, TrackingPlus_Key);
-}
-
-void MainWindow::on_trackingPlusButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_trackingMinusButton_pressed()
-{
-  startRepeating(currentKeyset, TrackingMinus_Key);
-}
-
-void MainWindow::on_trackingMinusButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_autoTrackingButton_pressed()
-{
-  startRepeating(currentKeyset, AutoTracking_Key);
-}
-
-void MainWindow::on_autoTrackingButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_pageUpButton_pressed()
-{
-  startRepeating(currentKeyset, PageUp_Key);
-}
-
-void MainWindow::on_pageUpButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_pageDownButton_pressed()
-{
-  startRepeating(currentKeyset, PageDown_Key);
-}
-
-void MainWindow::on_pageDownButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_slowButton_pressed()
-{
-  startRepeating(currentKeyset, Slow_Key);
-}
-
-void MainWindow::on_slowButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_slowMinusButton_pressed()
-{
-  startRepeating(currentKeyset, SlowMinus_Key);
-}
-
-void MainWindow::on_slowMinusButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_slowPlusButton_pressed()
-{
-  startRepeating(currentKeyset, SlowPlus_Key);
-}
-
-void MainWindow::on_slowPlusButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_programButton_pressed()
-{
-  startRepeating(currentKeyset, Program_Key);
-}
-
-void MainWindow::on_programButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_tunerBandButton_pressed()
-{
-  startRepeating(currentKeyset, TunerBand_Key);
-}
-
-void MainWindow::on_tunerBandButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_repeatButton_pressed()
-{
-  startRepeating(currentKeyset, Repeat_Key);
-}
-
-void MainWindow::on_repeatButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_repeatABButton_pressed()
-{
-  startRepeating(currentKeyset, RepeatAB_Key);
-}
-
-void MainWindow::on_repeatABButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_randomButton_pressed()
-{
-  startRepeating(currentKeyset, Random_Key);
-}
-
-void MainWindow::on_randomButton_released()
-{
-  stopRepeating();
-}
-
-
-// TV Slots:
-
-void MainWindow::on_pictureModeButton_pressed()
-{
-  startRepeating(currentKeyset, PictureMode_Key);
-}
-
-void MainWindow::on_pictureModeButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_soundModeButton_pressed()
-{
-  startRepeating(currentKeyset, SoundMode_Key);
-}
-
-void MainWindow::on_soundModeButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_liveTVButton_pressed()
-{
-  startRepeating(currentKeyset, LiveTV_Key);
-}
-
-void MainWindow::on_liveTVButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_favoritesButton_pressed()
-{
-  startRepeating(currentKeyset, Favorites_Key);
-}
-
-void MainWindow::on_favoritesButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_teletextButton_pressed()
-{
-  startRepeating(currentKeyset, Teletext_Key);
-}
-
-void MainWindow::on_teletextButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_teletextHoldButton_pressed()
-{
-  startRepeating(currentKeyset, TeletextHold_Key);
-}
-
-void MainWindow::on_teletextHoldButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_teletextRevealButton_pressed()
-{
-  startRepeating(currentKeyset, TeletextReveal_Key);
-}
-
-void MainWindow::on_teletextRevealButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_teletextSizeButton_pressed()
-{
-  startRepeating(currentKeyset, TeletextSize_Key);
-}
-
-void MainWindow::on_teletextSizeButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_pipOnOffButton_pressed()
-{
-  startRepeating(currentKeyset, PIP_Key);
-}
-
-void MainWindow::on_pipOnOffButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_pipSwapButton_pressed()
-{
-  startRepeating(currentKeyset, PIPSwap_Key);
-}
-
-void MainWindow::on_pipSwapButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_pipPositionButton_pressed()
-{
-  startRepeating(currentKeyset, PIPMove_Key);
-}
-
-void MainWindow::on_pipPositionButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_pipSourceButton_pressed()
-{
-  startRepeating(currentKeyset, PIPSource_Key);
-}
-
-void MainWindow::on_pipSourceButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_pipChannelUpButton_pressed()
-{
-  startRepeating(currentKeyset, PIPChannelUp_Key);
-}
-
-void MainWindow::on_pipChannelUpButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_pipChannelDownButton_pressed()
-{
-  startRepeating(currentKeyset, PIPChannelDown_Key);
-}
-
-void MainWindow::on_pipChannelDownButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_pipPauseButton_pressed()
-{
-  startRepeating(currentKeyset, PIPPause_Key);
-}
-
-void MainWindow::on_pipPauseButton_released()
-{
-  stopRepeating();
-}
-
-void MainWindow::on_pipSizeButton_pressed()
-{
-  startRepeating(currentKeyset, PIPSize_Key);
-}
-
-void MainWindow::on_pipSizeButton_released()
-{
-  stopRepeating();
-}
-
-
-
-// Menu actions:
-
-void MainWindow::on_actionSelectKeyset_triggered()
-{
-  selectKeysetForm->show();
-}
-
-void MainWindow::on_actionAbout_triggered()
-{
-  if (!aboutForm)
-  {
-    aboutForm = new PIRAboutForm(this);
-  }
-
-  aboutForm->show();
-}
-
-void MainWindow::on_actionDocumentation_triggered()
-{
-  if (!documentationForm)
-  {
-    documentationForm = new PIRDocumentationForm(this);
-  }
-
-  documentationForm->show();
-}
-
-
-// Other actions:
-
-void MainWindow::keysetSelectionChanged(
-  QListWidgetItem *item)
-{
-  if (!item) return;  // Should probably say something here!
-
-  PIRKeysetWidgetItem *kwi = dynamic_cast<PIRKeysetWidgetItem *>(item);
-
-  if (!kwi) return; // Also need to say something here
-  
-  currentKeyset = kwi->getID();
-
-  QSettings settings("pietrzak.org", "Pierogi");
-//  settings.setValue("currentKeyset", currentKeyset);
-
-  settings.setValue(
-    "currentKeysetMake",
-    makeManager.getMakeString(kwi->getMake()));
-
-  settings.setValue(
-    "currentKeysetName",
-    myKeysets->getDisplayName(currentKeyset));
-
-  enableButtons();
-}
-
-
-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 keyset already a favorite?
-  int count = ui->favoriteKeysetsWidget->count();
-  int index = 0;
-  PIRKeysetWidgetItem *kwi = NULL;
-  while (index < count)
-  {
-    kwi = dynamic_cast<PIRKeysetWidgetItem *>(
-      ui->favoriteKeysetsWidget->item(index));
-
-    if (kwi && (kwi->getID() == currentKeyset))
-    {
-      // Current keyset already in list!  No need to continue.
-      return;
-    }
-    ++index;
-  }
-
-  // Ok, add the current keyset 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 keyset 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("keysetID", currentKeyset);
-
-  settings.setValue(
-    "keysetMake",
-    makeManager.getMakeString(myKeysets->getMake(currentKeyset)));
-
-  settings.setValue("keysetName", myKeysets->getDisplayName(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;
-  unsigned int id;
-  PIRKeysetWidgetItem *kwi = NULL;
-  settings.beginWriteArray("favorites");
-  while (index < count)
-  {
-    kwi = dynamic_cast<PIRKeysetWidgetItem *>(
-      ui->favoriteKeysetsWidget->item(index));
-
-    settings.setArrayIndex(index);
-//    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();
-}
-
-void MainWindow::populateFavorites()
-{
-  QSettings settings("pietrzak.org", "Pierogi");
-
-  int size = settings.beginReadArray("favorites");
-  int index = 0;
-  QString make;
-  QString name;
-//  unsigned int id;
-  PIRKeysetWidgetItem *kwi;
-
-  while (index < size)
-  {
-    settings.setArrayIndex(index);
-//    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(
-  unsigned int id,
-  PIRKeyName name)
-{
-  QMutexLocker locker(&commandIFMutex);
-  if (!commandInFlight)
-  {
-    commandInFlight = true;
-    emit buttonPressed(id, name);
-  }
-}
-
-
-void MainWindow::stopRepeating()
-{
-  QMutexLocker locker(&stopRepeatingMutex);
-  stopRepeatingFlag = true;
+  myPanels->setupTabs(name);
 }