| author | drw <drw> | 2005-06-15 22:54:50 (UTC) |
|---|---|---|
| committer | drw <drw> | 2005-06-15 22:54:50 (UTC) |
| commit | 7ff2e7bd4620a574f3ff22a951a5904310cfd920 (patch) (side-by-side diff) | |
| tree | 6d8ffd28aadf00901b3ab560464794aded3efc76 /inputmethods/multikey | |
| parent | e0205bac48b9d23af9feb48004c24fcf7a5e8200 (diff) | |
| download | opie-7ff2e7bd4620a574f3ff22a951a5904310cfd920.zip opie-7ff2e7bd4620a574f3ff22a951a5904310cfd920.tar.gz opie-7ff2e7bd4620a574f3ff22a951a5904310cfd920.tar.bz2 | |
Resource -> OResource
| -rw-r--r-- | inputmethods/multikey/config.in | 2 | ||||
| -rw-r--r-- | inputmethods/multikey/configdlg.cpp | 13 | ||||
| -rw-r--r-- | inputmethods/multikey/multikey.pro | 2 | ||||
| -rw-r--r-- | inputmethods/multikey/opie-multikey.control | 2 |
4 files changed, 11 insertions, 8 deletions
diff --git a/inputmethods/multikey/config.in b/inputmethods/multikey/config.in index 4eeb326..dd3192b 100644 --- a/inputmethods/multikey/config.in +++ b/inputmethods/multikey/config.in @@ -1,4 +1,4 @@ config MULTIKEY boolean "opie-multikey (OnScreen keyboard for multiple languages)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && PICKBOARD && LIBQTAUX && LIBOPIE2UI + depends ( LIBQPE || LIBQPE-X11 ) && PICKBOARD && LIBQTAUX && LIBOPIE2CORE && LIBOPIE2UI diff --git a/inputmethods/multikey/configdlg.cpp b/inputmethods/multikey/configdlg.cpp index fe5051d..52c498b 100644 --- a/inputmethods/multikey/configdlg.cpp +++ b/inputmethods/multikey/configdlg.cpp @@ -8,9 +8,12 @@ * */ +#include <opie2/ofiledialog.h> +#include <opie2/qcolordialog.h> +#include <opie2/oresource.h> + #include <qpe/qpeapplication.h> #include <qpe/config.h> -#include <qpe/resource.h> #include <qlayout.h> #include <qwidget.h> @@ -26,8 +29,6 @@ #include <qlistbox.h> #include <qstringlist.h> #include <qtoolbutton.h> -#include <opie2/ofiledialog.h> -#include <opie2/qcolordialog.h> #include <qdir.h> #include <qfileinfo.h> #include "configdlg.h" @@ -62,14 +63,16 @@ ConfigDlg::ConfigDlg () : QDialog () QVBox *vbox1 = new QVBox(hbox1); QToolButton *tb1 = new QToolButton(vbox1, tr("Move Up")); - tb1->setPixmap(Resource::loadPixmap("up")); + tb1->setUsesBigPixmap( qApp->desktop()->size().width() > 330 ); + tb1->setPixmap(Opie::Core::OResource::loadPixmap("up", Opie::Core::OResource::SmallIcon)); tb1->setAutoRaise(TRUE); tb1->setFocusPolicy(QWidget::NoFocus); tb1->setToggleButton(FALSE); connect(tb1, SIGNAL(clicked()), this, SLOT(moveSelectedUp())); QToolButton *tb2 = new QToolButton(vbox1, tr("Move Down")); - tb2->setPixmap(Resource::loadPixmap("down")); + tb2->setUsesBigPixmap( qApp->desktop()->size().width() > 330 ); + tb2->setPixmap(Opie::Core::OResource::loadPixmap("down", Opie::Core::OResource::SmallIcon)); tb2->setAutoRaise(TRUE); tb2->setFocusPolicy(QWidget::NoFocus); tb2->setToggleButton(FALSE); diff --git a/inputmethods/multikey/multikey.pro b/inputmethods/multikey/multikey.pro index 3fd621f..4ad1923 100644 --- a/inputmethods/multikey/multikey.pro +++ b/inputmethods/multikey/multikey.pro @@ -10,7 +10,7 @@ TARGET = qmultikey DESTDIR = $(OPIEDIR)/plugins/inputmethods INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += ../../launcher -LIBS += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard -lqtaux2 -lopieui2 +LIBS += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard -lqtaux2 -lopiecore2 -lopieui2 QMAKE_LFLAGS += -Wl,-rpath,/opt/QtPalmtop/plugins/inputmethods VERSION = 1.0.0 diff --git a/inputmethods/multikey/opie-multikey.control b/inputmethods/multikey/opie-multikey.control index 5a5ce77..fc7d56c 100644 --- a/inputmethods/multikey/opie-multikey.control +++ b/inputmethods/multikey/opie-multikey.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/inputmethods Maintainer: Jake Richardson (jake@asdfnews.org) Architecture: arm -Depends: task-opie-minimal, opie-pickboard, libqtaux2 +Depends: task-opie-minimal, opie-pickboard, libqtaux2, libopiecore2, libopieui2 Description: Multiple language keyboard Keyboard for inputing multiple languages in the Opie environment. Version: $QPE_VERSION$EXTRAVERSION |