-rw-r--r-- | libopie2/opiecore/device/odevice_htc.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libopie2/opiecore/device/odevice_htc.cpp b/libopie2/opiecore/device/odevice_htc.cpp index 7f82369..4bc8c49 100644 --- a/libopie2/opiecore/device/odevice_htc.cpp +++ b/libopie2/opiecore/device/odevice_htc.cpp | |||
@@ -105,64 +105,65 @@ struct htc_button htc_buttons_universal [] = { | |||
105 | "opiemail", "raise()", | 105 | "opiemail", "raise()", |
106 | "opiemail", "newMail()" }, | 106 | "opiemail", "newMail()" }, |
107 | 107 | ||
108 | { Qt::Key_F15, QT_TRANSLATE_NOOP("Button", "Hinge1"), | 108 | { Qt::Key_F15, QT_TRANSLATE_NOOP("Button", "Hinge1"), |
109 | "devicebuttons/z_hinge1", | 109 | "devicebuttons/z_hinge1", |
110 | "QPE/Rotation", "rotateDefault()",0,0}, | 110 | "QPE/Rotation", "rotateDefault()",0,0}, |
111 | { Qt::Key_F16, QT_TRANSLATE_NOOP("Button", "Hinge2"), | 111 | { Qt::Key_F16, QT_TRANSLATE_NOOP("Button", "Hinge2"), |
112 | "devicebuttons/z_hinge2", | 112 | "devicebuttons/z_hinge2", |
113 | "QPE/Rotation", "rotateDefault()",0,0}, | 113 | "QPE/Rotation", "rotateDefault()",0,0}, |
114 | { Qt::Key_F17, QT_TRANSLATE_NOOP("Button", "Hinge3"), | 114 | { Qt::Key_F17, QT_TRANSLATE_NOOP("Button", "Hinge3"), |
115 | "devicebuttons/z_hinge3", | 115 | "devicebuttons/z_hinge3", |
116 | "QPE/Rotation", "rotateDefault()",0,0}, | 116 | "QPE/Rotation", "rotateDefault()",0,0}, |
117 | }; | 117 | }; |
118 | 118 | ||
119 | 119 | ||
120 | // | 120 | // |
121 | // HTC-Universal (PXA-model w/ 480x640 3.6" lcd) | 121 | // HTC-Universal (PXA-model w/ 480x640 3.6" lcd) |
122 | // HTC-Alpine (PXA-model w/ 240x320 3.5" lcd) | 122 | // HTC-Alpine (PXA-model w/ 240x320 3.5" lcd) |
123 | // HTC-Apache (PXA-model w/ 240x320 2.8" lcd) | 123 | // HTC-Apache (PXA-model w/ 240x320 2.8" lcd) |
124 | // HTC-Beetles (PXA-model w/ 240x240 3.0" lcd) | 124 | // HTC-Beetles (PXA-model w/ 240x240 3.0" lcd) |
125 | // HTC-Blueangel (PXA-model w/ 240x320 3.5" lcd) | 125 | // HTC-Blueangel (PXA-model w/ 240x320 3.5" lcd) |
126 | // HTC-Himalaya (PXA-model w/ 240x320 3.5" lcd) | 126 | // HTC-Himalaya (PXA-model w/ 240x320 3.5" lcd) |
127 | // HTC-Magician (PXA-model w/ 240x320 2.8" lcd) | 127 | // HTC-Magician (PXA-model w/ 240x320 2.8" lcd) |
128 | 128 | ||
129 | void HTC::init(const QString& cpu_info) | 129 | void HTC::init(const QString& cpu_info) |
130 | { | 130 | { |
131 | qDebug( "HTC::init()" ); | 131 | qDebug( "HTC::init()" ); |
132 | // Set the time to wait until the system is really suspended | 132 | // Set the time to wait until the system is really suspended |
133 | // the delta between apm --suspend and sleeping | 133 | // the delta between apm --suspend and sleeping |
134 | setAPMTimeOut( 15000 ); | 134 | setAPMTimeOut( 15000 ); |
135 | 135 | ||
136 | d->m_vendorstr = "Xanadux Team"; | 136 | d->m_vendorstr = "Xanadux Team"; |
137 | d->m_vendor = Vendor_HTC; | ||
137 | d->m_systemstr = "Familiar"; | 138 | d->m_systemstr = "Familiar"; |
138 | d->m_system = System_Familiar; | 139 | d->m_system = System_Familiar; |
139 | 140 | ||
140 | // check the HTC model | 141 | // check the HTC model |
141 | QString model; | 142 | QString model; |
142 | int loc = cpu_info.find( ":" ); | 143 | int loc = cpu_info.find( ":" ); |
143 | if ( loc != -1 ) | 144 | if ( loc != -1 ) |
144 | model = cpu_info.mid( loc+2 ).simplifyWhiteSpace(); | 145 | model = cpu_info.mid( loc+2 ).simplifyWhiteSpace(); |
145 | else | 146 | else |
146 | model = cpu_info; | 147 | model = cpu_info; |
147 | 148 | ||
148 | d->m_model = Model_HTC_Universal; | 149 | d->m_model = Model_HTC_Universal; |
149 | d->m_modelstr = "Unknown HTC"; | 150 | d->m_modelstr = "Unknown HTC"; |
150 | 151 | ||
151 | if ( model == "HTC Universal" ) { | 152 | if ( model == "HTC Universal" ) { |
152 | d->m_model = Model_HTC_Universal; | 153 | d->m_model = Model_HTC_Universal; |
153 | d->m_modelstr = "HTC Universal"; | 154 | d->m_modelstr = "HTC Universal"; |
154 | } | 155 | } |
155 | if ( model == "HTC Alpine" ) { | 156 | if ( model == "HTC Alpine" ) { |
156 | d->m_model = Model_HTC_Alpine; | 157 | d->m_model = Model_HTC_Alpine; |
157 | d->m_modelstr = "HTC Alpine"; | 158 | d->m_modelstr = "HTC Alpine"; |
158 | } | 159 | } |
159 | if ( model == "HTC Apache" ) { | 160 | if ( model == "HTC Apache" ) { |
160 | d->m_model = Model_HTC_Apache; | 161 | d->m_model = Model_HTC_Apache; |
161 | d->m_modelstr = "HTC Apache"; | 162 | d->m_modelstr = "HTC Apache"; |
162 | } | 163 | } |
163 | if ( model == "HTC Beetles" ) { | 164 | if ( model == "HTC Beetles" ) { |
164 | d->m_model = Model_HTC_Beetles; | 165 | d->m_model = Model_HTC_Beetles; |
165 | d->m_modelstr = "HTC Beetles"; | 166 | d->m_modelstr = "HTC Beetles"; |
166 | } | 167 | } |
167 | if ( model == "HTC Blueangel" ) { | 168 | if ( model == "HTC Blueangel" ) { |
168 | d->m_model = Model_HTC_Blueangel; | 169 | d->m_model = Model_HTC_Blueangel; |