summaryrefslogtreecommitdiff
authoralwin <alwin>2004-04-16 00:54:42 (UTC)
committer alwin <alwin>2004-04-16 00:54:42 (UTC)
commit7c29eeaecc8301fb500851382b3d94092ae72719 (patch) (side-by-side diff)
treeaa93d419a5b5752f080a6dc66afd5d8a3ec4ace0
parentde3d551d3b07617653c01e540ee3c6262a2cd595 (diff)
downloadopie-7c29eeaecc8301fb500851382b3d94092ae72719.zip
opie-7c29eeaecc8301fb500851382b3d94092ae72719.tar.gz
opie-7c29eeaecc8301fb500851382b3d94092ae72719.tar.bz2
not all buttons will showed in every view, small beauties
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/graphics/opie-eye/gui/iconview.cpp11
-rw-r--r--noncore/graphics/opie-eye/gui/imageview.cpp2
-rw-r--r--noncore/graphics/opie-eye/gui/mainwindow.cpp43
-rw-r--r--noncore/graphics/opie-eye/gui/mainwindow.h4
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
@@ -281,3 +281,2 @@ QString PIconView::nextFileName(bool &isDir)const
isDir = it->isDir();
- m_view->setCurrentItem(_it);
return it->path();
@@ -295,3 +294,2 @@ QString PIconView::prevFileName(bool &isDir)const{
isDir = it->isDir();
- m_view->setCurrentItem(_it);
return it->path();
@@ -481,5 +479,6 @@ void PIconView::slotShowNext()
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);
@@ -491,4 +490,6 @@ void PIconView::slotShowPrev()
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
@@ -45,2 +45,4 @@ void ImageView::initKeys()
lst.append( Opie::Core::OKeyPair::rightArrowKey() );
+ lst.append( Opie::Core::OKeyPair(Qt::Key_N,0));
+ lst.append( Opie::Core::OKeyPair(Qt::Key_P,0));
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
@@ -66,12 +66,12 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
- 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" ) );
@@ -93,4 +93,4 @@ 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)));
@@ -102,2 +102,14 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
+
+
+ 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);
@@ -286,2 +298,7 @@ void PMainWindow::slotShowInfo( const QString& inf ) {
m_info->setPath( inf );
+ prevButton->hide();
+ nextButton->hide();
+ upButton->hide();
+ fsButton->hide();
+ viewModeButton->hide();
m_stack->raiseWidget( ImageInfo );
@@ -294,2 +311,7 @@ void PMainWindow::slotDisplay( const QString& inf ) {
m_disp->setImage( inf );
+ prevButton->show();
+ nextButton->show();
+ upButton->hide();
+ fsButton->hide();
+ viewModeButton->hide();
m_stack->raiseWidget( ImageDisplay );
@@ -318,2 +340,7 @@ 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
@@ -65,4 +65,4 @@ private:
bool zoomerOn;
- QToolButton*rotateButton;
-
+ QToolButton*rotateButton,*upButton,*fsButton,*viewModeButton;
+ QToolButton*nextButton,*prevButton;