-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 | |||
@@ -222,25 +222,25 @@ ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags ) | |||
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 ); |
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 | |||
@@ -26,25 +26,25 @@ | |||
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 |
@@ -241,26 +241,26 @@ private: | |||
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; |