author | alwin <alwin> | 2004-04-16 00:54:42 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-04-16 00:54:42 (UTC) |
commit | 7c29eeaecc8301fb500851382b3d94092ae72719 (patch) (side-by-side diff) | |
tree | aa93d419a5b5752f080a6dc66afd5d8a3ec4ace0 /noncore | |
parent | de3d551d3b07617653c01e540ee3c6262a2cd595 (diff) | |
download | opie-7c29eeaecc8301fb500851382b3d94092ae72719.zip opie-7c29eeaecc8301fb500851382b3d94092ae72719.tar.gz opie-7c29eeaecc8301fb500851382b3d94092ae72719.tar.bz2 |
not all buttons will showed in every view, small beauties
-rw-r--r-- | noncore/graphics/opie-eye/gui/iconview.cpp | 11 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/imageview.cpp | 2 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.cpp | 43 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.h | 4 |
4 files changed, 45 insertions, 15 deletions
diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp index f6e1816..7231bfb 100644 --- a/noncore/graphics/opie-eye/gui/iconview.cpp +++ b/noncore/graphics/opie-eye/gui/iconview.cpp @@ -280,5 +280,4 @@ QString PIconView::nextFileName(bool &isDir)const IconViewItem* it = static_cast<IconViewItem*>( _it ); isDir = it->isDir(); - m_view->setCurrentItem(_it); return it->path(); } @@ -294,5 +293,4 @@ QString PIconView::prevFileName(bool &isDir)const{ IconViewItem* it = static_cast<IconViewItem*>( _it ); isDir = it->isDir(); - m_view->setCurrentItem(_it); return it->path(); } @@ -480,7 +478,8 @@ void PIconView::slotShowNext() bool isDir = false; QString name = nextFileName(isDir); - if (isDir) return; if (name.isEmpty()) return; - odebug << "Show next: " << name << oendl; + if (isDir) return; + /* if we got a name we have a next item */ + m_view->setCurrentItem(m_view->currentItem()->nextItem()); slotShowImage(name); } @@ -490,6 +489,8 @@ void PIconView::slotShowPrev() bool isDir = false; QString name = prevFileName(isDir); - if (isDir) return; if (name.isEmpty()) return; + if (isDir) return; + /* if we got a name we have a prev item */ + m_view->setCurrentItem(m_view->currentItem()->prevItem()); slotShowImage(name); } diff --git a/noncore/graphics/opie-eye/gui/imageview.cpp b/noncore/graphics/opie-eye/gui/imageview.cpp index aa2b9bc..fbc4494 100644 --- a/noncore/graphics/opie-eye/gui/imageview.cpp +++ b/noncore/graphics/opie-eye/gui/imageview.cpp @@ -44,4 +44,6 @@ void ImageView::initKeys() lst.append( Opie::Core::OKeyPair::leftArrowKey() ); lst.append( Opie::Core::OKeyPair::rightArrowKey() ); + lst.append( Opie::Core::OKeyPair(Qt::Key_N,0)); + lst.append( Opie::Core::OKeyPair(Qt::Key_P,0)); m_viewManager = new Opie::Core::OKeyConfigManager(m_cfg, "image_view_keys", diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp index 57be247..6f3f255 100644 --- a/noncore/graphics/opie-eye/gui/mainwindow.cpp +++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp @@ -65,14 +65,14 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) m_stack->forceMode(Opie::Ui::OWidgetStack::NoForce); - QToolButton *btn = new QToolButton( bar ); - btn->setIconSet( Resource::loadIconSet( "up" ) ); - connect( btn, SIGNAL(clicked()), + upButton = new QToolButton( bar ); + upButton->setIconSet( Resource::loadIconSet( "up" ) ); + connect( upButton, SIGNAL(clicked()), m_view, SLOT(slotDirUp()) ); - btn = new PFileSystem( bar ); - connect( btn, SIGNAL( changeDir( const QString& ) ), + fsButton = new PFileSystem( bar ); + connect( fsButton, SIGNAL( changeDir( const QString& ) ), m_view, SLOT(slotChangeDir( const QString& ) ) ); - btn = new QToolButton( bar ); + QToolButton*btn = new QToolButton( bar ); btn->setIconSet( Resource::loadIconSet( "edit" ) ); connect( btn, SIGNAL(clicked()), @@ -92,6 +92,6 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) - btn = new ViewModeButton( bar ); - connect( btn, SIGNAL(changeMode(int)), + viewModeButton = new ViewModeButton( bar ); + connect( viewModeButton, SIGNAL(changeMode(int)), m_view, SLOT(slotChangeMode(int))); @@ -101,4 +101,16 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) this, SLOT(slotConfig() ) ); + + + prevButton = new QToolButton(bar); + prevButton->setIconSet( Resource::loadIconSet( "back" ) ); + connect(prevButton,SIGNAL(clicked()),m_view,SLOT(slotShowPrev())); + prevButton->hide(); + + nextButton = new QToolButton(bar); + nextButton->setIconSet( Resource::loadIconSet( "forward" ) ); + connect(nextButton,SIGNAL(clicked()),m_view,SLOT(slotShowNext())); + nextButton->hide(); + rotateButton = new QToolButton(bar); rotateButton->setIconSet( Resource::loadIconSet( "rotate" ) ); @@ -285,4 +297,9 @@ void PMainWindow::slotShowInfo( const QString& inf ) { } m_info->setPath( inf ); + prevButton->hide(); + nextButton->hide(); + upButton->hide(); + fsButton->hide(); + viewModeButton->hide(); m_stack->raiseWidget( ImageInfo ); } @@ -293,4 +310,9 @@ void PMainWindow::slotDisplay( const QString& inf ) { } m_disp->setImage( inf ); + prevButton->show(); + nextButton->show(); + upButton->hide(); + fsButton->hide(); + viewModeButton->hide(); m_stack->raiseWidget( ImageDisplay ); } @@ -317,4 +339,9 @@ void PMainWindow::closeEvent( QCloseEvent* ev ) { void PMainWindow::raiseIconView() { + prevButton->hide(); + nextButton->hide(); + upButton->show(); + fsButton->show(); + viewModeButton->show(); m_stack->raiseWidget( IconView ); } diff --git a/noncore/graphics/opie-eye/gui/mainwindow.h b/noncore/graphics/opie-eye/gui/mainwindow.h index adb5dc2..1967ef7 100644 --- a/noncore/graphics/opie-eye/gui/mainwindow.h +++ b/noncore/graphics/opie-eye/gui/mainwindow.h @@ -64,6 +64,6 @@ private: bool autoScale; bool zoomerOn; - QToolButton*rotateButton; - + QToolButton*rotateButton,*upButton,*fsButton,*viewModeButton; + QToolButton*nextButton,*prevButton; private slots: |