author | drw <drw> | 2005-04-24 20:24:00 (UTC) |
---|---|---|
committer | drw <drw> | 2005-04-24 20:24:00 (UTC) |
commit | 01ab9377017060c7ad3ab9e4ed2b76a879d442f6 (patch) (unidiff) | |
tree | c265ad8794f510a4808e545d8d18ca73ea32f04e /core/settings | |
parent | 9f4dd8e0d2cbe83d23c5405394d5e076dd6c2c6b (diff) | |
download | opie-01ab9377017060c7ad3ab9e4ed2b76a879d442f6.zip opie-01ab9377017060c7ad3ab9e4ed2b76a879d442f6.tar.gz opie-01ab9377017060c7ad3ab9e4ed2b76a879d442f6.tar.bz2 |
Resource -> OResource
-rw-r--r-- | core/settings/button/buttonsettings.cpp | 46 | ||||
-rw-r--r-- | core/settings/button/buttonutils.cpp | 8 |
2 files changed, 28 insertions, 26 deletions
diff --git a/core/settings/button/buttonsettings.cpp b/core/settings/button/buttonsettings.cpp index a90b4a1..a476a6b 100644 --- a/core/settings/button/buttonsettings.cpp +++ b/core/settings/button/buttonsettings.cpp | |||
@@ -1,34 +1,34 @@ | |||
1 | /* | 1 | /* |
2 | =. This file is part of the OPIE Project | 2 | =. This file is part of the OPIE Project |
3 | .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> | 3 | .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> |
4 | .>+-= | 4 | .>+-= |
5 | _;:, .> :=|. This file is free software; you can | 5 | _;:, .> :=|. This file is free software; you can |
6 | .> <`_, > . <= redistribute it and/or modify it under | 6 | .> <`_, > . <= redistribute it and/or modify it under |
7 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | 7 | :`=1 )Y*s>-.-- : the terms of the GNU General Public |
8 | .="- .-=="i, .._ License as published by the Free Software | 8 | .="- .-=="i, .._ License as published by the Free Software |
9 | - . .-<_> .<> Foundation; either version 2 of the License, | 9 | - . .-<_> .<> Foundation; either version 2 of the License, |
10 | ._= =} : or (at your option) any later version. | 10 | ._= =} : or (at your option) any later version. |
11 | .%`+i> _;_. | 11 | .%`+i> _;_. |
12 | .i_,=:_. -<s. This file is distributed in the hope that | 12 | .i_,=:_. -<s. This file is distributed in the hope that |
13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
14 | : .. .:, . . . without even the implied warranty of | 14 | : .. .:, . . . without even the implied warranty of |
15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General | 16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General |
17 | ..}^=.= = ; Public License for more details. | 17 | ..}^=.= = ; Public License for more details. |
18 | ++= -. .` .: | 18 | ++= -. .` .: |
19 | : = ...= . :.=- You should have received a copy of the GNU | 19 | : = ...= . :.=- You should have received a copy of the GNU |
20 | -. .:....=;==+<; General Public License along with this file; | 20 | -. .:....=;==+<; General Public License along with this file; |
21 | -_. . . )=. = see the file COPYING. If not, write to the | 21 | -_. . . )=. = see the file COPYING. If not, write to the |
22 | -- :-=` Free Software Foundation, Inc., | 22 | -- :-=` Free Software Foundation, Inc., |
23 | 59 Temple Place - Suite 330, | 23 | 59 Temple Place - Suite 330, |
24 | Boston, MA 02111-1307, USA. | 24 | Boston, MA 02111-1307, USA. |
25 | 25 | ||
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include "buttonsettings.h" | 28 | #include "buttonsettings.h" |
29 | #include "buttonutils.h" | 29 | #include "buttonutils.h" |
30 | #include "remapdlg.h" | 30 | #include "remapdlg.h" |
31 | 31 | ||
32 | #include <opie2/odevice.h> | 32 | #include <opie2/odevice.h> |
33 | 33 | ||
34 | #include <qpe/applnk.h> | 34 | #include <qpe/applnk.h> |
@@ -108,35 +108,35 @@ ButtonSettings::ButtonSettings ( QWidget *parent , const char *, bool, WFlags | |||
108 | 108 | ||
109 | l = new QLabel ( framehold ); | 109 | l = new QLabel ( framehold ); |
110 | l-> setPixmap (( *it ). pixmap ( )); | 110 | l-> setPixmap (( *it ). pixmap ( )); |
111 | 111 | ||
112 | lay-> addMultiCellWidget ( l, i, i + 1, 0, 0 ); | 112 | lay-> addMultiCellWidget ( l, i, i + 1, 0, 0 ); |
113 | 113 | ||
114 | l = new QLabel ( tr( "Press:" ), framehold ); | 114 | l = new QLabel ( tr( "Press:" ), framehold ); |
115 | lay-> addWidget ( l, i, 1, AlignLeft | AlignBottom ); | 115 | lay-> addWidget ( l, i, 1, AlignLeft | AlignBottom ); |
116 | l = new QLabel ( tr( "Hold:" ), framehold ); | 116 | l = new QLabel ( tr( "Hold:" ), framehold ); |
117 | lay-> addWidget ( l, i + 1, 1, AlignLeft | AlignTop ); | 117 | lay-> addWidget ( l, i + 1, 1, AlignLeft | AlignTop ); |
118 | 118 | ||
119 | l = new QLabel ( framehold ); | 119 | l = new QLabel ( framehold ); |
120 | l-> setFixedSize ( 16, 16 ); | 120 | l-> setFixedSize ( AppLnk::smallIconSize(), AppLnk::smallIconSize() ); |
121 | lay-> addWidget ( l, i, 2, AlignLeft | AlignBottom ); | 121 | lay-> addWidget ( l, i, 2, AlignLeft | AlignBottom ); |
122 | bi-> m_picon = l; | 122 | bi-> m_picon = l; |
123 | 123 | ||
124 | l = new QLabel ( framehold ); | 124 | l = new QLabel ( framehold ); |
125 | l-> setAlignment ( AlignLeft | AlignVCenter | SingleLine ); | 125 | l-> setAlignment ( AlignLeft | AlignVCenter | SingleLine ); |
126 | lay-> addWidget ( l, i, 3, AlignLeft | AlignBottom ); | 126 | lay-> addWidget ( l, i, 3, AlignLeft | AlignBottom ); |
127 | bi-> m_plabel = l; | 127 | bi-> m_plabel = l; |
128 | 128 | ||
129 | l = new QLabel ( framehold ); | 129 | l = new QLabel ( framehold ); |
130 | l-> setFixedSize ( 16, 16 ); | 130 | l-> setFixedSize ( AppLnk::smallIconSize(), AppLnk::smallIconSize() ); |
131 | lay-> addWidget ( l, i + 1, 2, AlignLeft | AlignTop ); | 131 | lay-> addWidget ( l, i + 1, 2, AlignLeft | AlignTop ); |
132 | bi-> m_hicon = l; | 132 | bi-> m_hicon = l; |
133 | 133 | ||
134 | l = new QLabel ( framehold ); | 134 | l = new QLabel ( framehold ); |
135 | l-> setAlignment ( AlignLeft | AlignVCenter | SingleLine ); | 135 | l-> setAlignment ( AlignLeft | AlignVCenter | SingleLine ); |
136 | lay-> addWidget ( l, i + 1, 3, AlignLeft | AlignTop ); | 136 | lay-> addWidget ( l, i + 1, 3, AlignLeft | AlignTop ); |
137 | bi-> m_hlabel = l; | 137 | bi-> m_hlabel = l; |
138 | 138 | ||
139 | i += 2; | 139 | i += 2; |
140 | 140 | ||
141 | m_infos. append ( bi ); | 141 | m_infos. append ( bi ); |
142 | } | 142 | } |
diff --git a/core/settings/button/buttonutils.cpp b/core/settings/button/buttonutils.cpp index 9bf4b53..05fa883 100644 --- a/core/settings/button/buttonutils.cpp +++ b/core/settings/button/buttonutils.cpp | |||
@@ -1,19 +1,20 @@ | |||
1 | #include <stdlib.h> | 1 | #include <stdlib.h> |
2 | 2 | ||
3 | #include <opie2/oresource.h> | ||
4 | |||
3 | #include <qapplication.h> | 5 | #include <qapplication.h> |
4 | #include <qlistview.h> | 6 | #include <qlistview.h> |
5 | #include <qpe/applnk.h> | 7 | #include <qpe/applnk.h> |
6 | #include <qpe/mimetype.h> | 8 | #include <qpe/mimetype.h> |
7 | #include <qpe/resource.h> | ||
8 | 9 | ||
9 | #include "buttonutils.h" | 10 | #include "buttonutils.h" |
10 | 11 | ||
11 | using namespace Opie; | 12 | using namespace Opie; |
12 | 13 | ||
13 | using namespace Opie::Core; | 14 | using namespace Opie::Core; |
14 | struct predef_qcop { | 15 | struct predef_qcop { |
15 | const char *m_text; | 16 | const char *m_text; |
16 | const char *m_pixmap; | 17 | const char *m_pixmap; |
17 | const char *m_channel; | 18 | const char *m_channel; |
18 | const char *m_function; | 19 | const char *m_function; |
19 | }; | 20 | }; |
@@ -63,49 +64,50 @@ ButtonUtils::~ButtonUtils ( ) | |||
63 | 64 | ||
64 | qCopInfo ButtonUtils::messageToInfo ( const OQCopMessage &c ) | 65 | qCopInfo ButtonUtils::messageToInfo ( const OQCopMessage &c ) |
65 | { | 66 | { |
66 | QCString ch = c. channel ( ); | 67 | QCString ch = c. channel ( ); |
67 | QCString f = c. message ( ); | 68 | QCString f = c. message ( ); |
68 | 69 | ||
69 | 70 | ||
70 | if ( ch == "ignore" ) | 71 | if ( ch == "ignore" ) |
71 | return qCopInfo ( qApp-> translate ( "ButtonSettings", "<nobr>Ignored</nobr>" )); | 72 | return qCopInfo ( qApp-> translate ( "ButtonSettings", "<nobr>Ignored</nobr>" )); |
72 | 73 | ||
73 | for ( const predef_qcop *p = predef; p-> m_text; p++ ) { | 74 | for ( const predef_qcop *p = predef; p-> m_text; p++ ) { |
74 | if (( ch == p-> m_channel ) && ( f == p-> m_function )) | 75 | if (( ch == p-> m_channel ) && ( f == p-> m_function )) |
75 | return qCopInfo ( qApp-> translate ( "ButtonSettings", p-> m_text ), Resource::loadPixmap ( p-> m_pixmap )); | 76 | return qCopInfo ( qApp-> translate ( "ButtonSettings", p-> m_text ), |
77 | Opie::Core::OResource::loadPixmap( p->m_pixmap, Opie::Core::OResource::SmallIcon ) ); | ||
76 | } | 78 | } |
77 | 79 | ||
78 | if ( ch. left ( 16 ) == "QPE/Application/" ) { | 80 | if ( ch. left ( 16 ) == "QPE/Application/" ) { |
79 | QString app = ch. mid ( 16 ); | 81 | QString app = ch. mid ( 16 ); |
80 | const AppLnk *applnk = m_apps-> findExec ( app ); | 82 | const AppLnk *applnk = m_apps-> findExec ( app ); |
81 | if ( applnk ) | 83 | if ( applnk ) |
82 | app = applnk-> name ( ); | 84 | app = applnk-> name ( ); |
83 | 85 | ||
84 | if (( f == "raise()" ) || ( f == "nextView()" )) | 86 | if (( f == "raise()" ) || ( f == "nextView()" )) |
85 | return qCopInfo ( qApp-> translate ( "ButtonSettings", "<nobr>Show <b>%1</b></nobr>" ). arg ( app ), applnk ? applnk-> pixmap ( ) : QPixmap ( )); | 87 | return qCopInfo ( qApp-> translate ( "ButtonSettings", "<nobr>Show <b>%1</b></nobr>" ). arg ( app ), applnk ? applnk-> pixmap ( ) : QPixmap ( )); |
86 | else | 88 | else |
87 | return qCopInfo ( qApp-> translate ( "ButtonSettings", "<nobr>Call <b>%1</b>: <i>%2</i></nobr>" ). arg ( app ). arg ( f ), applnk ? applnk-> pixmap ( ) : QPixmap ( )); | 89 | return qCopInfo ( qApp-> translate ( "ButtonSettings", "<nobr>Call <b>%1</b>: <i>%2</i></nobr>" ). arg ( app ). arg ( f ), applnk ? applnk-> pixmap ( ) : QPixmap ( )); |
88 | } | 90 | } |
89 | else { | 91 | else { |
90 | return qCopInfo ( qApp-> translate ( "ButtonSettings", "<nobr>Call <b>%1</b> <i>%2</i></nobr>" ). arg (( ch. left ( 4 ) == "QPE/" ) ? ch. mid ( 4 ) : ch ). arg ( f )); | 92 | return qCopInfo ( qApp-> translate ( "ButtonSettings", "<nobr>Call <b>%1</b> <i>%2</i></nobr>" ). arg (( ch. left ( 4 ) == "QPE/" ) ? ch. mid ( 4 ) : ch ). arg ( f )); |
91 | } | 93 | } |
92 | } | 94 | } |
93 | 95 | ||
94 | 96 | ||
95 | void ButtonUtils::insertActions ( QListViewItem *here ) | 97 | void ButtonUtils::insertActions ( QListViewItem *here ) |
96 | { | 98 | { |
97 | for ( const predef_qcop *p = predef; p-> m_text; p++ ) { | 99 | for ( const predef_qcop *p = predef; p-> m_text; p++ ) { |
98 | QListViewItem *item = new QListViewItem ( here, qApp-> translate ( "ButtonSettings", p-> m_text ), p-> m_channel, p-> m_function ); | 100 | QListViewItem *item = new QListViewItem ( here, qApp-> translate ( "ButtonSettings", p-> m_text ), p-> m_channel, p-> m_function ); |
99 | item-> setPixmap ( 0, Resource::loadPixmap ( p-> m_pixmap )); | 101 | item-> setPixmap ( 0, Opie::Core::OResource::loadPixmap( p->m_pixmap, Opie::Core::OResource::SmallIcon ) ); |
100 | } | 102 | } |
101 | } | 103 | } |
102 | 104 | ||
103 | 105 | ||
104 | void ButtonUtils::insertAppLnks ( QListViewItem *here ) | 106 | void ButtonUtils::insertAppLnks ( QListViewItem *here ) |
105 | { | 107 | { |
106 | QStringList types = m_apps-> types ( ); | 108 | QStringList types = m_apps-> types ( ); |
107 | QListViewItem *typeitem [types. count ( )]; | 109 | QListViewItem *typeitem [types. count ( )]; |
108 | 110 | ||
109 | int i = 0; | 111 | int i = 0; |
110 | for ( QStringList::Iterator it = types. begin ( ); it != types. end ( ); ++it ) { | 112 | for ( QStringList::Iterator it = types. begin ( ); it != types. end ( ); ++it ) { |
111 | QListViewItem *item = new QListViewItem ( here, m_apps-> typeName ( *it )); | 113 | QListViewItem *item = new QListViewItem ( here, m_apps-> typeName ( *it )); |