author | zecke <zecke> | 2002-09-17 17:05:19 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-09-17 17:05:19 (UTC) |
commit | e1614b49cf61ee37350828ce5b5178a9da752f39 (patch) (unidiff) | |
tree | 836d16a45aaeb47cba40405ff8956a1661315637 | |
parent | 01b2fc89a105bf5b56bc1aa467343d14589dadd2 (diff) | |
download | opie-e1614b49cf61ee37350828ce5b5178a9da752f39.zip opie-e1614b49cf61ee37350828ce5b5178a9da752f39.tar.gz opie-e1614b49cf61ee37350828ce5b5178a9da752f39.tar.bz2 |
update
-rw-r--r-- | library/fileselector.h | 2 | ||||
-rw-r--r-- | library/qpedecoration_qws.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/library/fileselector.h b/library/fileselector.h index ef57626..f1c9eb1 100644 --- a/library/fileselector.h +++ b/library/fileselector.h | |||
@@ -42,72 +42,72 @@ public: | |||
42 | 42 | ||
43 | private: | 43 | private: |
44 | DocLnk fl; | 44 | DocLnk fl; |
45 | }; | 45 | }; |
46 | 46 | ||
47 | class FileSelectorPrivate; | 47 | class FileSelectorPrivate; |
48 | class FileSelector : public QVBox | 48 | class FileSelector : public QVBox |
49 | { | 49 | { |
50 | Q_OBJECT | 50 | Q_OBJECT |
51 | 51 | ||
52 | public: | 52 | public: |
53 | FileSelector( const QString &mimefilter, QWidget *parent, const char *name=0, bool newVisible = TRUE, bool closeVisible = TRUE ); | 53 | FileSelector( const QString &mimefilter, QWidget *parent, const char *name=0, bool newVisible = TRUE, bool closeVisible = TRUE ); |
54 | ~FileSelector(); | 54 | ~FileSelector(); |
55 | void setNewVisible( bool b ); | 55 | void setNewVisible( bool b ); |
56 | void setCloseVisible( bool b ); | 56 | void setCloseVisible( bool b ); |
57 | void reread(); | 57 | void reread(); |
58 | int fileCount(); | 58 | int fileCount(); |
59 | DocLnk selectedDocument() const | 59 | DocLnk selectedDocument() const |
60 | { | 60 | { |
61 | const DocLnk* rp = ((FileSelector*)this)->selected(); | 61 | const DocLnk* rp = ((FileSelector*)this)->selected(); |
62 | if (!rp) { | 62 | if (!rp) { |
63 | DocLnk r; | 63 | DocLnk r; |
64 | return r; | 64 | return r; |
65 | } | 65 | } |
66 | DocLnk r(*rp); | 66 | DocLnk r(*rp); |
67 | delete rp; | 67 | delete rp; |
68 | return r; | 68 | return r; |
69 | } | 69 | } |
70 | 70 | ||
71 | QValueList<DocLnk> fileList() const | 71 | QValueList<DocLnk> fileList() const |
72 | { | 72 | { |
73 | ((FileSelector*)this)->fileCount(); // ensure all loaded when this is extended | 73 | ((FileSelector*)this)->fileCount(); // ensure all loaded when this is extended |
74 | 74 | ||
75 | QValueList<DocLnk> list; | 75 | QValueList<DocLnk> list; |
76 | FileSelectorItem *item = (FileSelectorItem *)((QListView*)view)->firstChild(); | 76 | FileSelectorItem *item = (FileSelectorItem *)((QListView*)view)->firstChild(); |
77 | while (item) { | 77 | while (item) { |
78 | list.append(item->file()); | 78 | list.append(item->file()); |
79 | item = (FileSelectorItem *)item->nextSibling(); | 79 | item = (FileSelectorItem *)item->nextSibling(); |
80 | } | 80 | } |
81 | 81 | ||
82 | return list; | 82 | return list; |
83 | } | 83 | } |
84 | 84 | ||
85 | signals: | 85 | signals: |
86 | void fileSelected( const DocLnk & ); | 86 | void fileSelected( const DocLnk & ); |
87 | void newSelected( const DocLnk & ); | 87 | void newSelected( const DocLnk & ); |
88 | void closeMe(); | 88 | void closeMe(); |
89 | 89 | ||
90 | private slots: | 90 | private slots: |
91 | void createNew(); | 91 | void createNew(); |
92 | void fileClicked( int, QListViewItem *, const QPoint &, int ); | 92 | void fileClicked( int, QListViewItem *, const QPoint &, int ); |
93 | // pressed to get 'right down' | 93 | // pressed to get 'right down' |
94 | void filePressed( int, QListViewItem *, const QPoint &, int ); | 94 | void filePressed( int, QListViewItem *, const QPoint &, int ); |
95 | void fileClicked( QListViewItem *); | 95 | void fileClicked( QListViewItem *); |
96 | void typeSelected( const QString &type ); | 96 | void typeSelected( const QString &type ); |
97 | void catSelected( int ); | 97 | void catSelected( int ); |
98 | void cardMessage( const QCString &, const QByteArray &); | 98 | void cardMessage( const QCString &, const QByteArray &); |
99 | 99 | ||
100 | private: | 100 | private: |
101 | void updateView(); | 101 | void updateView(); |
102 | void updateWhatsThis(); | 102 | void updateWhatsThis(); |
103 | 103 | ||
104 | private: | 104 | private: |
105 | // RESOLVE please -zecke@handhelds.org | 105 | // RESOLVE please -zecke@handhelds.org |
106 | const DocLnk *selected(); // use selectedDocument() that's no luckily no compiler is putting the access into the symbol name | 106 | const DocLnk *selected(); // use selectedDocument() luckily no compiler is putting the access into the symbol name |
107 | FileSelectorView *view; | 107 | FileSelectorView *view; |
108 | QString filter; | 108 | QString filter; |
109 | QToolButton *buttonNew, *buttonClose; | 109 | QToolButton *buttonNew, *buttonClose; |
110 | FileSelectorPrivate *d; | 110 | FileSelectorPrivate *d; |
111 | }; | 111 | }; |
112 | 112 | ||
113 | #endif | 113 | #endif |
diff --git a/library/qpedecoration_qws.cpp b/library/qpedecoration_qws.cpp index c2eb751..708dd23 100644 --- a/library/qpedecoration_qws.cpp +++ b/library/qpedecoration_qws.cpp | |||
@@ -46,130 +46,129 @@ extern QRect qt_maxWindowRect; | |||
46 | 46 | ||
47 | #ifndef QT_NO_QWS_QPE_WM_STYLE | 47 | #ifndef QT_NO_QWS_QPE_WM_STYLE |
48 | 48 | ||
49 | #ifndef QT_NO_IMAGEIO_XPM | 49 | #ifndef QT_NO_IMAGEIO_XPM |
50 | 50 | ||
51 | /* XPM */ | 51 | /* XPM */ |
52 | static const char * const qpe_close_xpm[] = { | 52 | static const char * const qpe_close_xpm[] = { |
53 | "16 16 3 1", | 53 | "16 16 3 1", |
54 | " c None", | 54 | " c None", |
55 | ". c #FFFFFF", | 55 | ". c #FFFFFF", |
56 | "+ c #000000", | 56 | "+ c #000000", |
57 | " ", | 57 | " ", |
58 | " ", | 58 | " ", |
59 | " ..... ", | 59 | " ..... ", |
60 | " ..+++++.. ", | 60 | " ..+++++.. ", |
61 | " .+++++++++. ", | 61 | " .+++++++++. ", |
62 | " .+..+++..+. ", | 62 | " .+..+++..+. ", |
63 | " .++...+...++. ", | 63 | " .++...+...++. ", |
64 | " .+++.....+++. ", | 64 | " .+++.....+++. ", |
65 | " .++++...++++. ", | 65 | " .++++...++++. ", |
66 | " .+++.....+++. ", | 66 | " .+++.....+++. ", |
67 | " .++...+...++. ", | 67 | " .++...+...++. ", |
68 | " .+..+++..+. ", | 68 | " .+..+++..+. ", |
69 | " .+++++++++. ", | 69 | " .+++++++++. ", |
70 | " ..+++++.. ", | 70 | " ..+++++.. ", |
71 | " ..... ", | 71 | " ..... ", |
72 | " "}; | 72 | " "}; |
73 | 73 | ||
74 | /* XPM */ | 74 | /* XPM */ |
75 | static const char * const qpe_accept_xpm[] = { | 75 | static const char * const qpe_accept_xpm[] = { |
76 | "16 16 3 1", | 76 | "16 16 3 1", |
77 | " c None", | 77 | " c None", |
78 | ". c #FFFFFF", | 78 | ". c #FFFFFF", |
79 | "+ c #000000", | 79 | "+ c #000000", |
80 | " ", | 80 | " ", |
81 | " ", | 81 | " ", |
82 | " ..... ", | 82 | " ..... ", |
83 | " ..+++++.. ", | 83 | " ..+++++.. ", |
84 | " .+++++++++. ", | 84 | " .+++++++++. ", |
85 | " .+++++++++. ", | 85 | " .+++++++++. ", |
86 | " .+++++++..++. ", | 86 | " .+++++++..++. ", |
87 | " .++.+++...++. ", | 87 | " .++.+++...++. ", |
88 | " .+...+...+++. ", | 88 | " .+...+...+++. ", |
89 | " .+......++++. ", | 89 | " .+......++++. ", |
90 | " .++....+++++. ", | 90 | " .++....+++++. ", |
91 | " .++..+++++. ", | 91 | " .++..+++++. ", |
92 | " .+++++++++. ", | 92 | " .+++++++++. ", |
93 | " ..+++++.. ", | 93 | " ..+++++.. ", |
94 | " ..... ", | 94 | " ..... ", |
95 | " "}; | 95 | " "}; |
96 | 96 | ||
97 | #endif // QT_NO_IMAGEIO_XPM | 97 | #endif // QT_NO_IMAGEIO_XPM |
98 | 98 | ||
99 | class HackWidget : public QWidget | 99 | class HackWidget : public QWidget |
100 | { | 100 | { |
101 | public: | 101 | public: |
102 | bool needsOk() { | 102 | bool needsOk() { |
103 | return (getWState() & WState_Reserved1 ) || | 103 | return (getWState() & WState_Reserved1 ) || |
104 | (inherits( "QDialog" ) && !inherits( "QMessageBox" ) ); | 104 | (inherits( "QDialog" ) && !inherits( "QMessageBox" ) ); |
105 | } | 105 | } |
106 | }; | 106 | }; |
107 | 107 | ||
108 | static QImage scaleButton( const QImage &img, int height ) | 108 | static QImage scaleButton( const QImage &img, int height ) |
109 | { | 109 | { |
110 | qWarning("Height %d %d", height, img.height() ); | 110 | if ( img.height() != 0 && img.height() != height ) { |
111 | if ( img.height()!=0 && img.height() != height ) { | ||
112 | return img.smoothScale( img.width()*height/img.height(), height ); | 111 | return img.smoothScale( img.width()*height/img.height(), height ); |
113 | } else { | 112 | } else { |
114 | return img; | 113 | return img; |
115 | } | 114 | } |
116 | } | 115 | } |
117 | 116 | ||
118 | class TLWidget : public QWidget | 117 | class TLWidget : public QWidget |
119 | { | 118 | { |
120 | public: | 119 | public: |
121 | QWSManager *manager() | 120 | QWSManager *manager() |
122 | { | 121 | { |
123 | return topData()->qwsManager; | 122 | return topData()->qwsManager; |
124 | } | 123 | } |
125 | 124 | ||
126 | QTLWExtra *topExtra() | 125 | QTLWExtra *topExtra() |
127 | { | 126 | { |
128 | return topData(); | 127 | return topData(); |
129 | } | 128 | } |
130 | 129 | ||
131 | void setWState( uint s ) { QWidget::setWState( s ); } | 130 | void setWState( uint s ) { QWidget::setWState( s ); } |
132 | void clearWState( uint s ) { QWidget::clearWState( s ); } | 131 | void clearWState( uint s ) { QWidget::clearWState( s ); } |
133 | }; | 132 | }; |
134 | 133 | ||
135 | 134 | ||
136 | QPEManager::QPEManager( QPEDecoration *d, QObject *parent ) | 135 | QPEManager::QPEManager( QPEDecoration *d, QObject *parent ) |
137 | : QObject( parent ), decoration( d ), helpState(0), inWhatsThis(FALSE) | 136 | : QObject( parent ), decoration( d ), helpState(0), inWhatsThis(FALSE) |
138 | { | 137 | { |
139 | wtTimer = new QTimer( this ); | 138 | wtTimer = new QTimer( this ); |
140 | connect( wtTimer, SIGNAL(timeout()), this, SLOT(whatsThisTimeout()) ); | 139 | connect( wtTimer, SIGNAL(timeout()), this, SLOT(whatsThisTimeout()) ); |
141 | } | 140 | } |
142 | 141 | ||
143 | 142 | ||
144 | void QPEManager::updateActive() | 143 | void QPEManager::updateActive() |
145 | { | 144 | { |
146 | QWidget *newActive = qApp->activeWindow(); | 145 | QWidget *newActive = qApp->activeWindow(); |
147 | if ( newActive && (QWidget*)active == newActive ) | 146 | if ( newActive && (QWidget*)active == newActive ) |
148 | return; | 147 | return; |
149 | 148 | ||
150 | if ( active && (!newActive || ((TLWidget *)newActive)->manager()) ) { | 149 | if ( active && (!newActive || ((TLWidget *)newActive)->manager()) ) { |
151 | ((TLWidget *)(QWidget*)active)->manager()->removeEventFilter( this ); | 150 | ((TLWidget *)(QWidget*)active)->manager()->removeEventFilter( this ); |
152 | } | 151 | } |
153 | 152 | ||
154 | if ( newActive && ((TLWidget *)newActive)->manager() ) { | 153 | if ( newActive && ((TLWidget *)newActive)->manager() ) { |
155 | active = newActive; | 154 | active = newActive; |
156 | ((TLWidget *)(QWidget*)active)->manager()->installEventFilter( this ); | 155 | ((TLWidget *)(QWidget*)active)->manager()->installEventFilter( this ); |
157 | } else if ( !newActive ) { | 156 | } else if ( !newActive ) { |
158 | active = 0; | 157 | active = 0; |
159 | } | 158 | } |
160 | } | 159 | } |
161 | 160 | ||
162 | int QPEManager::pointInQpeRegion( QWidget *w, const QPoint &p ) | 161 | int QPEManager::pointInQpeRegion( QWidget *w, const QPoint &p ) |
163 | { | 162 | { |
164 | QRect rect(w->geometry()); | 163 | QRect rect(w->geometry()); |
165 | 164 | ||
166 | if ( decoration->region( w, rect, | 165 | if ( decoration->region( w, rect, |
167 | (QWSDecoration::Region)QPEDecoration::Help ).contains(p) ) | 166 | (QWSDecoration::Region)QPEDecoration::Help ).contains(p) ) |
168 | return QPEDecoration::Help; | 167 | return QPEDecoration::Help; |
169 | 168 | ||
170 | for (int i = QWSDecoration::LastRegion; i >= QWSDecoration::Title; i--) { | 169 | for (int i = QWSDecoration::LastRegion; i >= QWSDecoration::Title; i--) { |
171 | if (decoration->region(w, rect, (QWSDecoration::Region)i).contains(p)) | 170 | if (decoration->region(w, rect, (QWSDecoration::Region)i).contains(p)) |
172 | return (QWSDecoration::Region)i; | 171 | return (QWSDecoration::Region)i; |
173 | } | 172 | } |
174 | 173 | ||
175 | return QWSDecoration::None; | 174 | return QWSDecoration::None; |