| -rw-r--r-- | noncore/graphics/opie-eye/gui/gui.pro | 6 | ||||
| -rw-r--r-- | noncore/graphics/opie-eye/gui/iconview.cpp | 3 | ||||
| -rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.cpp | 19 |
3 files changed, 23 insertions, 5 deletions
diff --git a/noncore/graphics/opie-eye/gui/gui.pro b/noncore/graphics/opie-eye/gui/gui.pro index b9f0bf8..2759dd5 100644 --- a/noncore/graphics/opie-eye/gui/gui.pro +++ b/noncore/graphics/opie-eye/gui/gui.pro @@ -1,15 +1,17 @@ HEADERS += gui/filesystem.h \ gui/iconview.h \ gui/imageinfoui.h \ gui/imageview.h \ gui/mainwindow.h \ - gui/viewmodebutton.h + gui/viewmodebutton.h \ + gui/basesetup.h SOURCES += gui/filesystem.cpp \ gui/iconview.cpp \ gui/imageinfoui.cpp \ gui/imageview.cpp \ gui/mainwindow.cpp \ - gui/viewmodebutton.cpp + gui/viewmodebutton.cpp \ + gui/basesetup.cpp diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp index a41ce9f..7c8c88d 100644 --- a/noncore/graphics/opie-eye/gui/iconview.cpp +++ b/noncore/graphics/opie-eye/gui/iconview.cpp @@ -682,13 +682,14 @@ void PIconView::slotStartSlide() { if (isDir) { if (!slotShowFirst()) return; } else { slotShowImage( name ); } - emit sig_startslide(2); + int t = m_cfg->readNumEntry("base_slideshowtimeout", 2); + emit sig_startslide(t); } void PIconView::slotImageInfo() { bool isDir = false; QString name = currentFileName(isDir); if (isDir) return; diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp index e714e84..570ee45 100644 --- a/noncore/graphics/opie-eye/gui/mainwindow.cpp +++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp @@ -6,12 +6,13 @@ #include "imageview.h" #include "iconview.h" #include "filesystem.h" #include "imageinfoui.h" #include "viewmodebutton.h" +#include "basesetup.h" #include <iface/ifaceinfo.h> #include <iface/dirview.h> #include <opie2/odebug.h> #include <opie2/owidgetstack.h> @@ -66,12 +67,13 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) listviewMenu = 0; /* setup menu and toolbar */ setupActions(); setupToolbar(); setupMenu(); + m_aHideToolbar->setOn(m_cfg->readBoolEntry("base_showtoolbar",true)); } PMainWindow::~PMainWindow() { } void PMainWindow::slotToggleZoomer() @@ -137,12 +139,16 @@ void PMainWindow::slotConfig() { QDialog dlg(this, 0, true); dlg.setCaption( tr("Phunk View - Config" ) ); QHBoxLayout *lay = new QHBoxLayout(&dlg); Opie::Ui::OTabWidget *wid = new Opie::Ui::OTabWidget(&dlg ); lay->addWidget( wid ); + + BaseSetup*bSetup = new BaseSetup(m_cfg,wid); + wid->addTab(bSetup,"SettingsIcon","Basics setup"); + ViewMap *vM = viewMap(); ViewMap::Iterator _it = vM->begin(); QMap<PDirView*, QWidget*> lst; for( ; _it != vM->end(); ++_it ) { PDirView *view = (_it.data())(*m_cfg); @@ -193,12 +199,13 @@ void PMainWindow::slotConfig() { if ( act ) { m_view->resetView(); keyWid->save(); m_disp->manager()->save(); m_info->manager()->save(); m_view->manager()->save(); + bSetup->save_values(); } delete keyWid; } /* * create a new image info component @@ -265,14 +272,22 @@ void PMainWindow::slotFullScreenToggled(bool current) m_disp->setVScrollBarMode(QScrollView::AlwaysOff); m_disp->setHScrollBarMode(QScrollView::AlwaysOff); m_disp->resize(qApp->desktop()->width(), qApp->desktop()->height()); } else { setUpdatesEnabled(false); odebug << "window" << oendl; - m_disp->setMinimumSize(10,10); - m_disp->reparent(0,QPoint(0,0)); + if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) { + m_disp->setMinimumSize(QApplication::desktop()->size()/2); + } else { + m_disp->setMinimumSize(10,10); + } + if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) { + m_disp->reparent(0,QPoint(50,50)); + } else { + m_disp->reparent(0,QPoint(0,0)); + } m_disp->setBackgroundColor(white); m_stack->addWidget(m_disp,ImageDisplay); m_disp->setVScrollBarMode(QScrollView::Auto); m_disp->setHScrollBarMode(QScrollView::Auto); m_stack->raiseWidget(m_disp); if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) { |