Diffstat (limited to 'core/settings/button/buttonutils.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/settings/button/buttonutils.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
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 )); |