-rw-r--r-- | noncore/graphics/opie-eye/gui/iconview.cpp | 8 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/iconview.h | 1 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.cpp | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp index 7c8c88d..eafff1d 100644 --- a/noncore/graphics/opie-eye/gui/iconview.cpp +++ b/noncore/graphics/opie-eye/gui/iconview.cpp @@ -155,2 +155,3 @@ PIconView::PIconView( QWidget* wid, Opie::Core::OConfig* cfg ) m_mode = 0; + m_internalReset = false; @@ -365,3 +366,5 @@ void PIconView::loadViews() { void PIconView::resetView() { + m_internalReset = true; slotViewChanged(m_views->currentItem()); + m_internalReset = false; } @@ -409,3 +412,6 @@ void PIconView::slotViewChanged( int i) { - /* reload now with default Path*/ + /* reload now with default Path + * but only if it isn't a reset like from setupdlg + */ + if (!m_internalReset) m_path = lis->defaultPath(); diff --git a/noncore/graphics/opie-eye/gui/iconview.h b/noncore/graphics/opie-eye/gui/iconview.h index dff55ed..bea35c2 100644 --- a/noncore/graphics/opie-eye/gui/iconview.h +++ b/noncore/graphics/opie-eye/gui/iconview.h @@ -97,2 +97,3 @@ private: int m_mode; + bool m_internalReset:1; }; diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp index 6660eb2..30c9bf1 100644 --- a/noncore/graphics/opie-eye/gui/mainwindow.cpp +++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp @@ -175,2 +175,3 @@ void PMainWindow::slotConfig() { initInfo(); + m_info->hide(); } @@ -182,2 +183,3 @@ void PMainWindow::slotConfig() { initDisp(); + m_disp->hide(); } |