author | mickeyl <mickeyl> | 2003-12-07 13:51:01 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-12-07 13:51:01 (UTC) |
commit | c648101ca50a9782911b58b5158b31e1d0427ab3 (patch) (unidiff) | |
tree | 0fcf5801e23d95e071c7f1b62230c5b15c6256ea /noncore/multimedia | |
parent | 2d793ca674944241480f6939814e3f61d0a0e0fb (diff) | |
download | opie-c648101ca50a9782911b58b5158b31e1d0427ab3.zip opie-c648101ca50a9782911b58b5158b31e1d0427ab3.tar.gz opie-c648101ca50a9782911b58b5158b31e1d0427ab3.tar.bz2 |
s/QPEMenuBar/QMenuBar:
- remove usage of deprecated classses
- makes it easier to migrate to OMenuBar in the future
-rw-r--r-- | noncore/multimedia/showimg/showimg.cpp | 2 | ||||
-rw-r--r-- | noncore/multimedia/showimg/showimg.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/noncore/multimedia/showimg/showimg.cpp b/noncore/multimedia/showimg/showimg.cpp index 56bdecf..b7754f7 100644 --- a/noncore/multimedia/showimg/showimg.cpp +++ b/noncore/multimedia/showimg/showimg.cpp | |||
@@ -210,49 +210,49 @@ void ImageWidget::mouseReleaseEvent(QMouseEvent *) | |||
210 | } | 210 | } |
211 | 211 | ||
212 | //=========================================================================== | 212 | //=========================================================================== |
213 | 213 | ||
214 | ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags ) | 214 | ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags ) |
215 | : QMainWindow( parent, name, WResizeNoErase ), filename( 0 ), bFromDocView( FALSE ) | 215 | : QMainWindow( parent, name, WResizeNoErase ), filename( 0 ), bFromDocView( FALSE ) |
216 | { | 216 | { |
217 | setCaption( tr("Image Viewer") ); | 217 | setCaption( tr("Image Viewer") ); |
218 | setIcon( Resource::loadPixmap( "ImageViewer" ) ); | 218 | setIcon( Resource::loadPixmap( "ImageViewer" ) ); |
219 | 219 | ||
220 | 220 | ||
221 | Config cfg("Image Viewer"); | 221 | Config cfg("Image Viewer"); |
222 | cfg.setGroup("Image Viewer"); | 222 | cfg.setGroup("Image Viewer"); |
223 | 223 | ||
224 | showThumbView=cfg.readBoolEntry("ShowThumbnails",false); | 224 | showThumbView=cfg.readBoolEntry("ShowThumbnails",false); |
225 | isSized=cfg.readBoolEntry("SizeToScreen",true); | 225 | isSized=cfg.readBoolEntry("SizeToScreen",true); |
226 | 226 | ||
227 | isFullScreen = FALSE; | 227 | isFullScreen = FALSE; |
228 | 228 | ||
229 | setToolBarsMovable( FALSE ); | 229 | setToolBarsMovable( FALSE ); |
230 | 230 | ||
231 | toolBar = new QPEToolBar( this ); | 231 | toolBar = new QPEToolBar( this ); |
232 | toolBar->setHorizontalStretchable( TRUE ); | 232 | toolBar->setHorizontalStretchable( TRUE ); |
233 | 233 | ||
234 | menuBar = new QPEMenuBar( toolBar ); | 234 | menuBar = new QMenuBar( toolBar ); |
235 | 235 | ||
236 | current=menuBar; | 236 | current=menuBar; |
237 | 237 | ||
238 | 238 | ||
239 | 239 | ||
240 | fileMenuFile = new QPopupMenu(this); | 240 | fileMenuFile = new QPopupMenu(this); |
241 | //menuBarmenubarFile->insertItem( tr("File"), fileMenu ); | 241 | //menuBarmenubarFile->insertItem( tr("File"), fileMenu ); |
242 | fileMenuFile->insertItem(tr("Open"), | 242 | fileMenuFile->insertItem(tr("Open"), |
243 | this, SLOT(openFile()), 0); | 243 | this, SLOT(openFile()), 0); |
244 | 244 | ||
245 | viewMenuFile = new QPopupMenu( this ); | 245 | viewMenuFile = new QPopupMenu( this ); |
246 | //menubarFile->insertItem( tr("View"), viewMenu ); | 246 | //menubarFile->insertItem( tr("View"), viewMenu ); |
247 | viewMenuFile->insertItem( tr("Thumbnail View"), | 247 | viewMenuFile->insertItem( tr("Thumbnail View"), |
248 | this, SLOT(switchThumbView()), 0, SHOW_THUMBNAILS ); | 248 | this, SLOT(switchThumbView()), 0, SHOW_THUMBNAILS ); |
249 | 249 | ||
250 | viewMenuFile->setItemChecked ( SHOW_THUMBNAILS, showThumbView ); | 250 | viewMenuFile->setItemChecked ( SHOW_THUMBNAILS, showThumbView ); |
251 | 251 | ||
252 | 252 | ||
253 | 253 | ||
254 | 254 | ||
255 | optionsMenuFile = new QPopupMenu( this); | 255 | optionsMenuFile = new QPopupMenu( this); |
256 | //menubarFile->insertItem( tr("Options"),optionsMenu ); | 256 | //menubarFile->insertItem( tr("Options"),optionsMenu ); |
257 | slideAction = new QAction( tr( "Slide show" ), Resource::loadIconSet( "slideshow" ), | 257 | slideAction = new QAction( tr( "Slide show" ), Resource::loadIconSet( "slideshow" ), |
258 | QString::null, 0, this, 0 ); | 258 | QString::null, 0, this, 0 ); |
diff --git a/noncore/multimedia/showimg/showimg.h b/noncore/multimedia/showimg/showimg.h index abbd976..da4c0b6 100644 --- a/noncore/multimedia/showimg/showimg.h +++ b/noncore/multimedia/showimg/showimg.h | |||
@@ -14,49 +14,49 @@ | |||
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #ifndef SHOWIMG_H | 21 | #ifndef SHOWIMG_H |
22 | #define SHOWIMG_H | 22 | #define SHOWIMG_H |
23 | 23 | ||
24 | #include <qwidget.h> | 24 | #include <qwidget.h> |
25 | #include <qmainwindow.h> | 25 | #include <qmainwindow.h> |
26 | #include <qimage.h> | 26 | #include <qimage.h> |
27 | #include <qlabel.h> | 27 | #include <qlabel.h> |
28 | #include <qlayout.h> | 28 | #include <qlayout.h> |
29 | #include <qscrollview.h> | 29 | #include <qscrollview.h> |
30 | #include <qdialog.h> | 30 | #include <qdialog.h> |
31 | #include <qstringlist.h> | 31 | #include <qstringlist.h> |
32 | #include <qvaluelist.h> | 32 | #include <qvaluelist.h> |
33 | #include <qwmatrix.h> | 33 | #include <qwmatrix.h> |
34 | 34 | ||
35 | 35 | ||
36 | class QAction; | 36 | class QAction; |
37 | class QPEToolBar; | 37 | class QPEToolBar; |
38 | class QPEMenuBar; | 38 | class QMenuBar; |
39 | class QPopupMenu; | 39 | class QPopupMenu; |
40 | class QWidgetStack; | 40 | class QWidgetStack; |
41 | class FileSelector; | 41 | class FileSelector; |
42 | class DocLnk; | 42 | class DocLnk; |
43 | class QLabel; | 43 | class QLabel; |
44 | class QAction; | 44 | class QAction; |
45 | class QSpinBox; | 45 | class QSpinBox; |
46 | class ImageFileSelector; | 46 | class ImageFileSelector; |
47 | class QTimer; | 47 | class QTimer; |
48 | 48 | ||
49 | 49 | ||
50 | class ImageWidget : public QWidget | 50 | class ImageWidget : public QWidget |
51 | { | 51 | { |
52 | Q_OBJECT | 52 | Q_OBJECT |
53 | public: | 53 | public: |
54 | ImageWidget( QWidget *parent=0 ) | 54 | ImageWidget( QWidget *parent=0 ) |
55 | : QWidget( parent ) { | 55 | : QWidget( parent ) { |
56 | setBackgroundMode(NoBackground); | 56 | setBackgroundMode(NoBackground); |
57 | } | 57 | } |
58 | ~ImageWidget() { } | 58 | ~ImageWidget() { } |
59 | 59 | ||
60 | void setPixmap( const QPixmap &pm ) { | 60 | void setPixmap( const QPixmap &pm ) { |
61 | pixmap = pm; | 61 | pixmap = pm; |
62 | show(); | 62 | show(); |
@@ -229,50 +229,50 @@ private slots: | |||
229 | void rot90(); | 229 | void rot90(); |
230 | void rot270(); | 230 | void rot270(); |
231 | void normalView(); | 231 | void normalView(); |
232 | void fullScreen(); | 232 | void fullScreen(); |
233 | void stopSlideShow(); | 233 | void stopSlideShow(); |
234 | void blackAndWhite(); | 234 | void blackAndWhite(); |
235 | void displayInfoDialog(); | 235 | void displayInfoDialog(); |
236 | void displayControlsDialog(); | 236 | void displayControlsDialog(); |
237 | private: | 237 | private: |
238 | QWMatrix matrix; | 238 | QWMatrix matrix; |
239 | bool rotated90; | 239 | bool rotated90; |
240 | enum MENU_ITEMS { | 240 | enum MENU_ITEMS { |
241 | SHOW_THUMBNAILS, | 241 | SHOW_THUMBNAILS, |
242 | SIZE_TO_SCREEN, | 242 | SIZE_TO_SCREEN, |
243 | BLACKANDWHITE | 243 | BLACKANDWHITE |
244 | }; | 244 | }; |
245 | 245 | ||
246 | QString filename; | 246 | QString filename; |
247 | QString delayLoad; | 247 | QString delayLoad; |
248 | QImage image; // the loaded image | 248 | QImage image; // the loaded image |
249 | QPixmap pm; // the converted pixmap | 249 | QPixmap pm; // the converted pixmap |
250 | QPixmap pmScaled; // the scaled pixmap | 250 | QPixmap pmScaled; // the scaled pixmap |
251 | QPEToolBar *toolBar; | 251 | QPEToolBar *toolBar; |
252 | QPEToolBar *iconToolBar; | 252 | QPEToolBar *iconToolBar; |
253 | QPEMenuBar *menuBar; | 253 | QMenuBar *menuBar; |
254 | QPEMenuBar *current; | 254 | QMenuBar *current; |
255 | 255 | ||
256 | 256 | ||
257 | QPopupMenu *fileMenuFile; | 257 | QPopupMenu *fileMenuFile; |
258 | QPopupMenu *viewMenuFile; | 258 | QPopupMenu *viewMenuFile; |
259 | QPopupMenu *optionsMenuFile; | 259 | QPopupMenu *optionsMenuFile; |
260 | QPopupMenu *fileMenuView; | 260 | QPopupMenu *fileMenuView; |
261 | QPopupMenu *viewMenuView; | 261 | QPopupMenu *viewMenuView; |
262 | 262 | ||
263 | QAction *sss; // scale to screen size | 263 | QAction *sss; // scale to screen size |
264 | 264 | ||
265 | QLabel *lab; | 265 | QLabel *lab; |
266 | ImagePane *imagePanel; | 266 | ImagePane *imagePanel; |
267 | QWidgetStack *stack; | 267 | QWidgetStack *stack; |
268 | //FileSelector *fileSelector; | 268 | //FileSelector *fileSelector; |
269 | ImageFileSelector *fileSelector; | 269 | ImageFileSelector *fileSelector; |
270 | bool isFullScreen; | 270 | bool isFullScreen; |
271 | bool isSized; // true if image is to be resized to fit the window size | 271 | bool isSized; // true if image is to be resized to fit the window size |
272 | bool bFromDocView; // a flag to indicate whether or not we were | 272 | bool bFromDocView; // a flag to indicate whether or not we were |
273 | // launched from the document view... | 273 | // launched from the document view... |
274 | 274 | ||
275 | int slideDelay; | 275 | int slideDelay; |
276 | bool slideRepeat; | 276 | bool slideRepeat; |
277 | bool slideReverse; // show slideshow in reverse order | 277 | bool slideReverse; // show slideshow in reverse order |
278 | bool rotateOnLoad; // rotate by 90 degrees on loading | 278 | bool rotateOnLoad; // rotate by 90 degrees on loading |