summaryrefslogtreecommitdiff
path: root/noncore/graphics/opie-eye/gui
authorzecke <zecke>2004-08-27 22:22:44 (UTC)
committer zecke <zecke>2004-08-27 22:22:44 (UTC)
commit7d1ca5dba4cab829d9f7a8c79fb772dc3b643eac (patch) (unidiff)
tree1d189e90585190465233a67c7c9a2a740cb1d98a /noncore/graphics/opie-eye/gui
parenta6e7ebcee38719a9f33ede08ed4c8a364c2ecb20 (diff)
downloadopie-7d1ca5dba4cab829d9f7a8c79fb772dc3b643eac.zip
opie-7d1ca5dba4cab829d9f7a8c79fb772dc3b643eac.tar.gz
opie-7d1ca5dba4cab829d9f7a8c79fb772dc3b643eac.tar.bz2
-Removal of debug messages
-Cleanups of .pro files -Cleanups of source code And finally the long awaited DigiCam (dcim) Backend
Diffstat (limited to 'noncore/graphics/opie-eye/gui') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/graphics/opie-eye/gui/gui.pro15
-rw-r--r--noncore/graphics/opie-eye/gui/iconview.cpp23
2 files changed, 28 insertions, 10 deletions
diff --git a/noncore/graphics/opie-eye/gui/gui.pro b/noncore/graphics/opie-eye/gui/gui.pro
new file mode 100644
index 0000000..b9f0bf8
--- a/dev/null
+++ b/noncore/graphics/opie-eye/gui/gui.pro
@@ -0,0 +1,15 @@
1HEADERS += gui/filesystem.h \
2 gui/iconview.h \
3 gui/imageinfoui.h \
4 gui/imageview.h \
5 gui/mainwindow.h \
6 gui/viewmodebutton.h
7
8SOURCES += gui/filesystem.cpp \
9 gui/iconview.cpp \
10 gui/imageinfoui.cpp \
11 gui/imageview.cpp \
12 gui/mainwindow.cpp \
13 gui/viewmodebutton.cpp
14
15
diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp
index 652acc9..7196aba 100644
--- a/noncore/graphics/opie-eye/gui/iconview.cpp
+++ b/noncore/graphics/opie-eye/gui/iconview.cpp
@@ -41,7 +41,6 @@ using Opie::Core::OKeyConfigItem;
41namespace { 41namespace {
42 static QPixmap* _dirPix = 0; 42 static QPixmap* _dirPix = 0;
43 static QPixmap* _unkPix = 0; 43 static QPixmap* _unkPix = 0;
44 static QPixmap* _picPix = 0;
45 static QPixmap* _emptyPix = 0; 44 static QPixmap* _emptyPix = 0;
46 class IconViewItem : public QIconViewItem { 45 class IconViewItem : public QIconViewItem {
47 public: 46 public:
@@ -98,12 +97,12 @@ namespace {
98 _unkPix = new QPixmap( Resource::loadPixmap( "UnknownDocument" ) ); 97 _unkPix = new QPixmap( Resource::loadPixmap( "UnknownDocument" ) );
99 } 98 }
100 99
101 inline void IconViewItem::setPixmap( const QPixmap & icon, bool recalc, bool redraw) 100 inline void IconViewItem::setPixmap( const QPixmap & , bool, bool )
102 { 101 {
103 m_Pixset = true; 102 m_Pixset = true;
104 calcRect(text()); 103 calcRect(text());
105 } 104 }
106 inline void IconViewItem::setPixmap( const QPixmap & icon) 105 inline void IconViewItem::setPixmap( const QPixmap & )
107 { 106 {
108 m_Pixset = true; 107 m_Pixset = true;
109 calcRect(text()); 108 calcRect(text());
@@ -253,10 +252,7 @@ void PIconView::initKeys() {
253 */ 252 */
254void PIconView::slotDirUp() 253void PIconView::slotDirUp()
255{ 254{
256 if (m_path.isEmpty()) return; 255 slotChangeDir( currentView()->dirLister()->dirUp( m_path ) );
257 QDir dir( m_path );
258 dir.cdUp();
259 slotChangeDir( dir.absPath() );
260} 256}
261 257
262/* 258/*
@@ -379,11 +375,17 @@ void PIconView::slotViewChanged( int i) {
379 if (cur) delete cur; 375 if (cur) delete cur;
380 QString str = m_views->text(i); 376 QString str = m_views->text(i);
381 ViewMap* map = viewMap(); 377 ViewMap* map = viewMap();
382 if (!map) {setCurrentView(0l); return;} 378 if (!map) {
379 setCurrentView(0l);
380 return;
381 }
382
383 if (map->find(str) == map->end()) { 383 if (map->find(str) == map->end()) {
384 owarn << "Key not found" << oendl; 384 owarn << "Key not found" << oendl;
385 setCurrentView(0l); return; 385 setCurrentView(0l);
386 return;
386 } 387 }
388
387 m_cfg->writeEntry("LastView",str); 389 m_cfg->writeEntry("LastView",str);
388 m_cfg->write(); 390 m_cfg->write();
389 cur = (*(*map)[str])(*m_cfg); 391 cur = (*(*map)[str])(*m_cfg);
@@ -401,7 +403,8 @@ void PIconView::slotViewChanged( int i) {
401 this, SLOT(slotEnd()) ); 403 this, SLOT(slotEnd()) );
402 404
403 405
404 /* reload now */ 406 /* reload now with default Path*/
407 m_path = lis->defaultPath();
405 QTimer::singleShot( 0, this, SLOT(slotReloadDir())); 408 QTimer::singleShot( 0, this, SLOT(slotReloadDir()));
406} 409}
407 410