-rw-r--r-- | noncore/graphics/opie-eye/gui/iconview.cpp | 36 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/iconview.h | 3 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.cpp | 5 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/phunk_view.pro | 6 |
4 files changed, 47 insertions, 3 deletions
diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp index 2a49786..a06844a 100644 --- a/noncore/graphics/opie-eye/gui/iconview.cpp +++ b/noncore/graphics/opie-eye/gui/iconview.cpp | |||
@@ -32,39 +32,51 @@ | |||
32 | #include <qtimer.h> | 32 | #include <qtimer.h> |
33 | #include <qstyle.h> | 33 | #include <qstyle.h> |
34 | 34 | ||
35 | 35 | ||
36 | using Opie::Core::OKeyConfigItem; | 36 | using Opie::Core::OKeyConfigItem; |
37 | 37 | ||
38 | /* | 38 | /* |
39 | * The Icons, Request Cache and IconViewItem for the IconView | 39 | * The Icons, Request Cache and IconViewItem for the IconView |
40 | */ | 40 | */ |
41 | namespace { | 41 | namespace { |
42 | static QPixmap* _dirPix = 0; | 42 | static QPixmap* _dirPix = 0; |
43 | static QPixmap* _unkPix = 0; | 43 | static QPixmap* _unkPix = 0; |
44 | static QPixmap* _picPix = 0; | ||
44 | class IconViewItem : public QIconViewItem { | 45 | class IconViewItem : public QIconViewItem { |
45 | public: | 46 | public: |
46 | IconViewItem( QIconView*, const QString& path, const QString& name, bool isDir = false); | 47 | IconViewItem( QIconView*, const QString& path, const QString& name, bool isDir = false); |
47 | QPixmap* pixmap()const; | 48 | QPixmap* pixmap()const; |
48 | QString path()const { return m_path; } | 49 | QString path()const { return m_path; } |
49 | bool isDir()const { return m_isDir; } | 50 | bool isDir()const { return m_isDir; } |
50 | void setText( const QString& ); | 51 | void setText( const QString& ); |
51 | 52 | ||
53 | protected: | ||
54 | mutable QPixmap* m_pix; | ||
52 | 55 | ||
53 | private: | 56 | private: |
54 | mutable QPixmap* m_pix; | ||
55 | QString m_path; | 57 | QString m_path; |
56 | bool m_isDir : 1; | 58 | bool m_isDir : 1; |
57 | bool m_noInfo :1; | 59 | bool m_noInfo :1; |
58 | }; | 60 | }; |
61 | class TextViewItem : public IconViewItem { | ||
62 | TextViewItem( QIconView*, const QString& path, const QString& name, bool isDir = false ); | ||
63 | QPixmap *pixmap()const; | ||
64 | void setText( const QString& ); | ||
65 | }; | ||
66 | class ThumbViewItem : public IconViewItem { | ||
67 | ThumbViewItem( QIconView*, const QString& path, const QString& name, bool isDir = false ); | ||
68 | QPixmap *pixmap()const; | ||
69 | void setText( const QString& ); | ||
70 | }; | ||
59 | 71 | ||
60 | 72 | ||
61 | /* | 73 | /* |
62 | * If we request an Image or String | 74 | * If we request an Image or String |
63 | * we add it to the map | 75 | * we add it to the map |
64 | */ | 76 | */ |
65 | static QMap<QString, IconViewItem*> g_stringInf; | 77 | static QMap<QString, IconViewItem*> g_stringInf; |
66 | static QMap<QString, IconViewItem*> g_stringPix; | 78 | static QMap<QString, IconViewItem*> g_stringPix; |
67 | 79 | ||
68 | IconViewItem::IconViewItem( QIconView* view,const QString& path, | 80 | IconViewItem::IconViewItem( QIconView* view,const QString& path, |
69 | const QString& name, bool isDir ) | 81 | const QString& name, bool isDir ) |
70 | : QIconViewItem( view, name ), m_path( path ), m_isDir( isDir ), | 82 | : QIconViewItem( view, name ), m_path( path ), m_isDir( isDir ), |
@@ -106,24 +118,25 @@ namespace { | |||
106 | 118 | ||
107 | /* | 119 | /* |
108 | * Set up the GUI.. initialize the slave set up gui | 120 | * Set up the GUI.. initialize the slave set up gui |
109 | * and also load a dir | 121 | * and also load a dir |
110 | */ | 122 | */ |
111 | PIconView::PIconView( QWidget* wid, Opie::Core::OConfig* cfg ) | 123 | PIconView::PIconView( QWidget* wid, Opie::Core::OConfig* cfg ) |
112 | : QVBox( wid ), m_cfg( cfg ), m_updatet( false ) | 124 | : QVBox( wid ), m_cfg( cfg ), m_updatet( false ) |
113 | { | 125 | { |
114 | { | 126 | { |
115 | QCopEnvelope( "QPE/Application/opie-eye_slave", "refUp()" ); | 127 | QCopEnvelope( "QPE/Application/opie-eye_slave", "refUp()" ); |
116 | } | 128 | } |
117 | m_path = QDir::homeDirPath(); | 129 | m_path = QDir::homeDirPath(); |
130 | m_mode = 0; | ||
118 | 131 | ||
119 | QHBox *hbox = new QHBox( this ); | 132 | QHBox *hbox = new QHBox( this ); |
120 | QLabel* lbl = new QLabel( hbox ); | 133 | QLabel* lbl = new QLabel( hbox ); |
121 | lbl->setText( tr("View as" ) ); | 134 | lbl->setText( tr("View as" ) ); |
122 | 135 | ||
123 | m_views = new QComboBox( hbox, "View As" ); | 136 | m_views = new QComboBox( hbox, "View As" ); |
124 | connect( m_views, SIGNAL(activated(int)), | 137 | connect( m_views, SIGNAL(activated(int)), |
125 | this, SLOT(slotViewChanged(int)) ); | 138 | this, SLOT(slotViewChanged(int)) ); |
126 | 139 | ||
127 | m_view= new QIconView( this ); | 140 | m_view= new QIconView( this ); |
128 | connect(m_view, SIGNAL(clicked(QIconViewItem*) ), | 141 | connect(m_view, SIGNAL(clicked(QIconViewItem*) ), |
129 | this, SLOT(slotClicked(QIconViewItem*)) ); | 142 | this, SLOT(slotClicked(QIconViewItem*)) ); |
@@ -446,12 +459,33 @@ void PIconView::slotShowImage( const QString& name) { | |||
446 | } | 459 | } |
447 | void PIconView::slotImageInfo() { | 460 | void PIconView::slotImageInfo() { |
448 | bool isDir = false; | 461 | bool isDir = false; |
449 | QString name = currentFileName(isDir); | 462 | QString name = currentFileName(isDir); |
450 | if (isDir) return; | 463 | if (isDir) return; |
451 | 464 | ||
452 | slotImageInfo( name ); | 465 | slotImageInfo( name ); |
453 | } | 466 | } |
454 | 467 | ||
455 | void PIconView::slotImageInfo( const QString& name) { | 468 | void PIconView::slotImageInfo( const QString& name) { |
456 | emit sig_showInfo( name ); | 469 | emit sig_showInfo( name ); |
457 | } | 470 | } |
471 | |||
472 | |||
473 | void PIconView::slotChangeMode( int mode ) { | ||
474 | if ( mode >= 0 && mode <= 3 ) | ||
475 | m_mode = mode; | ||
476 | |||
477 | QIconView::ItemTextPos pos; | ||
478 | switch( m_mode ) { | ||
479 | case 1: | ||
480 | pos = QIconView::Bottom; | ||
481 | break; | ||
482 | case 2: | ||
483 | case 0: | ||
484 | default: | ||
485 | pos = QIconView::Right; | ||
486 | break; | ||
487 | } | ||
488 | m_view->setItemTextPos( pos ); | ||
489 | |||
490 | slotReloadDir(); | ||
491 | } | ||
diff --git a/noncore/graphics/opie-eye/gui/iconview.h b/noncore/graphics/opie-eye/gui/iconview.h index 9cf7b3e..af41aef 100644 --- a/noncore/graphics/opie-eye/gui/iconview.h +++ b/noncore/graphics/opie-eye/gui/iconview.h | |||
@@ -61,22 +61,25 @@ private slots: | |||
61 | 61 | ||
62 | void slotStart(); | 62 | void slotStart(); |
63 | void slotEnd(); | 63 | void slotEnd(); |
64 | 64 | ||
65 | /* for performance reasons make it inline in the future */ | 65 | /* for performance reasons make it inline in the future */ |
66 | void addFolders( const QStringList& ); | 66 | void addFolders( const QStringList& ); |
67 | void addFiles( const QStringList& ); | 67 | void addFiles( const QStringList& ); |
68 | void slotClicked(QIconViewItem* ); | 68 | void slotClicked(QIconViewItem* ); |
69 | 69 | ||
70 | /**/ | 70 | /**/ |
71 | void slotThumbInfo(const QString&, const QString&); | 71 | void slotThumbInfo(const QString&, const QString&); |
72 | void slotThumbNail(const QString&, const QPixmap&); | 72 | void slotThumbNail(const QString&, const QPixmap&); |
73 | |||
74 | void slotChangeMode( int ); | ||
73 | private: | 75 | private: |
74 | Opie::Core::OKeyConfigManager *m_viewManager; | 76 | Opie::Core::OKeyConfigManager *m_viewManager; |
75 | Opie::Core::OConfig *m_cfg; | 77 | Opie::Core::OConfig *m_cfg; |
76 | QComboBox* m_views; | 78 | QComboBox* m_views; |
77 | QIconView* m_view; | 79 | QIconView* m_view; |
78 | QString m_path; | 80 | QString m_path; |
79 | bool m_updatet : 1; | 81 | bool m_updatet : 1; |
82 | int m_mode; | ||
80 | }; | 83 | }; |
81 | 84 | ||
82 | #endif | 85 | #endif |
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp index ef23f79..dd9cced 100644 --- a/noncore/graphics/opie-eye/gui/mainwindow.cpp +++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp | |||
@@ -1,22 +1,23 @@ | |||
1 | /* | 1 | /* |
2 | * GPLv2 zecke@handhelds.org | 2 | * GPLv2 zecke@handhelds.org |
3 | * No WArranty... | 3 | * No WArranty... |
4 | */ | 4 | */ |
5 | #include "mainwindow.h" | 5 | #include "mainwindow.h" |
6 | 6 | ||
7 | #include "iconview.h" | 7 | #include "iconview.h" |
8 | #include "filesystem.h" | 8 | #include "filesystem.h" |
9 | #include "imageinfoui.h" | 9 | #include "imageinfoui.h" |
10 | #include "imageview.h" | 10 | #include "imageview.h" |
11 | #include "viewmodebutton.h" | ||
11 | 12 | ||
12 | #include <iface/ifaceinfo.h> | 13 | #include <iface/ifaceinfo.h> |
13 | #include <iface/dirview.h> | 14 | #include <iface/dirview.h> |
14 | 15 | ||
15 | #include <opie2/odebug.h> | 16 | #include <opie2/odebug.h> |
16 | #include <opie2/owidgetstack.h> | 17 | #include <opie2/owidgetstack.h> |
17 | #include <opie2/oapplicationfactory.h> | 18 | #include <opie2/oapplicationfactory.h> |
18 | #include <opie2/otabwidget.h> | 19 | #include <opie2/otabwidget.h> |
19 | #include <opie2/okeyconfigwidget.h> | 20 | #include <opie2/okeyconfigwidget.h> |
20 | 21 | ||
21 | #include <qpe/resource.h> | 22 | #include <qpe/resource.h> |
22 | #include <qpe/config.h> | 23 | #include <qpe/config.h> |
@@ -78,24 +79,28 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) | |||
78 | if ( Ir::supported() ) { | 79 | if ( Ir::supported() ) { |
79 | btn = new QToolButton( bar ); | 80 | btn = new QToolButton( bar ); |
80 | btn->setIconSet( Resource::loadIconSet( "beam" ) ); | 81 | btn->setIconSet( Resource::loadIconSet( "beam" ) ); |
81 | connect( btn, SIGNAL(clicked()), | 82 | connect( btn, SIGNAL(clicked()), |
82 | m_view, SLOT(slotBeam()) ); | 83 | m_view, SLOT(slotBeam()) ); |
83 | } | 84 | } |
84 | 85 | ||
85 | btn = new QToolButton( bar ); | 86 | btn = new QToolButton( bar ); |
86 | btn->setIconSet( Resource::loadIconSet( "trash" ) ); | 87 | btn->setIconSet( Resource::loadIconSet( "trash" ) ); |
87 | connect( btn, SIGNAL(clicked() ), | 88 | connect( btn, SIGNAL(clicked() ), |
88 | m_view, SLOT(slotTrash() ) ); | 89 | m_view, SLOT(slotTrash() ) ); |
89 | 90 | ||
91 | btn = new ViewModeButton( bar ); | ||
92 | connect( btn, SIGNAL(changeMode(int)), | ||
93 | m_view, SLOT(slotChangeMode(int))); | ||
94 | |||
90 | btn = new QToolButton( bar ); | 95 | btn = new QToolButton( bar ); |
91 | btn->setIconSet( Resource::loadIconSet( "SettingsIcon" ) ); | 96 | btn->setIconSet( Resource::loadIconSet( "SettingsIcon" ) ); |
92 | connect( btn, SIGNAL(clicked() ), | 97 | connect( btn, SIGNAL(clicked() ), |
93 | this, SLOT(slotConfig() ) ); | 98 | this, SLOT(slotConfig() ) ); |
94 | 99 | ||
95 | rotateButton = new QToolButton(bar); | 100 | rotateButton = new QToolButton(bar); |
96 | rotateButton->setIconSet( Resource::loadIconSet( "rotate" ) ); | 101 | rotateButton->setIconSet( Resource::loadIconSet( "rotate" ) ); |
97 | rotateButton->setToggleButton(true); | 102 | rotateButton->setToggleButton(true); |
98 | rotateButton->setOn(true); | 103 | rotateButton->setOn(true); |
99 | connect(rotateButton,SIGNAL(toggled(bool)),this,SLOT(slotRotateToggled(bool))); | 104 | connect(rotateButton,SIGNAL(toggled(bool)),this,SLOT(slotRotateToggled(bool))); |
100 | autoRotate = true; | 105 | autoRotate = true; |
101 | 106 | ||
diff --git a/noncore/graphics/opie-eye/phunk_view.pro b/noncore/graphics/opie-eye/phunk_view.pro index e9abe72..e9459ad 100644 --- a/noncore/graphics/opie-eye/phunk_view.pro +++ b/noncore/graphics/opie-eye/phunk_view.pro | |||
@@ -3,37 +3,39 @@ DESTDIR = $(OPIEDIR)/bin | |||
3 | TEMPLATE = app | 3 | TEMPLATE = app |
4 | TARGET = opie-eye | 4 | TARGET = opie-eye |
5 | # the name of the resulting object | 5 | # the name of the resulting object |
6 | 6 | ||
7 | HEADERS = gui/iconview.h gui/filesystem.h gui/mainwindow.h \ | 7 | HEADERS = gui/iconview.h gui/filesystem.h gui/mainwindow.h \ |
8 | lib/imagecache.h impl/dir/dir_dirview.h \ | 8 | lib/imagecache.h impl/dir/dir_dirview.h \ |
9 | iface/dirview.h iface/dirlister.h iface/ifaceinfo.h \ | 9 | iface/dirview.h iface/dirlister.h iface/ifaceinfo.h \ |
10 | impl/dir/dir_lister.h impl/dir/dir_ifaceinfo.h \ | 10 | impl/dir/dir_lister.h impl/dir/dir_ifaceinfo.h \ |
11 | lib/slavemaster.h \ | 11 | lib/slavemaster.h \ |
12 | iface/slaveiface.h \ | 12 | iface/slaveiface.h \ |
13 | gui/imageinfoui.h gui/imagescrollview.h \ | 13 | gui/imageinfoui.h gui/imagescrollview.h \ |
14 | gui/imageview.h \ | 14 | gui/imageview.h \ |
15 | lib/oimagezoomer.h | 15 | lib/oimagezoomer.h \ |
16 | gui/viewmodebutton.h | ||
16 | 17 | ||
17 | # A list header files | 18 | # A list header files |
18 | 19 | ||
19 | 20 | ||
20 | SOURCES = gui/iconview.cpp gui/filesystem.cpp gui/mainwindow.cpp \ | 21 | SOURCES = gui/iconview.cpp gui/filesystem.cpp gui/mainwindow.cpp \ |
21 | lib/imagecache.cpp lib/viewmap.cpp \ | 22 | lib/imagecache.cpp lib/viewmap.cpp \ |
22 | impl/dir/dir_dirview.cpp iface/dirlister.cpp \ | 23 | impl/dir/dir_dirview.cpp iface/dirlister.cpp \ |
23 | iface/dirview.cpp impl/dir/dir_lister.cpp \ | 24 | iface/dirview.cpp impl/dir/dir_lister.cpp \ |
24 | impl/dir/dir_ifaceinfo.cpp lib/slavemaster.cpp \ | 25 | impl/dir/dir_ifaceinfo.cpp lib/slavemaster.cpp \ |
25 | gui/imageinfoui.cpp gui/imagescrollview.cpp \ | 26 | gui/imageinfoui.cpp gui/imagescrollview.cpp \ |
26 | gui/imageview.cpp \ | 27 | gui/imageview.cpp \ |
27 | lib/oimagezoomer.cpp | 28 | lib/oimagezoomer.cpp \ |
29 | gui/viewmodebutton.cpp | ||
28 | # A list of source files | 30 | # A list of source files |
29 | 31 | ||
30 | INTERFACES = | 32 | INTERFACES = |
31 | # list of ui files | 33 | # list of ui files |
32 | 34 | ||
33 | INCLUDEPATH += . $(OPIEDIR)/include | 35 | INCLUDEPATH += . $(OPIEDIR)/include |
34 | DEPENDPATH += $(OPIEDIR)/include | 36 | DEPENDPATH += $(OPIEDIR)/include |
35 | 37 | ||
36 | 38 | ||
37 | 39 | ||
38 | LIBS += -lqpe -lopiecore2 -lopieui2 | 40 | LIBS += -lqpe -lopiecore2 -lopieui2 |
39 | 41 | ||