author | drw <drw> | 2005-04-05 23:01:28 (UTC) |
---|---|---|
committer | drw <drw> | 2005-04-05 23:01:28 (UTC) |
commit | 2b0e27b45eb9ff5563f786c5e45d53db49afb9f9 (patch) (unidiff) | |
tree | e5dfb23aa8e0e3778b5fa1f5633f6511789f41f2 /libopie2/opiecore/device/odevice_genuineintel.cpp | |
parent | 2a9ee3ea1d8d978b735f0ce3f2e54a15e37c87b3 (diff) | |
download | opie-2b0e27b45eb9ff5563f786c5e45d53db49afb9f9.zip opie-2b0e27b45eb9ff5563f786c5e45d53db49afb9f9.tar.gz opie-2b0e27b45eb9ff5563f786c5e45d53db49afb9f9.tar.bz2 |
Use OResource for loading images
Diffstat (limited to 'libopie2/opiecore/device/odevice_genuineintel.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opiecore/device/odevice_genuineintel.cpp | 60 |
1 files changed, 31 insertions, 29 deletions
diff --git a/libopie2/opiecore/device/odevice_genuineintel.cpp b/libopie2/opiecore/device/odevice_genuineintel.cpp index 1584249..b980909 100644 --- a/libopie2/opiecore/device/odevice_genuineintel.cpp +++ b/libopie2/opiecore/device/odevice_genuineintel.cpp | |||
@@ -1,27 +1,28 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | Â Â Â Â Â Â Â Â This file is part of the Opie Project |
3 | Copyright (C) 2002,2003,2004 The Opie Team <opie-devel@handhelds.org> | 3 | |
4 | Copyright (C)2002, 2003, 2004 The Opie Team <opie-devel@handhelds.org> | ||
4 | =. | 5 | =. |
5 | .=l. | 6 | .=l. |
6 | .>+-= | 7 | Â Â Â Â Â Â .>+-= |
7 | _;:, .> :=|. This program is free software; you can | 8 | Â _;:, Â Â .> Â Â :=|. This program is free software; you can |
8 | .> <`_, > . <= redistribute it and/or modify it under | 9 | .> <`_, Â > Â . Â <= redistribute it and/or modify it under |
9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 10 | :`=1 )Y*s>-.-- Â : the terms of the GNU Library General Public |
10 | .="- .-=="i, .._ License as published by the Free Software | 11 | .="- .-=="i, Â Â .._ License as published by the Free Software |
11 | - . .-<_> .<> Foundation; either version 2 of the License, | 12 | Â - . Â .-<_> Â Â .<> Foundation; either version 2 of the License, |
12 | ._= =} : or (at your option) any later version. | 13 | Â Â Â ._= =} Â Â Â : or (at your option) any later version. |
13 | .%`+i> _;_. | 14 | Â Â .%`+i> Â Â Â _;_. |
14 | .i_,=:_. -<s. This program is distributed in the hope that | 15 | Â Â .i_,=:_. Â Â Â -<s. This program is distributed in the hope that |
15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 16 | Â Â Â + Â . Â -:. Â Â Â = it will be useful, but WITHOUT ANY WARRANTY; |
16 | : .. .:, . . . without even the implied warranty of | 17 | : .. Â Â .:, Â Â . . . without even the implied warranty of |
17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 18 | Â Â =_ Â Â Â Â + Â Â =;=|` MERCHANTABILITY or FITNESS FOR A |
18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 19 | Â _.=:. Â Â Â : Â Â :=>`: PARTICULAR PURPOSE. See the GNU |
19 | ..}^=.= = ; Library General Public License for more | 20 | ..}^=.= Â Â Â = Â Â Â ; Library General Public License for more |
20 | ++= -. .` .: details. | 21 | ++= Â -. Â Â .` Â Â .: details. |
21 | : = ...= . :.=- | 22 | : Â Â = Â ...= . :.=- |
22 | -. .:....=;==+<; You should have received a copy of the GNU | 23 | Â -. Â .:....=;==+<; You should have received a copy of the GNU |
23 | -_. . . )=. = Library General Public License along with | 24 | Â -_. . . Â )=. Â = Library General Public License along with |
24 | -- :-=` this library; see the file COPYING.LIB. | 25 | Â Â -- Â Â Â Â :-=` this library; see the file COPYING.LIB. |
25 | If not, write to the Free Software Foundation, | 26 | If not, write to the Free Software Foundation, |
26 | Inc., 59 Temple Place - Suite 330, | 27 | Inc., 59 Temple Place - Suite 330, |
27 | Boston, MA 02111-1307, USA. | 28 | Boston, MA 02111-1307, USA. |
@@ -37,10 +38,11 @@ | |||
37 | 38 | ||
38 | /* OPIE */ | 39 | /* OPIE */ |
39 | #include <qpe/config.h> | 40 | #include <qpe/config.h> |
40 | #include <qpe/resource.h> | ||
41 | #include <qpe/sound.h> | 41 | #include <qpe/sound.h> |
42 | #include <qpe/qcopenvelope_qws.h> | 42 | #include <qpe/qcopenvelope_qws.h> |
43 | |||
43 | #include <opie2/okeyfilter.h> | 44 | #include <opie2/okeyfilter.h> |
45 | #include <opie2/oresource.h> | ||
44 | 46 | ||
45 | #ifndef QT_NO_SOUND | 47 | #ifndef QT_NO_SOUND |
46 | #include <linux/soundcard.h> | 48 | #include <linux/soundcard.h> |
@@ -50,32 +52,32 @@ using namespace Opie::Core; | |||
50 | using namespace Opie::Core::Internal; | 52 | using namespace Opie::Core::Internal; |
51 | 53 | ||
52 | struct gi_button genuineintel_buttons [] = { | 54 | struct gi_button genuineintel_buttons [] = { |
53 | { | 55 | { |
54 | Qt::Key_F1, QT_TRANSLATE_NOOP("Button", "Calendar Button"), | 56 | Qt::Key_F1, QT_TRANSLATE_NOOP("Button", "Calendar Button"), |
55 | "devicebuttons/ipaq_calendar", | 57 | "devicebuttons/ipaq_calendar", |
56 | "datebook", "nextView()", | 58 | "datebook", "nextView()", |
57 | "today", "raise()" }, | 59 | "today", "raise()" }, |
58 | { | 60 | { |
59 | Qt::Key_F2, QT_TRANSLATE_NOOP("Button", "Contacts Button"), | 61 | Qt::Key_F2, QT_TRANSLATE_NOOP("Button", "Contacts Button"), |
60 | "devicebuttons/ipaq_contact", | 62 | "devicebuttons/ipaq_contact", |
61 | "addressbook", "raise()", | 63 | "addressbook", "raise()", |
62 | "addressbook", "beamBusinessCard()" }, | 64 | "addressbook", "beamBusinessCard()" }, |
63 | { | 65 | { |
64 | Qt::Key_F3, QT_TRANSLATE_NOOP("Button", "Menu Button"), | 66 | Qt::Key_F3, QT_TRANSLATE_NOOP("Button", "Menu Button"), |
65 | "devicebuttons/ipaq_menu", | 67 | "devicebuttons/ipaq_menu", |
66 | "QPE/TaskBar", "toggleMenu()", | 68 | "QPE/TaskBar", "toggleMenu()", |
67 | "QPE/TaskBar", "toggleStartMenu()" }, | 69 | "QPE/TaskBar", "toggleStartMenu()" }, |
68 | { | 70 | { |
69 | Qt::Key_F4, QT_TRANSLATE_NOOP("Button", "Mail Button"), | 71 | Qt::Key_F4, QT_TRANSLATE_NOOP("Button", "Mail Button"), |
70 | "devicebuttons/ipaq_mail", | 72 | "devicebuttons/ipaq_mail", |
71 | "opiemail", "raise()", | 73 | "opiemail", "raise()", |
72 | "opiemail", "newMail()" }, | 74 | "opiemail", "newMail()" }, |
73 | { | 75 | { |
74 | Qt::Key_F5, QT_TRANSLATE_NOOP("Button", "Home Button"), | 76 | Qt::Key_F5, QT_TRANSLATE_NOOP("Button", "Home Button"), |
75 | "devicebuttons/ipaq_home", | 77 | "devicebuttons/ipaq_home", |
76 | "QPE/Launcher", "home()", | 78 | "QPE/Launcher", "home()", |
77 | "buttonsettings", "raise()" }, | 79 | "buttonsettings", "raise()" }, |
78 | { | 80 | { |
79 | Qt::Key_F6, QT_TRANSLATE_NOOP("Button", "Record Button"), | 81 | Qt::Key_F6, QT_TRANSLATE_NOOP("Button", "Record Button"), |
80 | "devicebuttons/ipaq_record", | 82 | "devicebuttons/ipaq_record", |
81 | "QPE/VMemo", "toggleRecord()", | 83 | "QPE/VMemo", "toggleRecord()", |
@@ -110,7 +112,7 @@ void GenuineIntel::initButtons() | |||
110 | 112 | ||
111 | b. setKeycode ( ib->code ); | 113 | b. setKeycode ( ib->code ); |
112 | b. setUserText ( QObject::tr ( "Button", ib->utext )); | 114 | b. setUserText ( QObject::tr ( "Button", ib->utext )); |
113 | b. setPixmap ( Resource::loadPixmap ( ib->pix )); | 115 | b. setPixmap ( OResource::loadPixmap ( ib->pix )); |
114 | b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( ib->fpressedservice ), ib->fpressedaction )); | 116 | b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( ib->fpressedservice ), ib->fpressedaction )); |
115 | b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( ib->fheldservice ), ib->fheldaction )); | 117 | b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( ib->fheldservice ), ib->fheldaction )); |
116 | 118 | ||