-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 | |||
@@ -74,40 +74,40 @@ public: | |||
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 | |||
@@ -78,66 +78,65 @@ static const char * const qpe_accept_xpm[] = { | |||
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 | ||