-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 | 15 |
3 files changed, 21 insertions, 3 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 | |||
@@ -4,5 +4,6 @@ HEADERS += gui/filesystem.h \ | |||
4 | gui/imageview.h \ | 4 | gui/imageview.h \ |
5 | gui/mainwindow.h \ | 5 | gui/mainwindow.h \ |
6 | gui/viewmodebutton.h | 6 | gui/viewmodebutton.h \ |
7 | gui/basesetup.h | ||
7 | 8 | ||
8 | SOURCES += gui/filesystem.cpp \ | 9 | SOURCES += gui/filesystem.cpp \ |
@@ -11,5 +12,6 @@ SOURCES += gui/filesystem.cpp \ | |||
11 | gui/imageview.cpp \ | 12 | gui/imageview.cpp \ |
12 | gui/mainwindow.cpp \ | 13 | gui/mainwindow.cpp \ |
13 | gui/viewmodebutton.cpp | 14 | gui/viewmodebutton.cpp \ |
15 | gui/basesetup.cpp | ||
14 | 16 | ||
15 | 17 | ||
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 | |||
@@ -686,5 +686,6 @@ void PIconView::slotStartSlide() { | |||
686 | slotShowImage( name ); | 686 | slotShowImage( name ); |
687 | } | 687 | } |
688 | emit sig_startslide(2); | 688 | int t = m_cfg->readNumEntry("base_slideshowtimeout", 2); |
689 | emit sig_startslide(t); | ||
689 | } | 690 | } |
690 | 691 | ||
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 | |||
@@ -10,4 +10,5 @@ | |||
10 | #include "imageinfoui.h" | 10 | #include "imageinfoui.h" |
11 | #include "viewmodebutton.h" | 11 | #include "viewmodebutton.h" |
12 | #include "basesetup.h" | ||
12 | 13 | ||
13 | #include <iface/ifaceinfo.h> | 14 | #include <iface/ifaceinfo.h> |
@@ -70,4 +71,5 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) | |||
70 | setupToolbar(); | 71 | setupToolbar(); |
71 | setupMenu(); | 72 | setupMenu(); |
73 | m_aHideToolbar->setOn(m_cfg->readBoolEntry("base_showtoolbar",true)); | ||
72 | } | 74 | } |
73 | 75 | ||
@@ -141,4 +143,8 @@ void PMainWindow::slotConfig() { | |||
141 | Opie::Ui::OTabWidget *wid = new Opie::Ui::OTabWidget(&dlg ); | 143 | Opie::Ui::OTabWidget *wid = new Opie::Ui::OTabWidget(&dlg ); |
142 | lay->addWidget( wid ); | 144 | lay->addWidget( wid ); |
145 | |||
146 | BaseSetup*bSetup = new BaseSetup(m_cfg,wid); | ||
147 | wid->addTab(bSetup,"SettingsIcon","Basics setup"); | ||
148 | |||
143 | ViewMap *vM = viewMap(); | 149 | ViewMap *vM = viewMap(); |
144 | ViewMap::Iterator _it = vM->begin(); | 150 | ViewMap::Iterator _it = vM->begin(); |
@@ -197,4 +203,5 @@ void PMainWindow::slotConfig() { | |||
197 | m_info->manager()->save(); | 203 | m_info->manager()->save(); |
198 | m_view->manager()->save(); | 204 | m_view->manager()->save(); |
205 | bSetup->save_values(); | ||
199 | } | 206 | } |
200 | delete keyWid; | 207 | delete keyWid; |
@@ -269,6 +276,14 @@ void PMainWindow::slotFullScreenToggled(bool current) | |||
269 | setUpdatesEnabled(false); | 276 | setUpdatesEnabled(false); |
270 | odebug << "window" << oendl; | 277 | odebug << "window" << oendl; |
278 | if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) { | ||
279 | m_disp->setMinimumSize(QApplication::desktop()->size()/2); | ||
280 | } else { | ||
271 | m_disp->setMinimumSize(10,10); | 281 | m_disp->setMinimumSize(10,10); |
282 | } | ||
283 | if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) { | ||
284 | m_disp->reparent(0,QPoint(50,50)); | ||
285 | } else { | ||
272 | m_disp->reparent(0,QPoint(0,0)); | 286 | m_disp->reparent(0,QPoint(0,0)); |
287 | } | ||
273 | m_disp->setBackgroundColor(white); | 288 | m_disp->setBackgroundColor(white); |
274 | m_stack->addWidget(m_disp,ImageDisplay); | 289 | m_stack->addWidget(m_disp,ImageDisplay); |