-rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.cpp | 21 |
1 files changed, 18 insertions, 3 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 | |||
@@ -5,14 +5,15 @@ | |||
5 | #include "mainwindow.h" | 5 | #include "mainwindow.h" |
6 | 6 | ||
7 | #include "iconview.h" | 7 | #include "iconview.h" |
8 | #include "filesystem.h" | 8 | #include "filesystem.h" |
9 | #include "imageinfoui.h" | 9 | #include "imageinfoui.h" |
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> |
14 | #include <iface/dirview.h> | 15 | #include <iface/dirview.h> |
15 | 16 | ||
16 | #include <opie2/odebug.h> | 17 | #include <opie2/odebug.h> |
17 | #include <opie2/owidgetstack.h> | 18 | #include <opie2/owidgetstack.h> |
18 | #include <opie2/oapplicationfactory.h> | 19 | #include <opie2/oapplicationfactory.h> |
@@ -59,12 +60,14 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) | |||
59 | m_stack->raiseWidget( IconView ); | 60 | m_stack->raiseWidget( IconView ); |
60 | connect(m_view, SIGNAL(sig_display(const QString&)), | 61 | connect(m_view, SIGNAL(sig_display(const QString&)), |
61 | this, SLOT(slotDisplay(const QString&))); | 62 | this, SLOT(slotDisplay(const QString&))); |
62 | connect(m_view, SIGNAL(sig_showInfo(const QString&)), | 63 | connect(m_view, SIGNAL(sig_showInfo(const QString&)), |
63 | this, SLOT(slotShowInfo(const QString&)) ); | 64 | this, SLOT(slotShowInfo(const QString&)) ); |
64 | 65 | ||
66 | m_stack->forceMode(Opie::Ui::OWidgetStack::NoForce); | ||
67 | |||
65 | QToolButton *btn = new QToolButton( bar ); | 68 | QToolButton *btn = new QToolButton( bar ); |
66 | btn->setIconSet( Resource::loadIconSet( "up" ) ); | 69 | btn->setIconSet( Resource::loadIconSet( "up" ) ); |
67 | connect( btn, SIGNAL(clicked()), | 70 | connect( btn, SIGNAL(clicked()), |
68 | m_view, SLOT(slotDirUp()) ); | 71 | m_view, SLOT(slotDirUp()) ); |
69 | 72 | ||
70 | btn = new PFileSystem( bar ); | 73 | btn = new PFileSystem( bar ); |
@@ -85,27 +88,36 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) | |||
85 | 88 | ||
86 | btn = new QToolButton( bar ); | 89 | btn = new QToolButton( bar ); |
87 | btn->setIconSet( Resource::loadIconSet( "trash" ) ); | 90 | btn->setIconSet( Resource::loadIconSet( "trash" ) ); |
88 | connect( btn, SIGNAL(clicked() ), | 91 | connect( btn, SIGNAL(clicked() ), |
89 | m_view, SLOT(slotTrash() ) ); | 92 | m_view, SLOT(slotTrash() ) ); |
90 | 93 | ||
94 | #if 0 | ||
91 | btn = new ViewModeButton( bar ); | 95 | btn = new ViewModeButton( bar ); |
92 | connect( btn, SIGNAL(changeMode(int)), | 96 | connect( btn, SIGNAL(changeMode(int)), |
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 ); |
96 | btn->setIconSet( Resource::loadIconSet( "SettingsIcon" ) ); | 100 | btn->setIconSet( Resource::loadIconSet( "SettingsIcon" ) ); |
97 | connect( btn, SIGNAL(clicked() ), | 101 | connect( btn, SIGNAL(clicked() ), |
98 | this, SLOT(slotConfig() ) ); | 102 | this, SLOT(slotConfig() ) ); |
99 | 103 | ||
100 | rotateButton = new QToolButton(bar); | 104 | rotateButton = new QToolButton(bar); |
101 | rotateButton->setIconSet( Resource::loadIconSet( "rotate" ) ); | 105 | rotateButton->setIconSet( Resource::loadIconSet( "rotate" ) ); |
102 | rotateButton->setToggleButton(true); | 106 | rotateButton->setToggleButton(true); |
107 | |||
108 | odebug << "Mode = " << m_stack->mode() << oendl; | ||
109 | if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) { | ||
103 | rotateButton->setOn(true); | 110 | rotateButton->setOn(true); |
104 | connect(rotateButton,SIGNAL(toggled(bool)),this,SLOT(slotRotateToggled(bool))); | ||
105 | autoRotate = true; | 111 | autoRotate = true; |
112 | } else { | ||
113 | rotateButton->setOn(false); | ||
114 | autoRotate = false; | ||
115 | } | ||
116 | |||
117 | connect(rotateButton,SIGNAL(toggled(bool)),this,SLOT(slotRotateToggled(bool))); | ||
106 | 118 | ||
107 | btn = new QToolButton(bar); | 119 | btn = new QToolButton(bar); |
108 | btn->setIconSet( Resource::loadIconSet( "1to1" ) ); | 120 | btn->setIconSet( Resource::loadIconSet( "1to1" ) ); |
109 | btn->setToggleButton(true); | 121 | btn->setToggleButton(true); |
110 | btn->setOn(false); | 122 | btn->setOn(false); |
111 | connect(btn,SIGNAL(toggled(bool)),this,SLOT(slotScaleToggled(bool))); | 123 | connect(btn,SIGNAL(toggled(bool)),this,SLOT(slotScaleToggled(bool))); |
@@ -245,12 +257,15 @@ void PMainWindow::initInfo() { | |||
245 | initT<imageinfo>( "Image Info", &m_info, ImageInfo ); | 257 | initT<imageinfo>( "Image Info", &m_info, ImageInfo ); |
246 | connect(m_info,SIGNAL(dispImage(const QString&)),this,SLOT(slotDisplay(const QString&))); | 258 | connect(m_info,SIGNAL(dispImage(const QString&)),this,SLOT(slotDisplay(const QString&))); |
247 | } | 259 | } |
248 | void PMainWindow::initDisp() { | 260 | void PMainWindow::initDisp() { |
249 | initT<ImageView>( "Image ScrollView", &m_disp, ImageDisplay ); | 261 | initT<ImageView>( "Image ScrollView", &m_disp, ImageDisplay ); |
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); |
252 | m_disp->setAutoRotate(autoRotate); | 267 | m_disp->setAutoRotate(autoRotate); |
253 | m_disp->setShowZoomer(zoomerOn); | 268 | m_disp->setShowZoomer(zoomerOn); |
254 | connect(m_disp,SIGNAL(dispImageInfo(const QString&)),this,SLOT(slotShowInfo(const QString&))); | 269 | connect(m_disp,SIGNAL(dispImageInfo(const QString&)),this,SLOT(slotShowInfo(const QString&))); |
255 | } | 270 | } |
256 | } | 271 | } |