| -rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.cpp | 23 | ||||
| -rw-r--r-- | noncore/graphics/opie-eye/phunk_view.pro | 8 |
2 files changed, 23 insertions, 8 deletions
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp index dd9cced..f63b5a1 100644 --- a/noncore/graphics/opie-eye/gui/mainwindow.cpp +++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp @@ -10,4 +10,5 @@ #include "imageview.h" +#if 0 #include "viewmodebutton.h" - +#endif #include <iface/ifaceinfo.h> @@ -64,2 +65,4 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) + m_stack->forceMode(Opie::Ui::OWidgetStack::NoForce); + QToolButton *btn = new QToolButton( bar ); @@ -90,2 +93,3 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) +#if 0 btn = new ViewModeButton( bar ); @@ -93,3 +97,3 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) m_view, SLOT(slotChangeMode(int))); - +#endif btn = new QToolButton( bar ); @@ -102,5 +106,13 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) rotateButton->setToggleButton(true); - rotateButton->setOn(true); + + odebug << "Mode = " << m_stack->mode() << oendl; + if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) { + rotateButton->setOn(true); + autoRotate = true; + } else { + rotateButton->setOn(false); + autoRotate = false; + } + connect(rotateButton,SIGNAL(toggled(bool)),this,SLOT(slotRotateToggled(bool))); - autoRotate = true; @@ -250,2 +262,5 @@ void PMainWindow::initDisp() { if (m_disp) { + if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) { + m_disp->setMinimumSize(QApplication::desktop()->size()/2); + } m_disp->setAutoScale(autoScale); diff --git a/noncore/graphics/opie-eye/phunk_view.pro b/noncore/graphics/opie-eye/phunk_view.pro index e9459ad..0aa7e14 100644 --- a/noncore/graphics/opie-eye/phunk_view.pro +++ b/noncore/graphics/opie-eye/phunk_view.pro @@ -14,4 +14,4 @@ HEADERS = gui/iconview.h gui/filesystem.h gui/mainwindow.h \ gui/imageview.h \ - lib/oimagezoomer.h \ - gui/viewmodebutton.h + lib/oimagezoomer.h #\ +# gui/viewmodebutton.h @@ -27,4 +27,4 @@ SOURCES = gui/iconview.cpp gui/filesystem.cpp gui/mainwindow.cpp \ gui/imageview.cpp \ - lib/oimagezoomer.cpp \ - gui/viewmodebutton.cpp + lib/oimagezoomer.cpp #\ +# gui/viewmodebutton.cpp # A list of source files |