Added Hildon Banners, bugfixes, new keysets
[pierogi] / mainwindow.cpp
index 405fcff..27f13d7 100644 (file)
@@ -1,17 +1,18 @@
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
-#include "pirkeysetwidgetitem.h"
-
-//#include "pirexception.h"
 
 #include <QtCore/QCoreApplication>
 #include <QMutex>
 #include <QtGui/QMessageBox>
 #include <QSettings>
-//#include <QDesktopServices>
-//#include <QUrl>
+#include <QMaemo5InformationBox>
 
-//#include <iostream>
+#include "pirkeysetwidgetitem.h"
+#include "pirselectkeysetform.h"
+#include "pirsecondaryform.h"
+#include "pirdocumentationform.h"
+#include "piraboutform.h"
+#include "pirkeysetmanager.h"
 
 //#define DEBUGGING
 
@@ -33,6 +34,7 @@ MainWindow::MainWindow(QWidget *parent)
   : QMainWindow(parent),
     ui(new Ui::MainWindow),
     selectKeysetForm(0),
+    secondaryForm(0),
     documentationForm(0),
     aboutForm(0),
     currentKeyset(0)
@@ -48,6 +50,9 @@ MainWindow::MainWindow(QWidget *parent)
   // Set up the keyset selection window:
   selectKeysetForm = new PIRSelectKeysetForm(this);
 
+  // Set up the secondary buttons window:
+  secondaryForm = new PIRSecondaryForm(this);
+
   myKeysets->populateGuiWidget(selectKeysetForm);
 
   // Remember any favorites the user has already set:
@@ -64,6 +69,7 @@ MainWindow::MainWindow(QWidget *parent)
   }
 
   enableButtons();
+  secondaryForm->enableButtons(myKeysets, currentKeyset);
 
   connect(
     ui->favoriteKeysetsWidget,
@@ -180,6 +186,7 @@ void MainWindow::enableButtons()
   emit volumeDownEnabled(myKeysets->hasKey(currentKeyset, VolumeDown_Key));
   emit channelUpEnabled(myKeysets->hasKey(currentKeyset, ChannelUp_Key));
   emit channelDownEnabled(myKeysets->hasKey(currentKeyset, ChannelDown_Key));
+  emit muteEnabled(myKeysets->hasKey(currentKeyset, Mute_Key));
 
   // Main tab labels:
   emit keysetMakeChanged(
@@ -191,14 +198,15 @@ void MainWindow::enableButtons()
   emit greenEnabled(myKeysets->hasKey(currentKeyset, Green_Key));
   emit yellowEnabled(myKeysets->hasKey(currentKeyset, Yellow_Key));
   emit blueEnabled(myKeysets->hasKey(currentKeyset, Blue_Key));
+  emit pictureModeEnabled(myKeysets->hasKey(currentKeyset, PictureMode_Key));
+  emit soundModeEnabled(myKeysets->hasKey(currentKeyset, SoundMode_Key));
   emit aspectRatioEnabled(myKeysets->hasKey(currentKeyset, AspectRatio_Key));
-  emit surroundEnabled(myKeysets->hasKey(currentKeyset, Surround_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));
@@ -242,42 +250,6 @@ void MainWindow::enableButtons()
   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));
 }
 
 
@@ -295,7 +267,7 @@ void MainWindow::receivedExternalWarning(
 
 void MainWindow::on_powerButton_pressed()
 {
-  startRepeating(currentKeyset, Power_Key);
+  startRepeating(Power_Key);
 }
 
 void MainWindow::on_powerButton_released()
@@ -305,7 +277,7 @@ void MainWindow::on_powerButton_released()
 
 void MainWindow::on_mainChannelUpButton_pressed()
 {
-  startRepeating(currentKeyset, ChannelUp_Key);
+  startRepeating(ChannelUp_Key);
 }
 
 void MainWindow::on_mainChannelUpButton_released()
@@ -315,7 +287,7 @@ void MainWindow::on_mainChannelUpButton_released()
 
 void MainWindow::on_mainChannelDownButton_pressed()
 {
-  startRepeating(currentKeyset, ChannelDown_Key);
+  startRepeating(ChannelDown_Key);
 }
 
 void MainWindow::on_mainChannelDownButton_released()
@@ -325,7 +297,7 @@ void MainWindow::on_mainChannelDownButton_released()
 
 void MainWindow::on_mainVolumeUp_pressed()
 {
-  startRepeating(currentKeyset, VolumeUp_Key);
+  startRepeating(VolumeUp_Key);
 }
 
 void MainWindow::on_mainVolumeUp_released()
@@ -335,7 +307,7 @@ void MainWindow::on_mainVolumeUp_released()
 
 void MainWindow::on_mainVolumeDownButton_pressed()
 {
-  startRepeating(currentKeyset, VolumeDown_Key);
+  startRepeating(VolumeDown_Key);
 }
 
 void MainWindow::on_mainVolumeDownButton_released()
@@ -343,12 +315,22 @@ void MainWindow::on_mainVolumeDownButton_released()
   stopRepeating();
 }
 
+void MainWindow::on_muteButton_pressed()
+{
+  startRepeating(Mute_Key);
+}
+
+void MainWindow::on_muteButton_released()
+{
+  stopRepeating();
+}
+
 
 // Utility tab buttons:
 
 void MainWindow::on_redButton_pressed()
 {
-  startRepeating(currentKeyset, Red_Key);
+  startRepeating(Red_Key);
 }
 
 void MainWindow::on_redButton_released()
@@ -358,7 +340,7 @@ void MainWindow::on_redButton_released()
 
 void MainWindow::on_greenButton_pressed()
 {
-  startRepeating(currentKeyset, Green_Key);
+  startRepeating(Green_Key);
 }
 
 void MainWindow::on_greenButton_released()
@@ -368,7 +350,7 @@ void MainWindow::on_greenButton_released()
 
 void MainWindow::on_yellowButton_pressed()
 {
-  startRepeating(currentKeyset, Yellow_Key);
+  startRepeating(Yellow_Key);
 }
 
 void MainWindow::on_yellowButton_released()
@@ -378,7 +360,7 @@ void MainWindow::on_yellowButton_released()
 
 void MainWindow::on_blueButton_pressed()
 {
-  startRepeating(currentKeyset, Blue_Key);
+  startRepeating(Blue_Key);
 }
 
 void MainWindow::on_blueButton_released()
@@ -386,9 +368,29 @@ void MainWindow::on_blueButton_released()
   stopRepeating();
 }
 
+void MainWindow::on_pictureModeButton_pressed()
+{
+  startRepeating(PictureMode_Key);
+}
+
+void MainWindow::on_pictureModeButton_released()
+{
+  stopRepeating();
+}
+
+void MainWindow::on_soundModeButton_pressed()
+{
+  startRepeating(SoundMode_Key);
+}
+
+void MainWindow::on_soundModeButton_released()
+{
+  stopRepeating();
+}
+
 void MainWindow::on_aspectRatioButton_pressed()
 {
-  startRepeating(currentKeyset, AspectRatio_Key);
+  startRepeating(AspectRatio_Key);
 }
 
 void MainWindow::on_aspectRatioButton_released()
@@ -396,19 +398,21 @@ void MainWindow::on_aspectRatioButton_released()
   stopRepeating();
 }
 
+/*
 void MainWindow::on_surroundButton_pressed()
 {
-  startRepeating(currentKeyset, Surround_Key);
+  startRepeating(Surround_Key);
 }
 
 void MainWindow::on_surroundButton_released()
 {
   stopRepeating();
 }
+*/
 
 void MainWindow::on_audioButton_pressed()
 {
-  startRepeating(currentKeyset, Audio_Key);
+  startRepeating(Audio_Key);
 }
 
 void MainWindow::on_audioButton_released()
@@ -418,7 +422,7 @@ void MainWindow::on_audioButton_released()
 
 void MainWindow::on_infoButton_pressed()
 {
-  startRepeating(currentKeyset, Info_Key);
+  startRepeating(Info_Key);
 }
 
 void MainWindow::on_infoButton_released()
@@ -428,7 +432,7 @@ void MainWindow::on_infoButton_released()
 
 void MainWindow::on_captionButton_pressed()
 {
-  startRepeating(currentKeyset, Captions_Key);
+  startRepeating(Captions_Key);
 }
 
 void MainWindow::on_captionButton_released()
@@ -438,7 +442,7 @@ void MainWindow::on_captionButton_released()
 
 void MainWindow::on_inputButton_pressed()
 {
-  startRepeating(currentKeyset, Input_Key);
+  startRepeating(Input_Key);
 }
 
 void MainWindow::on_inputButton_released()
@@ -448,7 +452,7 @@ void MainWindow::on_inputButton_released()
 
 void MainWindow::on_sleepButton_pressed()
 {
-  startRepeating(currentKeyset, Sleep_Key);
+  startRepeating(Sleep_Key);
 }
 
 void MainWindow::on_sleepButton_released()
@@ -456,22 +460,12 @@ void MainWindow::on_sleepButton_released()
   stopRepeating();
 }
 
-void MainWindow::on_muteButton_pressed()
-{
-  startRepeating(currentKeyset, Mute_Key);
-}
-
-void MainWindow::on_muteButton_released()
-{
-  stopRepeating();
-}
-
 
 // Keypad tab buttons:
 
 void MainWindow::on_oneButton_pressed()
 {
-  startRepeating(currentKeyset, One_Key);
+  startRepeating(One_Key);
 }
 
 void MainWindow::on_oneButton_released()
@@ -481,7 +475,7 @@ void MainWindow::on_oneButton_released()
 
 void MainWindow::on_twoButton_pressed()
 {
-  startRepeating(currentKeyset, Two_Key);
+  startRepeating(Two_Key);
 }
 
 void MainWindow::on_twoButton_released()
@@ -491,7 +485,7 @@ void MainWindow::on_twoButton_released()
 
 void MainWindow::on_threeButton_pressed()
 {
-  startRepeating(currentKeyset, Three_Key);
+  startRepeating(Three_Key);
 }
 
 void MainWindow::on_threeButton_released()
@@ -501,7 +495,7 @@ void MainWindow::on_threeButton_released()
 
 void MainWindow::on_fourButton_pressed()
 {
-  startRepeating(currentKeyset, Four_Key);
+  startRepeating(Four_Key);
 }
 
 void MainWindow::on_fourButton_released()
@@ -511,7 +505,7 @@ void MainWindow::on_fourButton_released()
 
 void MainWindow::on_fiveButton_pressed()
 {
-  startRepeating(currentKeyset, Five_Key);
+  startRepeating(Five_Key);
 }
 
 void MainWindow::on_fiveButton_released()
@@ -521,7 +515,7 @@ void MainWindow::on_fiveButton_released()
 
 void MainWindow::on_sixButton_pressed()
 {
-  startRepeating(currentKeyset, Six_Key);
+  startRepeating(Six_Key);
 }
 
 void MainWindow::on_sixButton_released()
@@ -531,7 +525,7 @@ void MainWindow::on_sixButton_released()
 
 void MainWindow::on_sevenButton_pressed()
 {
-  startRepeating(currentKeyset, Seven_Key);
+  startRepeating(Seven_Key);
 }
 
 void MainWindow::on_sevenButton_released()
@@ -541,7 +535,7 @@ void MainWindow::on_sevenButton_released()
 
 void MainWindow::on_eightButton_pressed()
 {
-  startRepeating(currentKeyset, Eight_Key);
+  startRepeating(Eight_Key);
 }
 
 void MainWindow::on_eightButton_released()
@@ -551,7 +545,7 @@ void MainWindow::on_eightButton_released()
 
 void MainWindow::on_nineButton_pressed()
 {
-  startRepeating(currentKeyset, Nine_Key);
+  startRepeating(Nine_Key);
 }
 
 void MainWindow::on_nineButton_released()
@@ -561,7 +555,7 @@ void MainWindow::on_nineButton_released()
 
 void MainWindow::on_zeroButton_pressed()
 {
-  startRepeating(currentKeyset, Zero_Key);
+  startRepeating(Zero_Key);
 }
 
 void MainWindow::on_zeroButton_released()
@@ -571,7 +565,7 @@ void MainWindow::on_zeroButton_released()
 
 void MainWindow::on_enterButton_pressed()
 {
-  startRepeating(currentKeyset, Enter_Key);
+  startRepeating(Enter_Key);
 }
 
 void MainWindow::on_enterButton_released()
@@ -581,7 +575,7 @@ void MainWindow::on_enterButton_released()
 
 void MainWindow::on_clearButton_pressed()
 {
-  startRepeating(currentKeyset, Clear_Key);
+  startRepeating(Clear_Key);
 }
 
 void MainWindow::on_clearButton_released()
@@ -591,7 +585,7 @@ void MainWindow::on_clearButton_released()
 
 void MainWindow::on_prevChannelButton_pressed()
 {
-  startRepeating(currentKeyset, PrevChannel_Key);
+  startRepeating(PrevChannel_Key);
 }
 
 void MainWindow::on_prevChannelButton_released()
@@ -601,7 +595,7 @@ void MainWindow::on_prevChannelButton_released()
 
 void MainWindow::on_plusOneHundredButton_pressed()
 {
-  startRepeating(currentKeyset, PlusOneHundred_Key);
+  startRepeating(PlusOneHundred_Key);
 }
 
 void MainWindow::on_plusOneHundredButton_released()
@@ -611,7 +605,7 @@ void MainWindow::on_plusOneHundredButton_released()
 
 void MainWindow::on_dashButton_pressed()
 {
-  startRepeating(currentKeyset, Dash_Key);
+  startRepeating(Dash_Key);
 }
 
 void MainWindow::on_dashButton_released()
@@ -621,7 +615,7 @@ void MainWindow::on_dashButton_released()
 
 void MainWindow::on_doubleDigitButton_pressed()
 {
-  startRepeating(currentKeyset, DoubleDigit_Key);
+  startRepeating(DoubleDigit_Key);
 }
 
 void MainWindow::on_doubleDigitButton_released()
@@ -634,7 +628,7 @@ void MainWindow::on_doubleDigitButton_released()
 
 void MainWindow::on_upButton_pressed()
 {
-  startRepeating(currentKeyset, Up_Key);
+  startRepeating(Up_Key);
 }
 
 void MainWindow::on_upButton_released()
@@ -644,7 +638,7 @@ void MainWindow::on_upButton_released()
 
 void MainWindow::on_leftButton_pressed()
 {
-  startRepeating(currentKeyset, Left_Key);
+  startRepeating(Left_Key);
 }
 
 void MainWindow::on_leftButton_released()
@@ -654,7 +648,7 @@ void MainWindow::on_leftButton_released()
 
 void MainWindow::on_rightButton_pressed()
 {
-  startRepeating(currentKeyset, Right_Key);
+  startRepeating(Right_Key);
 }
 
 void MainWindow::on_rightButton_released()
@@ -664,7 +658,7 @@ void MainWindow::on_rightButton_released()
 
 void MainWindow::on_downButton_pressed()
 {
-  startRepeating(currentKeyset, Down_Key);
+  startRepeating(Down_Key);
 }
 
 void MainWindow::on_downButton_released()
@@ -674,7 +668,7 @@ void MainWindow::on_downButton_released()
 
 void MainWindow::on_selectButton_pressed()
 {
-  startRepeating(currentKeyset, Select_Key);
+  startRepeating(Select_Key);
 }
 
 void MainWindow::on_selectButton_released()
@@ -684,7 +678,7 @@ void MainWindow::on_selectButton_released()
 
 void MainWindow::on_menuButton_pressed()
 {
-  startRepeating(currentKeyset, Menu_Key);
+  startRepeating(Menu_Key);
 }
 
 void MainWindow::on_menuButton_released()
@@ -694,7 +688,7 @@ void MainWindow::on_menuButton_released()
 
 void MainWindow::on_exitButton_pressed()
 {
-  startRepeating(currentKeyset, Exit_Key);
+  startRepeating(Exit_Key);
 }
 
 void MainWindow::on_exitButton_released()
@@ -704,7 +698,7 @@ void MainWindow::on_exitButton_released()
 
 void MainWindow::on_guideButton_pressed()
 {
-  startRepeating(currentKeyset, Guide_Key);
+  startRepeating(Guide_Key);
 }
 
 void MainWindow::on_guideButton_released()
@@ -714,7 +708,7 @@ void MainWindow::on_guideButton_released()
 
 void MainWindow::on_discMenuButton_pressed()
 {
-  startRepeating(currentKeyset, DiscMenu_Key);
+  startRepeating(DiscMenu_Key);
 }
 
 void MainWindow::on_discMenuButton_released()
@@ -727,7 +721,7 @@ void MainWindow::on_discMenuButton_released()
 
 void MainWindow::on_mediaPreviousButton_pressed()
 {
-  startRepeating(currentKeyset, Previous_Key);
+  startRepeating(Previous_Key);
 }
 
 void MainWindow::on_mediaPreviousButton_released()
@@ -737,7 +731,7 @@ void MainWindow::on_mediaPreviousButton_released()
 
 void MainWindow::on_mediaNextButton_pressed()
 {
-  startRepeating(currentKeyset, Next_Key);
+  startRepeating(Next_Key);
 }
 
 void MainWindow::on_mediaNextButton_released()
@@ -747,7 +741,7 @@ void MainWindow::on_mediaNextButton_released()
 
 void MainWindow::on_replayButton_pressed()
 {
-  startRepeating(currentKeyset, Replay_Key);
+  startRepeating(Replay_Key);
 }
 
 void MainWindow::on_replayButton_released()
@@ -757,7 +751,7 @@ void MainWindow::on_replayButton_released()
 
 void MainWindow::on_advanceButton_pressed()
 {
-  startRepeating(currentKeyset, Advance_Key);
+  startRepeating(Advance_Key);
 }
 
 void MainWindow::on_advanceButton_released()
@@ -767,7 +761,7 @@ void MainWindow::on_advanceButton_released()
 
 void MainWindow::on_stepBackButton_pressed()
 {
-  startRepeating(currentKeyset, StepBack_Key);
+  startRepeating(StepBack_Key);
 }
 
 void MainWindow::on_stepBackButton_released()
@@ -777,7 +771,7 @@ void MainWindow::on_stepBackButton_released()
 
 void MainWindow::on_stepForwardButton_pressed()
 {
-  startRepeating(currentKeyset, StepForward_Key);
+  startRepeating(StepForward_Key);
 }
 
 void MainWindow::on_stepForwardButton_released()
@@ -787,7 +781,7 @@ void MainWindow::on_stepForwardButton_released()
 
 void MainWindow::on_reverseButton_pressed()
 {
-  startRepeating(currentKeyset, Rewind_Key);
+  startRepeating(Rewind_Key);
 }
 
 void MainWindow::on_reverseButton_released()
@@ -797,7 +791,7 @@ void MainWindow::on_reverseButton_released()
 
 void MainWindow::on_fastForwardButton_pressed()
 {
-  startRepeating(currentKeyset, FastForward_Key);
+  startRepeating(FastForward_Key);
 }
 
 void MainWindow::on_fastForwardButton_released()
@@ -807,7 +801,7 @@ void MainWindow::on_fastForwardButton_released()
 
 void MainWindow::on_playButton_pressed()
 {
-  startRepeating(currentKeyset, Play_Key);
+  startRepeating(Play_Key);
 }
 
 void MainWindow::on_playButton_released()
@@ -817,7 +811,7 @@ void MainWindow::on_playButton_released()
 
 void MainWindow::on_pauseButton_pressed()
 {
-  startRepeating(currentKeyset, Pause_Key);
+  startRepeating(Pause_Key);
 }
 
 void MainWindow::on_pauseButton_released()
@@ -827,7 +821,7 @@ void MainWindow::on_pauseButton_released()
 
 void MainWindow::on_stopButton_pressed()
 {
-  startRepeating(currentKeyset, Stop_Key);
+  startRepeating(Stop_Key);
 }
 
 void MainWindow::on_stopButton_released()
@@ -837,7 +831,7 @@ void MainWindow::on_stopButton_released()
 
 void MainWindow::on_ejectButton_pressed()
 {
-  startRepeating(currentKeyset, Eject_Key);
+  startRepeating(Eject_Key);
 }
 
 void MainWindow::on_ejectButton_released()
@@ -846,338 +840,21 @@ void MainWindow::on_ejectButton_released()
 }
 
 
-// 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();
-}
+// Menu actions:
 
-void MainWindow::on_pipSizeButton_pressed()
+void MainWindow::on_actionSelectKeyset_triggered()
 {
-  startRepeating(currentKeyset, PIPSize_Key);
+  selectKeysetForm->show();
 }
 
-void MainWindow::on_pipSizeButton_released()
+void MainWindow::on_actionSecondary_Buttons_triggered()
 {
-  stopRepeating();
-}
-
-
-
-// Menu actions:
+  if (!secondaryForm)
+  {
+    secondaryForm = new PIRSecondaryForm(this);
+  }
 
-void MainWindow::on_actionSelectKeyset_triggered()
-{
-  selectKeysetForm->show();
+  secondaryForm->show();
 }
 
 void MainWindow::on_actionAbout_triggered()
@@ -1226,6 +903,7 @@ void MainWindow::keysetSelectionChanged(
     myKeysets->getDisplayName(currentKeyset));
 
   enableButtons();
+  secondaryForm->enableButtons(myKeysets, currentKeyset);
 }
 
 
@@ -1340,30 +1018,20 @@ void MainWindow::populateFavorites()
   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);
     }
 
@@ -1375,14 +1043,13 @@ void MainWindow::populateFavorites()
 
 
 void MainWindow::startRepeating(
-  unsigned int id,
   PIRKeyName name)
 {
   QMutexLocker locker(&commandIFMutex);
   if (!commandInFlight)
   {
     commandInFlight = true;
-    emit buttonPressed(id, name);
+    emit buttonPressed(currentKeyset, name);
   }
 }
 
@@ -1392,3 +1059,67 @@ void MainWindow::stopRepeating()
   QMutexLocker locker(&stopRepeatingMutex);
   stopRepeatingFlag = true;
 }
+
+
+QWidget *MainWindow::getSecondaryWindow()
+{
+  return secondaryForm;
+}
+
+
+void MainWindow::selectPrevFavKeyset()
+{
+  int size = ui->favoriteKeysetsWidget->count();
+
+  if (size == 0)
+  {
+    // No favorites, so nothing to do!
+    return;
+  }
+
+  int position = ui->favoriteKeysetsWidget->currentRow();
+
+  --position;
+  if (position < 0)
+  {
+    position = size - 1;
+  }
+
+  ui->favoriteKeysetsWidget->setCurrentRow(
+    position,
+    QItemSelectionModel::ClearAndSelect);
+
+  // Tell the user about the change:
+  QMaemo5InformationBox::information(
+    0,
+    ui->favoriteKeysetsWidget->item(position)->text());
+}
+
+
+void MainWindow::selectNextFavKeyset()
+{
+  int size = ui->favoriteKeysetsWidget->count();
+
+  if (size == 0)
+  {
+    // No favorites, so just return:
+    return;
+  }
+
+  int position = ui->favoriteKeysetsWidget->currentRow();
+
+  ++position;
+  if (position == size)
+  {
+    position = 0;
+  }
+
+  ui->favoriteKeysetsWidget->setCurrentRow(
+    position,
+    QItemSelectionModel::ClearAndSelect);
+
+  // Tell the user about the change:
+  QMaemo5InformationBox::information(
+    0,
+    ui->favoriteKeysetsWidget->item(position)->text());
+}