summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/graphics/opie-eye/gui/iconview.cpp45
-rw-r--r--noncore/graphics/opie-eye/gui/mainwindow.cpp4
-rw-r--r--noncore/graphics/opie-eye/gui/viewmodebutton.cpp4
-rw-r--r--noncore/graphics/opie-eye/gui/viewmodebutton.h2
4 files changed, 30 insertions, 25 deletions
diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp
index d546b64..660c4fa 100644
--- a/noncore/graphics/opie-eye/gui/iconview.cpp
+++ b/noncore/graphics/opie-eye/gui/iconview.cpp
@@ -161,31 +161,32 @@ PIconView::PIconView( QWidget* wid, Opie::Core::OConfig* cfg )
161 161
162 m_views = new QComboBox( hbox, "View As" ); 162 m_views = new QComboBox( hbox, "View As" );
163 connect( m_views, SIGNAL(activated(int)), 163 connect( m_views, SIGNAL(activated(int)),
164 this, SLOT(slotViewChanged(int)) ); 164 this, SLOT(slotViewChanged(int)) );
165 165
166 m_view= new QIconView( this ); 166 m_view= new QIconView( this );
167 connect(m_view, SIGNAL(clicked(QIconViewItem*) ), 167 connect(m_view, SIGNAL(clicked(QIconViewItem*) ),
168 this, SLOT(slotClicked(QIconViewItem*)) ); 168 this, SLOT(slotClicked(QIconViewItem*)) );
169 connect(m_view, SIGNAL(returnPressed(QIconViewItem*)), 169 connect(m_view, SIGNAL(returnPressed(QIconViewItem*)),
170 this, SLOT(slotClicked(QIconViewItem*)) ); 170 this, SLOT(slotClicked(QIconViewItem*)) );
171 171
172 m_view->setArrangement( QIconView::LeftToRight ); 172 m_view->setArrangement( QIconView::LeftToRight );
173 m_view->setItemTextPos( QIconView::Right );
174 173
175 int dw = QApplication::desktop()->width(); 174 m_mode = cfg->readNumEntry("ListViewMode", 1);
176 int viewerWidth = dw-style().scrollBarExtent().width();
177 m_view->setGridX( viewerWidth-3*m_view->spacing());
178 m_view->setGridY( fontMetrics().height()*2+40 );
179 175
176 if (m_mode < 1 || m_mode>3) m_mode = 1;
177
178 m_view->setItemTextPos( QIconView::Right );
179
180 calculateGrid();
180 181
181 initKeys(); 182 initKeys();
182 183
183 loadViews(); 184 loadViews();
184 slotViewChanged( m_views->currentItem() ); 185 slotViewChanged( m_views->currentItem() );
185} 186}
186 187
187/* 188/*
188 * Unref the slave and save the keyboard manager 189 * Unref the slave and save the keyboard manager
189 */ 190 */
190PIconView::~PIconView() { 191PIconView::~PIconView() {
191 { 192 {
@@ -556,59 +557,61 @@ void PIconView::slotImageInfo() {
556 slotImageInfo( name ); 557 slotImageInfo( name );
557} 558}
558 559
559void PIconView::slotImageInfo( const QString& name) { 560void PIconView::slotImageInfo( const QString& name) {
560 emit sig_showInfo( name ); 561 emit sig_showInfo( name );
561} 562}
562 563
563 564
564void PIconView::slotChangeMode( int mode ) { 565void PIconView::slotChangeMode( int mode ) {
565 if ( mode >= 1 && mode <= 3 ) 566 if ( mode >= 1 && mode <= 3 )
566 m_mode = mode; 567 m_mode = mode;
567 568
568 QIconView::ItemTextPos pos; 569 m_cfg->writeEntry("ListViewMode", m_mode);
569 switch( m_mode ) {
570 case 2:
571 pos = QIconView::Bottom;
572 break;
573 case 3:
574 case 1:
575 default:
576 pos = QIconView::Right;
577 break;
578 }
579 m_view->setItemTextPos( pos );
580
581 calculateGrid(); 570 calculateGrid();
582 slotReloadDir(); 571 slotReloadDir();
583} 572}
584 573
585 574
586void PIconView::resizeEvent( QResizeEvent* re ) { 575void PIconView::resizeEvent( QResizeEvent* re ) {
587 QVBox::resizeEvent( re ); 576 QVBox::resizeEvent( re );
588 calculateGrid(); 577 calculateGrid();
589} 578}
590 579
591 580
592void PIconView::calculateGrid() { 581void PIconView::calculateGrid() {
593 odebug << "Calc grid: x=" << m_view->gridX() << " y=" << m_view->gridY() << oendl; 582 odebug << "Calc grid: x=" << m_view->gridX() << " y=" << m_view->gridY() << oendl;
594 odebug << "Size of view: " << m_view->size() << oendl; 583 odebug << "Size of view: " << m_view->size() << oendl;
584 int dw = QApplication::desktop()->width();
585 int viewerWidth = dw-style().scrollBarExtent().width();
595 586
587 QIconView::ItemTextPos pos;
588 switch( m_mode ) {
589 case 2:
590 pos = QIconView::Bottom;
591 break;
592 case 3:
593 case 1:
594 default:
595 pos = QIconView::Right;
596 break;
597 }
598 m_view->setItemTextPos( pos );
596 switch (m_mode) { 599 switch (m_mode) {
597 case 2: 600 case 2:
598 m_view->setGridX(50); 601 m_view->setGridX(50);
599 m_view->setGridY(20); 602 m_view->setGridY(20);
600 PPixmapCache::self()->setMaxImages(40); 603 PPixmapCache::self()->setMaxImages(40);
601 break; 604 break;
602 case 3: 605 case 3:
603 m_view->setGridX(m_view->width()); 606 m_view->setGridX( fontMetrics().width("testimage.jpg")+20);
604 m_view->setGridY(8); 607 m_view->setGridY(8);
605 PPixmapCache::self()->setMaxImages(2); 608 PPixmapCache::self()->setMaxImages(2);
606 break; 609 break;
607 case 1: 610 case 1:
608 default: 611 default:
609 m_view->setGridX(m_view->width()); 612 m_view->setGridX( viewerWidth-3*m_view->spacing());
610 m_view->setGridY(80); 613 m_view->setGridY( fontMetrics().height()*2+40 );
611 PPixmapCache::self()->setMaxImages(20); 614 PPixmapCache::self()->setMaxImages(20);
612 break; 615 break;
613 } 616 }
614} 617}
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp
index ef6e6df..a90231b 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.cpp
+++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp
@@ -82,25 +82,27 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
82 btn = new QToolButton( bar ); 82 btn = new QToolButton( bar );
83 btn->setIconSet( Resource::loadIconSet( "beam" ) ); 83 btn->setIconSet( Resource::loadIconSet( "beam" ) );
84 connect( btn, SIGNAL(clicked()), 84 connect( btn, SIGNAL(clicked()),
85 m_view, SLOT(slotBeam()) ); 85 m_view, SLOT(slotBeam()) );
86 } 86 }
87 87
88 btn = new QToolButton( bar ); 88 btn = new QToolButton( bar );
89 btn->setIconSet( Resource::loadIconSet( "trash" ) ); 89 btn->setIconSet( Resource::loadIconSet( "trash" ) );
90 connect( btn, SIGNAL(clicked() ), 90 connect( btn, SIGNAL(clicked() ),
91 m_view, SLOT(slotTrash() ) ); 91 m_view, SLOT(slotTrash() ) );
92 92
93 93
94 viewModeButton = new ViewModeButton( bar ); 94 int mode = m_cfg->readNumEntry("ListViewMode", 1);
95 if (mode < 1 || mode>3) mode = 1;
96 viewModeButton = new ViewModeButton( bar,mode );
95 connect( viewModeButton, SIGNAL(changeMode(int)), 97 connect( viewModeButton, SIGNAL(changeMode(int)),
96 m_view, SLOT(slotChangeMode(int))); 98 m_view, SLOT(slotChangeMode(int)));
97 99
98 btn = new QToolButton( bar ); 100 btn = new QToolButton( bar );
99 btn->setIconSet( Resource::loadIconSet( "SettingsIcon" ) ); 101 btn->setIconSet( Resource::loadIconSet( "SettingsIcon" ) );
100 connect( btn, SIGNAL(clicked() ), 102 connect( btn, SIGNAL(clicked() ),
101 this, SLOT(slotConfig() ) ); 103 this, SLOT(slotConfig() ) );
102 104
103 105
104 106
105 prevButton = new QToolButton(bar); 107 prevButton = new QToolButton(bar);
106 prevButton->setIconSet( Resource::loadIconSet( "back" ) ); 108 prevButton->setIconSet( Resource::loadIconSet( "back" ) );
diff --git a/noncore/graphics/opie-eye/gui/viewmodebutton.cpp b/noncore/graphics/opie-eye/gui/viewmodebutton.cpp
index 0e4a7cb..36e5dcf 100644
--- a/noncore/graphics/opie-eye/gui/viewmodebutton.cpp
+++ b/noncore/graphics/opie-eye/gui/viewmodebutton.cpp
@@ -1,23 +1,23 @@
1#include "viewmodebutton.h" 1#include "viewmodebutton.h"
2 2
3#include <opie2/odebug.h> 3#include <opie2/odebug.h>
4 4
5#include <qtoolbar.h> 5#include <qtoolbar.h>
6#include <qpopupmenu.h> 6#include <qpopupmenu.h>
7 7
8ViewModeButton::ViewModeButton( QToolBar* bar ) 8ViewModeButton::ViewModeButton( QToolBar* bar,int def )
9 : QToolButton( bar ) 9 : QToolButton( bar )
10{ 10{
11 slotChange( 1 ); 11 slotChange( def );
12 QPopupMenu *pop= new QPopupMenu( this ); 12 QPopupMenu *pop= new QPopupMenu( this );
13 pop->setCheckable( true ); 13 pop->setCheckable( true );
14 pop->insertItem( tr("Thumbnail and Imageinfo"), 1 ); 14 pop->insertItem( tr("Thumbnail and Imageinfo"), 1 );
15 pop->insertItem( tr("Thumbnail and Name" ), 2 ); 15 pop->insertItem( tr("Thumbnail and Name" ), 2 );
16 pop->insertItem( tr("Name Only" ), 3 ); 16 pop->insertItem( tr("Name Only" ), 3 );
17 connect(pop, SIGNAL(activated(int)), 17 connect(pop, SIGNAL(activated(int)),
18 this, SIGNAL(changeMode(int)) ); 18 this, SIGNAL(changeMode(int)) );
19 connect(pop, SIGNAL(activated(int)), 19 connect(pop, SIGNAL(activated(int)),
20 this, SLOT(slotChange(int)) ); 20 this, SLOT(slotChange(int)) );
21 21
22 22
23 setPopup( pop ); 23 setPopup( pop );
diff --git a/noncore/graphics/opie-eye/gui/viewmodebutton.h b/noncore/graphics/opie-eye/gui/viewmodebutton.h
index 3247114..48f0e67 100644
--- a/noncore/graphics/opie-eye/gui/viewmodebutton.h
+++ b/noncore/graphics/opie-eye/gui/viewmodebutton.h
@@ -4,22 +4,22 @@
4 */ 4 */
5 5
6#ifndef PHUNK_VIEW_MODE_BUTTON_H 6#ifndef PHUNK_VIEW_MODE_BUTTON_H
7#define PHUNK_VIEW_MODE_BUTTON_H 7#define PHUNK_VIEW_MODE_BUTTON_H
8 8
9#include <qpe/resource.h> 9#include <qpe/resource.h>
10 10
11#include <qtoolbutton.h> 11#include <qtoolbutton.h>
12 12
13class ViewModeButton : public QToolButton { 13class ViewModeButton : public QToolButton {
14 Q_OBJECT 14 Q_OBJECT
15public: 15public:
16 ViewModeButton( QToolBar* ); 16 ViewModeButton( QToolBar*,int def=1 );
17 ~ViewModeButton(); 17 ~ViewModeButton();
18 18
19signals: 19signals:
20 void changeMode( int ); 20 void changeMode( int );
21private slots: 21private slots:
22 void slotChange( int i ); 22 void slotChange( int i );
23}; 23};
24 24
25#endif 25#endif