summaryrefslogtreecommitdiff
authoralwin <alwin>2004-04-14 08:25:56 (UTC)
committer alwin <alwin>2004-04-14 08:25:56 (UTC)
commit3ed50198400e432b308ca58178f562e2e256de0e (patch) (unidiff)
tree309807f0fcd25684a32c74e742089755553e9c11
parent79558e549b0ce1fa17fe79fc437859d137ad821f (diff)
downloadopie-3ed50198400e432b308ca58178f562e2e256de0e.zip
opie-3ed50198400e432b308ca58178f562e2e256de0e.tar.gz
opie-3ed50198400e432b308ca58178f562e2e256de0e.tar.bz2
in BigScreen mode the imagedisplay will get a minimum size half of the screen
Zecke: I had to deactivate your viewbuttons 'cause you forgot to add the files for it ;)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/graphics/opie-eye/gui/mainwindow.cpp23
-rw-r--r--noncore/graphics/opie-eye/phunk_view.pro8
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 @@
10#include "imageview.h" 10#include "imageview.h"
11#if 0
11#include "viewmodebutton.h" 12#include "viewmodebutton.h"
12 13#endif
13#include <iface/ifaceinfo.h> 14#include <iface/ifaceinfo.h>
@@ -64,2 +65,4 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
64 65
66 m_stack->forceMode(Opie::Ui::OWidgetStack::NoForce);
67
65 QToolButton *btn = new QToolButton( bar ); 68 QToolButton *btn = new QToolButton( bar );
@@ -90,2 +93,3 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
90 93
94#if 0
91 btn = new ViewModeButton( bar ); 95 btn = new ViewModeButton( bar );
@@ -93,3 +97,3 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
93 m_view, SLOT(slotChangeMode(int))); 97 m_view, SLOT(slotChangeMode(int)));
94 98#endif
95 btn = new QToolButton( bar ); 99 btn = new QToolButton( bar );
@@ -102,5 +106,13 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
102 rotateButton->setToggleButton(true); 106 rotateButton->setToggleButton(true);
103 rotateButton->setOn(true); 107
108 odebug << "Mode = " << m_stack->mode() << oendl;
109 if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) {
110 rotateButton->setOn(true);
111 autoRotate = true;
112 } else {
113 rotateButton->setOn(false);
114 autoRotate = false;
115 }
116
104 connect(rotateButton,SIGNAL(toggled(bool)),this,SLOT(slotRotateToggled(bool))); 117 connect(rotateButton,SIGNAL(toggled(bool)),this,SLOT(slotRotateToggled(bool)));
105 autoRotate = true;
106 118
@@ -250,2 +262,5 @@ void PMainWindow::initDisp() {
250 if (m_disp) { 262 if (m_disp) {
263 if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) {
264 m_disp->setMinimumSize(QApplication::desktop()->size()/2);
265 }
251 m_disp->setAutoScale(autoScale); 266 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 \
14 gui/imageview.h \ 14 gui/imageview.h \
15 lib/oimagezoomer.h \ 15 lib/oimagezoomer.h #\
16 gui/viewmodebutton.h 16 # gui/viewmodebutton.h
17 17
@@ -27,4 +27,4 @@ SOURCES = gui/iconview.cpp gui/filesystem.cpp gui/mainwindow.cpp \
27 gui/imageview.cpp \ 27 gui/imageview.cpp \
28 lib/oimagezoomer.cpp \ 28 lib/oimagezoomer.cpp #\
29 gui/viewmodebutton.cpp 29 # gui/viewmodebutton.cpp
30# A list of source files 30# A list of source files