author | drw <drw> | 2005-02-28 17:40:44 (UTC) |
---|---|---|
committer | drw <drw> | 2005-02-28 17:40:44 (UTC) |
commit | 772bc43173a3155ef08c769f1d01ef0ec7b31bcd (patch) (unidiff) | |
tree | 678a5cdeb431bca63299c3b595c26a0a6639a3f3 /qt/qt-2.3.10.patch | |
parent | 2b64a84d39eeed5681d0ee5068c7d11a01527750 (diff) | |
download | opie-772bc43173a3155ef08c769f1d01ef0ec7b31bcd.zip opie-772bc43173a3155ef08c769f1d01ef0ec7b31bcd.tar.gz opie-772bc43173a3155ef08c769f1d01ef0ec7b31bcd.tar.bz2 |
Added QT patch for QTabBar which fixes problems with the scroll buttons in OTabWidget
-rw-r--r-- | qt/qt-2.3.10.patch/qtabbar.patch | 39 | ||||
-rw-r--r-- | qt/qt-2.3.10.patch/qte-2.3.10-all.patch | 63 |
2 files changed, 88 insertions, 14 deletions
diff --git a/qt/qt-2.3.10.patch/qtabbar.patch b/qt/qt-2.3.10.patch/qtabbar.patch new file mode 100644 index 0000000..6940ec9 --- a/dev/null +++ b/qt/qt-2.3.10.patch/qtabbar.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | |||
2 | # | ||
3 | # Patch managed by http://www.holgerschurig.de/patcher.html | ||
4 | # | ||
5 | |||
6 | --- qt-2.3.10/src/widgets/qtabbar.cpp~qtabbar | ||
7 | +++ qt-2.3.10/src/widgets/qtabbar.cpp | ||
8 | @@ -260,7 +260,6 @@ | ||
9 | lstatic->insert( index, newTab ); | ||
10 | |||
11 | layoutTabs(); | ||
12 | - updateArrowButtons(); | ||
13 | makeVisible( tab( currentTab() ) ); | ||
14 | |||
15 | #ifndef QT_NO_ACCEL | ||
16 | @@ -282,7 +281,6 @@ | ||
17 | l->remove( t ); | ||
18 | lstatic->remove( t ); | ||
19 | layoutTabs(); | ||
20 | - updateArrowButtons(); | ||
21 | makeVisible( tab( currentTab() ) ); | ||
22 | update(); | ||
23 | } | ||
24 | @@ -887,6 +885,7 @@ | ||
25 | } | ||
26 | for ( t = lstatic->first(); t; t = lstatic->next() ) | ||
27 | t->r.setHeight( r.height() ); | ||
28 | + updateArrowButtons(); | ||
29 | } | ||
30 | |||
31 | /*! | ||
32 | @@ -977,7 +976,6 @@ | ||
33 | d->leftB->setGeometry( width() - 2*arrowWidth, 0, arrowWidth, height() ); | ||
34 | #endif | ||
35 | layoutTabs(); | ||
36 | - updateArrowButtons(); | ||
37 | makeVisible( tab( currentTab() )); | ||
38 | } | ||
39 | |||
diff --git a/qt/qt-2.3.10.patch/qte-2.3.10-all.patch b/qt/qt-2.3.10.patch/qte-2.3.10-all.patch index ab52716..24bac51 100644 --- a/qt/qt-2.3.10.patch/qte-2.3.10-all.patch +++ b/qt/qt-2.3.10.patch/qte-2.3.10-all.patch | |||
@@ -14,218 +14,218 @@ Index: qt-2.3.10/src/iconview/qiconview.cpp | |||
14 | QRect *rubber; | 14 | QRect *rubber; |
15 | + QPixmap *backBuffer; | 15 | + QPixmap *backBuffer; |
16 | QTimer *scrollTimer, *adjustTimer, *updateTimer, *inputTimer, | 16 | QTimer *scrollTimer, *adjustTimer, *updateTimer, *inputTimer, |
17 | *fullRedrawTimer; | 17 | *fullRedrawTimer; |
18 | int rastX, rastY, spacing; | 18 | int rastX, rastY, spacing; |
19 | @@ -2268,6 +2269,7 @@ | 19 | @@ -2268,6 +2269,7 @@ |
20 | d->currentItem = 0; | 20 | d->currentItem = 0; |
21 | d->highlightedItem = 0; | 21 | d->highlightedItem = 0; |
22 | d->rubber = 0; | 22 | d->rubber = 0; |
23 | + d->backBuffer = 0; | 23 | + d->backBuffer = 0; |
24 | d->scrollTimer = 0; | 24 | d->scrollTimer = 0; |
25 | d->startDragItem = 0; | 25 | d->startDragItem = 0; |
26 | d->tmpCurrentItem = 0; | 26 | d->tmpCurrentItem = 0; |
27 | @@ -2416,6 +2418,8 @@ | 27 | @@ -2416,6 +2418,8 @@ |
28 | delete item; | 28 | delete item; |
29 | item = tmp; | 29 | item = tmp; |
30 | } | 30 | } |
31 | + delete d->backBuffer; | 31 | + delete d->backBuffer; |
32 | + d->backBuffer = 0; | 32 | + d->backBuffer = 0; |
33 | delete d->fm; | 33 | delete d->fm; |
34 | d->fm = 0; | 34 | d->fm = 0; |
35 | #ifndef QT_NO_TOOLTIP | 35 | #ifndef QT_NO_TOOLTIP |
36 | @@ -2882,6 +2886,48 @@ | 36 | @@ -2882,6 +2886,48 @@ |
37 | } | 37 | } |
38 | 38 | ||
39 | /*! | 39 | /*! |
40 | + This function grabs all paintevents that otherwise would have been | 40 | + This function grabs all paintevents that otherwise would have been |
41 | + processed by the QScrollView::viewportPaintEvent(). Here we use a | 41 | + processed by the QScrollView::viewportPaintEvent(). Here we use a |
42 | + doublebuffer to reduce 'on-paint' flickering on QIconView | 42 | + doublebuffer to reduce 'on-paint' flickering on QIconView |
43 | + (and of course its childs). | 43 | + (and of course its childs). |
44 | + | 44 | + |
45 | + \sa QScrollView::viewportPaintEvent(), QIconView::drawContents() | 45 | + \sa QScrollView::viewportPaintEvent(), QIconView::drawContents() |
46 | +*/ | 46 | +*/ |
47 | + | 47 | + |
48 | +void QIconView::bufferedPaintEvent( QPaintEvent* pe ) | 48 | +void QIconView::bufferedPaintEvent( QPaintEvent* pe ) |
49 | +{ | 49 | +{ |
50 | + QWidget* vp = viewport(); | 50 | + QWidget* vp = viewport(); |
51 | + QRect r = pe->rect() & vp->rect(); | 51 | + QRect r = pe->rect() & vp->rect(); |
52 | + int ex = r.x() + contentsX(); | 52 | + int ex = r.x() + contentsX(); |
53 | + int ey = r.y() + contentsY(); | 53 | + int ey = r.y() + contentsY(); |
54 | + int ew = r.width(); | 54 | + int ew = r.width(); |
55 | + int eh = r.height(); | 55 | + int eh = r.height(); |
56 | + | 56 | + |
57 | + if ( !d->backBuffer ) | 57 | + if ( !d->backBuffer ) |
58 | +d->backBuffer = new QPixmap(vp->size()); | 58 | +d->backBuffer = new QPixmap(vp->size()); |
59 | + if ( d->backBuffer->size() != vp->size() ) { | 59 | + if ( d->backBuffer->size() != vp->size() ) { |
60 | +//Resize function (with hysteesis). Uses a good compromise between memory | 60 | +//Resize function (with hysteesis). Uses a good compromise between memory |
61 | +//consumption and speed (number) of resizes. | 61 | +//consumption and speed (number) of resizes. |
62 | + float newWidth = (float)vp->width(); | 62 | + float newWidth = (float)vp->width(); |
63 | +float newHeight = (float)vp->height(); | 63 | +float newHeight = (float)vp->height(); |
64 | +if ( newWidth > d->backBuffer->width() || newHeight > d->backBuffer->height() ) | 64 | +if ( newWidth > d->backBuffer->width() || newHeight > d->backBuffer->height() ) |
65 | +{ | 65 | +{ |
66 | + newWidth *= 1.1892; | 66 | + newWidth *= 1.1892; |
67 | + newHeight *= 1.1892; | 67 | + newHeight *= 1.1892; |
68 | + d->backBuffer->resize( (int)newWidth, (int)newHeight ); | 68 | + d->backBuffer->resize( (int)newWidth, (int)newHeight ); |
69 | +} else if ( 1.5*newWidth < d->backBuffer->width() || 1.5*newHeight < d->backBuffer->height() ) | 69 | +} else if ( 1.5*newWidth < d->backBuffer->width() || 1.5*newHeight < d->backBuffer->height() ) |
70 | + d->backBuffer->resize( (int)newWidth, (int)newHeight ); | 70 | + d->backBuffer->resize( (int)newWidth, (int)newHeight ); |
71 | + } | 71 | + } |
72 | + | 72 | + |
73 | + QPainter p; | 73 | + QPainter p; |
74 | + p.begin(d->backBuffer, vp); | 74 | + p.begin(d->backBuffer, vp); |
75 | + drawContentsOffset(&p, contentsX(), contentsY(), ex, ey, ew, eh); | 75 | + drawContentsOffset(&p, contentsX(), contentsY(), ex, ey, ew, eh); |
76 | + p.end(); | 76 | + p.end(); |
77 | + bitBlt(vp, r.x(), r.y(), d->backBuffer, r.x(), r.y(), ew, eh); | 77 | + bitBlt(vp, r.x(), r.y(), d->backBuffer, r.x(), r.y(), ew, eh); |
78 | +} | 78 | +} |
79 | + | 79 | + |
80 | +/*! | 80 | +/*! |
81 | + | 81 | + |
82 | \reimp | 82 | \reimp |
83 | */ | 83 | */ |
84 | 84 | ||
85 | @@ -4939,7 +4985,7 @@ | 85 | @@ -4939,7 +4985,7 @@ |
86 | if ( !d->rubber ) | 86 | if ( !d->rubber ) |
87 | drawDragShapes( d->oldDragPos ); | 87 | drawDragShapes( d->oldDragPos ); |
88 | } | 88 | } |
89 | - viewportPaintEvent( (QPaintEvent*)e ); | 89 | - viewportPaintEvent( (QPaintEvent*)e ); |
90 | + bufferedPaintEvent ((QPaintEvent*)e ); | 90 | + bufferedPaintEvent ((QPaintEvent*)e ); |
91 | if ( d->dragging ) { | 91 | if ( d->dragging ) { |
92 | if ( !d->rubber ) | 92 | if ( !d->rubber ) |
93 | drawDragShapes( d->oldDragPos ); | 93 | drawDragShapes( d->oldDragPos ); |
94 | @@ -5377,11 +5423,19 @@ | 94 | @@ -5377,11 +5423,19 @@ |
95 | return; | 95 | return; |
96 | 96 | ||
97 | if ( item->d->container1 && d->firstContainer ) { | 97 | if ( item->d->container1 && d->firstContainer ) { |
98 | -item->d->container1->items.removeRef( item ); | 98 | -item->d->container1->items.removeRef( item ); |
99 | + //Special-case checking of the last item, since this may be | 99 | + //Special-case checking of the last item, since this may be |
100 | + //called a few times for the same item. | 100 | + //called a few times for the same item. |
101 | + if (item->d->container1->items.last() == item) | 101 | + if (item->d->container1->items.last() == item) |
102 | + item->d->container1->items.removeLast(); | 102 | + item->d->container1->items.removeLast(); |
103 | + else | 103 | + else |
104 | + item->d->container1->items.removeRef( item ); | 104 | + item->d->container1->items.removeRef( item ); |
105 | } | 105 | } |
106 | item->d->container1 = 0; | 106 | item->d->container1 = 0; |
107 | if ( item->d->container2 && d->firstContainer ) { | 107 | if ( item->d->container2 && d->firstContainer ) { |
108 | -item->d->container2->items.removeRef( item ); | 108 | -item->d->container2->items.removeRef( item ); |
109 | + if (item->d->container2->items.last() == item) | 109 | + if (item->d->container2->items.last() == item) |
110 | + item->d->container2->items.removeLast(); | 110 | + item->d->container2->items.removeLast(); |
111 | + else | 111 | + else |
112 | + item->d->container2->items.removeRef( item ); | 112 | + item->d->container2->items.removeRef( item ); |
113 | } | 113 | } |
114 | item->d->container2 = 0; | 114 | item->d->container2 = 0; |
115 | 115 | ||
116 | Index: qt-2.3.10/src/iconview/qiconview.h | 116 | Index: qt-2.3.10/src/iconview/qiconview.h |
117 | =================================================================== | 117 | =================================================================== |
118 | --- qt-2.3.10.orig/src/iconview/qiconview.h2005-02-24 21:09:53.060675971 +0100 | 118 | --- qt-2.3.10.orig/src/iconview/qiconview.h2005-02-24 21:09:53.060675971 +0100 |
119 | +++ qt-2.3.10/src/iconview/qiconview.h2005-02-24 21:10:04.602019959 +0100 | 119 | +++ qt-2.3.10/src/iconview/qiconview.h2005-02-24 21:10:04.602019959 +0100 |
120 | @@ -444,6 +444,7 @@ | 120 | @@ -444,6 +444,7 @@ |
121 | virtual void contentsDropEvent( QDropEvent *e ); | 121 | virtual void contentsDropEvent( QDropEvent *e ); |
122 | #endif | 122 | #endif |
123 | 123 | ||
124 | + void bufferedPaintEvent( QPaintEvent* ); | 124 | + void bufferedPaintEvent( QPaintEvent* ); |
125 | virtual void resizeEvent( QResizeEvent* e ); | 125 | virtual void resizeEvent( QResizeEvent* e ); |
126 | virtual void keyPressEvent( QKeyEvent *e ); | 126 | virtual void keyPressEvent( QKeyEvent *e ); |
127 | virtual void focusInEvent( QFocusEvent *e ); | 127 | virtual void focusInEvent( QFocusEvent *e ); |
128 | Index: qt-2.3.10/src/kernel/qgfxraster_qws.cpp | 128 | Index: qt-2.3.10/src/kernel/qgfxraster_qws.cpp |
129 | =================================================================== | 129 | =================================================================== |
130 | --- qt-2.3.10.orig/src/kernel/qgfxraster_qws.cpp2005-02-24 21:09:54.817425663 +0100 | 130 | --- qt-2.3.10.orig/src/kernel/qgfxraster_qws.cpp2005-02-24 21:09:54.817425663 +0100 |
131 | +++ qt-2.3.10/src/kernel/qgfxraster_qws.cpp2005-02-24 21:10:02.521320506 +0100 | 131 | +++ qt-2.3.10/src/kernel/qgfxraster_qws.cpp2005-02-24 21:10:02.521320506 +0100 |
132 | @@ -4037,13 +4037,14 @@ | 132 | @@ -4037,13 +4037,14 @@ |
133 | for( loopc2=0;loopc2<frontadd;loopc2++ ) | 133 | for( loopc2=0;loopc2<frontadd;loopc2++ ) |
134 | *(alphaptr++)=get_value_32(16,(unsigned char **)&temppos); | 134 | *(alphaptr++)=get_value_32(16,(unsigned char **)&temppos); |
135 | 135 | ||
136 | -PackType temp2; | 136 | -PackType temp2; |
137 | -unsigned char * cp; | 137 | -unsigned char * cp; |
138 | +volatile PackType temp2; | 138 | +volatile PackType temp2; |
139 | +volatile unsigned short int * cp; | 139 | +volatile unsigned short int * cp; |
140 | for( loopc2=0;loopc2<count;loopc2++ ) { | 140 | for( loopc2=0;loopc2<count;loopc2++ ) { |
141 | - temp2=*((PackType *)temppos); | 141 | - temp2=*((PackType *)temppos); |
142 | - cp=(unsigned char *)&temp2; | 142 | - cp=(unsigned char *)&temp2; |
143 | - *(alphaptr++)=get_value_32(16,&cp); | 143 | - *(alphaptr++)=get_value_32(16,&cp); |
144 | - *(alphaptr++)=get_value_32(16,&cp); | 144 | - *(alphaptr++)=get_value_32(16,&cp); |
145 | + temp2=*reinterpret_cast<PackType *>(temppos); | 145 | + temp2=*reinterpret_cast<PackType *>(temppos); |
146 | + cp=reinterpret_cast<volatile unsigned short int *>(&temp2); | 146 | + cp=reinterpret_cast<volatile unsigned short int *>(&temp2); |
147 | + *(alphaptr++)=qt_conv16ToRgb(*cp); | 147 | + *(alphaptr++)=qt_conv16ToRgb(*cp); |
148 | + cp++; | 148 | + cp++; |
149 | + *(alphaptr++)=qt_conv16ToRgb(*cp); | 149 | + *(alphaptr++)=qt_conv16ToRgb(*cp); |
150 | temppos += 2; | 150 | temppos += 2; |
151 | } | 151 | } |
152 | 152 | ||
153 | Index: qt-2.3.10/src/kernel/qwindowsystem_qws.cpp | 153 | Index: qt-2.3.10/src/kernel/qwindowsystem_qws.cpp |
154 | =================================================================== | 154 | =================================================================== |
155 | --- qt-2.3.10.orig/src/kernel/qwindowsystem_qws.cpp2005-02-24 21:09:53.891557664 +0100 | 155 | --- qt-2.3.10.orig/src/kernel/qwindowsystem_qws.cpp2005-02-24 21:09:53.891557664 +0100 |
156 | +++ qt-2.3.10/src/kernel/qwindowsystem_qws.cpp2005-02-24 21:10:03.511177634 +0100 | 156 | +++ qt-2.3.10/src/kernel/qwindowsystem_qws.cpp2005-02-24 21:10:03.511177634 +0100 |
157 | @@ -918,6 +918,18 @@ | 157 | @@ -918,6 +918,18 @@ |
158 | { | 158 | { |
159 | } | 159 | } |
160 | 160 | ||
161 | +static void catchSegvSignal( int ) | 161 | +static void catchSegvSignal( int ) |
162 | +{ | 162 | +{ |
163 | +#ifndef QT_NO_QWS_KEYBOARD | 163 | +#ifndef QT_NO_QWS_KEYBOARD |
164 | + if ( qwsServer ) | 164 | + if ( qwsServer ) |
165 | +qwsServer->closeKeyboard(); | 165 | +qwsServer->closeKeyboard(); |
166 | +#endif | 166 | +#endif |
167 | + QWSServer::closedown(); | 167 | + QWSServer::closedown(); |
168 | + fprintf(stderr, "Segmentation fault.\n"); | 168 | + fprintf(stderr, "Segmentation fault.\n"); |
169 | + exit(1); | 169 | + exit(1); |
170 | +} | 170 | +} |
171 | + | 171 | + |
172 | + | 172 | + |
173 | /*! | 173 | /*! |
174 | \class QWSServer qwindowsystem_qws.h | 174 | \class QWSServer qwindowsystem_qws.h |
175 | \brief Server-specific functionality in Qt/Embedded | 175 | \brief Server-specific functionality in Qt/Embedded |
176 | @@ -1043,6 +1055,7 @@ | 176 | @@ -1043,6 +1055,7 @@ |
177 | } | 177 | } |
178 | 178 | ||
179 | signal(SIGPIPE, ignoreSignal); //we get it when we read | 179 | signal(SIGPIPE, ignoreSignal); //we get it when we read |
180 | + signal(SIGSEGV, catchSegvSignal); //recover the keyboard on crash | 180 | + signal(SIGSEGV, catchSegvSignal); //recover the keyboard on crash |
181 | #endif | 181 | #endif |
182 | focusw = 0; | 182 | focusw = 0; |
183 | mouseGrabber = 0; | 183 | mouseGrabber = 0; |
184 | Index: qt-2.3.10/src/kernel/qwsdecoration_qws.h | 184 | Index: qt-2.3.10/src/kernel/qwsdecoration_qws.h |
185 | =================================================================== | 185 | =================================================================== |
186 | --- qt-2.3.10.orig/src/kernel/qwsdecoration_qws.h2005-02-24 21:09:54.355491532 +0100 | 186 | --- qt-2.3.10.orig/src/kernel/qwsdecoration_qws.h2005-02-24 21:09:54.355491532 +0100 |
187 | +++ qt-2.3.10/src/kernel/qwsdecoration_qws.h2005-02-24 21:10:03.040245652 +0100 | 187 | +++ qt-2.3.10/src/kernel/qwsdecoration_qws.h2005-02-24 21:10:03.040245652 +0100 |
188 | @@ -50,7 +50,7 @@ | 188 | @@ -50,7 +50,7 @@ |
189 | enum Region { None=0, All=1, Title=2, Top=3, Bottom=4, Left=5, Right=6, | 189 | enum Region { None=0, All=1, Title=2, Top=3, Bottom=4, Left=5, Right=6, |
190 | TopLeft=7, TopRight=8, BottomLeft=9, BottomRight=10, | 190 | TopLeft=7, TopRight=8, BottomLeft=9, BottomRight=10, |
191 | Close=11, Minimize=12, Maximize=13, Normalize=14, | 191 | Close=11, Minimize=12, Maximize=13, Normalize=14, |
192 | - Menu=15, LastRegion=Menu }; | 192 | - Menu=15, LastRegion=Menu }; |
193 | + Menu=15, LastRegion=Menu, UserDefined = 100 }; | 193 | + Menu=15, LastRegion=Menu, UserDefined = 100 }; |
194 | 194 | ||
195 | virtual QRegion region(const QWidget *, const QRect &rect, Region r=All) = 0; | 195 | virtual QRegion region(const QWidget *, const QRect &rect, Region r=All) = 0; |
196 | virtual void close( QWidget * ); | 196 | virtual void close( QWidget * ); |
197 | Index: qt-2.3.10/src/tools/qcstring.h | 197 | Index: qt-2.3.10/src/tools/qcstring.h |
198 | =================================================================== | 198 | =================================================================== |
199 | --- qt-2.3.10.orig/src/tools/qcstring.h2005-02-24 21:09:54.354491675 +0100 | 199 | --- qt-2.3.10.orig/src/tools/qcstring.h2005-02-24 21:09:54.354491675 +0100 |
200 | +++ qt-2.3.10/src/tools/qcstring.h2005-02-24 21:10:03.026247674 +0100 | 200 | +++ qt-2.3.10/src/tools/qcstring.h2005-02-24 21:10:03.026247674 +0100 |
201 | @@ -119,7 +119,7 @@ | 201 | @@ -119,7 +119,7 @@ |
202 | // We want to keep source compatibility for 2.x | 202 | // We want to keep source compatibility for 2.x |
203 | // ### TODO for 4.0: completely remove these and the cstr* functions | 203 | // ### TODO for 4.0: completely remove these and the cstr* functions |
204 | 204 | ||
205 | -#if !defined(QT_GENUINE_STR) | 205 | -#if !defined(QT_GENUINE_STR) |
206 | +#if 0 | 206 | +#if 0 |
207 | 207 | ||
208 | #undefstrlen | 208 | #undefstrlen |
209 | #define strlen qstrlen | 209 | #define strlen qstrlen |
210 | Index: qt-2.3.10/src/tools/qstring.cpp | 210 | Index: qt-2.3.10/src/tools/qstring.cpp |
211 | =================================================================== | 211 | =================================================================== |
212 | --- qt-2.3.10.orig/src/tools/qstring.cpp2005-02-24 21:09:55.291358022 +0100 | 212 | --- qt-2.3.10.orig/src/tools/qstring.cpp2005-02-24 21:09:55.291358022 +0100 |
213 | +++ qt-2.3.10/src/tools/qstring.cpp2005-02-24 21:10:01.748431931 +0100 | 213 | +++ qt-2.3.10/src/tools/qstring.cpp2005-02-24 21:10:01.748431931 +0100 |
214 | @@ -14469,7 +14469,11 @@ | 214 | @@ -14469,7 +14469,11 @@ |
215 | return qt_winQString2MB( *this ); | 215 | return qt_winQString2MB( *this ); |
216 | #endif | 216 | #endif |
217 | #ifdef _WS_QWS_ | 217 | #ifdef _WS_QWS_ |
218 | - return utf8(); // ##### if there is ANY 8 bit format supported? | 218 | - return utf8(); // ##### if there is ANY 8 bit format supported? |
219 | + QTextCodec* codec = QTextCodec::codecForLocale(); | 219 | + QTextCodec* codec = QTextCodec::codecForLocale(); |
220 | + return codec | 220 | + return codec |
221 | + ? codec->fromUnicode(*this) | 221 | + ? codec->fromUnicode(*this) |
222 | + : utf8(); | 222 | + : utf8(); |
223 | + //return latin1(); // ##### if there is ANY 8 bit format supported? | 223 | + //return latin1(); // ##### if there is ANY 8 bit format supported? |
224 | #endif | 224 | #endif |
225 | #endif | 225 | #endif |
226 | } | 226 | } |
227 | @@ -14515,7 +14519,12 @@ | 227 | @@ -14515,7 +14519,12 @@ |
228 | return qt_winMB2QString( local8Bit ); | 228 | return qt_winMB2QString( local8Bit ); |
229 | #endif | 229 | #endif |
230 | #ifdef _WS_QWS_ | 230 | #ifdef _WS_QWS_ |
231 | - return fromUtf8(local8Bit,len); | 231 | - return fromUtf8(local8Bit,len); |
@@ -236,57 +236,92 @@ Index: qt-2.3.10/src/tools/qstring.cpp | |||
236 | + : QString::fromUtf8(local8Bit,len); | 236 | + : QString::fromUtf8(local8Bit,len); |
237 | +// return fromLatin1(local8Bit,len); | 237 | +// return fromLatin1(local8Bit,len); |
238 | #endif | 238 | #endif |
239 | #endif // QT_NO_TEXTCODEC | 239 | #endif // QT_NO_TEXTCODEC |
240 | } | 240 | } |
241 | Index: qt-2.3.10/src/widgets/qcommonstyle.cpp | 241 | Index: qt-2.3.10/src/widgets/qcommonstyle.cpp |
242 | =================================================================== | 242 | =================================================================== |
243 | --- qt-2.3.10.orig/src/widgets/qcommonstyle.cpp2005-02-24 21:09:53.864561508 +0100 | 243 | --- qt-2.3.10.orig/src/widgets/qcommonstyle.cpp2005-02-24 21:09:53.864561508 +0100 |
244 | +++ qt-2.3.10/src/widgets/qcommonstyle.cpp2005-02-24 21:10:03.484181533 +0100 | 244 | +++ qt-2.3.10/src/widgets/qcommonstyle.cpp2005-02-24 21:10:03.484181533 +0100 |
245 | @@ -572,7 +572,7 @@ | 245 | @@ -572,7 +572,7 @@ |
246 | bool enabled, bool active ) | 246 | bool enabled, bool active ) |
247 | { | 247 | { |
248 | #ifndef QT_NO_MENUBAR | 248 | #ifndef QT_NO_MENUBAR |
249 | -#ifndef QT_NO_STYLE_SGI | 249 | -#ifndef QT_NO_STYLE_SGI |
250 | +#if 1 // #ifndef QT_NO_STYLE_SGI | 250 | +#if 1 // #ifndef QT_NO_STYLE_SGI |
251 | if (draw_menu_bar_impl != 0) { | 251 | if (draw_menu_bar_impl != 0) { |
252 | QDrawMenuBarItemImpl impl = draw_menu_bar_impl; | 252 | QDrawMenuBarItemImpl impl = draw_menu_bar_impl; |
253 | (this->*impl)(p, x, y, w, h, mi, g, enabled, active); | 253 | (this->*impl)(p, x, y, w, h, mi, g, enabled, active); |
254 | Index: qt-2.3.10/src/widgets/qlistview.cpp | 254 | Index: qt-2.3.10/src/widgets/qlistview.cpp |
255 | =================================================================== | 255 | =================================================================== |
256 | --- qt-2.3.10.orig/src/widgets/qlistview.cpp2005-02-24 21:09:53.868560939 +0100 | 256 | --- qt-2.3.10.orig/src/widgets/qlistview.cpp2005-02-24 21:09:53.868560939 +0100 |
257 | +++ qt-2.3.10/src/widgets/qlistview.cpp2005-02-24 21:10:03.500179222 +0100 | 257 | +++ qt-2.3.10/src/widgets/qlistview.cpp2005-02-24 21:10:03.500179222 +0100 |
258 | @@ -5051,9 +5051,9 @@ | 258 | @@ -5051,9 +5051,9 @@ |
259 | l = l->childItem ? l->childItem : l->siblingItem; | 259 | l = l->childItem ? l->childItem : l->siblingItem; |
260 | 260 | ||
261 | if ( l && l->height() ) | 261 | if ( l && l->height() ) |
262 | -s.setHeight( s.height() + 10 * l->height() ); | 262 | -s.setHeight( s.height() + 10 * l->height() ); |
263 | - else | 263 | - else |
264 | -s.setHeight( s.height() + 140 ); | 264 | -s.setHeight( s.height() + 140 ); |
265 | +s.setHeight( s.height() + 4 /*10*/ * l->height() ); | 265 | +s.setHeight( s.height() + 4 /*10*/ * l->height() ); |
266 | + else // ^v much too big for handhelds | 266 | + else // ^v much too big for handhelds |
267 | +s.setHeight( s.height() + 30 /*140*/ ); | 267 | +s.setHeight( s.height() + 30 /*140*/ ); |
268 | 268 | ||
269 | if ( s.width() > s.height() * 3 ) | 269 | if ( s.width() > s.height() * 3 ) |
270 | s.setHeight( s.width() / 3 ); | 270 | s.setHeight( s.width() / 3 ); |
271 | Index: qt-2.3.10/src/widgets/qtoolbutton.cpp | 271 | Index: qt-2.3.10/src/widgets/qtoolbutton.cpp |
272 | =================================================================== | 272 | =================================================================== |
273 | --- qt-2.3.10.orig/src/widgets/qtoolbutton.cpp2005-02-24 21:09:53.868560939 +0100 | 273 | --- qt-2.3.10.orig/src/widgets/qtoolbutton.cpp2005-02-24 21:09:53.868560939 +0100 |
274 | +++ qt-2.3.10/src/widgets/qtoolbutton.cpp2005-02-24 21:10:03.524175756 +0100 | 274 | +++ qt-2.3.10/src/widgets/qtoolbutton.cpp2005-02-24 21:10:03.524175756 +0100 |
275 | @@ -332,12 +332,12 @@ | 275 | @@ -332,12 +332,12 @@ |
276 | QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Large, QIconSet::Normal); | 276 | QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Large, QIconSet::Normal); |
277 | w = pm.width(); | 277 | w = pm.width(); |
278 | h = pm.height(); | 278 | h = pm.height(); |
279 | -if ( w < 32 ) | 279 | -if ( w < 32 ) |
280 | - w = 32; | 280 | - w = 32; |
281 | -if ( h < 32 ) | 281 | -if ( h < 32 ) |
282 | - h = 32; | 282 | - h = 32; |
283 | +if ( w < 24 ) | 283 | +if ( w < 24 ) |
284 | + w = 24; | 284 | + w = 24; |
285 | +if ( h < 24 ) | 285 | +if ( h < 24 ) |
286 | + h = 24; | 286 | + h = 24; |
287 | } else { | 287 | } else { |
288 | -w = h = 16; | 288 | -w = h = 16; |
289 | +w = h = 14; | 289 | +w = h = 14; |
290 | QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal); | 290 | QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal); |
291 | w = pm.width(); | 291 | w = pm.width(); |
292 | h = pm.height(); | 292 | h = pm.height(); |
293 | Index: qt-2.3.10/src/widgets/qtabbar.cpp | ||
294 | =================================================================== | ||
295 | --- qt-2.3.10.orig/src/widgets/qtabbar.cpp2005-02-27 18:07:41.000000000 -0600 | ||
296 | +++ qt-2.3.10/src/widgets/qtabbar.cpp2005-02-28 11:16:56.444377440 -0600 | ||
297 | @@ -260,7 +260,6 @@ | ||
298 | lstatic->insert( index, newTab ); | ||
299 | |||
300 | layoutTabs(); | ||
301 | - updateArrowButtons(); | ||
302 | makeVisible( tab( currentTab() ) ); | ||
303 | |||
304 | #ifndef QT_NO_ACCEL | ||
305 | @@ -282,7 +281,6 @@ | ||
306 | l->remove( t ); | ||
307 | lstatic->remove( t ); | ||
308 | layoutTabs(); | ||
309 | - updateArrowButtons(); | ||
310 | makeVisible( tab( currentTab() ) ); | ||
311 | update(); | ||
312 | } | ||
313 | @@ -887,6 +885,7 @@ | ||
314 | } | ||
315 | for ( t = lstatic->first(); t; t = lstatic->next() ) | ||
316 | t->r.setHeight( r.height() ); | ||
317 | + updateArrowButtons(); | ||
318 | } | ||
319 | |||
320 | /*! | ||
321 | @@ -977,7 +976,6 @@ | ||
322 | d->leftB->setGeometry( width() - 2*arrowWidth, 0, arrowWidth, height() ); | ||
323 | #endif | ||
324 | layoutTabs(); | ||
325 | - updateArrowButtons(); | ||
326 | makeVisible( tab( currentTab() )); | ||
327 | } | ||