author | zecke <zecke> | 2004-04-13 22:21:20 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-04-13 22:21:20 (UTC) |
commit | 79558e549b0ce1fa17fe79fc437859d137ad821f (patch) (side-by-side diff) | |
tree | f8a504778d5a95abaed9f1cf3e451e31c94c5681 | |
parent | e61f3d63c310e4e560bc38f41c1390f246b5f670 (diff) | |
download | opie-79558e549b0ce1fa17fe79fc437859d137ad821f.zip opie-79558e549b0ce1fa17fe79fc437859d137ad821f.tar.gz opie-79558e549b0ce1fa17fe79fc437859d137ad821f.tar.bz2 |
First bits of different IconView Views
-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 @@ -42,4 +42,5 @@ namespace { static QPixmap* _dirPix = 0; static QPixmap* _unkPix = 0; + static QPixmap* _picPix = 0; class IconViewItem : public QIconViewItem { public: @@ -50,11 +51,22 @@ namespace { void setText( const QString& ); + protected: + mutable QPixmap* m_pix; private: - mutable QPixmap* m_pix; QString m_path; bool m_isDir : 1; bool m_noInfo :1; }; + class TextViewItem : public IconViewItem { + TextViewItem( QIconView*, const QString& path, const QString& name, bool isDir = false ); + QPixmap *pixmap()const; + void setText( const QString& ); + }; + class ThumbViewItem : public IconViewItem { + ThumbViewItem( QIconView*, const QString& path, const QString& name, bool isDir = false ); + QPixmap *pixmap()const; + void setText( const QString& ); + }; @@ -116,4 +128,5 @@ PIconView::PIconView( QWidget* wid, Opie::Core::OConfig* cfg ) } m_path = QDir::homeDirPath(); + m_mode = 0; QHBox *hbox = new QHBox( this ); @@ -456,2 +469,23 @@ void PIconView::slotImageInfo( const QString& name) { emit sig_showInfo( name ); } + + +void PIconView::slotChangeMode( int mode ) { + if ( mode >= 0 && mode <= 3 ) + m_mode = mode; + + QIconView::ItemTextPos pos; + switch( m_mode ) { + case 1: + pos = QIconView::Bottom; + break; + case 2: + case 0: + default: + pos = QIconView::Right; + break; + } + m_view->setItemTextPos( pos ); + + slotReloadDir(); +} 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 @@ -71,4 +71,6 @@ private slots: void slotThumbInfo(const QString&, const QString&); void slotThumbNail(const QString&, const QPixmap&); + + void slotChangeMode( int ); private: Opie::Core::OKeyConfigManager *m_viewManager; @@ -78,4 +80,5 @@ private: QString m_path; bool m_updatet : 1; + int m_mode; }; 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 @@ -9,4 +9,5 @@ #include "imageinfoui.h" #include "imageview.h" +#include "viewmodebutton.h" #include <iface/ifaceinfo.h> @@ -88,4 +89,8 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) m_view, SLOT(slotTrash() ) ); + btn = new ViewModeButton( bar ); + connect( btn, SIGNAL(changeMode(int)), + m_view, SLOT(slotChangeMode(int))); + btn = new QToolButton( bar ); btn->setIconSet( Resource::loadIconSet( "SettingsIcon" ) ); 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 @@ -13,5 +13,6 @@ HEADERS = gui/iconview.h gui/filesystem.h gui/mainwindow.h \ gui/imageinfoui.h gui/imagescrollview.h \ gui/imageview.h \ - lib/oimagezoomer.h + lib/oimagezoomer.h \ + gui/viewmodebutton.h # A list header files @@ -25,5 +26,6 @@ SOURCES = gui/iconview.cpp gui/filesystem.cpp gui/mainwindow.cpp \ gui/imageinfoui.cpp gui/imagescrollview.cpp \ gui/imageview.cpp \ - lib/oimagezoomer.cpp + lib/oimagezoomer.cpp \ + gui/viewmodebutton.cpp # A list of source files |