summaryrefslogtreecommitdiff
Unidiff
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
281 isDir = it->isDir(); 281 isDir = it->isDir();
282 m_view->setCurrentItem(_it);
283 return it->path(); 282 return it->path();
@@ -295,3 +294,2 @@ QString PIconView::prevFileName(bool &isDir)const{
295 isDir = it->isDir(); 294 isDir = it->isDir();
296 m_view->setCurrentItem(_it);
297 return it->path(); 295 return it->path();
@@ -481,5 +479,6 @@ void PIconView::slotShowNext()
481 QString name = nextFileName(isDir); 479 QString name = nextFileName(isDir);
482 if (isDir) return;
483 if (name.isEmpty()) return; 480 if (name.isEmpty()) return;
484 odebug << "Show next: " << name << oendl; 481 if (isDir) return;
482 /* if we got a name we have a next item */
483 m_view->setCurrentItem(m_view->currentItem()->nextItem());
485 slotShowImage(name); 484 slotShowImage(name);
@@ -491,4 +490,6 @@ void PIconView::slotShowPrev()
491 QString name = prevFileName(isDir); 490 QString name = prevFileName(isDir);
492 if (isDir) return;
493 if (name.isEmpty()) return; 491 if (name.isEmpty()) return;
492 if (isDir) return;
493 /* if we got a name we have a prev item */
494 m_view->setCurrentItem(m_view->currentItem()->prevItem());
494 slotShowImage(name); 495 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()
45 lst.append( Opie::Core::OKeyPair::rightArrowKey() ); 45 lst.append( Opie::Core::OKeyPair::rightArrowKey() );
46 lst.append( Opie::Core::OKeyPair(Qt::Key_N,0));
47 lst.append( Opie::Core::OKeyPair(Qt::Key_P,0));
46 48
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)
66 66
67 QToolButton *btn = new QToolButton( bar ); 67 upButton = new QToolButton( bar );
68 btn->setIconSet( Resource::loadIconSet( "up" ) ); 68 upButton->setIconSet( Resource::loadIconSet( "up" ) );
69 connect( btn, SIGNAL(clicked()), 69 connect( upButton, SIGNAL(clicked()),
70 m_view, SLOT(slotDirUp()) ); 70 m_view, SLOT(slotDirUp()) );
71 71
72 btn = new PFileSystem( bar ); 72 fsButton = new PFileSystem( bar );
73 connect( btn, SIGNAL( changeDir( const QString& ) ), 73 connect( fsButton, SIGNAL( changeDir( const QString& ) ),
74 m_view, SLOT(slotChangeDir( const QString& ) ) ); 74 m_view, SLOT(slotChangeDir( const QString& ) ) );
75 75
76 btn = new QToolButton( bar ); 76 QToolButton*btn = new QToolButton( bar );
77 btn->setIconSet( Resource::loadIconSet( "edit" ) ); 77 btn->setIconSet( Resource::loadIconSet( "edit" ) );
@@ -93,4 +93,4 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
93 93
94 btn = new ViewModeButton( bar ); 94 viewModeButton = new ViewModeButton( bar );
95 connect( btn, SIGNAL(changeMode(int)), 95 connect( viewModeButton, SIGNAL(changeMode(int)),
96 m_view, SLOT(slotChangeMode(int))); 96 m_view, SLOT(slotChangeMode(int)));
@@ -102,2 +102,14 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
102 102
103
104
105 prevButton = new QToolButton(bar);
106 prevButton->setIconSet( Resource::loadIconSet( "back" ) );
107 connect(prevButton,SIGNAL(clicked()),m_view,SLOT(slotShowPrev()));
108 prevButton->hide();
109
110 nextButton = new QToolButton(bar);
111 nextButton->setIconSet( Resource::loadIconSet( "forward" ) );
112 connect(nextButton,SIGNAL(clicked()),m_view,SLOT(slotShowNext()));
113 nextButton->hide();
114
103 rotateButton = new QToolButton(bar); 115 rotateButton = new QToolButton(bar);
@@ -286,2 +298,7 @@ void PMainWindow::slotShowInfo( const QString& inf ) {
286 m_info->setPath( inf ); 298 m_info->setPath( inf );
299 prevButton->hide();
300 nextButton->hide();
301 upButton->hide();
302 fsButton->hide();
303 viewModeButton->hide();
287 m_stack->raiseWidget( ImageInfo ); 304 m_stack->raiseWidget( ImageInfo );
@@ -294,2 +311,7 @@ void PMainWindow::slotDisplay( const QString& inf ) {
294 m_disp->setImage( inf ); 311 m_disp->setImage( inf );
312 prevButton->show();
313 nextButton->show();
314 upButton->hide();
315 fsButton->hide();
316 viewModeButton->hide();
295 m_stack->raiseWidget( ImageDisplay ); 317 m_stack->raiseWidget( ImageDisplay );
@@ -318,2 +340,7 @@ void PMainWindow::closeEvent( QCloseEvent* ev ) {
318void PMainWindow::raiseIconView() { 340void PMainWindow::raiseIconView() {
341 prevButton->hide();
342 nextButton->hide();
343 upButton->show();
344 fsButton->show();
345 viewModeButton->show();
319 m_stack->raiseWidget( IconView ); 346 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:
65 bool zoomerOn; 65 bool zoomerOn;
66 QToolButton*rotateButton; 66 QToolButton*rotateButton,*upButton,*fsButton,*viewModeButton;
67 67 QToolButton*nextButton,*prevButton;
68 68