-rw-r--r-- | library/qt_override.cpp | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/library/qt_override.cpp b/library/qt_override.cpp index edda874..df5a419 100644 --- a/library/qt_override.cpp +++ b/library/qt_override.cpp | |||
@@ -19,26 +19,26 @@ struct color_fix_t { | |||
19 | char *m_class; | 19 | char *m_class; |
20 | char *m_name; | 20 | char *m_name; |
21 | QColorGroup::ColorRole m_set; | 21 | QColorGroup::ColorRole m_set; |
22 | QColorGroup::ColorRole m_get; | 22 | QColorGroup::ColorRole m_get; |
23 | }; | 23 | }; |
24 | 24 | ||
25 | 25 | #ifndef OPIE_NO_OVERRIDE_QT | |
26 | 26 | ||
27 | static const color_fix_t apps_that_need_special_colors [] = { | 27 | static const color_fix_t apps_that_need_special_colors [] = { |
28 | { "HancomMobileWord", "HTextEdit", 0, QColorGroup::Background, QColorGroup::Base }, | 28 | { "HancomMobileWord", "HTextEdit", 0, QColorGroup::Background, QColorGroup::Base }, |
29 | { "neocal", "Display", 0, QColorGroup::Background, QColorGroup::Base }, | 29 | { "neocal", "Display", 0, QColorGroup::Background, QColorGroup::Base }, |
30 | 30 | ||
31 | { 0, 0, 0, QColorGroup::Base, QColorGroup::Base } | 31 | { 0, 0, 0, QColorGroup::Base, QColorGroup::Base } |
32 | }; | 32 | }; |
33 | 33 | ||
34 | static const char * const apps_that_need_pointsizes_times_10 [] = { | 34 | static const char * const apps_that_need_pointsizes_times_10 [] = { |
35 | "HancomMobileWord", | 35 | "HancomMobileWord", |
36 | "hancomsheet", | 36 | "hancomsheet", |
37 | "HancomPresenterViewer", | 37 | "HancomPresenterViewer", |
38 | 38 | ||
39 | 0 | 39 | 0 |
40 | }; | 40 | }; |
41 | 41 | ||
42 | 42 | ||
43 | 43 | ||
44 | 44 | ||
@@ -53,78 +53,84 @@ static void binaryNameFree ( ) | |||
53 | ::free ((void *) Opie::binaryName ( )); // we need to cast away the const here | 53 | ::free ((void *) Opie::binaryName ( )); // we need to cast away the const here |
54 | } | 54 | } |
55 | 55 | ||
56 | const char *Opie::binaryName ( ) | 56 | const char *Opie::binaryName ( ) |
57 | { | 57 | { |
58 | static const char *appname = 0; | 58 | static const char *appname = 0; |
59 | 59 | ||
60 | if ( !appname ) { | 60 | if ( !appname ) { |
61 | char dst [PATH_MAX + 1]; | 61 | char dst [PATH_MAX + 1]; |
62 | int l = ::readlink ( "/proc/self/exe", dst, PATH_MAX ); | 62 | int l = ::readlink ( "/proc/self/exe", dst, PATH_MAX ); |
63 | 63 | ||
64 | if ( l <= 0 ) | 64 | if ( l <= 0 ) |
65 | l = 0; | 65 | l = 0; |
66 | 66 | ||
67 | dst [l] = 0; | 67 | dst [l] = 0; |
68 | const char *b = ::strrchr ( dst, '/' ); | 68 | const char *b = ::strrchr ( dst, '/' ); |
69 | appname = ::strdup ( b ? b + 1 : dst ); | 69 | appname = ::strdup ( b ? b + 1 : dst ); |
70 | 70 | ||
71 | ::atexit ( binaryNameFree ); | 71 | ::atexit ( binaryNameFree ); |
72 | } | 72 | } |
73 | return appname; | 73 | return appname; |
74 | } | 74 | } |
75 | 75 | ||
76 | #else | ||
77 | int Opie::force_appearance = 0; | ||
78 | #endif | ||
76 | 79 | ||
77 | // Fix for a toolchain incompatibility (binaries compiled with | 80 | // Fix for a toolchain incompatibility (binaries compiled with |
78 | // old tcs using shared libs compiled with newer tcs) | 81 | // old tcs using shared libs compiled with newer tcs) |
79 | 82 | ||
80 | extern "C" { | 83 | extern "C" { |
81 | 84 | ||
82 | extern void __gmon_start__ ( ) __attribute__(( weak )); | 85 | extern void __gmon_start__ ( ) __attribute__(( weak )); |
83 | 86 | ||
84 | extern void __gmon_start__ ( ) | 87 | extern void __gmon_start__ ( ) |
85 | { | 88 | { |
86 | } | 89 | } |
87 | 90 | ||
88 | } | 91 | } |
89 | 92 | ||
90 | 93 | ||
91 | // Fix for apps, that use QPainter::eraseRect() which doesn't work with styles | 94 | // Fix for apps, that use QPainter::eraseRect() which doesn't work with styles |
92 | // that set a background pixmap (it would be easier to fix eraseRect(), but | 95 | // that set a background pixmap (it would be easier to fix eraseRect(), but |
93 | // TT made it an inline ...) | 96 | // TT made it an inline ...) |
94 | 97 | ||
95 | void QPEApplication::polish ( QWidget *w ) | 98 | void QPEApplication::polish ( QWidget *w ) |
96 | { | 99 | { |
100 | #ifndef OPIE_NO_OVERRIDE_QT | ||
97 | //qDebug ( "QPEApplication::polish()" ); | 101 | //qDebug ( "QPEApplication::polish()" ); |
98 | 102 | ||
99 | for ( const color_fix_t *ptr = apps_that_need_special_colors; ptr-> m_app; ptr++ ) { | 103 | for ( const color_fix_t *ptr = apps_that_need_special_colors; ptr-> m_app; ptr++ ) { |
100 | if (( ::strcmp ( Opie::binaryName ( ), ptr-> m_app ) == 0 ) && | 104 | if (( ::strcmp ( Opie::binaryName ( ), ptr-> m_app ) == 0 ) && |
101 | ( ptr-> m_class ? w-> inherits ( ptr-> m_class ) : true ) && | 105 | ( ptr-> m_class ? w-> inherits ( ptr-> m_class ) : true ) && |
102 | ( ptr-> m_name ? ( ::strcmp ( w-> name ( ), ptr-> m_name ) == 0 ) : true )) { | 106 | ( ptr-> m_name ? ( ::strcmp ( w-> name ( ), ptr-> m_name ) == 0 ) : true )) { |
103 | QPalette pal = w-> palette ( ); | 107 | QPalette pal = w-> palette ( ); |
104 | pal. setColor ( ptr-> m_set, pal. color ( QPalette::Active, ptr-> m_get )); | 108 | pal. setColor ( ptr-> m_set, pal. color ( QPalette::Active, ptr-> m_get )); |
105 | w-> setPalette ( pal ); | 109 | w-> setPalette ( pal ); |
106 | } | 110 | } |
107 | } | 111 | } |
112 | #endif | ||
108 | QApplication::polish ( w ); | 113 | QApplication::polish ( w ); |
109 | } | 114 | } |
110 | 115 | ||
111 | 116 | ||
117 | #ifndef OPIE_NO_OVERRIDE_QT | ||
112 | // Fix for the binary incompatibility that TT introduced in Qt/E 2.3.4 -- point sizes | 118 | // Fix for the binary incompatibility that TT introduced in Qt/E 2.3.4 -- point sizes |
113 | // were multiplied by 10 (which was incorrect) | 119 | // were multiplied by 10 (which was incorrect) |
114 | 120 | ||
115 | QValueList <int> QFontDatabase::pointSizes ( QString const &family, QString const &style, QString const &charset ) | 121 | QValueList <int> QFontDatabase::pointSizes ( QString const &family, QString const &style, QString const &charset ) |
116 | { | 122 | { |
117 | //qDebug ( "QFontDatabase::pointSizes()" ); | 123 | //qDebug ( "QFontDatabase::pointSizes()" ); |
118 | 124 | ||
119 | QValueList <int> sl = pointSizes_NonWeak ( family, style, charset ); | 125 | QValueList <int> sl = pointSizes_NonWeak ( family, style, charset ); |
120 | 126 | ||
121 | for ( const char * const *ptr = apps_that_need_pointsizes_times_10; *ptr; ptr++ ) { | 127 | for ( const char * const *ptr = apps_that_need_pointsizes_times_10; *ptr; ptr++ ) { |
122 | if ( ::strcmp ( Opie::binaryName ( ), *ptr ) == 0 ) { | 128 | if ( ::strcmp ( Opie::binaryName ( ), *ptr ) == 0 ) { |
123 | for ( QValueList <int>::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) | 129 | for ( QValueList <int>::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) |
124 | *it *= 10; | 130 | *it *= 10; |
125 | } | 131 | } |
126 | } | 132 | } |
127 | return sl; | 133 | return sl; |
128 | } | 134 | } |
129 | 135 | ||
130 | 136 | ||
@@ -153,19 +159,19 @@ void QApplication::setFont ( const QFont &fnt, bool informWidgets, const char *c | |||
153 | { | 159 | { |
154 | //qDebug ( "QApplication::setFont()" ); | 160 | //qDebug ( "QApplication::setFont()" ); |
155 | 161 | ||
156 | if (!( Opie::force_appearance & Opie::Force_Font )) | 162 | if (!( Opie::force_appearance & Opie::Force_Font )) |
157 | QApplication::setFont_NonWeak ( fnt, informWidgets, className ); | 163 | QApplication::setFont_NonWeak ( fnt, informWidgets, className ); |
158 | } | 164 | } |
159 | 165 | ||
160 | 166 | ||
161 | void QApplication::qwsSetDecoration ( QWSDecoration *deco ) | 167 | void QApplication::qwsSetDecoration ( QWSDecoration *deco ) |
162 | { | 168 | { |
163 | //qDebug ( "QApplication::qwsSetDecoration()" ); | 169 | //qDebug ( "QApplication::qwsSetDecoration()" ); |
164 | 170 | ||
165 | if ( Opie::force_appearance & Opie::Force_Decoration ) | 171 | if ( Opie::force_appearance & Opie::Force_Decoration ) |
166 | delete deco; | 172 | delete deco; |
167 | else | 173 | else |
168 | QApplication::qwsSetDecoration_NonWeak ( deco ); | 174 | QApplication::qwsSetDecoration_NonWeak ( deco ); |
169 | } | 175 | } |
170 | 176 | #endif | |
171 | #endif \ No newline at end of file | 177 | #endif |