-rw-r--r-- | noncore/tools/opie-sh/fviewer.cpp | 2 | ||||
-rw-r--r-- | noncore/tools/opie-sh/inputdialog.cpp | 3 | ||||
-rw-r--r-- | noncore/tools/opie-sh/mbox.cpp | 2 | ||||
-rw-r--r-- | noncore/tools/opie-sh/opie-sh.cpp | 3 | ||||
-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 |
17 files changed, 26 insertions, 24 deletions
diff --git a/noncore/tools/opie-sh/fviewer.cpp b/noncore/tools/opie-sh/fviewer.cpp index 882c72c..6f8f054 100644 --- a/noncore/tools/opie-sh/fviewer.cpp +++ b/noncore/tools/opie-sh/fviewer.cpp | |||
@@ -6,25 +6,25 @@ This program is free software; you can redistribute it and/or modify it under th | |||
6 | License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later | 6 | License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later |
7 | version. | 7 | version. |
8 | 8 | ||
9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the | 9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the |
10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General | 10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General |
11 | Public License for more details. | 11 | Public License for more details. |
12 | 12 | ||
13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free | 13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free |
14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
15 | */ | 15 | */ |
16 | #include "fviewer.h" | 16 | #include "fviewer.h" |
17 | 17 | ||
18 | FViewer::FViewer(QString icon, QString filename, QString title, QWidget *parent=0, const char*name=0):QWidget(parent, name) | 18 | FViewer::FViewer(QString icon, QString filename, QString title, QWidget *parent, const char*name):QWidget(parent, name) |
19 | { | 19 | { |
20 | QVBoxLayout *layout = new QVBoxLayout(this); | 20 | QVBoxLayout *layout = new QVBoxLayout(this); |
21 | 21 | ||
22 | setIcon(Resource::loadPixmap("opie-sh")); | 22 | setIcon(Resource::loadPixmap("opie-sh")); |
23 | 23 | ||
24 | textView = new QTextBrowser(this, "textview"); | 24 | textView = new QTextBrowser(this, "textview"); |
25 | layout->addWidget(textView); | 25 | layout->addWidget(textView); |
26 | 26 | ||
27 | QString string; | 27 | QString string; |
28 | 28 | ||
29 | if(title.isNull()) | 29 | if(title.isNull()) |
30 | { | 30 | { |
diff --git a/noncore/tools/opie-sh/inputdialog.cpp b/noncore/tools/opie-sh/inputdialog.cpp index 0780def..1c4e688 100644 --- a/noncore/tools/opie-sh/inputdialog.cpp +++ b/noncore/tools/opie-sh/inputdialog.cpp | |||
@@ -6,25 +6,25 @@ This program is free software; you can redistribute it and/or modify it under th | |||
6 | License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later | 6 | License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later |
7 | version. | 7 | version. |
8 | 8 | ||
9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the | 9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the |
10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General | 10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General |
11 | Public License for more details. | 11 | Public License for more details. |
12 | 12 | ||
13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free | 13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free |
14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
15 | */ | 15 | */ |
16 | #include "inputdialog.h" | 16 | #include "inputdialog.h" |
17 | 17 | ||
18 | InputDialog::InputDialog(int w, int h, int newtype, QString labelString, QString title, QString filename, bool edit, QWidget *parent=0, const char *name=0, bool modal=true, WFlags f=0):QDialog(parent, name, modal, f) | 18 | InputDialog::InputDialog(int w, int h, int newtype, QString labelString, QString title, QString filename, bool edit, QWidget *parent, const char *name, bool modal, WFlags f):QDialog(parent, name, modal, f) |
19 | { | 19 | { |
20 | type = newtype; | 20 | type = newtype; |
21 | QHBoxLayout *layout = new QHBoxLayout(this); | 21 | QHBoxLayout *layout = new QHBoxLayout(this); |
22 | layout->addStrut(32); | 22 | layout->addStrut(32); |
23 | QLabel *label = new QLabel(labelString, this, "label"); | 23 | QLabel *label = new QLabel(labelString, this, "label"); |
24 | setCaption(title); | 24 | setCaption(title); |
25 | int x, y; | 25 | int x, y; |
26 | 26 | ||
27 | layout->addSpacing(5); | 27 | layout->addSpacing(5); |
28 | layout->addWidget(label); | 28 | layout->addWidget(label); |
29 | layout->addSpacing(5); | 29 | layout->addSpacing(5); |
30 | 30 | ||
@@ -105,13 +105,14 @@ QString InputDialog::getString() | |||
105 | { | 105 | { |
106 | if(listBox->isSelected(i)) | 106 | if(listBox->isSelected(i)) |
107 | { | 107 | { |
108 | string+=listBox->text(i)+'\n'; | 108 | string+=listBox->text(i)+'\n'; |
109 | } | 109 | } |
110 | } | 110 | } |
111 | if(string[string.length()-1] == '\n') | 111 | if(string[string.length()-1] == '\n') |
112 | { | 112 | { |
113 | string.truncate(string.length()-1); | 113 | string.truncate(string.length()-1); |
114 | } | 114 | } |
115 | return string; | 115 | return string; |
116 | } | 116 | } |
117 | return QString::null; | ||
117 | } | 118 | } |
diff --git a/noncore/tools/opie-sh/mbox.cpp b/noncore/tools/opie-sh/mbox.cpp index cb3ea1b..04b397d 100644 --- a/noncore/tools/opie-sh/mbox.cpp +++ b/noncore/tools/opie-sh/mbox.cpp | |||
@@ -7,25 +7,25 @@ License as published by the Free Software Foundation; either version 2 of the Li | |||
7 | version. | 7 | version. |
8 | 8 | ||
9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the | 9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the |
10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General | 10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General |
11 | Public License for more details. | 11 | Public License for more details. |
12 | 12 | ||
13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free | 13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free |
14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "mbox.h" | 17 | #include "mbox.h" |
18 | 18 | ||
19 | MBox::MBox(int w, int h, int type, QString title, QString message, QString *btext0 = 0, QString *btext1= 0, QString *btext2 = 0, QWidget *parent=0, const char*name=0, bool modal=true, WFlags f=0):QDialog(parent, name, modal, f) | 19 | MBox::MBox(int w, int h, int type, QString title, QString message, QString *btext0, QString *btext1, QString *btext2, QWidget *parent, const char*name, bool modal, WFlags f):QDialog(parent, name, modal, f) |
20 | { | 20 | { |
21 | QVBoxLayout *layout = new QVBoxLayout(this); | 21 | QVBoxLayout *layout = new QVBoxLayout(this); |
22 | 22 | ||
23 | QHBoxLayout *hlayout1 = new QHBoxLayout(this); | 23 | QHBoxLayout *hlayout1 = new QHBoxLayout(this); |
24 | QHBoxLayout *hlayout2 = new QHBoxLayout(this); | 24 | QHBoxLayout *hlayout2 = new QHBoxLayout(this); |
25 | 25 | ||
26 | int x, y; | 26 | int x, y; |
27 | 27 | ||
28 | layout->addLayout(hlayout1); | 28 | layout->addLayout(hlayout1); |
29 | layout->addLayout(hlayout2); | 29 | layout->addLayout(hlayout2); |
30 | 30 | ||
31 | setCaption(title); | 31 | setCaption(title); |
diff --git a/noncore/tools/opie-sh/opie-sh.cpp b/noncore/tools/opie-sh/opie-sh.cpp index e898cb1..96b4b93 100644 --- a/noncore/tools/opie-sh/opie-sh.cpp +++ b/noncore/tools/opie-sh/opie-sh.cpp | |||
@@ -90,24 +90,25 @@ int myMessageBox(int wi, int h, QWidget *w, int argc, QStringList args) | |||
90 | switch(mbox->exec() ) | 90 | switch(mbox->exec() ) |
91 | { | 91 | { |
92 | case 0: | 92 | case 0: |
93 | return -1; | 93 | return -1; |
94 | case 1: | 94 | case 1: |
95 | return -1; | 95 | return -1; |
96 | case 2: | 96 | case 2: |
97 | return 0; | 97 | return 0; |
98 | case 3: | 98 | case 3: |
99 | return 1; | 99 | return 1; |
100 | case 4: | 100 | case 4: |
101 | return 2; | 101 | return 2; |
102 | default: return -1; | ||
102 | } | 103 | } |
103 | } | 104 | } |
104 | 105 | ||
105 | void printusage() | 106 | void printusage() |
106 | { | 107 | { |
107 | printf("Usage instructions for Opie-sh\n"); | 108 | printf("Usage instructions for Opie-sh\n"); |
108 | printf("Usage: opie-sh [dialog type] [type specific options]\n"); | 109 | printf("Usage: opie-sh [dialog type] [type specific options]\n"); |
109 | printf("Types:\n"); | 110 | printf("Types:\n"); |
110 | printf(" -m Message Box\n"); | 111 | printf(" -m Message Box\n"); |
111 | printf(" -f [filename] View file [Default = stdin]\n"); | 112 | printf(" -f [filename] View file [Default = stdin]\n"); |
112 | printf(" -i Input dialog\n"); | 113 | printf(" -i Input dialog\n"); |
113 | printf(" -h --help These instructions\n"); | 114 | printf(" -h --help These instructions\n"); |
@@ -119,25 +120,25 @@ void printusage() | |||
119 | printf(" -e Use the error icon\n"); | 120 | printf(" -e Use the error icon\n"); |
120 | printf(" -0 [text] First button text [Default = OK]\n"); | 121 | printf(" -0 [text] First button text [Default = OK]\n"); |
121 | printf(" -1 [text] Second button text\n"); | 122 | printf(" -1 [text] Second button text\n"); |
122 | printf(" -2 [text] Third button text\n"); | 123 | printf(" -2 [text] Third button text\n"); |
123 | printf(" -g Disable fullscreen\n"); | 124 | printf(" -g Disable fullscreen\n"); |
124 | printf("Input Dialog options:\n"); | 125 | printf("Input Dialog options:\n"); |
125 | printf(" -s A single line of input (output to console)\n"); | 126 | printf(" -s A single line of input (output to console)\n"); |
126 | printf(" -l List input (newline separated list read in from file)\n"); | 127 | printf(" -l List input (newline separated list read in from file)\n"); |
127 | printf(" -b A list box, enabling multiple selections (input same as -l)\n"); | 128 | printf(" -b A list box, enabling multiple selections (input same as -l)\n"); |
128 | printf(" -L [label] The label for the input field\n"); | 129 | printf(" -L [label] The label for the input field\n"); |
129 | printf(" -F [filename] An input file (for when it makes sense) [Default = stdin]\n"); | 130 | printf(" -F [filename] An input file (for when it makes sense) [Default = stdin]\n"); |
130 | printf(" -E Makes list input editable\n"); | 131 | printf(" -E Makes list input editable\n"); |
131 | printf(" -g Disable fullscreen\n\0"); | 132 | printf(" -g Disable fullscreen\n"); |
132 | } | 133 | } |
133 | 134 | ||
134 | int fileviewer(QPEApplication *a, int argc, QStringList args) | 135 | int fileviewer(QPEApplication *a, int argc, QStringList args) |
135 | { | 136 | { |
136 | int i; | 137 | int i; |
137 | QString filename, title, icon; | 138 | QString filename, title, icon; |
138 | bool update=false; | 139 | bool update=false; |
139 | 140 | ||
140 | for(i=0; i < argc; i++) | 141 | for(i=0; i < argc; i++) |
141 | { | 142 | { |
142 | if(args[i] == "-f") | 143 | if(args[i] == "-f") |
143 | { | 144 | { |
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 | |||
@@ -7,25 +7,25 @@ License as published by the Free Software Foundation; either version 2 of the Li | |||
7 | version. | 7 | version. |
8 | 8 | ||
9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the | 9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the |
10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General | 10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General |
11 | Public License for more details. | 11 | Public License for more details. |
12 | 12 | ||
13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free | 13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free |
14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "buttondialog.h" | 17 | #include "buttondialog.h" |
18 | 18 | ||
19 | ButtonDialog::ButtonDialog(QString buttonName, QWidget *parent=0, const char*name=0, bool modal=FALSE, WFlags f=0):QDialog(parent, name, modal, f) | 19 | ButtonDialog::ButtonDialog(QString buttonName, QWidget *parent, const char*name, bool modal, WFlags f):QDialog(parent, name, modal, f) |
20 | { | 20 | { |
21 | setCaption(tr(buttonName)); | 21 | setCaption(tr(buttonName)); |
22 | 22 | ||
23 | QVBoxLayout *layout = new QVBoxLayout(this); | 23 | QVBoxLayout *layout = new QVBoxLayout(this); |
24 | 24 | ||
25 | QHBoxLayout *hlayout1 = new QHBoxLayout(this); | 25 | QHBoxLayout *hlayout1 = new QHBoxLayout(this); |
26 | QHBoxLayout *hlayout2 = new QHBoxLayout(this); | 26 | QHBoxLayout *hlayout2 = new QHBoxLayout(this); |
27 | QHBoxLayout *hlayout3 = new QHBoxLayout(this); | 27 | QHBoxLayout *hlayout3 = new QHBoxLayout(this); |
28 | 28 | ||
29 | layout->addSpacing(5); | 29 | layout->addSpacing(5); |
30 | layout->addLayout(hlayout1); | 30 | layout->addLayout(hlayout1); |
31 | layout->addSpacing(5); | 31 | layout->addSpacing(5); |
@@ -102,25 +102,25 @@ QStringList ButtonDialog::getRemotes() | |||
102 | { | 102 | { |
103 | QMessageBox *mb = new QMessageBox("Error!", | 103 | QMessageBox *mb = new QMessageBox("Error!", |
104 | "couldnt connect to socket", | 104 | "couldnt connect to socket", |
105 | QMessageBox::NoIcon, | 105 | QMessageBox::NoIcon, |
106 | QMessageBox::Ok, | 106 | QMessageBox::Ok, |
107 | QMessageBox::NoButton, | 107 | QMessageBox::NoButton, |
108 | QMessageBox::NoButton); | 108 | QMessageBox::NoButton); |
109 | mb->exec(); | 109 | mb->exec(); |
110 | perror("ButtonDialog::GetRemotes"); | 110 | perror("ButtonDialog::GetRemotes"); |
111 | return NULL; | 111 | return NULL; |
112 | } | 112 | } |
113 | 113 | ||
114 | if(std::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1) | 114 | if(::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1) |
115 | { | 115 | { |
116 | QMessageBox *mb = new QMessageBox("Error!", | 116 | QMessageBox *mb = new QMessageBox("Error!", |
117 | "couldnt connect to socket", | 117 | "couldnt connect to socket", |
118 | QMessageBox::NoIcon, | 118 | QMessageBox::NoIcon, |
119 | QMessageBox::Ok, | 119 | QMessageBox::Ok, |
120 | QMessageBox::NoButton, | 120 | QMessageBox::NoButton, |
121 | QMessageBox::NoButton); | 121 | QMessageBox::NoButton); |
122 | mb->exec(); | 122 | mb->exec(); |
123 | perror("ButtonDialog::GetRemotes"); | 123 | perror("ButtonDialog::GetRemotes"); |
124 | return NULL; | 124 | return NULL; |
125 | } | 125 | } |
126 | 126 | ||
@@ -145,25 +145,25 @@ QStringList ButtonDialog::getRemotes() | |||
145 | { | 145 | { |
146 | QMessageBox *mb = new QMessageBox("Error!", | 146 | QMessageBox *mb = new QMessageBox("Error!", |
147 | "bad packet", | 147 | "bad packet", |
148 | QMessageBox::NoIcon, | 148 | QMessageBox::NoIcon, |
149 | QMessageBox::Ok, | 149 | QMessageBox::Ok, |
150 | QMessageBox::NoButton, | 150 | QMessageBox::NoButton, |
151 | QMessageBox::NoButton); | 151 | QMessageBox::NoButton); |
152 | mb->exec(); | 152 | mb->exec(); |
153 | perror("ButtonDialog::GetRemotes"); | 153 | perror("ButtonDialog::GetRemotes"); |
154 | return NULL; | 154 | return NULL; |
155 | } | 155 | } |
156 | 156 | ||
157 | std::close(fd); | 157 | ::close(fd); |
158 | return list; | 158 | return list; |
159 | } | 159 | } |
160 | 160 | ||
161 | QStringList ButtonDialog::getButtons(const char *remoteName) | 161 | QStringList ButtonDialog::getButtons(const char *remoteName) |
162 | { | 162 | { |
163 | QString write_buffer = "LIST "; | 163 | QString write_buffer = "LIST "; |
164 | const char *readbuffer; | 164 | const char *readbuffer; |
165 | int i, j, numlines; | 165 | int i, j, numlines; |
166 | QStringList list; | 166 | QStringList list; |
167 | QString string; | 167 | QString string; |
168 | 168 | ||
169 | write_buffer += remoteName; | 169 | write_buffer += remoteName; |
@@ -175,25 +175,25 @@ QStringList ButtonDialog::getButtons(const char *remoteName) | |||
175 | QMessageBox *mb = new QMessageBox("Error!", | 175 | QMessageBox *mb = new QMessageBox("Error!", |
176 | "couldnt connect to socket", | 176 | "couldnt connect to socket", |
177 | QMessageBox::NoIcon, | 177 | QMessageBox::NoIcon, |
178 | QMessageBox::Ok, | 178 | QMessageBox::Ok, |
179 | QMessageBox::NoButton, | 179 | QMessageBox::NoButton, |
180 | QMessageBox::NoButton); | 180 | QMessageBox::NoButton); |
181 | mb->exec(); | 181 | mb->exec(); |
182 | perror("ButtonDialog::GetButtons"); | 182 | perror("ButtonDialog::GetButtons"); |
183 | return NULL; | 183 | return NULL; |
184 | } | 184 | } |
185 | 185 | ||
186 | 186 | ||
187 | if(std::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1) | 187 | if(::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1) |
188 | { | 188 | { |
189 | QMessageBox *mb = new QMessageBox("Error!", | 189 | QMessageBox *mb = new QMessageBox("Error!", |
190 | "couldnt connect to socket", | 190 | "couldnt connect to socket", |
191 | QMessageBox::NoIcon, | 191 | QMessageBox::NoIcon, |
192 | QMessageBox::Ok, | 192 | QMessageBox::Ok, |
193 | QMessageBox::NoButton, | 193 | QMessageBox::NoButton, |
194 | QMessageBox::NoButton); | 194 | QMessageBox::NoButton); |
195 | mb->exec(); | 195 | mb->exec(); |
196 | perror("ButtonDialog::GetButtons"); | 196 | perror("ButtonDialog::GetButtons"); |
197 | return NULL; | 197 | return NULL; |
198 | } | 198 | } |
199 | 199 | ||
@@ -221,25 +221,25 @@ QStringList ButtonDialog::getButtons(const char *remoteName) | |||
221 | { | 221 | { |
222 | QMessageBox *mb = new QMessageBox("Error!", | 222 | QMessageBox *mb = new QMessageBox("Error!", |
223 | "bad packet", | 223 | "bad packet", |
224 | QMessageBox::NoIcon, | 224 | QMessageBox::NoIcon, |
225 | QMessageBox::Ok, | 225 | QMessageBox::Ok, |
226 | QMessageBox::NoButton, | 226 | QMessageBox::NoButton, |
227 | QMessageBox::NoButton); | 227 | QMessageBox::NoButton); |
228 | mb->exec(); | 228 | mb->exec(); |
229 | perror("ButtonDialog::GetButtons"); | 229 | perror("ButtonDialog::GetButtons"); |
230 | return NULL; | 230 | return NULL; |
231 | } | 231 | } |
232 | 232 | ||
233 | std::close(fd); | 233 | ::close(fd); |
234 | return list; | 234 | return list; |
235 | } | 235 | } |
236 | 236 | ||
237 | 237 | ||
238 | //this function was ripped for rc.c in xrc, it is available here: http://www.lirc.org/software.html | 238 | //this function was ripped for rc.c in xrc, it is available here: http://www.lirc.org/software.html |
239 | const char *ButtonDialog::readPacket() | 239 | const char *ButtonDialog::readPacket() |
240 | { | 240 | { |
241 | static char buffer[PACKET_SIZE+1]=""; | 241 | static char buffer[PACKET_SIZE+1]=""; |
242 | char *end; | 242 | char *end; |
243 | static int ptr=0,end_len=0; | 243 | static int ptr=0,end_len=0; |
244 | ssize_t ret; | 244 | ssize_t ret; |
245 | timeout = 0; | 245 | timeout = 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 | |||
@@ -7,25 +7,25 @@ License as published by the Free Software Foundation; either version 2 of the Li | |||
7 | version. | 7 | version. |
8 | 8 | ||
9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the | 9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the |
10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General | 10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General |
11 | Public License for more details. | 11 | Public License for more details. |
12 | 12 | ||
13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free | 13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free |
14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "channelgroup.h" | 17 | #include "channelgroup.h" |
18 | 18 | ||
19 | ChannelGroup::ChannelGroup(QWidget *parent=0, const char *name=0):QWidget(parent,name) | 19 | ChannelGroup::ChannelGroup(QWidget *parent, const char *name):QWidget(parent,name) |
20 | { | 20 | { |
21 | QGridLayout *layout = new QGridLayout(this); | 21 | QGridLayout *layout = new QGridLayout(this); |
22 | QVBoxLayout *volLayout = new QVBoxLayout(this); | 22 | QVBoxLayout *volLayout = new QVBoxLayout(this); |
23 | QVBoxLayout *chanLayout = new QVBoxLayout(this); | 23 | QVBoxLayout *chanLayout = new QVBoxLayout(this); |
24 | 24 | ||
25 | layout->addRowSpacing(1,1); | 25 | layout->addRowSpacing(1,1); |
26 | layout->addRowSpacing(3,1); | 26 | layout->addRowSpacing(3,1); |
27 | layout->addRowSpacing(5,1); | 27 | layout->addRowSpacing(5,1); |
28 | 28 | ||
29 | layout->addColSpacing(1,1); | 29 | layout->addColSpacing(1,1); |
30 | layout->addColSpacing(3,1); | 30 | layout->addColSpacing(3,1); |
31 | layout->addColSpacing(5,1); | 31 | layout->addColSpacing(5,1); |
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 | |||
@@ -7,25 +7,25 @@ License as published by the Free Software Foundation; either version 2 of the Li | |||
7 | version. | 7 | version. |
8 | 8 | ||
9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the | 9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the |
10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General | 10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General |
11 | Public License for more details. | 11 | Public License for more details. |
12 | 12 | ||
13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free | 13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free |
14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "channelgroupconf.h" | 17 | #include "channelgroupconf.h" |
18 | 18 | ||
19 | ChannelGroupConf::ChannelGroupConf(QWidget *parent=0, const char *name=0):QWidget(parent,name) | 19 | ChannelGroupConf::ChannelGroupConf(QWidget *parent, const char *name):QWidget(parent,name) |
20 | { | 20 | { |
21 | QGridLayout *layout = new QGridLayout(this); | 21 | QGridLayout *layout = new QGridLayout(this); |
22 | QVBoxLayout *volLayout = new QVBoxLayout(this); | 22 | QVBoxLayout *volLayout = new QVBoxLayout(this); |
23 | QVBoxLayout *chanLayout = new QVBoxLayout(this); | 23 | QVBoxLayout *chanLayout = new QVBoxLayout(this); |
24 | 24 | ||
25 | layout->addRowSpacing(1,5); | 25 | layout->addRowSpacing(1,5); |
26 | layout->addRowSpacing(3,5); | 26 | layout->addRowSpacing(3,5); |
27 | layout->addRowSpacing(5,5); | 27 | layout->addRowSpacing(5,5); |
28 | 28 | ||
29 | layout->addColSpacing(1,1); | 29 | layout->addColSpacing(1,1); |
30 | layout->addColSpacing(3,1); | 30 | layout->addColSpacing(3,1); |
31 | layout->addColSpacing(5,1); | 31 | layout->addColSpacing(5,1); |
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 | |||
@@ -7,25 +7,25 @@ License as published by the Free Software Foundation; either version 2 of the Li | |||
7 | version. | 7 | version. |
8 | 8 | ||
9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the | 9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the |
10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General | 10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General |
11 | Public License for more details. | 11 | Public License for more details. |
12 | 12 | ||
13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free | 13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free |
14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "configtab.h" | 17 | #include "configtab.h" |
18 | 18 | ||
19 | ConfigTab::ConfigTab(QWidget *parent=0, const char *name=0):QWidget(parent,name) | 19 | ConfigTab::ConfigTab(QWidget *parent, const char *name):QWidget(parent,name) |
20 | { | 20 | { |
21 | 21 | ||
22 | QVBoxLayout *layout = new QVBoxLayout(this); | 22 | QVBoxLayout *layout = new QVBoxLayout(this); |
23 | 23 | ||
24 | topGroupConf = new TopGroupConf(this, "topGroupConf"); | 24 | topGroupConf = new TopGroupConf(this, "topGroupConf"); |
25 | layout->addWidget(topGroupConf, 1); | 25 | layout->addWidget(topGroupConf, 1); |
26 | layout->addSpacing(1); | 26 | layout->addSpacing(1); |
27 | 27 | ||
28 | dvdGroupConf = new DVDGroupConf(this, "dvdGroupConf"); | 28 | dvdGroupConf = new DVDGroupConf(this, "dvdGroupConf"); |
29 | layout->addWidget(dvdGroupConf, 1); | 29 | layout->addWidget(dvdGroupConf, 1); |
30 | layout->addSpacing(1); | 30 | layout->addSpacing(1); |
31 | 31 | ||
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 | |||
@@ -13,25 +13,25 @@ WARRANTY; without even the | |||
13 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
14 | 14 | ||
15 | GNU General | 15 | GNU General |
16 | Public License for more details. | 16 | Public License for more details. |
17 | 17 | ||
18 | You should have received a copy of the GNU General Public License along with | 18 | You should have received a copy of the GNU General Public License along with |
19 | this program; if not, write to the Free | 19 | this program; if not, write to the Free |
20 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include "dvdgroup.h" | 23 | #include "dvdgroup.h" |
24 | 24 | ||
25 | DVDGroup::DVDGroup(QWidget *parent=0, const char *name=0):QWidget(parent,name) | 25 | DVDGroup::DVDGroup(QWidget *parent, const char *name):QWidget(parent,name) |
26 | { | 26 | { |
27 | QGridLayout *layout = new QGridLayout(this); | 27 | QGridLayout *layout = new QGridLayout(this); |
28 | 28 | ||
29 | //put rows between the buttons of size 1 | 29 | //put rows between the buttons of size 1 |
30 | layout->addRowSpacing(1,1); | 30 | layout->addRowSpacing(1,1); |
31 | layout->addRowSpacing(3,1); | 31 | layout->addRowSpacing(3,1); |
32 | 32 | ||
33 | //put collumns between the buttons of size 5 | 33 | //put collumns between the buttons of size 5 |
34 | layout->addColSpacing(1,5); | 34 | layout->addColSpacing(1,5); |
35 | layout->addColSpacing(3,5); | 35 | layout->addColSpacing(3,5); |
36 | layout->addColSpacing(5,5); | 36 | layout->addColSpacing(5,5); |
37 | layout->addColSpacing(7,5); | 37 | layout->addColSpacing(7,5); |
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 | |||
@@ -7,25 +7,25 @@ License as published by the Free Software Foundation; either version 2 of the Li | |||
7 | version. | 7 | version. |
8 | 8 | ||
9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the | 9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the |
10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General | 10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General |
11 | Public License for more details. | 11 | Public License for more details. |
12 | 12 | ||
13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free | 13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free |
14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "dvdgroupconf.h" | 17 | #include "dvdgroupconf.h" |
18 | 18 | ||
19 | DVDGroupConf::DVDGroupConf(QWidget *parent=0, const char *name=0):QWidget(parent,name) | 19 | DVDGroupConf::DVDGroupConf(QWidget *parent, const char *name):QWidget(parent,name) |
20 | { | 20 | { |
21 | QGridLayout *layout = new QGridLayout(this); | 21 | QGridLayout *layout = new QGridLayout(this); |
22 | 22 | ||
23 | //put rows between the buttons of size 1 | 23 | //put rows between the buttons of size 1 |
24 | layout->addRowSpacing(1,1); | 24 | layout->addRowSpacing(1,1); |
25 | layout->addRowSpacing(3,1); | 25 | layout->addRowSpacing(3,1); |
26 | 26 | ||
27 | //put collumns between the buttons of size 5 | 27 | //put collumns between the buttons of size 5 |
28 | layout->addColSpacing(1,5); | 28 | layout->addColSpacing(1,5); |
29 | layout->addColSpacing(3,5); | 29 | layout->addColSpacing(3,5); |
30 | layout->addColSpacing(5,5); | 30 | layout->addColSpacing(5,5); |
31 | layout->addColSpacing(7,5); | 31 | layout->addColSpacing(7,5); |
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 | |||
@@ -7,20 +7,20 @@ License as published by the Free Software Foundation; either version 2 of the Li | |||
7 | version. | 7 | version. |
8 | 8 | ||
9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the | 9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the |
10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General | 10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General |
11 | Public License for more details. | 11 | Public License for more details. |
12 | 12 | ||
13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free | 13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free |
14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "learntab.h" | 17 | #include "learntab.h" |
18 | 18 | ||
19 | LearnTab::LearnTab(QWidget *parent=0, const char *name=0):QWidget(parent,name) | 19 | LearnTab::LearnTab(QWidget *parent, const char *name):QWidget(parent,name) |
20 | { | 20 | { |
21 | QVBoxLayout *layout = new QVBoxLayout(this); | 21 | QVBoxLayout *layout = new QVBoxLayout(this); |
22 | 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>"); | 22 | 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>"); |
23 | 23 | ||
24 | QTextView *textView = new QTextView(*string, 0, this); | 24 | QTextView *textView = new QTextView(*string, 0, this); |
25 | layout->addWidget(textView); | 25 | layout->addWidget(textView); |
26 | } | 26 | } |
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 | |||
@@ -7,25 +7,25 @@ License as published by the Free Software Foundation; either version 2 of the Li | |||
7 | version. | 7 | version. |
8 | 8 | ||
9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the | 9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the |
10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General | 10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General |
11 | Public License for more details. | 11 | Public License for more details. |
12 | 12 | ||
13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free | 13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free |
14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "mainview.h" | 17 | #include "mainview.h" |
18 | 18 | ||
19 | MainView::MainView(QWidget *parent, const char *name=0) : QWidget(parent, name) | 19 | MainView::MainView(QWidget *parent, const char *name) : QWidget(parent, name) |
20 | { | 20 | { |
21 | setIcon( Resource::loadPixmap( "remote" ) ); | 21 | setIcon( Resource::loadPixmap( "remote" ) ); |
22 | setCaption(tr("Remote") ); | 22 | setCaption(tr("Remote") ); |
23 | 23 | ||
24 | QVBoxLayout *layout = new QVBoxLayout(this); | 24 | QVBoxLayout *layout = new QVBoxLayout(this); |
25 | QTabWidget *tabs = new QTabWidget(this); | 25 | QTabWidget *tabs = new QTabWidget(this); |
26 | 26 | ||
27 | layout->addWidget(tabs); | 27 | layout->addWidget(tabs); |
28 | 28 | ||
29 | printf("MainView: 1\n"); | 29 | printf("MainView: 1\n"); |
30 | remote = new RemoteTab(tabs); | 30 | remote = new RemoteTab(tabs); |
31 | printf("MainView: 2\n"); | 31 | printf("MainView: 2\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 | |||
@@ -7,25 +7,25 @@ License as published by the Free Software Foundation; either version 2 of the Li | |||
7 | version. | 7 | version. |
8 | 8 | ||
9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the | 9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the |
10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General | 10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General |
11 | Public License for more details. | 11 | Public License for more details. |
12 | 12 | ||
13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free | 13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free |
14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "remotetab.h" | 17 | #include "remotetab.h" |
18 | 18 | ||
19 | RemoteTab::RemoteTab(QWidget *parent=0, const char *name=0):QWidget(parent,name) | 19 | RemoteTab::RemoteTab(QWidget *parent, const char *name):QWidget(parent,name) |
20 | { | 20 | { |
21 | QVBoxLayout *layout = new QVBoxLayout(this); | 21 | QVBoxLayout *layout = new QVBoxLayout(this); |
22 | 22 | ||
23 | topGroup = new TopGroup(this); | 23 | topGroup = new TopGroup(this); |
24 | //topGroup->setMaximumHeight(22); | 24 | //topGroup->setMaximumHeight(22); |
25 | layout->addWidget(topGroup, 0, 0); | 25 | layout->addWidget(topGroup, 0, 0); |
26 | printf("%d %d", topGroup->width(), topGroup->height()); | 26 | printf("%d %d", topGroup->width(), topGroup->height()); |
27 | 27 | ||
28 | layout->addSpacing(1); | 28 | layout->addSpacing(1); |
29 | 29 | ||
30 | dvdGroup = new DVDGroup(this); | 30 | dvdGroup = new DVDGroup(this); |
31 | //dvdGroup->setMaximumHeight(68); | 31 | //dvdGroup->setMaximumHeight(68); |
@@ -62,29 +62,29 @@ int RemoteTab::sendIR() | |||
62 | 62 | ||
63 | fd = socket(AF_UNIX, SOCK_STREAM, 0); | 63 | fd = socket(AF_UNIX, SOCK_STREAM, 0); |
64 | if(fd == -1) | 64 | if(fd == -1) |
65 | { | 65 | { |
66 | QMessageBox *mb = new QMessageBox("Error!", | 66 | QMessageBox *mb = new QMessageBox("Error!", |
67 | "couldnt connect to socket", | 67 | "couldnt connect to socket", |
68 | QMessageBox::NoIcon, | 68 | QMessageBox::NoIcon, |
69 | QMessageBox::Ok, | 69 | QMessageBox::Ok, |
70 | QMessageBox::NoButton, | 70 | QMessageBox::NoButton, |
71 | QMessageBox::NoButton); | 71 | QMessageBox::NoButton); |
72 | mb->exec(); | 72 | mb->exec(); |
73 | perror("RemoteTab::SendIR"); | 73 | perror("RemoteTab::SendIR"); |
74 | return NULL; | 74 | return 0; |
75 | } | 75 | } |
76 | 76 | ||
77 | 77 | ||
78 | if(std::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1) | 78 | if(::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1) |
79 | { | 79 | { |
80 | QMessageBox *mb = new QMessageBox("Error!", | 80 | QMessageBox *mb = new QMessageBox("Error!", |
81 | "couldnt connect to socket", | 81 | "couldnt connect to socket", |
82 | QMessageBox::NoIcon, | 82 | QMessageBox::NoIcon, |
83 | QMessageBox::Ok, | 83 | QMessageBox::Ok, |
84 | QMessageBox::NoButton, | 84 | QMessageBox::NoButton, |
85 | QMessageBox::NoButton); | 85 | QMessageBox::NoButton); |
86 | mb->exec(); | 86 | mb->exec(); |
87 | perror("RemoteTab::SendIR"); | 87 | perror("RemoteTab::SendIR"); |
88 | } | 88 | } |
89 | 89 | ||
90 | printf("fd2: %d\n", fd); | 90 | printf("fd2: %d\n", fd); |
@@ -94,25 +94,25 @@ int RemoteTab::sendIR() | |||
94 | printf("%d\n", write(fd, write_buffer, strlen(write_buffer) ) ); | 94 | printf("%d\n", write(fd, write_buffer, strlen(write_buffer) ) ); |
95 | printf("2\n"); | 95 | printf("2\n"); |
96 | while(!done) | 96 | while(!done) |
97 | { | 97 | { |
98 | read_buffer=readPacket(); | 98 | read_buffer=readPacket(); |
99 | printf("%s\n", read_buffer); | 99 | printf("%s\n", read_buffer); |
100 | if(strcasecmp(read_buffer, "END") == 0) | 100 | if(strcasecmp(read_buffer, "END") == 0) |
101 | { | 101 | { |
102 | printf("done reading packet\n"); | 102 | printf("done reading packet\n"); |
103 | done=true; | 103 | done=true; |
104 | } | 104 | } |
105 | } | 105 | } |
106 | std::close(fd); | 106 | ::close(fd); |
107 | } | 107 | } |
108 | 108 | ||
109 | // printf("%s\n", readPacket()); | 109 | // printf("%s\n", readPacket()); |
110 | // printf("%d\n", read(fd, read_buffer,sizeof(read_buffer)) ); | 110 | // printf("%d\n", read(fd, read_buffer,sizeof(read_buffer)) ); |
111 | // printf("%s", read_buffer); | 111 | // printf("%s", read_buffer); |
112 | 112 | ||
113 | //this function was ripped for rc.c in xrc, it is available here: http://www.lirc.org/software.html | 113 | //this function was ripped for rc.c in xrc, it is available here: http://www.lirc.org/software.html |
114 | const char *RemoteTab::readPacket() | 114 | const char *RemoteTab::readPacket() |
115 | { | 115 | { |
116 | static char buffer[PACKET_SIZE+1]=""; | 116 | static char buffer[PACKET_SIZE+1]=""; |
117 | char *end; | 117 | char *end; |
118 | static int ptr=0,end_len=0; | 118 | static int ptr=0,end_len=0; |
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 | |||
@@ -7,25 +7,25 @@ License as published by the Free Software Foundation; either version 2 of the Li | |||
7 | version. | 7 | version. |
8 | 8 | ||
9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the | 9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the |
10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General | 10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General |
11 | Public License for more details. | 11 | Public License for more details. |
12 | 12 | ||
13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free | 13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free |
14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "topgroup.h" | 17 | #include "topgroup.h" |
18 | 18 | ||
19 | TopGroup::TopGroup(QWidget *parent=0, const char *name=0):QWidget(parent,name) | 19 | TopGroup::TopGroup(QWidget *parent, const char *name):QWidget(parent,name) |
20 | { | 20 | { |
21 | QHBoxLayout *layout = new QHBoxLayout(this, 0, -1, 0); | 21 | QHBoxLayout *layout = new QHBoxLayout(this, 0, -1, 0); |
22 | 22 | ||
23 | QPushButton *power = new QPushButton("Power",this,"power"); | 23 | QPushButton *power = new QPushButton("Power",this,"power"); |
24 | layout->addWidget(power); | 24 | layout->addWidget(power); |
25 | connect(power, SIGNAL(pressed()), this->parentWidget(), SLOT(sendIR()) ); | 25 | connect(power, SIGNAL(pressed()), this->parentWidget(), SLOT(sendIR()) ); |
26 | //power->setGeometry(5, 5,40, 20); | 26 | //power->setGeometry(5, 5,40, 20); |
27 | 27 | ||
28 | layout->addSpacing(5); | 28 | layout->addSpacing(5); |
29 | 29 | ||
30 | QPushButton *source = new QPushButton("Source",this,"source"); | 30 | QPushButton *source = new QPushButton("Source",this,"source"); |
31 | layout->addWidget(source); | 31 | layout->addWidget(source); |
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 | |||
@@ -7,25 +7,25 @@ License as published by the Free Software Foundation; either version 2 of the Li | |||
7 | version. | 7 | version. |
8 | 8 | ||
9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the | 9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the |
10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General | 10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General |
11 | Public License for more details. | 11 | Public License for more details. |
12 | 12 | ||
13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free | 13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free |
14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "topgroupconf.h" | 17 | #include "topgroupconf.h" |
18 | 18 | ||
19 | TopGroupConf::TopGroupConf(QWidget *parent=0, const char *name=0):QWidget(parent,name) | 19 | TopGroupConf::TopGroupConf(QWidget *parent, const char *name):QWidget(parent,name) |
20 | { | 20 | { |
21 | QHBoxLayout *layout = new QHBoxLayout(this); | 21 | QHBoxLayout *layout = new QHBoxLayout(this); |
22 | 22 | ||
23 | QPushButton *power = new QPushButton("Power",this,"power"); | 23 | QPushButton *power = new QPushButton("Power",this,"power"); |
24 | layout->addWidget(power); | 24 | layout->addWidget(power); |
25 | connect(power, SIGNAL(pressed()), this->parentWidget(), SLOT(buttonPressed()) ); | 25 | connect(power, SIGNAL(pressed()), this->parentWidget(), SLOT(buttonPressed()) ); |
26 | //power->setGeometry(5, 5,40, 20); | 26 | //power->setGeometry(5, 5,40, 20); |
27 | 27 | ||
28 | layout->addSpacing(5); | 28 | layout->addSpacing(5); |
29 | 29 | ||
30 | QPushButton *source = new QPushButton("Source",this,"source"); | 30 | QPushButton *source = new QPushButton("Source",this,"source"); |
31 | layout->addWidget(source); | 31 | layout->addWidget(source); |
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 | |||
@@ -13,25 +13,25 @@ WARRANTY; without even the | |||
13 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
14 | 14 | ||
15 | GNU General | 15 | GNU General |
16 | Public License for more details. | 16 | Public License for more details. |
17 | 17 | ||
18 | You should have received a copy of the GNU General Public License along with | 18 | You should have received a copy of the GNU General Public License along with |
19 | this program; if not, write to the Free | 19 | this program; if not, write to the Free |
20 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include "vcrgroup.h" | 23 | #include "vcrgroup.h" |
24 | 24 | ||
25 | VCRGroup::VCRGroup(QWidget *parent=0, const char *name=0) : QWidget(parent, | 25 | VCRGroup::VCRGroup(QWidget *parent, const char *name) : QWidget(parent, |
26 | name) | 26 | name) |
27 | { | 27 | { |
28 | QVBoxLayout *vlayout = new QVBoxLayout(this); | 28 | QVBoxLayout *vlayout = new QVBoxLayout(this); |
29 | 29 | ||
30 | QHBoxLayout *hlayout1 = new QHBoxLayout(this); | 30 | QHBoxLayout *hlayout1 = new QHBoxLayout(this); |
31 | QHBoxLayout *hlayout2 = new QHBoxLayout(this); | 31 | QHBoxLayout *hlayout2 = new QHBoxLayout(this); |
32 | 32 | ||
33 | vlayout->addLayout(hlayout1); | 33 | vlayout->addLayout(hlayout1); |
34 | vlayout->addSpacing(1); | 34 | vlayout->addSpacing(1); |
35 | vlayout->addLayout(hlayout2); | 35 | vlayout->addLayout(hlayout2); |
36 | 36 | ||
37 | QPushButton *play = new | 37 | QPushButton *play = new |
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 | |||
@@ -7,25 +7,25 @@ License as published by the Free Software Foundation; either version 2 of the Li | |||
7 | version. | 7 | version. |
8 | 8 | ||
9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the | 9 | This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the |
10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General | 10 | implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General |
11 | Public License for more details. | 11 | Public License for more details. |
12 | 12 | ||
13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free | 13 | You should have received a copy of the GNU General Public License along with this program; if not, write to the Free |
14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 14 | Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "vcrgroupconf.h" | 17 | #include "vcrgroupconf.h" |
18 | 18 | ||
19 | VCRGroupConf::VCRGroupConf(QWidget *parent=0, const char *name=0) : QWidget(parent, name) | 19 | VCRGroupConf::VCRGroupConf(QWidget *parent, const char *name) : QWidget(parent, name) |
20 | { | 20 | { |
21 | QVBoxLayout *vlayout = new QVBoxLayout(this); | 21 | QVBoxLayout *vlayout = new QVBoxLayout(this); |
22 | 22 | ||
23 | QHBoxLayout *hlayout1 = new QHBoxLayout(this); | 23 | QHBoxLayout *hlayout1 = new QHBoxLayout(this); |
24 | QHBoxLayout *hlayout2 = new QHBoxLayout(this); | 24 | QHBoxLayout *hlayout2 = new QHBoxLayout(this); |
25 | 25 | ||
26 | vlayout->addLayout(hlayout1); | 26 | vlayout->addLayout(hlayout1); |
27 | vlayout->addSpacing(1); | 27 | vlayout->addSpacing(1); |
28 | vlayout->addLayout(hlayout2); | 28 | vlayout->addLayout(hlayout2); |
29 | 29 | ||
30 | QPushButton *play = new QPushButton("Play",this, "play"); | 30 | QPushButton *play = new QPushButton("Play",this, "play"); |
31 | hlayout1->addWidget(play); | 31 | hlayout1->addWidget(play); |