summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/graphics/opie-eye/gui/gui.pro6
-rw-r--r--noncore/graphics/opie-eye/gui/iconview.cpp3
-rw-r--r--noncore/graphics/opie-eye/gui/mainwindow.cpp19
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
@@ -2,14 +2,16 @@ 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
@@ -684,9 +684,10 @@ void PIconView::slotStartSlide() {
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;
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
@@ -8,8 +8,9 @@
#include "iconview.h"
#include "filesystem.h"
#include "imageinfoui.h"
#include "viewmodebutton.h"
+#include "basesetup.h"
#include <iface/ifaceinfo.h>
#include <iface/dirview.h>
@@ -68,8 +69,9 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
/* setup menu and toolbar */
setupActions();
setupToolbar();
setupMenu();
+ m_aHideToolbar->setOn(m_cfg->readBoolEntry("base_showtoolbar",true));
}
PMainWindow::~PMainWindow() {
}
@@ -139,8 +141,12 @@ void PMainWindow::slotConfig() {
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;
@@ -195,8 +201,9 @@ void PMainWindow::slotConfig() {
keyWid->save();
m_disp->manager()->save();
m_info->manager()->save();
m_view->manager()->save();
+ bSetup->save_values();
}
delete keyWid;
}
@@ -267,10 +274,18 @@ void PMainWindow::slotFullScreenToggled(bool current)
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);