author | drw <drw> | 2005-05-24 00:09:07 (UTC) |
---|---|---|
committer | drw <drw> | 2005-05-24 00:09:07 (UTC) |
commit | 1ce0e947a999c2a98d6f6a78e69a8d1f433d7cba (patch) (unidiff) | |
tree | 2ddbea9f816ad8bec8516dffc72bb42cf1a5b614 /noncore/tools | |
parent | 6f01d6a0d9daa537b2aa54ed36ea77e755a463d3 (diff) | |
download | opie-1ce0e947a999c2a98d6f6a78e69a8d1f433d7cba.zip opie-1ce0e947a999c2a98d6f6a78e69a8d1f433d7cba.tar.gz opie-1ce0e947a999c2a98d6f6a78e69a8d1f433d7cba.tar.bz2 |
Resource -> OResource
-rw-r--r-- | noncore/tools/opie-sh/config.in | 2 | ||||
-rw-r--r-- | noncore/tools/opie-sh/fviewer.cpp | 4 | ||||
-rw-r--r-- | noncore/tools/opie-sh/fviewer.h | 1 | ||||
-rw-r--r-- | noncore/tools/opie-sh/mbox.cpp | 8 | ||||
-rw-r--r-- | noncore/tools/opie-sh/mbox.h | 1 | ||||
-rw-r--r-- | noncore/tools/opie-sh/opie-sh.control | 2 | ||||
-rw-r--r-- | noncore/tools/opie-sh/opie-sh.pro | 2 |
7 files changed, 11 insertions, 9 deletions
diff --git a/noncore/tools/opie-sh/config.in b/noncore/tools/opie-sh/config.in index b3ca373..c4e99c3 100644 --- a/noncore/tools/opie-sh/config.in +++ b/noncore/tools/opie-sh/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config OPIE-SH | 1 | config OPIE-SH |
2 | boolean "opie-sh (qdialog frontend allows you to write dialogs from shell scripts)" | 2 | boolean "opie-sh (qdialog frontend allows you to write dialogs from shell scripts)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE |
diff --git a/noncore/tools/opie-sh/fviewer.cpp b/noncore/tools/opie-sh/fviewer.cpp index 6f8f054..bef7233 100644 --- a/noncore/tools/opie-sh/fviewer.cpp +++ b/noncore/tools/opie-sh/fviewer.cpp | |||
@@ -10,21 +10,23 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY | |||
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 | #include <opie2/oresource.h> | ||
19 | |||
18 | FViewer::FViewer(QString icon, QString filename, QString title, QWidget *parent, const char*name):QWidget(parent, name) | 20 | FViewer::FViewer(QString icon, QString filename, QString title, QWidget *parent, const char*name):QWidget(parent, name) |
19 | { | 21 | { |
20 | QVBoxLayout *layout = new QVBoxLayout(this); | 22 | QVBoxLayout *layout = new QVBoxLayout(this); |
21 | 23 | ||
22 | setIcon(Resource::loadPixmap("opie-sh")); | 24 | setIcon(Opie::Core::OResource::loadPixmap("opie-sh", Opie::Core::OResource::SmallIcon)); |
23 | 25 | ||
24 | textView = new QTextBrowser(this, "textview"); | 26 | textView = new QTextBrowser(this, "textview"); |
25 | layout->addWidget(textView); | 27 | layout->addWidget(textView); |
26 | 28 | ||
27 | QString string; | 29 | QString string; |
28 | 30 | ||
29 | if(title.isNull()) | 31 | if(title.isNull()) |
30 | { | 32 | { |
diff --git a/noncore/tools/opie-sh/fviewer.h b/noncore/tools/opie-sh/fviewer.h index cd5206c..e0b3813 100644 --- a/noncore/tools/opie-sh/fviewer.h +++ b/noncore/tools/opie-sh/fviewer.h | |||
@@ -16,17 +16,16 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |||
16 | 16 | ||
17 | #include <qwidget.h> | 17 | #include <qwidget.h> |
18 | #include <qfile.h> | 18 | #include <qfile.h> |
19 | #include <qtextstream.h> | 19 | #include <qtextstream.h> |
20 | #include <qtextbrowser.h> | 20 | #include <qtextbrowser.h> |
21 | #include <qlayout.h> | 21 | #include <qlayout.h> |
22 | #include <qtimer.h> | 22 | #include <qtimer.h> |
23 | #include <qdir.h> | 23 | #include <qdir.h> |
24 | #include <qpe/resource.h> | ||
25 | 24 | ||
26 | class FViewer :public QWidget | 25 | class FViewer :public QWidget |
27 | { | 26 | { |
28 | Q_OBJECT | 27 | Q_OBJECT |
29 | public: | 28 | public: |
30 | FViewer(QString icon, QString filename, QString title, QWidget *parent=0, const char*name=0); | 29 | FViewer(QString icon, QString filename, QString title, QWidget *parent=0, const char*name=0); |
31 | private: | 30 | private: |
32 | QFile *file; | 31 | QFile *file; |
diff --git a/noncore/tools/opie-sh/mbox.cpp b/noncore/tools/opie-sh/mbox.cpp index 04b397d..45145d9 100644 --- a/noncore/tools/opie-sh/mbox.cpp +++ b/noncore/tools/opie-sh/mbox.cpp | |||
@@ -11,16 +11,18 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
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 | #include <opie2/oresource.h> | ||
20 | |||
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) | 21 | 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 | { | 22 | { |
21 | QVBoxLayout *layout = new QVBoxLayout(this); | 23 | QVBoxLayout *layout = new QVBoxLayout(this); |
22 | 24 | ||
23 | QHBoxLayout *hlayout1 = new QHBoxLayout(this); | 25 | QHBoxLayout *hlayout1 = new QHBoxLayout(this); |
24 | QHBoxLayout *hlayout2 = new QHBoxLayout(this); | 26 | QHBoxLayout *hlayout2 = new QHBoxLayout(this); |
25 | 27 | ||
26 | int x, y; | 28 | int x, y; |
@@ -31,23 +33,23 @@ MBox::MBox(int w, int h, int type, QString title, QString message, QString *btex | |||
31 | setCaption(title); | 33 | setCaption(title); |
32 | 34 | ||
33 | QLabel *image = new QLabel(this, "image"); | 35 | QLabel *image = new QLabel(this, "image"); |
34 | QLabel *text = new QLabel(message, this, "text"); | 36 | QLabel *text = new QLabel(message, this, "text"); |
35 | 37 | ||
36 | switch (type) | 38 | switch (type) |
37 | { | 39 | { |
38 | case 0: | 40 | case 0: |
39 | image->setPixmap(Resource::loadPixmap("opie-sh/info")); | 41 | image->setPixmap(Opie::Core::OResource::loadPixmap("opie-sh/info", Opie::Core::OResource::SmallIcon)); |
40 | break; | 42 | break; |
41 | case 1: | 43 | case 1: |
42 | image->setPixmap(Resource::loadPixmap("opie-sh/warning")); | 44 | image->setPixmap(Opie::Core::OResource::loadPixmap("opie-sh/warning", Opie::Core::OResource::SmallIcon)); |
43 | break; | 45 | break; |
44 | case 2: | 46 | case 2: |
45 | image->setPixmap(Resource::loadPixmap("opie-sh/error")); | 47 | image->setPixmap(Opie::Core::OResource::loadPixmap("opie-sh/error", Opie::Core::OResource::SmallIcon)); |
46 | break; | 48 | break; |
47 | } | 49 | } |
48 | 50 | ||
49 | hlayout1->addWidget(image); | 51 | hlayout1->addWidget(image); |
50 | hlayout1->addSpacing(5); | 52 | hlayout1->addSpacing(5); |
51 | hlayout1->addWidget(text); | 53 | hlayout1->addWidget(text); |
52 | 54 | ||
53 | if(!btext0->isNull()) | 55 | if(!btext0->isNull()) |
diff --git a/noncore/tools/opie-sh/mbox.h b/noncore/tools/opie-sh/mbox.h index 66c982a..967a0a3 100644 --- a/noncore/tools/opie-sh/mbox.h +++ b/noncore/tools/opie-sh/mbox.h | |||
@@ -9,17 +9,16 @@ version. | |||
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 <qpe/resource.h> | ||
18 | #include <qdialog.h> | 17 | #include <qdialog.h> |
19 | #include <qstring.h> | 18 | #include <qstring.h> |
20 | #include <qiconset.h> | 19 | #include <qiconset.h> |
21 | #include <qpixmap.h> | 20 | #include <qpixmap.h> |
22 | #include <qlabel.h> | 21 | #include <qlabel.h> |
23 | #include <qlayout.h> | 22 | #include <qlayout.h> |
24 | #include <qpushbutton.h> | 23 | #include <qpushbutton.h> |
25 | #include <qwidget.h> | 24 | #include <qwidget.h> |
diff --git a/noncore/tools/opie-sh/opie-sh.control b/noncore/tools/opie-sh/opie-sh.control index 6627335..67b552f 100644 --- a/noncore/tools/opie-sh/opie-sh.control +++ b/noncore/tools/opie-sh/opie-sh.control | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: opie-sh | 1 | Package: opie-sh |
2 | Files: bin/opie-sh apps/Opie-SH/opie-sh.desktop pics/opie-sh/*.png help/opie-sh/*.html | 2 | Files: bin/opie-sh apps/Opie-SH/opie-sh.desktop pics/opie-sh/*.png help/opie-sh/*.html |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/sh | 4 | Section: opie/sh |
5 | Maintainer: Thomas Stephens <spiralman@softhome.net> | 5 | Maintainer: Thomas Stephens <spiralman@softhome.net> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: 0.5$EXTRAVERSION | 7 | Version: 0.5$EXTRAVERSION |
8 | Depends: task-opie-minimal | 8 | Depends: task-opie-minimal, libopiecore2 |
9 | License: GPL | 9 | License: GPL |
10 | Description: A QDialog shell frontend | 10 | Description: A QDialog shell frontend |
11 | A program to let you use various dialogs from the console (or a shell script) | 11 | A program to let you use various dialogs from the console (or a shell script) |
diff --git a/noncore/tools/opie-sh/opie-sh.pro b/noncore/tools/opie-sh/opie-sh.pro index 57f7978..b0cf052 100644 --- a/noncore/tools/opie-sh/opie-sh.pro +++ b/noncore/tools/opie-sh/opie-sh.pro | |||
@@ -1,11 +1,11 @@ | |||
1 | TEMPLATE =app | 1 | TEMPLATE =app |
2 | CONFIG +=qt warn_on | 2 | CONFIG +=qt warn_on |
3 | DESTDIR =$(OPIEDIR)/bin | 3 | DESTDIR =$(OPIEDIR)/bin |
4 | HEADERS =mbox.h fviewer.h inputdialog.h | 4 | HEADERS =mbox.h fviewer.h inputdialog.h |
5 | SOURCES =opie-sh.cpp mbox.cpp fviewer.cpp inputdialog.cpp | 5 | SOURCES =opie-sh.cpp mbox.cpp fviewer.cpp inputdialog.cpp |
6 | INCLUDEPATH +=$(OPIEDIR)/include | 6 | INCLUDEPATH +=$(OPIEDIR)/include |
7 | DEPENDPATH +=$(OPIEDIR)/include | 7 | DEPENDPATH +=$(OPIEDIR)/include |
8 | LIBS +=-lqpe | 8 | LIBS +=-lqpe -lopiecore2 |
9 | TARGET = opie-sh | 9 | TARGET = opie-sh |
10 | 10 | ||
11 | include( $(OPIEDIR)/include.pro ) | 11 | include( $(OPIEDIR)/include.pro ) |