From ba2bdf24764a4fdda9acf6526ca07c653e142ad4 Mon Sep 17 00:00:00 2001 From: John Pietrzak Date: Fri, 2 Mar 2012 20:10:13 -0500 Subject: [PATCH] Bug fixes, new panel Several bugs in the Select Keyset by Device form fixed, including the problem of child classes inheriting their parent's devices. Also, a new Program/Record panel, bringing the "Record" button back to Pierogi. Finally, new keysets for Compro, Kaon, and QNAP. --- PierogiResources.qrc | 1 + forms/piradjustform.ui | 11 +- forms/pirairconditionerform.ui | 11 +- forms/pirfavoritesform.ui | 11 +- forms/pirinputform.ui | 11 +- forms/pirkeypadform.ui | 11 +- forms/pirmainform.ui | 11 +- forms/pirmedia2form.ui | 11 +- forms/pirmediaform.ui | 11 +- forms/pirmenuform.ui | 11 +- forms/pirrecordform.cpp | 157 +++++++++++ forms/pirrecordform.h | 73 +++++ forms/pirrecordform.ui | 449 ++++++++++++++++++++++++++++++ forms/pirtvform.ui | 11 +- forms/pirutilityform.ui | 11 +- icons/red_pause.png | Bin 0 -> 2889 bytes keysets/compro.cpp | 66 +++++ keysets/compro.h | 18 ++ keysets/kaon.cpp | 68 +++++ keysets/kaon.h | 18 ++ keysets/lg.cpp | 1 + keysets/qnap.cpp | 68 +++++ keysets/qnap.h | 18 ++ keysets/sky.cpp | 5 +- keysets/sony.cpp | 1 + keysets/wd.cpp | 2 + mainwindow.cpp | 4 +- mainwindow.ui | 11 +- pierogi.pro | 20 +- pierogi.pro.user | 10 +- pirdeviceinfo.cpp | 14 + pirdeviceinfo.h | 34 +++ pirkeysetmanager.cpp | 18 +- pirkeysetmanager.h | 5 +- pirkeysetmetadata.cpp | 25 +- pirkeysetmetadata.h | 34 +-- pirmakenames.cpp | 3 + pirmakenames.h | 3 + pirpanelmanager.cpp | 34 ++- pirpanelmanager.h | 6 +- pirpanelnames.h | 3 +- pirpanelselectionform.cpp | 13 +- pirpanelselectionform.h | 3 +- pirpanelselectionform.ui | 7 + pirselectdeviceform.cpp | 7 +- pirselectdeviceform.h | 7 +- pirselectdeviceform.ui | 2 +- pirselectkeysetform.cpp | 2 + pirselectkeysetform.h | 2 + protocols/rc6skyprotocol.cpp | 1 + qtc_packaging/debian_fremantle/changelog | 7 + qtc_packaging/debian_fremantle/control | 4 +- 52 files changed, 1149 insertions(+), 196 deletions(-) create mode 100644 forms/pirrecordform.cpp create mode 100644 forms/pirrecordform.h create mode 100644 forms/pirrecordform.ui create mode 100644 icons/red_pause.png create mode 100644 keysets/compro.cpp create mode 100644 keysets/compro.h create mode 100644 keysets/kaon.cpp create mode 100644 keysets/kaon.h create mode 100644 keysets/qnap.cpp create mode 100644 keysets/qnap.h create mode 100644 pirdeviceinfo.cpp create mode 100644 pirdeviceinfo.h diff --git a/PierogiResources.qrc b/PierogiResources.qrc index fbbcb26..86b2991 100644 --- a/PierogiResources.qrc +++ b/PierogiResources.qrc @@ -32,5 +32,6 @@ doc/about.html doc/documentation.html icons/PierogiIcon.png + icons/red_pause.png diff --git a/forms/piradjustform.ui b/forms/piradjustform.ui index eee3fbb..a6f0d4a 100644 --- a/forms/piradjustform.ui +++ b/forms/piradjustform.ui @@ -14,18 +14,9 @@ Form - - 8 - - + 0 - - 8 - - - 8 - diff --git a/forms/pirairconditionerform.ui b/forms/pirairconditionerform.ui index 2627502..d3197a9 100644 --- a/forms/pirairconditionerform.ui +++ b/forms/pirairconditionerform.ui @@ -14,18 +14,9 @@ Form - - 8 - - + 0 - - 8 - - - 8 - diff --git a/forms/pirfavoritesform.ui b/forms/pirfavoritesform.ui index 8aaded9..316e1c3 100644 --- a/forms/pirfavoritesform.ui +++ b/forms/pirfavoritesform.ui @@ -14,18 +14,9 @@ Form - - 8 - - + 0 - - 8 - - - 8 - diff --git a/forms/pirinputform.ui b/forms/pirinputform.ui index 00fac49..1b493d4 100644 --- a/forms/pirinputform.ui +++ b/forms/pirinputform.ui @@ -14,18 +14,9 @@ Form - - 8 - - + 0 - - 8 - - - 8 - diff --git a/forms/pirkeypadform.ui b/forms/pirkeypadform.ui index 825519a..6631811 100644 --- a/forms/pirkeypadform.ui +++ b/forms/pirkeypadform.ui @@ -14,18 +14,9 @@ Form - - 8 - - + 0 - - 8 - - - 8 - diff --git a/forms/pirmainform.ui b/forms/pirmainform.ui index d27c99b..0852c53 100644 --- a/forms/pirmainform.ui +++ b/forms/pirmainform.ui @@ -14,18 +14,9 @@ Form - - 8 - - + 0 - - 8 - - - 8 - diff --git a/forms/pirmedia2form.ui b/forms/pirmedia2form.ui index f4a43ef..4f8cf10 100644 --- a/forms/pirmedia2form.ui +++ b/forms/pirmedia2form.ui @@ -14,18 +14,9 @@ Form - - 8 - - + 0 - - 8 - - - 8 - diff --git a/forms/pirmediaform.ui b/forms/pirmediaform.ui index bbbcb85..0cbc95f 100644 --- a/forms/pirmediaform.ui +++ b/forms/pirmediaform.ui @@ -14,18 +14,9 @@ Form - - 8 - - + 0 - - 8 - - - 8 - diff --git a/forms/pirmenuform.ui b/forms/pirmenuform.ui index 7b2327f..0f8ee79 100644 --- a/forms/pirmenuform.ui +++ b/forms/pirmenuform.ui @@ -14,18 +14,9 @@ Form - - 8 - - + 0 - - 8 - - - 8 - diff --git a/forms/pirrecordform.cpp b/forms/pirrecordform.cpp new file mode 100644 index 0000000..8d36881 --- /dev/null +++ b/forms/pirrecordform.cpp @@ -0,0 +1,157 @@ +#include "pirrecordform.h" +#include "ui_pirrecordform.h" + +#include "mainwindow.h" +#include "pirkeysetmanager.h" + +PIRRecordForm::PIRRecordForm( + MainWindow *mw) + : QWidget(0), + ui(new Ui::PIRRecordForm), + mainWindow(mw) +{ + ui->setupUi(this); +} + +PIRRecordForm::~PIRRecordForm() +{ + delete ui; +} + +void PIRRecordForm::enableButtons( + const PIRKeysetManager *keyset, + unsigned int id) +{ + emit timerEnabled(keyset->hasKey(id, Timer_Key)); + emit programEnabled(keyset->hasKey(id, Program_Key)); + emit memoryEnabled(keyset->hasKey(id, Memory_Key)); + emit callEnabled(keyset->hasKey(id, Call_Key)); + emit favoritesEnabled(keyset->hasKey(id, Favorites_Key)); + emit scanEnabled(keyset->hasKey(id, Scan_Key)); + emit prevPresetEnabled(keyset->hasKey(id, PrevPreset_Key)); + emit nextPresetEnabled(keyset->hasKey(id, NextPreset_Key)); + emit recordEnabled(keyset->hasKey(id, Record_Key)); + emit recordPauseEnabled(keyset->hasKey(id, RecordPause_Key)); + emit recordStopEnabled(keyset->hasKey(id, RecordStop_Key)); + emit recordMuteEnabled(keyset->hasKey(id, RecordMute_Key)); +} + +void PIRRecordForm::on_timerButton_pressed() +{ + mainWindow->startRepeating(Timer_Key); +} + +void PIRRecordForm::on_timerButton_released() +{ + mainWindow->stopRepeating(); +} + +void PIRRecordForm::on_programButton_pressed() +{ + mainWindow->startRepeating(Program_Key); +} + +void PIRRecordForm::on_programButton_released() +{ + mainWindow->stopRepeating(); +} + +void PIRRecordForm::on_memoryButton_pressed() +{ + mainWindow->startRepeating(Memory_Key); +} + +void PIRRecordForm::on_memoryButton_released() +{ + mainWindow->stopRepeating(); +} + +void PIRRecordForm::on_callButton_pressed() +{ + mainWindow->startRepeating(Call_Key); +} + +void PIRRecordForm::on_callButton_released() +{ + mainWindow->stopRepeating(); +} + +void PIRRecordForm::on_favoritesButton_pressed() +{ + mainWindow->startRepeating(Favorites_Key); +} + +void PIRRecordForm::on_favoritesButton_released() +{ + mainWindow->stopRepeating(); +} + +void PIRRecordForm::on_scanButton_pressed() +{ + mainWindow->startRepeating(Scan_Key); +} + +void PIRRecordForm::on_scanButton_released() +{ + mainWindow->stopRepeating(); +} + +void PIRRecordForm::on_prevPresetButton_pressed() +{ + mainWindow->startRepeating(PrevPreset_Key); +} + +void PIRRecordForm::on_prevPresetButton_released() +{ + mainWindow->stopRepeating(); +} + +void PIRRecordForm::on_nextPresetButton_pressed() +{ + mainWindow->startRepeating(NextPreset_Key); +} + +void PIRRecordForm::on_nextPresetButton_released() +{ + mainWindow->stopRepeating(); +} + +void PIRRecordForm::on_recordButton_pressed() +{ + mainWindow->startRepeating(Record_Key); +} + +void PIRRecordForm::on_recordButton_released() +{ + mainWindow->stopRepeating(); +} + +void PIRRecordForm::on_recordPauseButton_pressed() +{ + mainWindow->startRepeating(RecordPause_Key); +} + +void PIRRecordForm::on_recordPauseButton_released() +{ + mainWindow->stopRepeating(); +} + +void PIRRecordForm::on_recordStopButton_pressed() +{ + mainWindow->startRepeating(RecordStop_Key); +} + +void PIRRecordForm::on_recordStopButton_released() +{ + mainWindow->stopRepeating(); +} + +void PIRRecordForm::on_recordMuteButton_pressed() +{ + mainWindow->startRepeating(RecordMute_Key); +} + +void PIRRecordForm::on_recordMuteButton_released() +{ + mainWindow->stopRepeating(); +} diff --git a/forms/pirrecordform.h b/forms/pirrecordform.h new file mode 100644 index 0000000..71820b7 --- /dev/null +++ b/forms/pirrecordform.h @@ -0,0 +1,73 @@ +#ifndef PIRRECORDFORM_H +#define PIRRECORDFORM_H + +#include + +class MainWindow; +class PIRKeysetManager; + +namespace Ui { +class PIRRecordForm; +} + +class PIRRecordForm : public QWidget +{ + Q_OBJECT + +public: + PIRRecordForm( + MainWindow *mw); + + ~PIRRecordForm(); + + void enableButtons( + const PIRKeysetManager *keyset, + unsigned int id); + +signals: + void timerEnabled(bool); + void programEnabled(bool); + void memoryEnabled(bool); + void callEnabled(bool); + void favoritesEnabled(bool); + void scanEnabled(bool); + void prevPresetEnabled(bool); + void nextPresetEnabled(bool); + void recordEnabled(bool); + void recordPauseEnabled(bool); + void recordStopEnabled(bool); + void recordMuteEnabled(bool); + +private slots: + void on_timerButton_pressed(); + void on_timerButton_released(); + void on_programButton_pressed(); + void on_programButton_released(); + void on_memoryButton_pressed(); + void on_memoryButton_released(); + void on_callButton_pressed(); + void on_callButton_released(); + void on_favoritesButton_pressed(); + void on_favoritesButton_released(); + void on_scanButton_pressed(); + void on_scanButton_released(); + void on_prevPresetButton_pressed(); + void on_prevPresetButton_released(); + void on_nextPresetButton_pressed(); + void on_nextPresetButton_released(); + void on_recordButton_pressed(); + void on_recordButton_released(); + void on_recordPauseButton_pressed(); + void on_recordPauseButton_released(); + void on_recordStopButton_pressed(); + void on_recordStopButton_released(); + void on_recordMuteButton_pressed(); + void on_recordMuteButton_released(); + +private: + Ui::PIRRecordForm *ui; + + MainWindow *mainWindow; +}; + +#endif // PIRRECORDFORM_H diff --git a/forms/pirrecordform.ui b/forms/pirrecordform.ui new file mode 100644 index 0000000..d9b1544 --- /dev/null +++ b/forms/pirrecordform.ui @@ -0,0 +1,449 @@ + + + PIRRecordForm + + + + 0 + 0 + 800 + 480 + + + + Form + + + + 0 + + + + + + 0 + 0 + + + + Timer + + + + :/icons/clock_icon&48.png:/icons/clock_icon&48.png + + + + 48 + 48 + + + + + + + + + 0 + 0 + + + + Program + + + + + + + + 0 + 0 + + + + Memory + + + + + + + + 0 + 0 + + + + Call + + + + + + + + 0 + 0 + + + + Favorites + + + + + + + + 0 + 0 + + + + Scan + + + + + + + + 0 + 0 + + + + Prev Preset + + + + :/icons/arrow_left_icon&48.png:/icons/arrow_left_icon&48.png + + + + 48 + 48 + + + + + + + + + 0 + 0 + + + + Next Preset + + + + :/icons/arrow_right_icon&48.png:/icons/arrow_right_icon&48.png + + + + 48 + 48 + + + + + + + + + 0 + 0 + + + + Record + + + + :/icons/red_record_icon.png:/icons/red_record_icon.png + + + + 48 + 48 + + + + + + + + + 0 + 0 + + + + Rec Pause + + + + :/icons/red_pause.png:/icons/red_pause.png + + + + 48 + 48 + + + + + + + + + 0 + 0 + + + + Rec Stop + + + + :/icons/red_square.png:/icons/red_square.png + + + + 48 + 48 + + + + + + + + + 0 + 0 + + + + Rec Mute + + + + + + + + + + + PIRRecordForm + timerEnabled(bool) + timerButton + setEnabled(bool) + + + 399 + 239 + + + 99 + 79 + + + + + PIRRecordForm + programEnabled(bool) + programButton + setEnabled(bool) + + + 399 + 239 + + + 299 + 79 + + + + + PIRRecordForm + memoryEnabled(bool) + memoryButton + setEnabled(bool) + + + 399 + 239 + + + 500 + 79 + + + + + PIRRecordForm + callEnabled(bool) + callButton + setEnabled(bool) + + + 399 + 239 + + + 700 + 79 + + + + + PIRRecordForm + favoritesEnabled(bool) + favoritesButton + setEnabled(bool) + + + 399 + 239 + + + 99 + 239 + + + + + PIRRecordForm + scanEnabled(bool) + scanButton + setEnabled(bool) + + + 399 + 239 + + + 299 + 239 + + + + + PIRRecordForm + prevPresetEnabled(bool) + prevPresetButton + setEnabled(bool) + + + 399 + 239 + + + 500 + 239 + + + + + PIRRecordForm + nextPresetEnabled(bool) + nextPresetButton + setEnabled(bool) + + + 399 + 239 + + + 700 + 239 + + + + + PIRRecordForm + recordEnabled(bool) + recordButton + setEnabled(bool) + + + 399 + 239 + + + 99 + 400 + + + + + PIRRecordForm + recordPauseEnabled(bool) + recordPauseButton + setEnabled(bool) + + + 399 + 239 + + + 299 + 400 + + + + + PIRRecordForm + recordStopEnabled(bool) + recordStopButton + setEnabled(bool) + + + 399 + 239 + + + 500 + 400 + + + + + PIRRecordForm + recordMuteEnabled(bool) + recordMuteButton + setEnabled(bool) + + + 399 + 239 + + + 700 + 400 + + + + + + timerEnabled(bool) + programEnabled(bool) + memoryEnabled(bool) + callEnabled(bool) + favoritesEnabled(bool) + scanEnabled(bool) + prevPresetEnabled(bool) + nextPresetEnabled(bool) + recordEnabled(bool) + recordPauseEnabled(bool) + recordStopEnabled(bool) + recordMuteEnabled(bool) + + diff --git a/forms/pirtvform.ui b/forms/pirtvform.ui index 51ae510..b7783e7 100644 --- a/forms/pirtvform.ui +++ b/forms/pirtvform.ui @@ -14,18 +14,9 @@ Form - - 8 - - + 0 - - 8 - - - 8 - diff --git a/forms/pirutilityform.ui b/forms/pirutilityform.ui index ad53ba1..b6df1fc 100644 --- a/forms/pirutilityform.ui +++ b/forms/pirutilityform.ui @@ -14,18 +14,9 @@ Form - - 8 - - + 0 - - 8 - - - 8 - diff --git a/icons/red_pause.png b/icons/red_pause.png new file mode 100644 index 0000000000000000000000000000000000000000..07ed3f3c3eeac3fafd65fcb7781463ee538f2b0c GIT binary patch literal 2889 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 #include +#include "pirkeysetmetadata.h" #include "pirkeysetwidgetitem.h" #include "pirselectkeysetform.h" #include "pirselectdeviceform.h" @@ -54,14 +55,15 @@ MainWindow::MainWindow(QWidget *parent) // Set up the keyset selection window: selectKeysetForm = new PIRSelectKeysetForm(this); + myKeysets->populateSelectionWidget(selectKeysetForm); // Set up the device selection window: selectDeviceForm = new PIRSelectDeviceForm(this); + PIRKeysetMetaData::populateDevices(selectDeviceForm); // Set up the panel selection window: panelSelectionForm = new PIRPanelSelectionForm(this); - myKeysets->populateSelectionWidgets(selectKeysetForm, selectDeviceForm); // myPanels->setupPanels(panelSelectionForm); // Remember any favorites the user has already set: diff --git a/mainwindow.ui b/mainwindow.ui index 4e30f06..08af423 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -27,18 +27,9 @@ - - 0 - - + 8 - - 0 - - - 0 - diff --git a/pierogi.pro b/pierogi.pro index f2f5c2a..85aabaa 100644 --- a/pierogi.pro +++ b/pierogi.pro @@ -157,7 +157,12 @@ SOURCES += main.cpp mainwindow.cpp \ keysets/dynex.cpp \ keysets/kathrein.cpp \ keysets/starsat.cpp \ - keysets/viewsat.cpp + keysets/viewsat.cpp \ + pirdeviceinfo.cpp \ + keysets/kaon.cpp \ + forms/pirrecordform.cpp \ + keysets/qnap.cpp \ + keysets/compro.cpp HEADERS += mainwindow.h \ pirkeynames.h \ pirmakenames.h \ @@ -290,7 +295,12 @@ HEADERS += mainwindow.h \ keysets/dynex.h \ keysets/kathrein.h \ keysets/starsat.h \ - keysets/viewsat.h + keysets/viewsat.h \ + keysets/kaon.h \ + pirdeviceinfo.h \ + forms/pirrecordform.h \ + keysets/qnap.h \ + keysets/compro.h FORMS += mainwindow.ui \ pirdocumentationform.ui \ piraboutform.ui \ @@ -308,7 +318,8 @@ FORMS += mainwindow.ui \ forms/pirmenuform.ui \ forms/pirmediaform.ui \ forms/pirfavoritesform.ui \ - pirpanelselectionform.ui + pirpanelselectionform.ui \ + forms/pirrecordform.ui # Please do not modify the following two lines. Required for deployment. include(deployment.pri) @@ -374,7 +385,8 @@ OTHER_FILES += \ www/PierogiIcon.png \ www/AdjustTab.png \ www/InputTab.png \ - qtc_packaging/debian_fremantle/postrm + qtc_packaging/debian_fremantle/postrm \ + icons/red_pause.png RESOURCES += \ PierogiResources.qrc diff --git a/pierogi.pro.user b/pierogi.pro.user index 71e8824..fa90698 100644 --- a/pierogi.pro.user +++ b/pierogi.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget @@ -79,7 +79,7 @@ dpkg-buildpackage -sa -S -uc -us /Users/john/QtSDK/Maemo/4.6.2/bin/mad false - /Users/john/Develop/n900/pierogi-1.0.0 + /Users/john/Develop/n900/pierogi-1.1.0 Custom Process Step ProjectExplorer.ProcessStep @@ -210,6 +210,7 @@ /Users/john/Develop/n900/pierogi-build-maemo-Qt_for_Fremantle_PR1_3_Devices__Qt_SDK__Release/pierogi_0_1_6_armel.deb /Users/john/Develop/n900/pierogi-build-maemo-Qt_for_Fremantle_PR1_3_Devices__Qt_SDK__Release/pierogi_0_6_10_armel.deb /Users/john/Develop/n900/pierogi-build-maemo-Qt_for_Fremantle_PR1_3_Devices__Qt_SDK__Release/pierogi_0_1_2_armel.deb + /Users/john/Develop/n900/pierogi-build-maemo-Qt_for_Fremantle_PR1_3_Devices__Qt_SDK__Release/pierogi_1_1_1_armel.deb 192.168.0.15 @@ -240,6 +241,7 @@ 192.168.0.15 192.168.0.15 192.168.0.15 + 192.168.0.15 @@ -270,6 +272,7 @@ + 2012-01-19T22:18:07 @@ -283,7 +286,7 @@ 2012-02-16T21:50:07 2012-01-17T00:15:23 2012-01-30T20:23:06 - 2012-02-29T19:26:06 + 2012-02-29T20:01:12 2012-01-17T13:21:05 2012-01-23T09:47:37 2012-02-03T10:04:34 @@ -300,6 +303,7 @@ 2012-01-25T13:42:55 2012-02-22T09:37:53 2012-01-17T12:19:28 + 2012-03-02T20:06:33 3 diff --git a/pirdeviceinfo.cpp b/pirdeviceinfo.cpp new file mode 100644 index 0000000..1dd93f5 --- /dev/null +++ b/pirdeviceinfo.cpp @@ -0,0 +1,14 @@ +#include "pirdeviceinfo.h" + +#include + +bool operator< ( + const DeviceInfo &a, + const DeviceInfo &b) +{ + if (a.make < b.make) return true; + + if ((a.make == b.make) && (strcmp(a.model, b.model) < 0)) return true; + + return false; +} diff --git a/pirdeviceinfo.h b/pirdeviceinfo.h new file mode 100644 index 0000000..1337ec0 --- /dev/null +++ b/pirdeviceinfo.h @@ -0,0 +1,34 @@ +#ifndef PIRDEVICEINFO_H +#define PIRDEVICEINFO_H + +#include "pirmakenames.h" +#include "pirdevicetypenames.h" + +#include + +class DeviceInfo +{ +public: + DeviceInfo( + PIRMakeName ma, + const char *mo, + PIRDeviceTypeName t) + : make(ma), + model(mo), + type(t) + {} + + PIRMakeName make; + const char *model; + PIRDeviceTypeName type; +}; + +bool operator< ( + const DeviceInfo &a, + const DeviceInfo &b); + +typedef std::map PIRDeviceCollection; + +typedef std::pair PIRDCPair; + +#endif // PIRDEVICEINFO_H diff --git a/pirkeysetmanager.cpp b/pirkeysetmanager.cpp index e0f6f15..611d78b 100644 --- a/pirkeysetmanager.cpp +++ b/pirkeysetmanager.cpp @@ -15,6 +15,7 @@ #include "keysets/bush.h" #include "keysets/cambridge.h" #include "keysets/canon.h" +#include "keysets/compro.h" #include "keysets/daewoo.h" #include "keysets/dell.h" #include "keysets/denon.h" @@ -41,6 +42,7 @@ #include "keysets/humax.h" #include "keysets/hyundai.h" #include "keysets/jvc.h" +#include "keysets/kaon.h" #include "keysets/kathrein.h" #include "keysets/kenwood.h" #include "keysets/lg.h" @@ -57,6 +59,7 @@ #include "keysets/philips.h" #include "keysets/pinnacle.h" #include "keysets/pioneer.h" +#include "keysets/qnap.h" #include "keysets/raite.h" #include "keysets/rca.h" #include "keysets/roku.h" @@ -94,7 +97,6 @@ extern QMutex stopRepeatingMutex; // Global helper objects: PIRMakeMgr makeManager; -PIRDeviceTypeMgr deviceManager; // Now, on to the actual method definitions: @@ -152,6 +154,8 @@ PIRKeysetManager::PIRKeysetManager() setupKeyset(new CanonCamcorder1(counter++)); setupKeyset(new CanonPowershot1(counter++)); + setupKeyset(new ComproTVCard1(counter++)); + setupKeyset(new DaewooTV1(counter++)); setupKeyset(new DaewooTV2(counter++)); setupKeyset(new DaewooTV3(counter++)); @@ -309,6 +313,8 @@ PIRKeysetManager::PIRKeysetManager() setupKeyset(new JVCAudio2(counter++)); setupKeyset(new JVCDVD1(counter++)); + setupKeyset(new KaonSat1(counter++)); + setupKeyset(new KathreinSat1(counter++)); setupKeyset(new KathreinSat2(counter++)); setupKeyset(new KathreinSat3(counter++)); @@ -447,6 +453,8 @@ PIRKeysetManager::PIRKeysetManager() setupKeyset(new PioneerLaserDisc1(counter++)); setupKeyset(new PioneerDVD1(counter++)); + setupKeyset(new QNAPPlayer1(counter++)); + setupKeyset(new RaiteDVD1(counter++)); setupKeyset(new RCATV1(counter++)); @@ -763,9 +771,8 @@ void PIRKeysetManager::setupKeyset( } -void PIRKeysetManager::populateSelectionWidgets( - PIRSelectKeysetForm *skf, - PIRSelectDeviceForm *sdf) const +void PIRKeysetManager::populateSelectionWidget( + PIRSelectKeysetForm *skf) const { PIRMakeName make; PIRKeysetWidgetItem *kwi; @@ -782,9 +789,6 @@ void PIRKeysetManager::populateSelectionWidgets( kwi = new PIRKeysetWidgetItem(tempString, i->first, make); skf->addWidgetItem(kwi); - // Create widgets for the devices: - i->second->populateDevices(i->first, sdf); - ++i; } } diff --git a/pirkeysetmanager.h b/pirkeysetmanager.h index 4cc5f42..af95199 100644 --- a/pirkeysetmanager.h +++ b/pirkeysetmanager.h @@ -28,9 +28,8 @@ public: ~PIRKeysetManager(); - void populateSelectionWidgets( - PIRSelectKeysetForm *skf, - PIRSelectDeviceForm *sdf) const; + void populateSelectionWidget( + PIRSelectKeysetForm *skf) const; bool keysetExists( unsigned int keysetID) const; diff --git a/pirkeysetmetadata.cpp b/pirkeysetmetadata.cpp index f7076a6..b0e5bed 100644 --- a/pirkeysetmetadata.cpp +++ b/pirkeysetmetadata.cpp @@ -5,9 +5,11 @@ #include -// Global helper objects: +// Global helper object: extern PIRMakeMgr makeManager; -//extern PIRDeviceTypeMgr deviceManager; + +// Static member definition: +PIRDeviceCollection PIRKeysetMetaData::controlledDevices; PIRKeysetMetaData::PIRKeysetMetaData( const char *r, @@ -39,8 +41,7 @@ void PIRKeysetMetaData::moveToThread( void PIRKeysetMetaData::populateDevices( - unsigned int id, - PIRSelectDeviceForm *sdf) const + PIRSelectDeviceForm *sdf) { PIRKeysetWidgetItem *kwi; @@ -49,10 +50,13 @@ void PIRKeysetMetaData::populateDevices( while (i != controlledDevices.end()) { // Create a widget for the keyset: - QString tempString = makeManager.getMakeString(i->make); + QString tempString = makeManager.getMakeString(i->first.make); tempString.append(" "); - tempString.append(i->model); - kwi = new PIRKeysetWidgetItem(tempString, id, i->make, i->type); + tempString.append(i->first.model); + + kwi = new PIRKeysetWidgetItem( + tempString, i->second, i->first.make, i->first.type); + sdf->addWidgetItem(kwi); ++i; @@ -82,9 +86,10 @@ void PIRKeysetMetaData::addControlledDevice( const char *model, PIRDeviceTypeName type) { - controlledDevices.push_back(DeviceInfo(make, model, type)); - - deviceTypes.insert(type); + controlledDevices.insert( + PIRDCPair( + DeviceInfo(make, model, type), + index)); } diff --git a/pirkeysetmetadata.h b/pirkeysetmetadata.h index c70b040..b3bfb55 100644 --- a/pirkeysetmetadata.h +++ b/pirkeysetmetadata.h @@ -3,10 +3,12 @@ #include "pirkeynames.h" #include "pirmakenames.h" -#include "pirdevicetypenames.h" +//#include "pirdevicetypenames.h" + +#include "pirdeviceinfo.h" #include -#include +//#include class QThread; class QObject; @@ -16,24 +18,6 @@ class PIRProtocol; typedef std::map KeyCollection; -class DeviceInfo -{ -public: - DeviceInfo( - PIRMakeName ma, - const char *mo, - PIRDeviceTypeName t) - : make(ma), - model(mo), - type(t) - {} - - PIRMakeName make; - const char *model; - PIRDeviceTypeName type; -}; - -typedef std::list PIRDeviceCollection; class PIRKeysetMetaData { @@ -58,9 +42,8 @@ public: void moveToThread( QThread *thread); - void populateDevices( - unsigned int id, - PIRSelectDeviceForm *sdf) const; + static void populateDevices( + PIRSelectDeviceForm *sdf); protected: void addControlledDevice( @@ -151,15 +134,14 @@ protected: KeyCollection keys; - PIRDeviceCollection controlledDevices; - PIRProtocol *threadableProtocol; unsigned int index; private: const char *keysetName; PIRMakeName make; - PIRDeviceTypeCollection deviceTypes; + static PIRDeviceCollection controlledDevices; +// PIRDeviceTypeCollection deviceTypes; }; diff --git a/pirmakenames.cpp b/pirmakenames.cpp index 716e155..8c7cfa7 100644 --- a/pirmakenames.cpp +++ b/pirmakenames.cpp @@ -16,6 +16,7 @@ PIRMakeMgr::PIRMakeMgr() makes[Bush_Make] = "Bush"; makes[Cambridge_Make] = "Cambridge Audio"; makes[Canon_Make] = "Canon"; + makes[Compro_Make] = "Compro"; makes[Daewoo_Make] = "Daewoo"; makes[Dell_Make] = "Dell"; makes[Denon_Make] = "Denon"; @@ -42,6 +43,7 @@ PIRMakeMgr::PIRMakeMgr() makes[Humax_Make] = "Humax"; makes[Hyundai_Make] = "Hyundai"; makes[JVC_Make] = "JVC"; + makes[Kaon_Make] = "Kaon"; makes[Kathrein_Make] = "Kathrein"; makes[Kenwood_Make] = "Kenwood"; makes[LG_Make] = "LG"; @@ -58,6 +60,7 @@ PIRMakeMgr::PIRMakeMgr() makes[Philips_Make] = "Philips"; makes[Pinnacle_Make] = "Pinnacle Systems"; makes[Pioneer_Make] = "Pioneer"; + makes[QNAP_Make] = "QNAP"; makes[Raite_Make] = "Raite"; makes[RCA_Make] = "RCA"; makes[Roku_Make] = "Roku"; diff --git a/pirmakenames.h b/pirmakenames.h index 13430a9..4083269 100644 --- a/pirmakenames.h +++ b/pirmakenames.h @@ -17,6 +17,7 @@ enum PIRMakeName{ Bush_Make, Cambridge_Make, Canon_Make, + Compro_Make, Daewoo_Make, Dell_Make, Denon_Make, @@ -43,6 +44,7 @@ enum PIRMakeName{ Humax_Make, Hyundai_Make, JVC_Make, + Kaon_Make, Kathrein_Make, Kenwood_Make, LG_Make, @@ -59,6 +61,7 @@ enum PIRMakeName{ Philips_Make, Pinnacle_Make, Pioneer_Make, + QNAP_Make, Raite_Make, RCA_Make, Roku_Make, diff --git a/pirpanelmanager.cpp b/pirpanelmanager.cpp index 66dc178..23eca10 100644 --- a/pirpanelmanager.cpp +++ b/pirpanelmanager.cpp @@ -5,12 +5,13 @@ #include "forms/pirkeypadform.h" #include "forms/pirmenuform.h" #include "forms/pirmediaform.h" -#include "forms/pirfavoritesform.h" -#include "forms/pirtvform.h" #include "forms/pirmedia2form.h" +#include "forms/pirrecordform.h" +#include "forms/pirtvform.h" #include "forms/pirinputform.h" #include "forms/piradjustform.h" #include "forms/pirairconditionerform.h" +#include "forms/pirfavoritesform.h" #include "mainwindow.h" @@ -21,6 +22,7 @@ PIRPanelManager::PIRPanelManager(MainWindow *mw) menuForm(0), mediaForm(0), media2Form(0), + recordForm(0), tvForm(0), inputForm(0), adjustForm(0), @@ -34,6 +36,7 @@ PIRPanelManager::PIRPanelManager(MainWindow *mw) panelList.push_back(PIRPanelPair(Menu_Panel, false)); panelList.push_back(PIRPanelPair(Media_Panel, false)); panelList.push_back(PIRPanelPair(Media2_Panel, false)); + panelList.push_back(PIRPanelPair(Record_Panel, false)); panelList.push_back(PIRPanelPair(TV_Panel, false)); panelList.push_back(PIRPanelPair(Input_Panel, false)); panelList.push_back(PIRPanelPair(Adjust_Panel, false)); @@ -70,6 +73,7 @@ void PIRPanelManager::enableButtons( if (menuForm) menuForm->enableButtons(keyset, id); if (mediaForm) mediaForm->enableButtons(keyset, id); if (media2Form) media2Form->enableButtons(keyset, id); + if (recordForm) recordForm->enableButtons(keyset, id); if (tvForm) tvForm->enableButtons(keyset, id); if (inputForm) inputForm->enableButtons(keyset, id); if (adjustForm) adjustForm->enableButtons(keyset, id); @@ -142,14 +146,18 @@ void PIRPanelManager::hidePanel( if (mediaForm) mainWindow->removePanel(index, mediaForm); break; - case TV_Panel: - if (tvForm) mainWindow->removePanel(index, tvForm); - break; - case Media2_Panel: if (media2Form) mainWindow->removePanel(index, media2Form); break; + case Record_Panel: + if (recordForm) mainWindow->removePanel(index, recordForm); + break; + + case TV_Panel: + if (tvForm) mainWindow->removePanel(index, tvForm); + break; + case Input_Panel: if (inputForm) mainWindow->removePanel(index, inputForm); break; @@ -263,6 +271,20 @@ void PIRPanelManager::showPanel( break; + case Record_Panel: + if (!recordForm) + { + recordForm = new PIRRecordForm(mainWindow); + mainWindow->enableButtons(); + } + + mainWindow->insertPanel( + index, + recordForm, + QString("Program/Record Panel - control over memory and storage")); + + break; + case TV_Panel: if (!tvForm) { diff --git a/pirpanelmanager.h b/pirpanelmanager.h index 025a904..631f310 100644 --- a/pirpanelmanager.h +++ b/pirpanelmanager.h @@ -8,12 +8,13 @@ class PIRUtilityForm; class PIRKeypadForm; class PIRMenuForm; class PIRMediaForm; -class PIRFavoritesForm; -class PIRTVForm; class PIRMedia2Form; +class PIRRecordForm; +class PIRTVForm; class PIRInputForm; class PIRAdjustForm; class PIRAirConditionerForm; +class PIRFavoritesForm; class PIRKeysetWidgetItem; class PIRPanelSelectionForm; @@ -84,6 +85,7 @@ private: PIRMenuForm *menuForm; PIRMediaForm *mediaForm; PIRMedia2Form *media2Form; + PIRRecordForm *recordForm; PIRTVForm *tvForm; PIRInputForm *inputForm; PIRAdjustForm *adjustForm; diff --git a/pirpanelnames.h b/pirpanelnames.h index 27289a4..ea65a0b 100644 --- a/pirpanelnames.h +++ b/pirpanelnames.h @@ -8,8 +8,9 @@ enum PIRPanelName Keypad_Panel, Menu_Panel, Media_Panel, - TV_Panel, Media2_Panel, + Record_Panel, + TV_Panel, Input_Panel, Adjust_Panel, AC_Panel, diff --git a/pirpanelselectionform.cpp b/pirpanelselectionform.cpp index 67e87f0..9fa23b1 100644 --- a/pirpanelselectionform.cpp +++ b/pirpanelselectionform.cpp @@ -53,14 +53,19 @@ void PIRPanelSelectionForm::on_mediaCheckBox_stateChanged(int arg1) mainWindow->managePanel(Media_Panel, arg1); } -void PIRPanelSelectionForm::on_tvCheckBox_stateChanged(int arg1) +void PIRPanelSelectionForm::on_media2CheckBox_stateChanged(int arg1) { - mainWindow->managePanel(TV_Panel, arg1); + mainWindow->managePanel(Media2_Panel, arg1); } -void PIRPanelSelectionForm::on_media2CheckBox_stateChanged(int arg1) +void PIRPanelSelectionForm::on_recordCheckBox_stateChanged(int arg1) { - mainWindow->managePanel(Media2_Panel, arg1); + mainWindow->managePanel(Record_Panel, arg1); +} + +void PIRPanelSelectionForm::on_tvCheckBox_stateChanged(int arg1) +{ + mainWindow->managePanel(TV_Panel, arg1); } void PIRPanelSelectionForm::on_inputCheckBox_stateChanged(int arg1) diff --git a/pirpanelselectionform.h b/pirpanelselectionform.h index 9a81565..e8dd33b 100644 --- a/pirpanelselectionform.h +++ b/pirpanelselectionform.h @@ -25,8 +25,9 @@ private slots: void on_keypadCheckBox_stateChanged(int arg1); void on_menuCheckBox_stateChanged(int arg1); void on_mediaCheckBox_stateChanged(int arg1); - void on_tvCheckBox_stateChanged(int arg1); void on_media2CheckBox_stateChanged(int arg1); + void on_recordCheckBox_stateChanged(int arg1); + void on_tvCheckBox_stateChanged(int arg1); void on_inputCheckBox_stateChanged(int arg1); void on_adjustCheckBox_stateChanged(int arg1); void on_acCheckBox_stateChanged(int arg1); diff --git a/pirpanelselectionform.ui b/pirpanelselectionform.ui index aa2d76f..86690aa 100644 --- a/pirpanelselectionform.ui +++ b/pirpanelselectionform.ui @@ -78,6 +78,13 @@ + + + Program/Record Panel - control over memory and storage + + + + TV Panel - Teletext and Picture-in-Picture diff --git a/pirselectdeviceform.cpp b/pirselectdeviceform.cpp index 5ea463e..4eb5ed3 100644 --- a/pirselectdeviceform.cpp +++ b/pirselectdeviceform.cpp @@ -2,8 +2,9 @@ #include "ui_pirselectdeviceform.h" #include "pirkeysetwidgetitem.h" +PIRDeviceTypeMgr deviceTypeManager; + extern PIRMakeMgr makeManager; -extern PIRDeviceTypeMgr deviceManager; PIRSelectDeviceForm::PIRSelectDeviceForm( QWidget *parent) @@ -19,7 +20,7 @@ PIRSelectDeviceForm::PIRSelectDeviceForm( // push the list of makers into the make combo box: makeManager.populateComboBox(ui->makeComboBox); - deviceManager.populateComboBox(ui->deviceComboBox); + deviceTypeManager.populateComboBox(ui->deviceComboBox); // Connection telling main window that keyset has been selected: connect( @@ -50,6 +51,7 @@ PIRSelectDeviceForm::~PIRSelectDeviceForm() delete ui; } +/* void PIRSelectDeviceForm::addNameToList( QString name, unsigned int index, @@ -57,6 +59,7 @@ void PIRSelectDeviceForm::addNameToList( { ui->deviceListWidget->addItem(new PIRKeysetWidgetItem(name, index, make)); } +*/ void PIRSelectDeviceForm::addWidgetItem( PIRKeysetWidgetItem *kwi) diff --git a/pirselectdeviceform.h b/pirselectdeviceform.h index ed30206..63b05fe 100644 --- a/pirselectdeviceform.h +++ b/pirselectdeviceform.h @@ -5,6 +5,7 @@ #include "pirmakenames.h" #include "pirdevicetypenames.h" +#include "pirdeviceinfo.h" class PIRKeysetWidgetItem; class QListWidget; @@ -18,13 +19,17 @@ class PIRSelectDeviceForm : public QWidget Q_OBJECT public: - explicit PIRSelectDeviceForm(QWidget *parent = 0); + explicit PIRSelectDeviceForm( + QWidget *parent = 0); + ~PIRSelectDeviceForm(); +/* void addNameToList( QString name, unsigned int index, PIRMakeName make); +*/ void addWidgetItem( PIRKeysetWidgetItem *kwi); diff --git a/pirselectdeviceform.ui b/pirselectdeviceform.ui index ede45f0..06d4d9b 100644 --- a/pirselectdeviceform.ui +++ b/pirselectdeviceform.ui @@ -11,7 +11,7 @@ - Form + Select Device diff --git a/pirselectkeysetform.cpp b/pirselectkeysetform.cpp index 072f361..67c9e61 100644 --- a/pirselectkeysetform.cpp +++ b/pirselectkeysetform.cpp @@ -41,6 +41,7 @@ PIRSelectKeysetForm::~PIRSelectKeysetForm() delete ui; } +/* void PIRSelectKeysetForm::addNameToList( QString name, unsigned int index, @@ -48,6 +49,7 @@ void PIRSelectKeysetForm::addNameToList( { ui->keysetListWidget->addItem(new PIRKeysetWidgetItem(name, index, make)); } +*/ void PIRSelectKeysetForm::addWidgetItem( PIRKeysetWidgetItem *kwi) diff --git a/pirselectkeysetform.h b/pirselectkeysetform.h index 2d88ac8..45706aa 100644 --- a/pirselectkeysetform.h +++ b/pirselectkeysetform.h @@ -21,10 +21,12 @@ public: explicit PIRSelectKeysetForm(QWidget *parent = 0); ~PIRSelectKeysetForm(); +/* void addNameToList( QString name, unsigned int index, PIRMakeName make); +*/ void addWidgetItem( PIRKeysetWidgetItem *kwi); diff --git a/protocols/rc6skyprotocol.cpp b/protocols/rc6skyprotocol.cpp index d6e469b..9b376af 100644 --- a/protocols/rc6skyprotocol.cpp +++ b/protocols/rc6skyprotocol.cpp @@ -73,6 +73,7 @@ void RC6SkyProtocol::startSendingCommand( // b) a "start bit", value 1 (so 444 us pulse, 444 us space) // c) three control bits, set to "110" (i.e., mode "6") // d) the double-sized "trailer" bit, set based on the keypress count: + // d2) I'm trying out setting the toggle bit to always be 0. rx51device.addSingle(HEADER_PULSE); // lead pulse duration += HEADER_PULSE; diff --git a/qtc_packaging/debian_fremantle/changelog b/qtc_packaging/debian_fremantle/changelog index 311bbd9..4d089f8 100644 --- a/qtc_packaging/debian_fremantle/changelog +++ b/qtc_packaging/debian_fremantle/changelog @@ -1,3 +1,10 @@ +pierogi (1.1.1) unstable; urgency=low + * The Record button returns to Pierogi via a new "Program/Record" panel + * Several fixes for Select Keyset by Device window (thanks sixwheeledbeast!) + * First pass at keysets for Compro, Kaon, and QNAP + + -- John Pietrzak Fri, 02 Mar 2012 08:42:07 -0500 + pierogi (1.1.0) unstable; urgency=low * GUI changed - "panels" instead of "tabs", new navigation controls. * New window added for selecting keysets by device. "Device" filter removed from select keyset by name window. diff --git a/qtc_packaging/debian_fremantle/control b/qtc_packaging/debian_fremantle/control index 7b554f5..47784f0 100644 --- a/qtc_packaging/debian_fremantle/control +++ b/qtc_packaging/debian_fremantle/control @@ -11,8 +11,8 @@ Architecture: armel Depends: ${shlibs:Depends}, ${misc:Depends} Description: Universal Infrared (IR) Remote Control for N900 Pierogi is a Universal Infrared Remote Control app for the Nokia N900. It is independent from the LIRC server, and stores all configuration info internally. -XB-Maemo-Upgrade-Description: New GUI - In order to provide more flexibility to Pierogi, I've revamped the GUI. Mostly, I've replaced the tab-bar with a construct of my own. We'll have to see how well this works. Also, many new keysets in this update, as well as better A/C support. +XB-Maemo-Upgrade-Description: Record button is back + The "Record" button makes its triumphant return to Pierogi through a new "Program/Record" control panel. Also several bug-fixes to the Select Keyset by Device window (thanks to sixwheeledbeast for pointing them out), and a first pass at keysets for Compro, Kaon, and QNAP XSBC-Bugtracker: https://garage.maemo.org/tracker/?func=add&group_id=2286&atid=7641 XB-Maemo-Display-Name: Pierogi XB-Maemo-Icon-26: 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 -- 1.7.9.5