author | alwin <alwin> | 2004-04-16 00:54:42 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-04-16 00:54:42 (UTC) |
commit | 7c29eeaecc8301fb500851382b3d94092ae72719 (patch) (unidiff) | |
tree | aa93d419a5b5752f080a6dc66afd5d8a3ec4ace0 /noncore/graphics/opie-eye/gui | |
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 | |||
280 | IconViewItem* it = static_cast<IconViewItem*>( _it ); | 280 | IconViewItem* it = static_cast<IconViewItem*>( _it ); |
281 | isDir = it->isDir(); | 281 | isDir = it->isDir(); |
282 | m_view->setCurrentItem(_it); | ||
283 | return it->path(); | 282 | return it->path(); |
284 | } | 283 | } |
@@ -294,5 +293,4 @@ QString PIconView::prevFileName(bool &isDir)const{ | |||
294 | IconViewItem* it = static_cast<IconViewItem*>( _it ); | 293 | IconViewItem* it = static_cast<IconViewItem*>( _it ); |
295 | isDir = it->isDir(); | 294 | isDir = it->isDir(); |
296 | m_view->setCurrentItem(_it); | ||
297 | return it->path(); | 295 | return it->path(); |
298 | } | 296 | } |
@@ -480,7 +478,8 @@ void PIconView::slotShowNext() | |||
480 | bool isDir = false; | 478 | bool isDir = false; |
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); |
486 | } | 485 | } |
@@ -490,6 +489,8 @@ void PIconView::slotShowPrev() | |||
490 | bool isDir = false; | 489 | bool isDir = false; |
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); |
495 | } | 496 | } |
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() | |||
44 | lst.append( Opie::Core::OKeyPair::leftArrowKey() ); | 44 | lst.append( Opie::Core::OKeyPair::leftArrowKey() ); |
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 | ||
47 | m_viewManager = new Opie::Core::OKeyConfigManager(m_cfg, "image_view_keys", | 49 | 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) | |||
65 | m_stack->forceMode(Opie::Ui::OWidgetStack::NoForce); | 65 | m_stack->forceMode(Opie::Ui::OWidgetStack::NoForce); |
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" ) ); |
78 | connect( btn, SIGNAL(clicked()), | 78 | connect( btn, SIGNAL(clicked()), |
@@ -92,6 +92,6 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) | |||
92 | 92 | ||
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))); |
97 | 97 | ||
@@ -101,4 +101,16 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) | |||
101 | this, SLOT(slotConfig() ) ); | 101 | this, SLOT(slotConfig() ) ); |
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); |
104 | rotateButton->setIconSet( Resource::loadIconSet( "rotate" ) ); | 116 | rotateButton->setIconSet( Resource::loadIconSet( "rotate" ) ); |
@@ -285,4 +297,9 @@ void PMainWindow::slotShowInfo( const QString& inf ) { | |||
285 | } | 297 | } |
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 ); |
288 | } | 305 | } |
@@ -293,4 +310,9 @@ void PMainWindow::slotDisplay( const QString& inf ) { | |||
293 | } | 310 | } |
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 ); |
296 | } | 318 | } |
@@ -317,4 +339,9 @@ void PMainWindow::closeEvent( QCloseEvent* ev ) { | |||
317 | 339 | ||
318 | void PMainWindow::raiseIconView() { | 340 | void 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 ); |
320 | } | 347 | } |
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: | |||
64 | bool autoScale; | 64 | bool autoScale; |
65 | bool zoomerOn; | 65 | bool zoomerOn; |
66 | QToolButton*rotateButton; | 66 | QToolButton*rotateButton,*upButton,*fsButton,*viewModeButton; |
67 | 67 | QToolButton*nextButton,*prevButton; | |
68 | 68 | ||
69 | private slots: | 69 | private slots: |