summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/graphics/opie-eye/gui/iconview.cpp36
-rw-r--r--noncore/graphics/opie-eye/gui/iconview.h3
-rw-r--r--noncore/graphics/opie-eye/gui/mainwindow.cpp5
-rw-r--r--noncore/graphics/opie-eye/phunk_view.pro6
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
@@ -41,6 +41,7 @@ using Opie::Core::OKeyConfigItem;
41namespace { 41namespace {
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);
@@ -49,13 +50,24 @@ namespace {
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/*
@@ -115,6 +127,7 @@ PIconView::PIconView( QWidget* wid, Opie::Core::OConfig* cfg )
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 );
@@ -455,3 +468,24 @@ void PIconView::slotImageInfo() {
455void PIconView::slotImageInfo( const QString& name) { 468void PIconView::slotImageInfo( const QString& name) {
456 emit sig_showInfo( name ); 469 emit sig_showInfo( name );
457} 470}
471
472
473void 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
@@ -70,6 +70,8 @@ private slots:
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 );
73private: 75private:
74 Opie::Core::OKeyConfigManager *m_viewManager; 76 Opie::Core::OKeyConfigManager *m_viewManager;
75 Opie::Core::OConfig *m_cfg; 77 Opie::Core::OConfig *m_cfg;
@@ -77,6 +79,7 @@ private:
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
@@ -8,6 +8,7 @@
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>
@@ -87,6 +88,10 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
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() ),
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
@@ -12,7 +12,8 @@ HEADERS = gui/iconview.h gui/filesystem.h gui/mainwindow.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
@@ -24,7 +25,8 @@ SOURCES = gui/iconview.cpp gui/filesystem.cpp gui/mainwindow.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
30INTERFACES = 32INTERFACES =