-rw-r--r-- | noncore/tools/remote/buttondialog.cpp | 10 | ||||
-rw-r--r-- | noncore/tools/remote/channelgroup.cpp | 2 | ||||
-rw-r--r-- | noncore/tools/remote/channelgroupconf.cpp | 2 | ||||
-rw-r--r-- | noncore/tools/remote/configtab.cpp | 2 | ||||
-rw-r--r-- | noncore/tools/remote/dvdgroup.cpp | 2 | ||||
-rw-r--r-- | noncore/tools/remote/dvdgroupconf.cpp | 2 | ||||
-rw-r--r-- | noncore/tools/remote/learntab.cpp | 2 | ||||
-rw-r--r-- | noncore/tools/remote/mainview.cpp | 2 | ||||
-rw-r--r-- | noncore/tools/remote/remotetab.cpp | 8 | ||||
-rw-r--r-- | noncore/tools/remote/topgroup.cpp | 2 | ||||
-rw-r--r-- | noncore/tools/remote/topgroupconf.cpp | 2 | ||||
-rw-r--r-- | noncore/tools/remote/vcrgroup.cpp | 2 | ||||
-rw-r--r-- | noncore/tools/remote/vcrgroupconf.cpp | 2 |
13 files changed, 20 insertions, 20 deletions
diff --git a/noncore/tools/remote/buttondialog.cpp b/noncore/tools/remote/buttondialog.cpp index 7479e85..6ea4801 100644 --- a/noncore/tools/remote/buttondialog.cpp +++ b/noncore/tools/remote/buttondialog.cpp @@ -1,281 +1,281 @@ /* Opie-Remote. emulates remote controlls on an iPaq (and maybe a Zaurus) in Opie. Copyright (C) 2002 Thomas Stephens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "buttondialog.h" -ButtonDialog::ButtonDialog(QString buttonName, QWidget *parent=0, const char*name=0, bool modal=FALSE, WFlags f=0):QDialog(parent, name, modal, f) +ButtonDialog::ButtonDialog(QString buttonName, QWidget *parent, const char*name, bool modal, WFlags f):QDialog(parent, name, modal, f) { setCaption(tr(buttonName)); QVBoxLayout *layout = new QVBoxLayout(this); QHBoxLayout *hlayout1 = new QHBoxLayout(this); QHBoxLayout *hlayout2 = new QHBoxLayout(this); QHBoxLayout *hlayout3 = new QHBoxLayout(this); layout->addSpacing(5); layout->addLayout(hlayout1); layout->addSpacing(5); layout->addLayout(hlayout2); layout->addSpacing(5); layout->addLayout(hlayout3); layout->addSpacing(5); remote = new QComboBox(false, this, "remote"); QLabel *remoteLabel = new QLabel(remote, "Remote: ", this, "remoteLabel"); hlayout1->addSpacing(5); hlayout1->addWidget(remoteLabel); hlayout1->addSpacing(5); hlayout1->addWidget(remote); hlayout1->addSpacing(5); remote->insertItem("Remote "); remote->insertStringList(getRemotes()); connect(remote, SIGNAL(activated(const QString &)), this, SLOT(remoteSelected(const QString&)) ); button = new QComboBox(false, this, "button"); QLabel *buttonLabel = new QLabel(remote, "Button: ", this, "buttonLabel"); hlayout2->addSpacing(5); hlayout2->addWidget(buttonLabel); hlayout2->addSpacing(5); hlayout2->addWidget(button); hlayout2->addSpacing(5); button->insertItem("Button "); connect(button, SIGNAL(activated(const QString &)), this, SLOT(buttonSelected(const QString&)) ); label = new QLineEdit(this, "label"); label->setText(buttonName); QLabel *labelLabel = new QLabel(label, "Label: ", this, "labelLabel"); hlayout3->addSpacing(5); hlayout3->addWidget(labelLabel); hlayout3->addSpacing(5); hlayout3->addWidget(label); hlayout3->addSpacing(5); } void ButtonDialog::remoteSelected(const QString &string) { button->insertStringList(getButtons(string.latin1()) ); list="SEND_ONCE"; list+=string; } void ButtonDialog::buttonSelected(const QString &string) { list+=string; } QStringList ButtonDialog::getList() { return list; } QString ButtonDialog::getLabel() { return label->text(); } QStringList ButtonDialog::getRemotes() { const char write_buffer[] = "LIST\n"; const char *readbuffer; int i, numlines; QStringList list; addr.sun_family=AF_UNIX; strcpy(addr.sun_path,"/dev/lircd"); fd = socket(AF_UNIX, SOCK_STREAM, 0); if(fd == -1) { QMessageBox *mb = new QMessageBox("Error!", "couldnt connect to socket", QMessageBox::NoIcon, QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton); mb->exec(); perror("ButtonDialog::GetRemotes"); return NULL; } - if(std::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1) + if(::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1) { QMessageBox *mb = new QMessageBox("Error!", "couldnt connect to socket", QMessageBox::NoIcon, QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton); mb->exec(); perror("ButtonDialog::GetRemotes"); return NULL; } write(fd, write_buffer, strlen(write_buffer)); for(i=0; i<5; i++) { printf("%d\n", i); readbuffer = readPacket(); printf("%s", readbuffer); printf("%d\n", i); } numlines = atoi(readbuffer); for(i=0; i<numlines; i++) { list+=readPacket(); } if(strcasecmp(readPacket(), "END") != 0) { QMessageBox *mb = new QMessageBox("Error!", "bad packet", QMessageBox::NoIcon, QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton); mb->exec(); perror("ButtonDialog::GetRemotes"); return NULL; } - std::close(fd); + ::close(fd); return list; } QStringList ButtonDialog::getButtons(const char *remoteName) { QString write_buffer = "LIST "; const char *readbuffer; int i, j, numlines; QStringList list; QString string; write_buffer += remoteName; write_buffer += '\n'; fd = socket(AF_UNIX, SOCK_STREAM, 0); if(fd == -1) { QMessageBox *mb = new QMessageBox("Error!", "couldnt connect to socket", QMessageBox::NoIcon, QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton); mb->exec(); perror("ButtonDialog::GetButtons"); return NULL; } - if(std::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1) + if(::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1) { QMessageBox *mb = new QMessageBox("Error!", "couldnt connect to socket", QMessageBox::NoIcon, QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton); mb->exec(); perror("ButtonDialog::GetButtons"); return NULL; } write(fd, write_buffer.latin1(), strlen(write_buffer) ); for(i=0; i<5; i++) { readbuffer = readPacket(); } numlines = atoi(readbuffer); for(i=0; i<numlines; i++) { list+=readPacket(); for(j=0; j<list[i].length(); j++) { if(list[i][j] == ' ') break; } list[i].remove(0, j+1); } if(strcasecmp(readPacket(), "END") != 0) { QMessageBox *mb = new QMessageBox("Error!", "bad packet", QMessageBox::NoIcon, QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton); mb->exec(); perror("ButtonDialog::GetButtons"); return NULL; } - std::close(fd); + ::close(fd); return list; } //this function was ripped for rc.c in xrc, it is available here: http://www.lirc.org/software.html const char *ButtonDialog::readPacket() { static char buffer[PACKET_SIZE+1]=""; char *end; static int ptr=0,end_len=0; ssize_t ret; timeout = 0; if(ptr>0) { memmove(buffer,buffer+ptr,strlen(buffer+ptr)+1); ptr=strlen(buffer); end=strchr(buffer,'\n'); } else { end=NULL; } alarm(TIMEOUT); while(end==NULL) { if(PACKET_SIZE<=ptr) { fprintf(stderr,"bad packet\n"); ptr=0; return(NULL); } ret=read(fd,buffer+ptr,PACKET_SIZE-ptr); if(ret<=0 || timeout) { if(timeout) { fprintf(stderr,"timeout\n"); } else { alarm(0); } ptr=0; return(NULL); } buffer[ptr+ret]=0; diff --git a/noncore/tools/remote/channelgroup.cpp b/noncore/tools/remote/channelgroup.cpp index 9f90284..7c33674 100644 --- a/noncore/tools/remote/channelgroup.cpp +++ b/noncore/tools/remote/channelgroup.cpp @@ -1,67 +1,67 @@ /* Opie-Remote. emulates remote controlls on an iPaq (and maybe a Zaurus) in Opie. Copyright (C) 2002 Thomas Stephens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "channelgroup.h" -ChannelGroup::ChannelGroup(QWidget *parent=0, const char *name=0):QWidget(parent,name) +ChannelGroup::ChannelGroup(QWidget *parent, const char *name):QWidget(parent,name) { QGridLayout *layout = new QGridLayout(this); QVBoxLayout *volLayout = new QVBoxLayout(this); QVBoxLayout *chanLayout = new QVBoxLayout(this); layout->addRowSpacing(1,1); layout->addRowSpacing(3,1); layout->addRowSpacing(5,1); layout->addColSpacing(1,1); layout->addColSpacing(3,1); layout->addColSpacing(5,1); layout->addColSpacing(7,1); QPushButton *one = new QPushButton("1", this, "one"); layout->addWidget(one, 0, 2, 0); connect(one, SIGNAL(pressed()), this->parentWidget(), SLOT(sendIR()) ); QPushButton *two = new QPushButton("2", this, "two"); layout->addWidget(two, 0, 4, 0); connect(two, SIGNAL(pressed()), this->parentWidget(), SLOT(sendIR()) ); QPushButton *three = new QPushButton("3", this, "three"); layout->addWidget(three, 0, 6, 0); connect(three, SIGNAL(pressed()), this->parentWidget(), SLOT(sendIR()) ); QPushButton *four = new QPushButton("4", this, "four"); layout->addWidget(four, 2, 2, 0); connect(four, SIGNAL(pressed()), this->parentWidget(), SLOT(sendIR()) ); QPushButton *five = new QPushButton("5", this, "five"); layout->addWidget(five, 2, 4, 0); connect(five, SIGNAL(pressed()), this->parentWidget(), SLOT(sendIR()) ); QPushButton *six = new QPushButton("6", this, "six"); layout->addWidget(six, 2, 6, 0); connect(six, SIGNAL(pressed()), this->parentWidget(), SLOT(sendIR()) ); QPushButton *seven = new QPushButton("7", this, "seven"); layout->addWidget(seven, 4, 2, 0); connect(seven, SIGNAL(pressed()), this->parentWidget(), SLOT(sendIR()) ); QPushButton *eight = new QPushButton("8", this, "eight"); layout->addWidget(eight, 4, 4, 0); connect(eight, SIGNAL(pressed()), this->parentWidget(), SLOT(sendIR()) ); QPushButton *nine = new QPushButton("9", this, "nine"); layout->addWidget(nine, 4, 6, 0); diff --git a/noncore/tools/remote/channelgroupconf.cpp b/noncore/tools/remote/channelgroupconf.cpp index 2d98115..e39121e 100644 --- a/noncore/tools/remote/channelgroupconf.cpp +++ b/noncore/tools/remote/channelgroupconf.cpp @@ -1,67 +1,67 @@ /* Opie-Remote. emulates remote controlls on an iPaq (and maybe a Zaurus) in Opie. Copyright (C) 2002 Thomas Stephens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "channelgroupconf.h" -ChannelGroupConf::ChannelGroupConf(QWidget *parent=0, const char *name=0):QWidget(parent,name) +ChannelGroupConf::ChannelGroupConf(QWidget *parent, const char *name):QWidget(parent,name) { QGridLayout *layout = new QGridLayout(this); QVBoxLayout *volLayout = new QVBoxLayout(this); QVBoxLayout *chanLayout = new QVBoxLayout(this); layout->addRowSpacing(1,5); layout->addRowSpacing(3,5); layout->addRowSpacing(5,5); layout->addColSpacing(1,1); layout->addColSpacing(3,1); layout->addColSpacing(5,1); layout->addColSpacing(7,1); QPushButton *one = new QPushButton("1", this, "one"); layout->addWidget(one, 0, 2, 0); connect(one, SIGNAL(pressed()), this->parentWidget(), SLOT(buttonPressed()) ); QPushButton *two = new QPushButton("2", this, "two"); layout->addWidget(two, 0, 4, 0); connect(two, SIGNAL(pressed()), this->parentWidget(), SLOT(buttonPressed()) ); QPushButton *three = new QPushButton("3", this, "three"); layout->addWidget(three, 0, 6, 0); connect(three, SIGNAL(pressed()), this->parentWidget(), SLOT(buttonPressed()) ); QPushButton *four = new QPushButton("4", this, "four"); layout->addWidget(four, 2, 2, 0); connect(four, SIGNAL(pressed()), this->parentWidget(), SLOT(buttonPressed()) ); QPushButton *five = new QPushButton("5", this, "five"); layout->addWidget(five, 2, 4, 0); connect(five, SIGNAL(pressed()), this->parentWidget(), SLOT(buttonPressed()) ); QPushButton *six = new QPushButton("6", this, "six"); layout->addWidget(six, 2, 6, 0); connect(six, SIGNAL(pressed()), this->parentWidget(), SLOT(buttonPressed()) ); QPushButton *seven = new QPushButton("7", this, "seven"); layout->addWidget(seven, 4, 2, 0); connect(seven, SIGNAL(pressed()), this->parentWidget(), SLOT(buttonPressed()) ); QPushButton *eight = new QPushButton("8", this, "eight"); layout->addWidget(eight, 4, 4, 0); connect(eight, SIGNAL(pressed()), this->parentWidget(), SLOT(buttonPressed()) ); QPushButton *nine = new QPushButton("9", this, "nine"); layout->addWidget(nine, 4, 6, 0); diff --git a/noncore/tools/remote/configtab.cpp b/noncore/tools/remote/configtab.cpp index f5896a9..17cdc6a 100644 --- a/noncore/tools/remote/configtab.cpp +++ b/noncore/tools/remote/configtab.cpp @@ -1,67 +1,67 @@ /* Opie-Remote. emulates remote controlls on an iPaq (and maybe a Zaurus) in Opie. Copyright (C) 2002 Thomas Stephens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "configtab.h" -ConfigTab::ConfigTab(QWidget *parent=0, const char *name=0):QWidget(parent,name) +ConfigTab::ConfigTab(QWidget *parent, const char *name):QWidget(parent,name) { QVBoxLayout *layout = new QVBoxLayout(this); topGroupConf = new TopGroupConf(this, "topGroupConf"); layout->addWidget(topGroupConf, 1); layout->addSpacing(1); dvdGroupConf = new DVDGroupConf(this, "dvdGroupConf"); layout->addWidget(dvdGroupConf, 1); layout->addSpacing(1); vcrGroupConf = new VCRGroupConf(this, "vcrGroupConf"); layout->addWidget(vcrGroupConf, 1); layout->addSpacing(1); channelGroupConf = new ChannelGroupConf(this, "channelGroupConf"); layout->addWidget(channelGroupConf, 1); } void ConfigTab::setConfig(Config *newCfg) { cfg = newCfg; cfg->setGroup("Remotes"); topGroupConf->updateRemotes(cfg->readListEntry("remoteList", ',') ); cfg->setGroup("Default"); const QObject *obj; const QObjectList *objList = topGroupConf->children(); for(obj = ((QObjectList *)objList)->first(); obj != 0; obj=((QObjectList *)objList)->next()) { if(obj->inherits("QPushButton")) { if(!cfg->hasKey((QString)obj->name()+"Label")) { cfg->writeEntry((QString)obj->name()+"Label", ((QPushButton *)obj)->text()); } } } objList = dvdGroupConf->children(); for(obj = ((QObjectList *)objList)->first(); obj != 0; obj=((QObjectList *)objList)->next()) { if(obj->inherits("QPushButton")) { if(!cfg->hasKey((QString)obj->name()+"Label")) diff --git a/noncore/tools/remote/dvdgroup.cpp b/noncore/tools/remote/dvdgroup.cpp index a75c48a..d7ff515 100644 --- a/noncore/tools/remote/dvdgroup.cpp +++ b/noncore/tools/remote/dvdgroup.cpp @@ -1,73 +1,73 @@ /* Opie-Remote. emulates remote controlls on an iPaq (and maybe a Zaurus) in Opie. Copyright (C) 2002 Thomas Stephens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "dvdgroup.h" -DVDGroup::DVDGroup(QWidget *parent=0, const char *name=0):QWidget(parent,name) +DVDGroup::DVDGroup(QWidget *parent, const char *name):QWidget(parent,name) { QGridLayout *layout = new QGridLayout(this); //put rows between the buttons of size 1 layout->addRowSpacing(1,1); layout->addRowSpacing(3,1); //put collumns between the buttons of size 5 layout->addColSpacing(1,5); layout->addColSpacing(3,5); layout->addColSpacing(5,5); layout->addColSpacing(7,5); //make sure that the collumns with the buttons in them stretch before the filler collumns do //since there is so little room, there is no need to do this for the rows layout->setColStretch(4,1); layout->setColStretch(2,1); layout->setColStretch(6,1); layout->setColStretch(8,1); layout->setColStretch(0,1); //add the menu navigation buttons, and connect them to the RemoteTab slots... QPushButton *up = new QPushButton("Up", this,"up"); layout->addWidget(up, 0, 4, 0); connect(up, SIGNAL(pressed()), this->parentWidget(), SLOT(sendIR()) ); QPushButton *down = new QPushButton("Down",this,"down"); layout->addWidget(down, 4, 4, 0); connect(down, SIGNAL(pressed()), this->parentWidget(), SLOT(sendIR()) ); QPushButton *left = new QPushButton("Left",this,"left"); layout->addWidget(left, 2, 2, 0); connect(left, SIGNAL(pressed()), this->parentWidget(), SLOT(sendIR()) ); QPushButton *right = new QPushButton("Right", this, "right"); layout->addWidget(right, 2, 6, 0); connect(right, SIGNAL(pressed()), this->parentWidget(), SLOT(sendIR()) ); QPushButton *enter = new QPushButton("Enter",this,"enter"); layout->addWidget(enter, 2, 4, 0); connect(enter, SIGNAL(pressed()), this->parentWidget(), SLOT(sendIR()) ); //add some other buttons QPushButton *eject = new QPushButton("Eject", this, "eject"); layout->addWidget(eject, 0, 0, 0); connect(eject, SIGNAL(pressed()), this->parentWidget(), SLOT(sendIR()) ); diff --git a/noncore/tools/remote/dvdgroupconf.cpp b/noncore/tools/remote/dvdgroupconf.cpp index 5bfe393..2a08ab6 100644 --- a/noncore/tools/remote/dvdgroupconf.cpp +++ b/noncore/tools/remote/dvdgroupconf.cpp @@ -1,67 +1,67 @@ /* Opie-Remote. emulates remote controlls on an iPaq (and maybe a Zaurus) in Opie. Copyright (C) 2002 Thomas Stephens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "dvdgroupconf.h" -DVDGroupConf::DVDGroupConf(QWidget *parent=0, const char *name=0):QWidget(parent,name) +DVDGroupConf::DVDGroupConf(QWidget *parent, const char *name):QWidget(parent,name) { QGridLayout *layout = new QGridLayout(this); //put rows between the buttons of size 1 layout->addRowSpacing(1,1); layout->addRowSpacing(3,1); //put collumns between the buttons of size 5 layout->addColSpacing(1,5); layout->addColSpacing(3,5); layout->addColSpacing(5,5); layout->addColSpacing(7,5); //make sure that the collumns with the buttons in them stretch before the filler collumns do //since there is so little room, there is no need to do this for the rows layout->setColStretch(4,1); layout->setColStretch(2,1); layout->setColStretch(6,1); layout->setColStretch(8,1); layout->setColStretch(0,1); //add the menu navigation buttons, and connect them to the RemoteTab slots... QPushButton *up = new QPushButton("Up",this,"up"); layout->addWidget(up, 0, 4, 0); connect(up, SIGNAL(pressed()), this->parentWidget(), SLOT(buttonPressed()) ); QPushButton *down = new QPushButton("Down",this,"down"); layout->addWidget(down, 4, 4, 0); connect(down, SIGNAL(pressed()), this->parentWidget(), SLOT(buttonPressed()) ); QPushButton *left = new QPushButton("Left",this,"left"); layout->addWidget(left, 2, 2, 0); connect(left, SIGNAL(pressed()), this->parentWidget(), SLOT(buttonPressed()) ); QPushButton *right = new QPushButton("Right", this, "right"); layout->addWidget(right, 2, 6, 0); connect(right, SIGNAL(pressed()), this->parentWidget(), SLOT(buttonPressed()) ); QPushButton *enter = new QPushButton("Enter",this,"enter"); layout->addWidget(enter, 2, 4, 0); connect(enter, SIGNAL(pressed()), this->parentWidget(), SLOT(buttonPressed()) ); //add some other buttons QPushButton *eject = new QPushButton("Eject", this, "eject"); layout->addWidget(eject, 0, 0, 0); connect(eject, SIGNAL(pressed()), this->parentWidget(), SLOT(buttonPressed()) ); diff --git a/noncore/tools/remote/learntab.cpp b/noncore/tools/remote/learntab.cpp index 054bc7b..998f449 100644 --- a/noncore/tools/remote/learntab.cpp +++ b/noncore/tools/remote/learntab.cpp @@ -1,26 +1,26 @@ /* Opie-Remote. emulates remote controlls on an iPaq (and maybe a Zaurus) in Opie. Copyright (C) 2002 Thomas Stephens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "learntab.h" -LearnTab::LearnTab(QWidget *parent=0, const char *name=0):QWidget(parent,name) +LearnTab::LearnTab(QWidget *parent, const char *name):QWidget(parent,name) { QVBoxLayout *layout = new QVBoxLayout(this); QString *string = new QString("<qt><h1>Opie-Remote Usage Instructions</h1><p>First, some definitions. A Remote is a remote entry in an lircd.conf file, it represents one remote you want to emulate. A Remote Layout is one entry in your ~/Settings/Remote.conf file. It represents the buttons that you see on your screen. Each button on a Remote Layout can be mapped to any button in a Remote. This way you can have, for example, a vcr remote layout, in which all the play/pause/etc buttons are mapped to the buttons on your vcr's remote. However, most VCR's don't have volume controls, so the volume buttons can be mapped to the volume buttons on your TV.</p><p>The first things you need the lirc and lirc-modules ipkgs. If you installed this from an ipkg, they should already be there, thanks to the wonderful world of dependencies. If not, get them. The next thing you need is an lircd.conf file. you can get these at <a href=http://www.lirc.org/>http://www.lirc.org/</a>. Read the documentation there to figure out how to make your own, if one for your remote doesn't exist, or how to have multiple remotes in one lircd.conf file. Once you have a good lircd.conf file, put it in /etc, kill the lircd daemon (if its running) and do a modprobe lirc_sir. Then, run lircd again.</p><p>The next thing you want to do is to create a remote layout. Go to the config tab, and enter a name for your remote layout in the pulldown menu. Dont use the name Remotes, as that could confuse the app. Hopefully, that will be fixed soon. after entering the name you want to use, press New, and then select the name again from the pulldown menu (another oddity that i hope to fix). Then, press each button that you want to map, and a dialog should appear. Select the remote and button that you want to use, and click OK. Once you are done, go to the Remote tab, and select the new remote from the dropdown menu. It should works fine. If at any time you want to change a remote layout, go to the Config tab, select the layout from the dropdown menu, and change the buttons you want to change.</p><p>This is program is written and maintaned by Thomas (spiralman) Stephens. <a href=mailto:spiralman@softhome.net>spiralman@softhome.net</a>. Or, look for me on #opie or #handhelds.org on irc.openprojects.net.</p></qt>"); QTextView *textView = new QTextView(*string, 0, this); layout->addWidget(textView); } diff --git a/noncore/tools/remote/mainview.cpp b/noncore/tools/remote/mainview.cpp index 47027fb..a7be9e3 100644 --- a/noncore/tools/remote/mainview.cpp +++ b/noncore/tools/remote/mainview.cpp @@ -1,67 +1,67 @@ /* Opie-Remote. emulates remote controlls on an iPaq (and maybe a Zaurus) in Opie. Copyright (C) 2002 Thomas Stephens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "mainview.h" -MainView::MainView(QWidget *parent, const char *name=0) : QWidget(parent, name) +MainView::MainView(QWidget *parent, const char *name) : QWidget(parent, name) { setIcon( Resource::loadPixmap( "remote" ) ); setCaption(tr("Remote") ); QVBoxLayout *layout = new QVBoxLayout(this); QTabWidget *tabs = new QTabWidget(this); layout->addWidget(tabs); printf("MainView: 1\n"); remote = new RemoteTab(tabs); printf("MainView: 2\n"); learn = new LearnTab(tabs); printf("MainView: 3\n"); config = new ConfigTab(tabs); printf("MainView: 4\n"); connect(config, SIGNAL(remotesChanged()), this, SLOT(updateRemotesList()) ); printf("MainView: 5\n"); remote->setIRSocket(fd); tabs->addTab(remote, tr("Remote") ); tabs->addTab(learn,tr("Learn") ); tabs->addTab(config,tr("Config") ); printf("1\n"); cfg = new Config("Remote"); printf("2\n"); remote->setConfig(cfg); config->setConfig(cfg); } int MainView::getIRSocket() { return fd; } void MainView::setIRSocket(int newfd) { fd = newfd; remote->setIRSocket(fd); } void MainView::updateRemotesList() { remote->updateRemotesList(); printf("MainView: got remotes changed signal\n"); diff --git a/noncore/tools/remote/remotetab.cpp b/noncore/tools/remote/remotetab.cpp index 64b8ee4..5b02e94 100644 --- a/noncore/tools/remote/remotetab.cpp +++ b/noncore/tools/remote/remotetab.cpp @@ -1,154 +1,154 @@ /* Opie-Remote. emulates remote controlls on an iPaq (and maybe a Zaurus) in Opie. Copyright (C) 2002 Thomas Stephens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "remotetab.h" -RemoteTab::RemoteTab(QWidget *parent=0, const char *name=0):QWidget(parent,name) +RemoteTab::RemoteTab(QWidget *parent, const char *name):QWidget(parent,name) { QVBoxLayout *layout = new QVBoxLayout(this); topGroup = new TopGroup(this); // topGroup->setMaximumHeight(22); layout->addWidget(topGroup, 0, 0); printf("%d %d", topGroup->width(), topGroup->height()); layout->addSpacing(1); dvdGroup = new DVDGroup(this); // dvdGroup->setMaximumHeight(68); layout->addWidget(dvdGroup, 0, 0); layout->addSpacing(1); vcrGroup = new VCRGroup(this); layout->addWidget(vcrGroup, 0, 0); // vcrGroup->setMaximumHeight(45); layout->addSpacing(1); channelGroup = new ChannelGroup(this); // channelGroup->setMaximumHeight(91); layout->addWidget(channelGroup, 0, 0); this->setMaximumWidth(240); timeout = 0; addr.sun_family=AF_UNIX; strcpy(addr.sun_path,"/dev/lircd"); } int RemoteTab::sendIR() { const QObject *button = sender(); QString string = cfg->readEntry(button->name()); string+='\n'; const char *write_buffer = string.latin1(); const char *read_buffer; bool done=false; fd = socket(AF_UNIX, SOCK_STREAM, 0); if(fd == -1) { QMessageBox *mb = new QMessageBox("Error!", "couldnt connect to socket", QMessageBox::NoIcon, QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton); mb->exec(); perror("RemoteTab::SendIR"); - return NULL; + return 0; } - if(std::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1) + if(::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1) { QMessageBox *mb = new QMessageBox("Error!", "couldnt connect to socket", QMessageBox::NoIcon, QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton); mb->exec(); perror("RemoteTab::SendIR"); } printf("fd2: %d\n", fd); printf("%s", write_buffer); printf("1\n"); printf("%d\n", write(fd, write_buffer, strlen(write_buffer) ) ); printf("2\n"); while(!done) { read_buffer=readPacket(); printf("%s\n", read_buffer); if(strcasecmp(read_buffer, "END") == 0) { printf("done reading packet\n"); done=true; } } - std::close(fd); + ::close(fd); } // printf("%s\n", readPacket()); // printf("%d\n", read(fd, read_buffer,sizeof(read_buffer)) ); // printf("%s", read_buffer); //this function was ripped for rc.c in xrc, it is available here: http://www.lirc.org/software.html const char *RemoteTab::readPacket() { static char buffer[PACKET_SIZE+1]=""; char *end; static int ptr=0,end_len=0; ssize_t ret; if(ptr>0) { memmove(buffer,buffer+ptr,strlen(buffer+ptr)+1); ptr=strlen(buffer); end=strchr(buffer,'\n'); } else { end=NULL; } alarm(TIMEOUT); while(end==NULL) { if(PACKET_SIZE<=ptr) { // fprintf(stderr,"%s: bad packet\n",progname); ptr=0; return(NULL); } ret=read(fd,buffer+ptr,PACKET_SIZE-ptr); if(ret<=0 || timeout) { if(timeout) { // fprintf(stderr,"%s: timeout\n",progname); } else { alarm(0); } ptr=0; return(NULL); } diff --git a/noncore/tools/remote/topgroup.cpp b/noncore/tools/remote/topgroup.cpp index 94ea622..93cffbb 100644 --- a/noncore/tools/remote/topgroup.cpp +++ b/noncore/tools/remote/topgroup.cpp @@ -1,54 +1,54 @@ /* Opie-Remote. emulates remote controlls on an iPaq (and maybe a Zaurus) in Opie. Copyright (C) 2002 Thomas Stephens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "topgroup.h" -TopGroup::TopGroup(QWidget *parent=0, const char *name=0):QWidget(parent,name) +TopGroup::TopGroup(QWidget *parent, const char *name):QWidget(parent,name) { QHBoxLayout *layout = new QHBoxLayout(this, 0, -1, 0); QPushButton *power = new QPushButton("Power",this,"power"); layout->addWidget(power); connect(power, SIGNAL(pressed()), this->parentWidget(), SLOT(sendIR()) ); // power->setGeometry(5, 5,40, 20); layout->addSpacing(5); QPushButton *source = new QPushButton("Source",this,"source"); layout->addWidget(source); connect(source, SIGNAL(pressed()), this->parentWidget(), SLOT(sendIR()) ); // source->setGeometry(50,5,40,20); remotes = new QComboBox(false, this, "remotes"); connect(remotes, SIGNAL(activated(const QString &)), this->parentWidget(), SLOT(remoteSelected(const QString &)) ); remotes->insertItem("Select Remote"); // remotes->setGeometry(135,5,95,20); QLabel *remoteLabel = new QLabel(remotes, "Remote: ",this,"remoteLabel"); // remoteLabel->setGeometry(90,5,40,20); remoteLabel->setAlignment(AlignRight | AlignVCenter); layout->addWidget(remoteLabel); layout->addWidget(remotes); } void TopGroup::updateRemotes(Config *cfg) { remotes->clear(); remotes->insertItem(QString("SelectRemote")); cfg->setGroup("Remotes"); remotes->insertStringList(cfg->readListEntry("remoteList", ',') ); } diff --git a/noncore/tools/remote/topgroupconf.cpp b/noncore/tools/remote/topgroupconf.cpp index eb071fb..d763a3a 100644 --- a/noncore/tools/remote/topgroupconf.cpp +++ b/noncore/tools/remote/topgroupconf.cpp @@ -1,67 +1,67 @@ /* Opie-Remote. emulates remote controlls on an iPaq (and maybe a Zaurus) in Opie. Copyright (C) 2002 Thomas Stephens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "topgroupconf.h" -TopGroupConf::TopGroupConf(QWidget *parent=0, const char *name=0):QWidget(parent,name) +TopGroupConf::TopGroupConf(QWidget *parent, const char *name):QWidget(parent,name) { QHBoxLayout *layout = new QHBoxLayout(this); QPushButton *power = new QPushButton("Power",this,"power"); layout->addWidget(power); connect(power, SIGNAL(pressed()), this->parentWidget(), SLOT(buttonPressed()) ); // power->setGeometry(5, 5,40, 20); layout->addSpacing(5); QPushButton *source = new QPushButton("Source",this,"source"); layout->addWidget(source); connect(source, SIGNAL(pressed()), this->parentWidget(), SLOT(buttonPressed()) ); // source->setGeometry(50,5,40,20); remotes = new QComboBox(true, this, "remotes"); remotes->insertItem(QString("Remotes")); layout->addWidget(remotes); layout->setStretchFactor(remotes, 1); connect(remotes, SIGNAL(activated(const QString &)), this->parentWidget(), SLOT(remoteSelected(const QString &)) ); QPushButton *newrem = new QPushButton("New", this, "new"); layout->addWidget(newrem); connect(newrem, SIGNAL(pressed()), this->parentWidget(), SLOT(newPressed()) ); /* remotes = new QComboBox(false, this, "remotes"); connect(remotes, SIGNAL(activated(const QString &)), this->parentWidget(), SLOT(remoteSelected(const QString &)) ); remotes->insertItem("Select Remote"); // remotes->setGeometry(135,5,95,20); QLabel *remoteLabel = new QLabel(remotes, "Remote: ",this,"remoteLabel"); // remoteLabel->setGeometry(90,5,40,20); remoteLabel->setAlignment(AlignRight | AlignVCenter); layout->addWidget(remoteLabel); layout->addWidget(remotes); */ } void TopGroupConf::updateRemotes(QStringList list) { remotes->insertStringList(list); } QString TopGroupConf::getRemotesText() { diff --git a/noncore/tools/remote/vcrgroup.cpp b/noncore/tools/remote/vcrgroup.cpp index 4f07ca3..10ebe5d 100644 --- a/noncore/tools/remote/vcrgroup.cpp +++ b/noncore/tools/remote/vcrgroup.cpp @@ -1,73 +1,73 @@ /* Opie-Remote. emulates remote controlls on an iPaq (and maybe a Zaurus) in Opie. Copyright (C) 2002 Thomas Stephens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "vcrgroup.h" -VCRGroup::VCRGroup(QWidget *parent=0, const char *name=0) : QWidget(parent, +VCRGroup::VCRGroup(QWidget *parent, const char *name) : QWidget(parent, name) { QVBoxLayout *vlayout = new QVBoxLayout(this); QHBoxLayout *hlayout1 = new QHBoxLayout(this); QHBoxLayout *hlayout2 = new QHBoxLayout(this); vlayout->addLayout(hlayout1); vlayout->addSpacing(1); vlayout->addLayout(hlayout2); QPushButton *play = new QPushButton("Play",this, "play"); hlayout1->addWidget(play); connect(play, SIGNAL(pressed()), this->parentWidget(), SLOT(sendIR()) ); hlayout1->addSpacing(5); QPushButton *pause = new QPushButton("Pause",this, "pause"); hlayout1->addWidget(pause); connect(pause, SIGNAL(pressed()), this->parentWidget(), SLOT(sendIR()) ); hlayout1->addSpacing(5); QPushButton *stop = new QPushButton("Stop",this, "stop"); hlayout1->addWidget(stop); connect(stop, SIGNAL(pressed()), this->parentWidget(), SLOT(sendIR()) ); hlayout1->addSpacing(5); QPushButton *record = new QPushButton("Record",this, "record"); hlayout1->addWidget(record); connect(record, SIGNAL(pressed()), this->parentWidget(), SLOT(sendIR()) ); QPushButton *back = new QPushButton("Back",this, "back"); hlayout2->addWidget(back); connect(back, SIGNAL(pressed()), this->parentWidget(), SLOT(sendIR()) ); hlayout2->addSpacing(5); QPushButton *rewind = new QPushButton("Rewind",this, "rewind"); hlayout2->addWidget(rewind); connect(rewind, SIGNAL(pressed()), this->parentWidget(), SLOT(sendIR()) ); diff --git a/noncore/tools/remote/vcrgroupconf.cpp b/noncore/tools/remote/vcrgroupconf.cpp index a50ed0a..2158d43 100644 --- a/noncore/tools/remote/vcrgroupconf.cpp +++ b/noncore/tools/remote/vcrgroupconf.cpp @@ -1,67 +1,67 @@ /* Opie-Remote. emulates remote controlls on an iPaq (and maybe a Zaurus) in Opie. Copyright (C) 2002 Thomas Stephens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "vcrgroupconf.h" -VCRGroupConf::VCRGroupConf(QWidget *parent=0, const char *name=0) : QWidget(parent, name) +VCRGroupConf::VCRGroupConf(QWidget *parent, const char *name) : QWidget(parent, name) { QVBoxLayout *vlayout = new QVBoxLayout(this); QHBoxLayout *hlayout1 = new QHBoxLayout(this); QHBoxLayout *hlayout2 = new QHBoxLayout(this); vlayout->addLayout(hlayout1); vlayout->addSpacing(1); vlayout->addLayout(hlayout2); QPushButton *play = new QPushButton("Play",this, "play"); hlayout1->addWidget(play); connect(play, SIGNAL(pressed()), this->parentWidget(), SLOT(buttonPressed()) ); hlayout1->addSpacing(5); QPushButton *pause = new QPushButton("Pause",this, "pause"); hlayout1->addWidget(pause); connect(pause, SIGNAL(pressed()), this->parentWidget(), SLOT(buttonPressed()) ); hlayout1->addSpacing(5); QPushButton *stop = new QPushButton("Stop",this, "stop"); hlayout1->addWidget(stop); connect(stop, SIGNAL(pressed()), this->parentWidget(), SLOT(buttonPressed()) ); hlayout1->addSpacing(5); QPushButton *record = new QPushButton("Record",this, "record"); hlayout1->addWidget(record); connect(record, SIGNAL(pressed()), this->parentWidget(), SLOT(buttonPressed()) ); QPushButton *back = new QPushButton("Back",this, "back"); hlayout2->addWidget(back); connect(back, SIGNAL(pressed()), this->parentWidget(), SLOT(buttonPressed()) ); hlayout2->addSpacing(5); QPushButton *rewind = new QPushButton("Rewind",this, "rewind"); hlayout2->addWidget(rewind); connect(rewind, SIGNAL(pressed()), this->parentWidget(), SLOT(buttonPressed()) ); hlayout2->addSpacing(5); QPushButton *ff = new QPushButton("FF",this, "ff"); hlayout2->addWidget(ff); connect(ff, SIGNAL(pressed()), this->parentWidget(), SLOT(buttonPressed()) ); |