summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/tools/opie-sh/config.in2
-rw-r--r--noncore/tools/opie-sh/fviewer.cpp4
-rw-r--r--noncore/tools/opie-sh/fviewer.h1
-rw-r--r--noncore/tools/opie-sh/mbox.cpp8
-rw-r--r--noncore/tools/opie-sh/mbox.h1
-rw-r--r--noncore/tools/opie-sh/opie-sh.control2
-rw-r--r--noncore/tools/opie-sh/opie-sh.pro2
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 @@
config OPIE-SH
boolean "opie-sh (qdialog frontend allows you to write dialogs from shell scripts)"
default "y"
- depends ( LIBQPE || LIBQPE-X11 )
+ 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
@@ -12,17 +12,19 @@ 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 "fviewer.h"
+#include <opie2/oresource.h>
+
FViewer::FViewer(QString icon, QString filename, QString title, QWidget *parent, const char*name):QWidget(parent, name)
{
QVBoxLayout *layout = new QVBoxLayout(this);
- setIcon(Resource::loadPixmap("opie-sh"));
+ setIcon(Opie::Core::OResource::loadPixmap("opie-sh", Opie::Core::OResource::SmallIcon));
textView = new QTextBrowser(this, "textview");
layout->addWidget(textView);
QString string;
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
@@ -18,13 +18,12 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include <qfile.h>
#include <qtextstream.h>
#include <qtextbrowser.h>
#include <qlayout.h>
#include <qtimer.h>
#include <qdir.h>
-#include <qpe/resource.h>
class FViewer :public QWidget
{
Q_OBJECT
public:
FViewer(QString icon, QString filename, QString title, QWidget *parent=0, const char*name=0);
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
@@ -13,12 +13,14 @@ 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 "mbox.h"
+#include <opie2/oresource.h>
+
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)
{
QVBoxLayout *layout = new QVBoxLayout(this);
QHBoxLayout *hlayout1 = new QHBoxLayout(this);
QHBoxLayout *hlayout2 = new QHBoxLayout(this);
@@ -33,19 +35,19 @@ MBox::MBox(int w, int h, int type, QString title, QString message, QString *btex
QLabel *image = new QLabel(this, "image");
QLabel *text = new QLabel(message, this, "text");
switch (type)
{
case 0:
- image->setPixmap(Resource::loadPixmap("opie-sh/info"));
+ image->setPixmap(Opie::Core::OResource::loadPixmap("opie-sh/info", Opie::Core::OResource::SmallIcon));
break;
case 1:
- image->setPixmap(Resource::loadPixmap("opie-sh/warning"));
+ image->setPixmap(Opie::Core::OResource::loadPixmap("opie-sh/warning", Opie::Core::OResource::SmallIcon));
break;
case 2:
- image->setPixmap(Resource::loadPixmap("opie-sh/error"));
+ image->setPixmap(Opie::Core::OResource::loadPixmap("opie-sh/error", Opie::Core::OResource::SmallIcon));
break;
}
hlayout1->addWidget(image);
hlayout1->addSpacing(5);
hlayout1->addWidget(text);
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
@@ -11,13 +11,12 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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 <qpe/resource.h>
#include <qdialog.h>
#include <qstring.h>
#include <qiconset.h>
#include <qpixmap.h>
#include <qlabel.h>
#include <qlayout.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
@@ -2,10 +2,10 @@ Package: opie-sh
Files: bin/opie-sh apps/Opie-SH/opie-sh.desktop pics/opie-sh/*.png help/opie-sh/*.html
Priority: optional
Section: opie/sh
Maintainer: Thomas Stephens <spiralman@softhome.net>
Architecture: arm
Version: 0.5$EXTRAVERSION
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopiecore2
License: GPL
Description: A QDialog shell frontend
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
@@ -2,10 +2,10 @@ TEMPLATE =app
CONFIG +=qt warn_on
DESTDIR =$(OPIEDIR)/bin
HEADERS =mbox.h fviewer.h inputdialog.h
SOURCES =opie-sh.cpp mbox.cpp fviewer.cpp inputdialog.cpp
INCLUDEPATH +=$(OPIEDIR)/include
DEPENDPATH +=$(OPIEDIR)/include
-LIBS +=-lqpe
+LIBS +=-lqpe -lopiecore2
TARGET = opie-sh
include( $(OPIEDIR)/include.pro )