author | alwin <alwin> | 2004-04-22 11:47:08 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-04-22 11:47:08 (UTC) |
commit | a95b0c46820c2e9e76598cf430ce279eeba7edb8 (patch) (unidiff) | |
tree | da8073f4a2b4041db0f7ef1cb3ae5e6eb8cb9019 /libopie2/opiecore/device | |
parent | 2a950511ee173c2cbce5da4d14de9cea6fcd5034 (diff) | |
download | opie-a95b0c46820c2e9e76598cf430ce279eeba7edb8.zip opie-a95b0c46820c2e9e76598cf430ce279eeba7edb8.tar.gz opie-a95b0c46820c2e9e76598cf430ce279eeba7edb8.tar.bz2 |
-added default buttons for emulation in qvfb or for unknown devices
-default email app is now opiemail instead of mail
-rw-r--r-- | libopie2/opiecore/device/odevice.cpp | 33 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice.h | 15 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice_ipaq.cpp | 4 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice_simpad.cpp | 4 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice_zaurus.cpp | 4 |
5 files changed, 54 insertions, 6 deletions
diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp index ee66d95..62a2e03 100644 --- a/libopie2/opiecore/device/odevice.cpp +++ b/libopie2/opiecore/device/odevice.cpp | |||
@@ -41,48 +41,71 @@ _;:, .> :=|. This program is free software; you can | |||
41 | #include <qwindowsystem_qws.h> | 41 | #include <qwindowsystem_qws.h> |
42 | 42 | ||
43 | /* OPIE */ | 43 | /* OPIE */ |
44 | #include <qpe/config.h> | 44 | #include <qpe/config.h> |
45 | #include <qpe/resource.h> | 45 | #include <qpe/resource.h> |
46 | #include <qpe/sound.h> | 46 | #include <qpe/sound.h> |
47 | #include <qpe/qcopenvelope_qws.h> | 47 | #include <qpe/qcopenvelope_qws.h> |
48 | 48 | ||
49 | /* STD */ | 49 | /* STD */ |
50 | #include <fcntl.h> | 50 | #include <fcntl.h> |
51 | #include <math.h> | 51 | #include <math.h> |
52 | #include <stdlib.h> | 52 | #include <stdlib.h> |
53 | #include <signal.h> | 53 | #include <signal.h> |
54 | #include <sys/ioctl.h> | 54 | #include <sys/ioctl.h> |
55 | #include <sys/time.h> | 55 | #include <sys/time.h> |
56 | #include <unistd.h> | 56 | #include <unistd.h> |
57 | #ifndef QT_NO_SOUND | 57 | #ifndef QT_NO_SOUND |
58 | #include <linux/soundcard.h> | 58 | #include <linux/soundcard.h> |
59 | #endif | 59 | #endif |
60 | 60 | ||
61 | const char* PATH_PROC_CPUINFO = "/proc/cpuinfo"; | 61 | const char* PATH_PROC_CPUINFO = "/proc/cpuinfo"; |
62 | 62 | ||
63 | using namespace Opie::Core; | 63 | using namespace Opie::Core; |
64 | 64 | ||
65 | struct default_button default_buttons [] = { | ||
66 | { Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"), | ||
67 | "devicebuttons/z_calendar", | ||
68 | "datebook", "nextView()", | ||
69 | "today", "raise()" }, | ||
70 | { Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"), | ||
71 | "devicebuttons/z_contact", | ||
72 | "addressbook", "raise()", | ||
73 | "addressbook", "beamBusinessCard()" }, | ||
74 | { Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"), | ||
75 | "devicebuttons/z_home", | ||
76 | "QPE/Launcher", "home()", | ||
77 | "buttonsettings", "raise()" }, | ||
78 | { Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"), | ||
79 | "devicebuttons/z_menu", | ||
80 | "QPE/TaskBar", "toggleMenu()", | ||
81 | "QPE/TaskBar", "toggleStartMenu()" }, | ||
82 | { Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"), | ||
83 | "devicebuttons/z_mail", | ||
84 | "opiemail", "raise()", | ||
85 | "opiemail", "newMail()" }, | ||
86 | }; | ||
87 | |||
65 | ODevice *ODevice::inst() | 88 | ODevice *ODevice::inst() |
66 | { | 89 | { |
67 | static ODevice *dev = 0; | 90 | static ODevice *dev = 0; |
68 | 91 | ||
69 | // rewrite this to only use /proc/cpuinfo or so | 92 | // rewrite this to only use /proc/cpuinfo or so |
70 | 93 | ||
71 | if ( !dev ) | 94 | if ( !dev ) |
72 | { | 95 | { |
73 | QFile f( PATH_PROC_CPUINFO ); | 96 | QFile f( PATH_PROC_CPUINFO ); |
74 | if ( f.open( IO_ReadOnly ) ) | 97 | if ( f.open( IO_ReadOnly ) ) |
75 | { | 98 | { |
76 | QTextStream s( &f ); | 99 | QTextStream s( &f ); |
77 | while ( !s.atEnd() ) | 100 | while ( !s.atEnd() ) |
78 | { | 101 | { |
79 | QString line; | 102 | QString line; |
80 | line = s.readLine(); | 103 | line = s.readLine(); |
81 | if ( line.startsWith( "Hardware" ) ) | 104 | if ( line.startsWith( "Hardware" ) ) |
82 | { | 105 | { |
83 | qDebug( "ODevice() - found '%s'", (const char*) line ); | 106 | qDebug( "ODevice() - found '%s'", (const char*) line ); |
84 | if ( line.contains( "sharp", false ) ) dev = new Internal::Zaurus(); | 107 | if ( line.contains( "sharp", false ) ) dev = new Internal::Zaurus(); |
85 | else if ( line.contains( "ipaq", false ) ) dev = new Internal::iPAQ(); | 108 | else if ( line.contains( "ipaq", false ) ) dev = new Internal::iPAQ(); |
86 | else if ( line.contains( "simpad", false ) ) dev = new Internal::SIMpad(); | 109 | else if ( line.contains( "simpad", false ) ) dev = new Internal::SIMpad(); |
87 | else if ( line.contains( "jornada", false ) ) dev = new Internal::Jornada(); | 110 | else if ( line.contains( "jornada", false ) ) dev = new Internal::Jornada(); |
88 | else if ( line.contains( "ramses", false ) ) dev = new Internal::Ramses(); | 111 | else if ( line.contains( "ramses", false ) ) dev = new Internal::Ramses(); |
@@ -120,48 +143,58 @@ ODevice::ODevice() | |||
120 | d->m_cpu_frequencies = new QStrList; | 143 | d->m_cpu_frequencies = new QStrList; |
121 | } | 144 | } |
122 | 145 | ||
123 | void ODevice::systemMessage ( const QCString &msg, const QByteArray & ) | 146 | void ODevice::systemMessage ( const QCString &msg, const QByteArray & ) |
124 | { | 147 | { |
125 | if ( msg == "deviceButtonMappingChanged()" ) { | 148 | if ( msg == "deviceButtonMappingChanged()" ) { |
126 | reloadButtonMapping(); | 149 | reloadButtonMapping(); |
127 | } | 150 | } |
128 | } | 151 | } |
129 | 152 | ||
130 | void ODevice::init() | 153 | void ODevice::init() |
131 | { | 154 | { |
132 | } | 155 | } |
133 | 156 | ||
134 | /** | 157 | /** |
135 | * This method initialises the button mapping | 158 | * This method initialises the button mapping |
136 | */ | 159 | */ |
137 | void ODevice::initButtons() | 160 | void ODevice::initButtons() |
138 | { | 161 | { |
139 | if ( d->m_buttons ) | 162 | if ( d->m_buttons ) |
140 | return; | 163 | return; |
141 | 164 | ||
142 | qDebug ( "init Buttons" ); | 165 | qDebug ( "init Buttons" ); |
143 | d->m_buttons = new QValueList <ODeviceButton>; | 166 | d->m_buttons = new QValueList <ODeviceButton>; |
167 | for ( uint i = 0; i < ( sizeof( default_buttons ) / sizeof( default_button )); i++ ) { | ||
168 | default_button *db = default_buttons + i; | ||
169 | ODeviceButton b; | ||
170 | b. setKeycode ( db->code ); | ||
171 | b. setUserText ( QObject::tr ( "Button", db->utext )); | ||
172 | b. setPixmap ( Resource::loadPixmap ( db->pix )); | ||
173 | b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( db->fpressedservice ), db->fpressedaction )); | ||
174 | b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( db->fheldservice ), db->fheldaction )); | ||
175 | d->m_buttons->append ( b ); | ||
176 | } | ||
144 | 177 | ||
145 | reloadButtonMapping(); | 178 | reloadButtonMapping(); |
146 | 179 | ||
147 | QCopChannel *sysch = new QCopChannel ( "QPE/System", this ); | 180 | QCopChannel *sysch = new QCopChannel ( "QPE/System", this ); |
148 | connect ( sysch, SIGNAL( received(const QCString&,const QByteArray&)), this, SLOT( systemMessage(const QCString&,const QByteArray&))); | 181 | connect ( sysch, SIGNAL( received(const QCString&,const QByteArray&)), this, SLOT( systemMessage(const QCString&,const QByteArray&))); |
149 | } | 182 | } |
150 | 183 | ||
151 | ODevice::~ODevice() | 184 | ODevice::~ODevice() |
152 | { | 185 | { |
153 | // we leak m_devicebuttons and m_cpu_frequency | 186 | // we leak m_devicebuttons and m_cpu_frequency |
154 | // but it's a singleton and it is not so importantant | 187 | // but it's a singleton and it is not so importantant |
155 | // -zecke | 188 | // -zecke |
156 | delete d; | 189 | delete d; |
157 | } | 190 | } |
158 | 191 | ||
159 | bool ODevice::setSoftSuspend ( bool /*soft*/ ) | 192 | bool ODevice::setSoftSuspend ( bool /*soft*/ ) |
160 | { | 193 | { |
161 | return false; | 194 | return false; |
162 | } | 195 | } |
163 | 196 | ||
164 | //#include <linux/apm_bios.h> | 197 | //#include <linux/apm_bios.h> |
165 | 198 | ||
166 | #define APM_IOC_SUSPEND OD_IO( 'A', 2 ) | 199 | #define APM_IOC_SUSPEND OD_IO( 'A', 2 ) |
167 | 200 | ||
diff --git a/libopie2/opiecore/device/odevice.h b/libopie2/opiecore/device/odevice.h index 5ee9cca..0ba58f0 100644 --- a/libopie2/opiecore/device/odevice.h +++ b/libopie2/opiecore/device/odevice.h | |||
@@ -139,48 +139,63 @@ enum OHardKey { | |||
139 | HardKey_Menu = Qt::Key_F11, | 139 | HardKey_Menu = Qt::Key_F11, |
140 | HardKey_Home = Qt::Key_F12, | 140 | HardKey_Home = Qt::Key_F12, |
141 | HardKey_Mail = Qt::Key_F13, | 141 | HardKey_Mail = Qt::Key_F13, |
142 | HardKey_Record = Qt::Key_F24, | 142 | HardKey_Record = Qt::Key_F24, |
143 | HardKey_Suspend = Qt::Key_F34, | 143 | HardKey_Suspend = Qt::Key_F34, |
144 | HardKey_Backlight = Qt::Key_F35, | 144 | HardKey_Backlight = Qt::Key_F35, |
145 | HardKey_Action = Qt::Key_F10, | 145 | HardKey_Action = Qt::Key_F10, |
146 | HardKey_OK = Qt::Key_F11, | 146 | HardKey_OK = Qt::Key_F11, |
147 | HardKey_End = Qt::Key_F12, | 147 | HardKey_End = Qt::Key_F12, |
148 | }; | 148 | }; |
149 | 149 | ||
150 | enum ODirection { | 150 | enum ODirection { |
151 | CW = 0, | 151 | CW = 0, |
152 | CCW = 1, | 152 | CCW = 1, |
153 | Flip = 2, | 153 | Flip = 2, |
154 | }; | 154 | }; |
155 | 155 | ||
156 | enum OHingeStatus { | 156 | enum OHingeStatus { |
157 | CASE_CLOSED = 3, | 157 | CASE_CLOSED = 3, |
158 | CASE_PORTRAIT = 2, | 158 | CASE_PORTRAIT = 2, |
159 | CASE_LANDSCAPE = 0, | 159 | CASE_LANDSCAPE = 0, |
160 | CASE_UNKNOWN = 1, | 160 | CASE_UNKNOWN = 1, |
161 | }; | 161 | }; |
162 | 162 | ||
163 | /* default button for qvfb or such | ||
164 | * see odevice.cpp for details. | ||
165 | * hint: manage a user defined button for qvfb? | ||
166 | * alwin | ||
167 | */ | ||
168 | struct default_button { | ||
169 | Qt::Key code; | ||
170 | char *utext; | ||
171 | char *pix; | ||
172 | char *fpressedservice; | ||
173 | char *fpressedaction; | ||
174 | char *fheldservice; | ||
175 | char *fheldaction; | ||
176 | }; | ||
177 | |||
163 | /** | 178 | /** |
164 | * A singleton which gives informations about device specefic option | 179 | * A singleton which gives informations about device specefic option |
165 | * like the Hardware used, LEDs, the Base Distribution and | 180 | * like the Hardware used, LEDs, the Base Distribution and |
166 | * hardware key mappings. | 181 | * hardware key mappings. |
167 | * | 182 | * |
168 | * @short A small class for device specefic options | 183 | * @short A small class for device specefic options |
169 | * @see QObject | 184 | * @see QObject |
170 | * @author Robert Griebl | 185 | * @author Robert Griebl |
171 | * @version 1.0 | 186 | * @version 1.0 |
172 | */ | 187 | */ |
173 | class ODevice : public QObject | 188 | class ODevice : public QObject |
174 | { | 189 | { |
175 | Q_OBJECT | 190 | Q_OBJECT |
176 | 191 | ||
177 | private: | 192 | private: |
178 | /* disable copy */ | 193 | /* disable copy */ |
179 | ODevice ( const ODevice & ); | 194 | ODevice ( const ODevice & ); |
180 | 195 | ||
181 | protected: | 196 | protected: |
182 | ODevice(); | 197 | ODevice(); |
183 | virtual void init(); | 198 | virtual void init(); |
184 | virtual void initButtons(); | 199 | virtual void initButtons(); |
185 | static void sendSuspendmsg(); | 200 | static void sendSuspendmsg(); |
186 | 201 | ||
diff --git a/libopie2/opiecore/device/odevice_ipaq.cpp b/libopie2/opiecore/device/odevice_ipaq.cpp index 2efcd3a..98e2ffa 100644 --- a/libopie2/opiecore/device/odevice_ipaq.cpp +++ b/libopie2/opiecore/device/odevice_ipaq.cpp | |||
@@ -79,50 +79,50 @@ typedef struct { | |||
79 | } FLITE_IN; | 79 | } FLITE_IN; |
80 | 80 | ||
81 | #define LED_ON OD_IOW( 'f', 5, LED_IN ) | 81 | #define LED_ON OD_IOW( 'f', 5, LED_IN ) |
82 | #define FLITE_ON OD_IOW( 'f', 7, FLITE_IN ) | 82 | #define FLITE_ON OD_IOW( 'f', 7, FLITE_IN ) |
83 | 83 | ||
84 | struct i_button ipaq_buttons [] = { | 84 | struct i_button ipaq_buttons [] = { |
85 | { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, | 85 | { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, |
86 | Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"), | 86 | Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"), |
87 | "devicebuttons/ipaq_calendar", | 87 | "devicebuttons/ipaq_calendar", |
88 | "datebook", "nextView()", | 88 | "datebook", "nextView()", |
89 | "today", "raise()" }, | 89 | "today", "raise()" }, |
90 | { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, | 90 | { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, |
91 | Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"), | 91 | Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"), |
92 | "devicebuttons/ipaq_contact", | 92 | "devicebuttons/ipaq_contact", |
93 | "addressbook", "raise()", | 93 | "addressbook", "raise()", |
94 | "addressbook", "beamBusinessCard()" }, | 94 | "addressbook", "beamBusinessCard()" }, |
95 | { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx, | 95 | { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx, |
96 | Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"), | 96 | Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"), |
97 | "devicebuttons/ipaq_menu", | 97 | "devicebuttons/ipaq_menu", |
98 | "QPE/TaskBar", "toggleMenu()", | 98 | "QPE/TaskBar", "toggleMenu()", |
99 | "QPE/TaskBar", "toggleStartMenu()" }, | 99 | "QPE/TaskBar", "toggleStartMenu()" }, |
100 | { Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, | 100 | { Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, |
101 | Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"), | 101 | Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"), |
102 | "devicebuttons/ipaq_mail", | 102 | "devicebuttons/ipaq_mail", |
103 | "mail", "raise()", | 103 | "opiemail", "raise()", |
104 | "mail", "newMail()" }, | 104 | "opiemail", "newMail()" }, |
105 | { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, | 105 | { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, |
106 | Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"), | 106 | Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"), |
107 | "devicebuttons/ipaq_home", | 107 | "devicebuttons/ipaq_home", |
108 | "QPE/Launcher", "home()", | 108 | "QPE/Launcher", "home()", |
109 | "buttonsettings", "raise()" }, | 109 | "buttonsettings", "raise()" }, |
110 | { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, | 110 | { Model_iPAQ_H31xx | Model_iPAQ_H36xx | Model_iPAQ_H37xx | Model_iPAQ_H38xx | Model_iPAQ_H39xx | Model_iPAQ_H5xxx, |
111 | Qt::Key_F24, QT_TRANSLATE_NOOP("Button", "Record Button"), | 111 | Qt::Key_F24, QT_TRANSLATE_NOOP("Button", "Record Button"), |
112 | "devicebuttons/ipaq_record", | 112 | "devicebuttons/ipaq_record", |
113 | "QPE/VMemo", "toggleRecord()", | 113 | "QPE/VMemo", "toggleRecord()", |
114 | "sound", "raise()" }, | 114 | "sound", "raise()" }, |
115 | }; | 115 | }; |
116 | 116 | ||
117 | void iPAQ::init() | 117 | void iPAQ::init() |
118 | { | 118 | { |
119 | d->m_vendorstr = "HP"; | 119 | d->m_vendorstr = "HP"; |
120 | d->m_vendor = Vendor_HP; | 120 | d->m_vendor = Vendor_HP; |
121 | 121 | ||
122 | QFile f ( "/proc/hal/model" ); | 122 | QFile f ( "/proc/hal/model" ); |
123 | 123 | ||
124 | if ( f. open ( IO_ReadOnly )) { | 124 | if ( f. open ( IO_ReadOnly )) { |
125 | QTextStream ts ( &f ); | 125 | QTextStream ts ( &f ); |
126 | 126 | ||
127 | d->m_modelstr = "H" + ts. readLine(); | 127 | d->m_modelstr = "H" + ts. readLine(); |
128 | 128 | ||
diff --git a/libopie2/opiecore/device/odevice_simpad.cpp b/libopie2/opiecore/device/odevice_simpad.cpp index 7d79ef5..e9481bb 100644 --- a/libopie2/opiecore/device/odevice_simpad.cpp +++ b/libopie2/opiecore/device/odevice_simpad.cpp | |||
@@ -54,50 +54,50 @@ _;:, .> :=|. This program is free software; you can | |||
54 | #endif | 54 | #endif |
55 | 55 | ||
56 | using namespace Opie::Core; | 56 | using namespace Opie::Core; |
57 | using namespace Opie::Core::Internal; | 57 | using namespace Opie::Core::Internal; |
58 | 58 | ||
59 | struct s_button simpad_buttons [] = { | 59 | struct s_button simpad_buttons [] = { |
60 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, | 60 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, |
61 | Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Lower+Up"), | 61 | Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Lower+Up"), |
62 | "devicebuttons/simpad_lower_up", | 62 | "devicebuttons/simpad_lower_up", |
63 | "datebook", "nextView()", | 63 | "datebook", "nextView()", |
64 | "today", "raise()" }, | 64 | "today", "raise()" }, |
65 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, | 65 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, |
66 | Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Lower+Down"), | 66 | Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Lower+Down"), |
67 | "devicebuttons/simpad_lower_down", | 67 | "devicebuttons/simpad_lower_down", |
68 | "addressbook", "raise()", | 68 | "addressbook", "raise()", |
69 | "addressbook", "beamBusinessCard()" }, | 69 | "addressbook", "beamBusinessCard()" }, |
70 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, | 70 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, |
71 | Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Lower+Right"), | 71 | Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Lower+Right"), |
72 | "devicebuttons/simpad_lower_right", | 72 | "devicebuttons/simpad_lower_right", |
73 | "QPE/TaskBar", "toggleMenu()", | 73 | "QPE/TaskBar", "toggleMenu()", |
74 | "QPE/TaskBar", "toggleStartMenu()" }, | 74 | "QPE/TaskBar", "toggleStartMenu()" }, |
75 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, | 75 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, |
76 | Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Lower+Left"), | 76 | Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Lower+Left"), |
77 | "devicebuttons/simpad_lower_left", | 77 | "devicebuttons/simpad_lower_left", |
78 | "mail", "raise()", | 78 | "opiemail", "raise()", |
79 | "mail", "newMail()" }, | 79 | "opiemail", "newMail()" }, |
80 | 80 | ||
81 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, | 81 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, |
82 | Qt::Key_F5, QT_TRANSLATE_NOOP("Button", "Upper+Up"), | 82 | Qt::Key_F5, QT_TRANSLATE_NOOP("Button", "Upper+Up"), |
83 | "devicebuttons/simpad_upper_up", | 83 | "devicebuttons/simpad_upper_up", |
84 | "QPE/Launcher", "home()", | 84 | "QPE/Launcher", "home()", |
85 | "buttonsettings", "raise()" }, | 85 | "buttonsettings", "raise()" }, |
86 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, | 86 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, |
87 | Qt::Key_F6, QT_TRANSLATE_NOOP("Button", "Upper+Down"), | 87 | Qt::Key_F6, QT_TRANSLATE_NOOP("Button", "Upper+Down"), |
88 | "devicebuttons/simpad_upper_down", | 88 | "devicebuttons/simpad_upper_down", |
89 | "addressbook", "raise()", | 89 | "addressbook", "raise()", |
90 | "addressbook", "beamBusinessCard()" }, | 90 | "addressbook", "beamBusinessCard()" }, |
91 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, | 91 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, |
92 | Qt::Key_F7, QT_TRANSLATE_NOOP("Button", "Upper+Right"), | 92 | Qt::Key_F7, QT_TRANSLATE_NOOP("Button", "Upper+Right"), |
93 | "devicebuttons/simpad_upper_right", | 93 | "devicebuttons/simpad_upper_right", |
94 | "QPE/TaskBar", "toggleMenu()", | 94 | "QPE/TaskBar", "toggleMenu()", |
95 | "QPE/TaskBar", "toggleStartMenu()" }, | 95 | "QPE/TaskBar", "toggleStartMenu()" }, |
96 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, | 96 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, |
97 | Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Upper+Left"), | 97 | Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Upper+Left"), |
98 | "devicebuttons/simpad_upper_left", | 98 | "devicebuttons/simpad_upper_left", |
99 | "QPE/Rotation", "flip()", | 99 | "QPE/Rotation", "flip()", |
100 | "QPE/Rotation", "flip()" }, | 100 | "QPE/Rotation", "flip()" }, |
101 | /* | 101 | /* |
102 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, | 102 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, |
103 | Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Lower+Upper"), | 103 | Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Lower+Upper"), |
diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp index 000d29c..1434e69 100644 --- a/libopie2/opiecore/device/odevice_zaurus.cpp +++ b/libopie2/opiecore/device/odevice_zaurus.cpp | |||
@@ -54,50 +54,50 @@ _;:, .> :=|. This program is free software; you can | |||
54 | #endif | 54 | #endif |
55 | 55 | ||
56 | using namespace Opie::Core; | 56 | using namespace Opie::Core; |
57 | using namespace Opie::Core::Internal; | 57 | using namespace Opie::Core::Internal; |
58 | 58 | ||
59 | struct z_button z_buttons [] = { | 59 | struct z_button z_buttons [] = { |
60 | { Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"), | 60 | { Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"), |
61 | "devicebuttons/z_calendar", | 61 | "devicebuttons/z_calendar", |
62 | "datebook", "nextView()", | 62 | "datebook", "nextView()", |
63 | "today", "raise()" }, | 63 | "today", "raise()" }, |
64 | { Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"), | 64 | { Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"), |
65 | "devicebuttons/z_contact", | 65 | "devicebuttons/z_contact", |
66 | "addressbook", "raise()", | 66 | "addressbook", "raise()", |
67 | "addressbook", "beamBusinessCard()" }, | 67 | "addressbook", "beamBusinessCard()" }, |
68 | { Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"), | 68 | { Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"), |
69 | "devicebuttons/z_home", | 69 | "devicebuttons/z_home", |
70 | "QPE/Launcher", "home()", | 70 | "QPE/Launcher", "home()", |
71 | "buttonsettings", "raise()" }, | 71 | "buttonsettings", "raise()" }, |
72 | { Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"), | 72 | { Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"), |
73 | "devicebuttons/z_menu", | 73 | "devicebuttons/z_menu", |
74 | "QPE/TaskBar", "toggleMenu()", | 74 | "QPE/TaskBar", "toggleMenu()", |
75 | "QPE/TaskBar", "toggleStartMenu()" }, | 75 | "QPE/TaskBar", "toggleStartMenu()" }, |
76 | { Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"), | 76 | { Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"), |
77 | "devicebuttons/z_mail", | 77 | "devicebuttons/z_mail", |
78 | "mail", "raise()", | 78 | "opiemail", "raise()", |
79 | "mail", "newMail()" }, | 79 | "opiemail", "newMail()" }, |
80 | }; | 80 | }; |
81 | 81 | ||
82 | struct z_button z_buttons_c700 [] = { | 82 | struct z_button z_buttons_c700 [] = { |
83 | { Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"), | 83 | { Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"), |
84 | "devicebuttons/z_calendar", | 84 | "devicebuttons/z_calendar", |
85 | "datebook", "nextView()", | 85 | "datebook", "nextView()", |
86 | "today", "raise()" }, | 86 | "today", "raise()" }, |
87 | { Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"), | 87 | { Qt::Key_F10, QT_TRANSLATE_NOOP("Button", "Contacts Button"), |
88 | "devicebuttons/z_contact", | 88 | "devicebuttons/z_contact", |
89 | "addressbook", "raise()", | 89 | "addressbook", "raise()", |
90 | "addressbook", "beamBusinessCard()" }, | 90 | "addressbook", "beamBusinessCard()" }, |
91 | { Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"), | 91 | { Qt::Key_F12, QT_TRANSLATE_NOOP("Button", "Home Button"), |
92 | "devicebuttons/z_home", | 92 | "devicebuttons/z_home", |
93 | "QPE/Launcher", "home()", | 93 | "QPE/Launcher", "home()", |
94 | "buttonsettings", "raise()" }, | 94 | "buttonsettings", "raise()" }, |
95 | { Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"), | 95 | { Qt::Key_F11, QT_TRANSLATE_NOOP("Button", "Menu Button"), |
96 | "devicebuttons/z_menu", | 96 | "devicebuttons/z_menu", |
97 | "QPE/TaskBar", "toggleMenu()", | 97 | "QPE/TaskBar", "toggleMenu()", |
98 | "QPE/TaskBar", "toggleStartMenu()" }, | 98 | "QPE/TaskBar", "toggleStartMenu()" }, |
99 | { Qt::Key_F14, QT_TRANSLATE_NOOP("Button", "Display Rotate"), | 99 | { Qt::Key_F14, QT_TRANSLATE_NOOP("Button", "Display Rotate"), |
100 | "devicebuttons/z_hinge", | 100 | "devicebuttons/z_hinge", |
101 | "QPE/Rotation", "rotateDefault()", | 101 | "QPE/Rotation", "rotateDefault()", |
102 | "QPE/Dummy", "doNothing()" }, | 102 | "QPE/Dummy", "doNothing()" }, |
103 | }; | 103 | }; |