1 files changed, 17 insertions, 2 deletions

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 @@
 #include "imageinfoui.h"
 #include "viewmodebutton.h"
+#include "basesetup.h"
 
 #include <iface/ifaceinfo.h>
@@ -70,4 +71,5 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
     setupToolbar();
     setupMenu();
+    m_aHideToolbar->setOn(m_cfg->readBoolEntry("base_showtoolbar",true));
 }
 
@@ -141,4 +143,8 @@ void PMainWindow::slotConfig() {
     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();
@@ -197,4 +203,5 @@ void PMainWindow::slotConfig() {
         m_info->manager()->save();
         m_view->manager()->save();
+        bSetup->save_values();
     }
     delete keyWid;
@@ -269,6 +276,14 @@ void PMainWindow::slotFullScreenToggled(bool current)
         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);