summaryrefslogtreecommitdiff
authorpaule <paule>2007-01-28 06:43:22 (UTC)
committer paule <paule>2007-01-28 06:43:22 (UTC)
commita70f2692462053c1b76f990919f698a2eaa56fb5 (patch) (unidiff)
treedae72297f0ba8e43385ca0122edf5813bd51faf7
parent8cf13e6845fa0159fb7f864bf5d3c5c0a62188ff (diff)
downloadopie-a70f2692462053c1b76f990919f698a2eaa56fb5.zip
opie-a70f2692462053c1b76f990919f698a2eaa56fb5.tar.gz
opie-a70f2692462053c1b76f990919f698a2eaa56fb5.tar.bz2
Correctly select first remote upon loading configuration; show a warning message if user presses a button that has not been configured
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/tools/remote/remotetab.cpp19
1 files changed, 15 insertions, 4 deletions
diff --git a/noncore/tools/remote/remotetab.cpp b/noncore/tools/remote/remotetab.cpp
index 84038ca..45995fd 100644
--- a/noncore/tools/remote/remotetab.cpp
+++ b/noncore/tools/remote/remotetab.cpp
@@ -14,6 +14,8 @@ You should have received a copy of the GNU General Public License along with thi
14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15*/ 15*/
16 16
17#include <qmessagebox.h>
18
17#include "remotetab.h" 19#include "remotetab.h"
18#include "lirchandler.h" 20#include "lirchandler.h"
19 21
@@ -51,10 +53,15 @@ int RemoteTab::sendIR()
51{ 53{
52 const QObject *button = sender(); 54 const QObject *button = sender();
53 QString string = cfg->readEntry(button->name()); 55 QString string = cfg->readEntry(button->name());
54 string+='\n'; 56 if(string != "") {
55 57 string+='\n';
56 LircHandler lh; 58 LircHandler lh;
57 return lh.sendIR(string.latin1()); 59 return lh.sendIR(string.latin1());
60 }
61 else {
62 QMessageBox::warning(this, tr("Error"), tr("This button has not\nbeen configured"), QMessageBox::Ok, QMessageBox::NoButton);
63 return 0;
64 }
58} 65}
59 66
60void RemoteTab::setConfig(Config *newCfg) 67void RemoteTab::setConfig(Config *newCfg)
@@ -62,6 +69,10 @@ void RemoteTab::setConfig(Config *newCfg)
62 cfg = newCfg; 69 cfg = newCfg;
63 cfg->setGroup("Remotes"); 70 cfg->setGroup("Remotes");
64 topGroup->updateRemotes(cfg); 71 topGroup->updateRemotes(cfg);
72
73 QString curr_remote = topGroup->getRemotesText();
74 if(curr_remote != "")
75 remoteSelected(curr_remote);
65} 76}
66 77
67void RemoteTab::remoteSelected(const QString &string) 78void RemoteTab::remoteSelected(const QString &string)