summaryrefslogtreecommitdiff
authorpaule <paule>2007-02-07 10:34:31 (UTC)
committer paule <paule>2007-02-07 10:34:31 (UTC)
commit6b84dbea9b4b64ce88844ca19d4b0361a0cc0bbc (patch) (unidiff)
treebb644f091d2be43065bc4f454bf575abb1b6ac00
parent5f5827b8e28311589e821f199dcefeb964538301 (diff)
downloadopie-6b84dbea9b4b64ce88844ca19d4b0361a0cc0bbc.zip
opie-6b84dbea9b4b64ce88844ca19d4b0361a0cc0bbc.tar.gz
opie-6b84dbea9b4b64ce88844ca19d4b0361a0cc0bbc.tar.bz2
Check lircd is configured before accepting button presses
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/tools/remote/remotetab.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/noncore/tools/remote/remotetab.cpp b/noncore/tools/remote/remotetab.cpp
index c89d8c2..065feac 100644
--- a/noncore/tools/remote/remotetab.cpp
+++ b/noncore/tools/remote/remotetab.cpp
@@ -48,25 +48,29 @@ RemoteTab::RemoteTab(QWidget *parent, const char *name):QWidget(parent,name)
48 48
49 this->setMaximumWidth(240); 49 this->setMaximumWidth(240);
50} 50}
51 51
52int RemoteTab::sendIR() 52int RemoteTab::sendIR()
53{ 53{
54 LircHandler lh;
55
56 if(!lh.checkLircdConfValid(false))
57 return 0;
58
54 QString curr_remote = topGroup->getRemotesText(); 59 QString curr_remote = topGroup->getRemotesText();
55 if(curr_remote != "") 60 if(curr_remote != "")
56 cfg->setGroup(curr_remote); 61 cfg->setGroup(curr_remote);
57 else { 62 else {
58 QMessageBox::warning(this, tr("Error"), tr("Please select or create\na remote layout"), QMessageBox::Ok, QMessageBox::NoButton); 63 QMessageBox::warning(this, tr("Error"), tr("Please select or create\na remote layout"), QMessageBox::Ok, QMessageBox::NoButton);
59 return 0; 64 return 0;
60 } 65 }
61 66
62 const QObject *button = sender(); 67 const QObject *button = sender();
63 QString string = cfg->readEntry(button->name()); 68 QString string = cfg->readEntry(button->name());
64 if(string != "") { 69 if(string != "") {
65 string+='\n'; 70 string+='\n';
66 LircHandler lh;
67 return lh.sendIR(string.latin1()); 71 return lh.sendIR(string.latin1());
68 } 72 }
69 else { 73 else {
70 QMessageBox::warning(this, tr("Error"), tr("This button has not\nbeen configured"), QMessageBox::Ok, QMessageBox::NoButton); 74 QMessageBox::warning(this, tr("Error"), tr("This button has not\nbeen configured"), QMessageBox::Ok, QMessageBox::NoButton);
71 return 0; 75 return 0;
72 } 76 }