summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/graphics/opie-eye/gui/mainwindow.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp
index 295f93f..7570ee3 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.cpp
+++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp
@@ -1,733 +1,733 @@
1/* 1/*
2 * GPLv2 zecke@handhelds.org 2 * GPLv2 zecke@handhelds.org
3 * No WArranty... 3 * No WArranty...
4 */ 4 */
5#include "mainwindow.h" 5#include "mainwindow.h"
6#include "imageview.h" 6#include "imageview.h"
7 7
8#include "iconview.h" 8#include "iconview.h"
9#include "filesystem.h" 9#include "filesystem.h"
10#include "imageinfoui.h" 10#include "imageinfoui.h"
11#include "viewmodebutton.h" 11#include "viewmodebutton.h"
12#include "basesetup.h" 12#include "basesetup.h"
13 13
14#include <iface/ifaceinfo.h> 14#include <iface/ifaceinfo.h>
15#include <iface/dirview.h> 15#include <iface/dirview.h>
16 16
17#include <opie2/odebug.h> 17#include <opie2/odebug.h>
18#include <opie2/owidgetstack.h> 18#include <opie2/owidgetstack.h>
19#include <opie2/oapplicationfactory.h> 19#include <opie2/oapplicationfactory.h>
20#include <opie2/otabwidget.h> 20#include <opie2/otabwidget.h>
21#include <opie2/okeyconfigwidget.h> 21#include <opie2/okeyconfigwidget.h>
22 22
23#include <qpe/resource.h> 23#include <qpe/resource.h>
24#include <qpe/config.h> 24#include <qpe/config.h>
25#include <qpe/ir.h> 25#include <qpe/ir.h>
26#include <qpe/storage.h> 26#include <qpe/storage.h>
27#include <qpe/applnk.h> 27#include <qpe/applnk.h>
28 28
29#include <qtoolbar.h> 29#include <qtoolbar.h>
30#include <qtoolbutton.h> 30#include <qtoolbutton.h>
31#include <qlayout.h> 31#include <qlayout.h>
32#include <qdialog.h> 32#include <qdialog.h>
33#include <qmap.h> 33#include <qmap.h>
34#include <qtimer.h> 34#include <qtimer.h>
35#include <qframe.h> 35#include <qframe.h>
36#include <qmenubar.h> 36#include <qmenubar.h>
37#include <qaction.h> 37#include <qaction.h>
38 38
39//OPIE_EXPORT_APP_V2( Opie::Core::OApplicationFactory<PMainWindow>,"Opie Eye" ) 39//OPIE_EXPORT_APP_V2( Opie::Core::OApplicationFactory<PMainWindow>,"Opie Eye" )
40OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<PMainWindow>) 40OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<PMainWindow>)
41 41
42PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) 42PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
43 : QMainWindow( wid, name, style ), m_info( 0 ), m_disp( 0 ) 43 : QMainWindow( wid, name, style ), m_info( 0 ), m_disp( 0 )
44{ 44{
45 setCaption( QObject::tr("Opie Eye Caramba" ) ); 45 setCaption( QObject::tr("Opie Eye" ) );
46 m_cfg = new Opie::Core::OConfig("opie-eye"); 46 m_cfg = new Opie::Core::OConfig("opie-eye");
47 m_cfg->setGroup("main" ); 47 m_cfg->setGroup("main" );
48 readConfig(); 48 readConfig();
49 m_setDocCalled = false; 49 m_setDocCalled = false;
50 m_polishDone = false; 50 m_polishDone = false;
51 51
52 m_storage = new StorageInfo(); 52 m_storage = new StorageInfo();
53 connect(m_storage, SIGNAL(disksChanged() ), 53 connect(m_storage, SIGNAL(disksChanged() ),
54 this, SLOT( dirChanged() ) ); 54 this, SLOT( dirChanged() ) );
55 55
56 m_stack = new Opie::Ui::OWidgetStack( this ); 56 m_stack = new Opie::Ui::OWidgetStack( this );
57 setCentralWidget( m_stack ); 57 setCentralWidget( m_stack );
58 58
59 m_view = new PIconView( m_stack, m_cfg ); 59 m_view = new PIconView( m_stack, m_cfg );
60 m_stack->addWidget( m_view, IconView ); 60 m_stack->addWidget( m_view, IconView );
61 m_stack->raiseWidget( IconView ); 61 m_stack->raiseWidget( IconView );
62 62
63 connect(m_view, SIGNAL(sig_display(const QString&)), 63 connect(m_view, SIGNAL(sig_display(const QString&)),
64 this, SLOT(slotDisplay(const QString&))); 64 this, SLOT(slotDisplay(const QString&)));
65 connect(m_view, SIGNAL(sig_showInfo(const QString&)), 65 connect(m_view, SIGNAL(sig_showInfo(const QString&)),
66 this, SLOT(slotShowInfo(const QString&)) ); 66 this, SLOT(slotShowInfo(const QString&)) );
67 connect(this,SIGNAL(changeListMode(int)),m_view,SLOT(slotChangeMode(int))); 67 connect(this,SIGNAL(changeListMode(int)),m_view,SLOT(slotChangeMode(int)));
68 68
69 m_stack->forceMode(Opie::Ui::OWidgetStack::NoForce); 69 m_stack->forceMode(Opie::Ui::OWidgetStack::NoForce);
70 70
71 listviewMenu = 0; 71 listviewMenu = 0;
72 /* setup menu and toolbar */ 72 /* setup menu and toolbar */
73 setupActions(); 73 setupActions();
74 setupToolbar(); 74 setupToolbar();
75 setupMenu(); 75 setupMenu();
76 m_aHideToolbar->setOn(m_cfg->readBoolEntry("showtoolbar",true)); 76 m_aHideToolbar->setOn(m_cfg->readBoolEntry("showtoolbar",true));
77 m_aAutoRotate->setEnabled(!m_aUnscaled->isOn()); 77 m_aAutoRotate->setEnabled(!m_aUnscaled->isOn());
78 odebug << "mainwindow constructor done" << oendl; 78 odebug << "mainwindow constructor done" << oendl;
79} 79}
80 80
81PMainWindow::~PMainWindow() { 81PMainWindow::~PMainWindow() {
82} 82}
83 83
84void PMainWindow::slotToggleZoomer() 84void PMainWindow::slotToggleZoomer()
85{ 85{
86 m_aZoomer->setOn(!m_aZoomer->isOn()); 86 m_aZoomer->setOn(!m_aZoomer->isOn());
87} 87}
88 88
89void PMainWindow::slotZoomerToggled(bool how) 89void PMainWindow::slotZoomerToggled(bool how)
90{ 90{
91 if (m_disp) { 91 if (m_disp) {
92 m_disp->setShowZoomer(how); 92 m_disp->setShowZoomer(how);
93 } 93 }
94 if (autoSave) { 94 if (autoSave) {
95 m_cfg->writeEntry("zoomeron",how); 95 m_cfg->writeEntry("zoomeron",how);
96 } 96 }
97} 97}
98 98
99void PMainWindow::slotToggleAutorotate() 99void PMainWindow::slotToggleAutorotate()
100{ 100{
101 if (!m_aAutoRotate->isEnabled()) return; 101 if (!m_aAutoRotate->isEnabled()) return;
102 m_aAutoRotate->setOn(!m_aAutoRotate->isOn()); 102 m_aAutoRotate->setOn(!m_aAutoRotate->isOn());
103} 103}
104 104
105void PMainWindow::slotToggleAutoscale() 105void PMainWindow::slotToggleAutoscale()
106{ 106{
107 m_aUnscaled->setOn(!m_aUnscaled->isOn()); 107 m_aUnscaled->setOn(!m_aUnscaled->isOn());
108} 108}
109 109
110void PMainWindow::slotRotateToggled(bool how) 110void PMainWindow::slotRotateToggled(bool how)
111{ 111{
112 if (autoSave) { 112 if (autoSave) {
113 m_cfg->writeEntry("autorotate",how); 113 m_cfg->writeEntry("autorotate",how);
114 } 114 }
115 if (m_disp) { 115 if (m_disp) {
116 m_disp->setAutoScaleRotate(!m_aUnscaled->isOn(),how); 116 m_disp->setAutoScaleRotate(!m_aUnscaled->isOn(),how);
117 } 117 }
118} 118}
119 119
120void PMainWindow::slotScaleToggled(bool how) 120void PMainWindow::slotScaleToggled(bool how)
121{ 121{
122 if (autoSave) { 122 if (autoSave) {
123 m_cfg->writeEntry("unscaled",how); 123 m_cfg->writeEntry("unscaled",how);
124 } 124 }
125 odebug << "Unscaled: " << m_aUnscaled->isOn() << oendl; 125 odebug << "Unscaled: " << m_aUnscaled->isOn() << oendl;
126 odebug << "How: " << how << oendl; 126 odebug << "How: " << how << oendl;
127 if (how) { 127 if (how) {
128 m_aAutoRotate->setOn(false); 128 m_aAutoRotate->setOn(false);
129 } 129 }
130 if (m_disp) { 130 if (m_disp) {
131 m_disp->setAutoScaleRotate(!m_aUnscaled->isOn(),m_aAutoRotate->isOn()); 131 m_disp->setAutoScaleRotate(!m_aUnscaled->isOn(),m_aAutoRotate->isOn());
132 } 132 }
133 m_aAutoRotate->setEnabled(!how); 133 m_aAutoRotate->setEnabled(!how);
134 odebug << "Autorotate: " << m_aAutoRotate->isOn() << oendl; 134 odebug << "Autorotate: " << m_aAutoRotate->isOn() << oendl;
135} 135}
136 136
137void PMainWindow::slotConfig() { 137void PMainWindow::slotConfig() {
138 /* 138 /*
139 * have a tab with the possible views 139 * have a tab with the possible views
140 * a tab for globals image cache size.. scaled loading 140 * a tab for globals image cache size.. scaled loading
141 * and one tab for the KeyConfigs 141 * and one tab for the KeyConfigs
142 */ 142 */
143 QDialog dlg(this, 0, true); 143 QDialog dlg(this, 0, true);
144 dlg.setCaption( tr("Opie Eye - Config" ) ); 144 dlg.setCaption( tr("Opie Eye - Config" ) );
145 145
146 QHBoxLayout *lay = new QHBoxLayout(&dlg); 146 QHBoxLayout *lay = new QHBoxLayout(&dlg);
147 Opie::Ui::OTabWidget *wid = new Opie::Ui::OTabWidget(&dlg ); 147 Opie::Ui::OTabWidget *wid = new Opie::Ui::OTabWidget(&dlg );
148 lay->addWidget( wid ); 148 lay->addWidget( wid );
149 149
150 BaseSetup*bSetup = new BaseSetup(m_cfg,wid); 150 BaseSetup*bSetup = new BaseSetup(m_cfg,wid);
151 wid->addTab(bSetup,"SettingsIcon","Basics setup"); 151 wid->addTab(bSetup,"SettingsIcon","Basics setup");
152 152
153 ViewMap *vM = viewMap(); 153 ViewMap *vM = viewMap();
154 ViewMap::Iterator _it = vM->begin(); 154 ViewMap::Iterator _it = vM->begin();
155 QMap<PDirView*, QWidget*> lst; 155 QMap<PDirView*, QWidget*> lst;
156 156
157 for( ; _it != vM->end(); ++_it ) { 157 for( ; _it != vM->end(); ++_it ) {
158 PDirView *view = (_it.data())(*m_cfg); 158 PDirView *view = (_it.data())(*m_cfg);
159 PInterfaceInfo *inf = view->interfaceInfo(); 159 PInterfaceInfo *inf = view->interfaceInfo();
160 QWidget *_wid = inf->configWidget( *m_cfg ); 160 QWidget *_wid = inf->configWidget( *m_cfg );
161 if (!_wid) continue; 161 if (!_wid) continue;
162 _wid->reparent(wid, QPoint() ); 162 _wid->reparent(wid, QPoint() );
163 lst.insert( view, _wid ); 163 lst.insert( view, _wid );
164 wid->addTab( _wid, "fileopen", inf->name() ); 164 wid->addTab( _wid, "fileopen", inf->name() );
165 } 165 }
166 166
167/* 167/*
168 * Add the KeyConfigWidget 168 * Add the KeyConfigWidget
169 */ 169 */
170 Opie::Ui::OKeyConfigWidget* keyWid = new Opie::Ui::OKeyConfigWidget( wid, "key config" ); 170 Opie::Ui::OKeyConfigWidget* keyWid = new Opie::Ui::OKeyConfigWidget( wid, "key config" );
171 keyWid->setChangeMode( Opie::Ui::OKeyConfigWidget::Queue ); 171 keyWid->setChangeMode( Opie::Ui::OKeyConfigWidget::Queue );
172 keyWid->insert( tr("Browser Keyboard Actions"), m_view->manager() ); 172 keyWid->insert( tr("Browser Keyboard Actions"), m_view->manager() );
173 QWidget*w = m_stack->visibleWidget(); 173 QWidget*w = m_stack->visibleWidget();
174 174
175 bool reminfo = false; 175 bool reminfo = false;
176 if ( !m_info ) { 176 if ( !m_info ) {
177 reminfo = true; 177 reminfo = true;
178 initInfo(); 178 initInfo();
179 m_info->hide(); 179 m_info->hide();
180 } 180 }
181 keyWid->insert( tr("Imageinfo Keyboard Actions"), m_info->manager() ); 181 keyWid->insert( tr("Imageinfo Keyboard Actions"), m_info->manager() );
182 182
183 bool remdisp = false; 183 bool remdisp = false;
184 if ( !m_disp ) { 184 if ( !m_disp ) {
185 remdisp = true; 185 remdisp = true;
186 initDisp(); 186 initDisp();
187 m_disp->hide(); 187 m_disp->hide();
188 } 188 }
189 keyWid->insert( tr("Imageview Keyboard Actions"), m_disp->manager() ); 189 keyWid->insert( tr("Imageview Keyboard Actions"), m_disp->manager() );
190 190
191 keyWid->load(); 191 keyWid->load();
192 wid->addTab( keyWid, QString::fromLatin1("AppsIcon" ), tr("Keyboard Configuration") ); 192 wid->addTab( keyWid, QString::fromLatin1("AppsIcon" ), tr("Keyboard Configuration") );
193 wid->setCurrentTab(0); 193 wid->setCurrentTab(0);
194 bool act = ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted ); 194 bool act = ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted );
195 195
196/* 196/*
197 * clean up 197 * clean up
198 *apply changes 198 *apply changes
199 */ 199 */
200 200
201 QMap<PDirView*, QWidget*>::Iterator it; 201 QMap<PDirView*, QWidget*>::Iterator it;
202 for ( it = lst.begin(); it != lst.end(); ++it ) { 202 for ( it = lst.begin(); it != lst.end(); ++it ) {
203 if ( act ) 203 if ( act )
204 it.key()->interfaceInfo()->writeConfig(it.data(), *m_cfg); 204 it.key()->interfaceInfo()->writeConfig(it.data(), *m_cfg);
205 delete it.key(); 205 delete it.key();
206 } 206 }
207 207
208 208
209 if ( act ) { 209 if ( act ) {
210 keyWid->save(); 210 keyWid->save();
211 m_disp->manager()->save(); 211 m_disp->manager()->save();
212 m_info->manager()->save(); 212 m_info->manager()->save();
213 m_view->manager()->save(); 213 m_view->manager()->save();
214 bSetup->save_values(); 214 bSetup->save_values();
215 m_view->resetView(); 215 m_view->resetView();
216 readConfig(); 216 readConfig();
217 } 217 }
218 delete keyWid; 218 delete keyWid;
219 219
220 m_stack->raiseWidget(w); 220 m_stack->raiseWidget(w);
221 if (remdisp) { 221 if (remdisp) {
222 m_disp->hide(); 222 m_disp->hide();
223 } 223 }
224 if (reminfo) { 224 if (reminfo) {
225 m_info->hide(); 225 m_info->hide();
226 } 226 }
227} 227}
228 228
229/* 229/*
230 * create a new image info component 230 * create a new image info component
231 * and detach the current one 231 * and detach the current one
232 * we will make the other delete on exit 232 * we will make the other delete on exit
233 */ 233 */
234template<class T> 234template<class T>
235void PMainWindow::initT( const char* name, T** ptr, int id) { 235void PMainWindow::initT( const char* name, T** ptr, int id) {
236 if ( *ptr ) { 236 if ( *ptr ) {
237 (*ptr)->disconnect(this, SLOT(slotReturn())); 237 (*ptr)->disconnect(this, SLOT(slotReturn()));
238 (*ptr)->setDestructiveClose(); 238 (*ptr)->setDestructiveClose();
239 m_stack->removeWidget( *ptr ); 239 m_stack->removeWidget( *ptr );
240 } 240 }
241 *ptr = new T(m_cfg, m_stack, name ); 241 *ptr = new T(m_cfg, m_stack, name );
242 m_stack->addWidget( *ptr, id ); 242 m_stack->addWidget( *ptr, id );
243 243
244 connect(*ptr, SIGNAL(sig_return()), 244 connect(*ptr, SIGNAL(sig_return()),
245 this,SLOT(slotReturn())); 245 this,SLOT(slotReturn()));
246 246
247} 247}
248 248
249void PMainWindow::initInfo() { 249void PMainWindow::initInfo() {
250 initT<imageinfo>( "Image Info", &m_info, ImageInfo ); 250 initT<imageinfo>( "Image Info", &m_info, ImageInfo );
251 connect(m_info,SIGNAL(dispImage(const QString&)),this,SLOT(slotDisplay(const QString&))); 251 connect(m_info,SIGNAL(dispImage(const QString&)),this,SLOT(slotDisplay(const QString&)));
252} 252}
253 253
254void PMainWindow::initDisp() { 254void PMainWindow::initDisp() {
255 initT<ImageView>( "Image ScrollView", &m_disp, ImageDisplay ); 255 initT<ImageView>( "Image ScrollView", &m_disp, ImageDisplay );
256 if (m_disp) { 256 if (m_disp) {
257 if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) { 257 if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) {
258 m_disp->setMinimumSize(QApplication::desktop()->size()/2); 258 m_disp->setMinimumSize(QApplication::desktop()->size()/2);
259 } 259 }
260 m_disp->setMenuActions(m_hGroup,m_gPrevNext,m_gDisplayType); 260 m_disp->setMenuActions(m_hGroup,m_gPrevNext,m_gDisplayType);
261 m_disp->setAutoScale(!m_aUnscaled->isOn()); 261 m_disp->setAutoScale(!m_aUnscaled->isOn());
262 m_disp->setAutoRotate(m_aAutoRotate->isOn()); 262 m_disp->setAutoRotate(m_aAutoRotate->isOn());
263 m_disp->setShowZoomer(m_aZoomer->isOn()); 263 m_disp->setShowZoomer(m_aZoomer->isOn());
264 m_disp->setBackgroundColor(white); 264 m_disp->setBackgroundColor(white);
265 connect(m_disp,SIGNAL(dispImageInfo(const QString&)),this,SLOT(slotShowInfo(const QString&))); 265 connect(m_disp,SIGNAL(dispImageInfo(const QString&)),this,SLOT(slotShowInfo(const QString&)));
266 connect(m_disp,SIGNAL(dispNext()),m_view,SLOT(slotShowNext())); 266 connect(m_disp,SIGNAL(dispNext()),m_view,SLOT(slotShowNext()));
267 connect(m_disp,SIGNAL(dispPrev()),m_view,SLOT(slotShowPrev())); 267 connect(m_disp,SIGNAL(dispPrev()),m_view,SLOT(slotShowPrev()));
268 connect(m_disp,SIGNAL(toggleFullScreen()),this,SLOT(slotToggleFullScreen())); 268 connect(m_disp,SIGNAL(toggleFullScreen()),this,SLOT(slotToggleFullScreen()));
269 connect(m_disp,SIGNAL(hideMe()),this,SLOT(raiseIconView())); 269 connect(m_disp,SIGNAL(hideMe()),this,SLOT(raiseIconView()));
270 connect(m_disp,SIGNAL(toggleZoomer()),this,SLOT(slotToggleZoomer())); 270 connect(m_disp,SIGNAL(toggleZoomer()),this,SLOT(slotToggleZoomer()));
271 connect(m_disp,SIGNAL(toggleAutoscale()),this,SLOT(slotToggleAutoscale())); 271 connect(m_disp,SIGNAL(toggleAutoscale()),this,SLOT(slotToggleAutoscale()));
272 connect(m_disp,SIGNAL(toggleAutorotate()),this,SLOT(slotToggleAutorotate())); 272 connect(m_disp,SIGNAL(toggleAutorotate()),this,SLOT(slotToggleAutorotate()));
273 connect(m_view,SIGNAL(sig_startslide(int)),m_disp,SLOT(startSlide(int))); 273 connect(m_view,SIGNAL(sig_startslide(int)),m_disp,SLOT(startSlide(int)));
274 slotFullScreenToggled(m_aFullScreen->isOn()); 274 slotFullScreenToggled(m_aFullScreen->isOn());
275 } 275 }
276} 276}
277 277
278void PMainWindow::slotToggleFullScreen() 278void PMainWindow::slotToggleFullScreen()
279{ 279{
280 bool current = !m_aFullScreen->isOn(); 280 bool current = !m_aFullScreen->isOn();
281 m_aFullScreen->setOn(current); 281 m_aFullScreen->setOn(current);
282} 282}
283 283
284void PMainWindow::slotFullScreenButton(bool current) 284void PMainWindow::slotFullScreenButton(bool current)
285{ 285{
286 if (autoSave) { 286 if (autoSave) {
287 m_cfg->writeEntry("fullscreen",current); 287 m_cfg->writeEntry("fullscreen",current);
288 } 288 }
289 if (!m_disp) return; 289 if (!m_disp) return;
290 if (m_disp->isVisible()) { 290 if (m_disp->isVisible()) {
291 setupViewWindow(current, true); 291 setupViewWindow(current, true);
292 } 292 }
293} 293}
294 294
295void PMainWindow::setupViewWindow(bool current, bool forceDisplay) 295void PMainWindow::setupViewWindow(bool current, bool forceDisplay)
296{ 296{
297 if (!m_disp) return; 297 if (!m_disp) return;
298 if (current) { 298 if (current) {
299 m_disp->setBackgroundColor(black); 299 m_disp->setBackgroundColor(black);
300 m_disp->reparent(0, WStyle_Customize | WStyle_NoBorder, QPoint(0,0)); 300 m_disp->reparent(0, WStyle_Customize | WStyle_NoBorder, QPoint(0,0));
301 m_disp->setVScrollBarMode(QScrollView::AlwaysOff); 301 m_disp->setVScrollBarMode(QScrollView::AlwaysOff);
302 m_disp->setHScrollBarMode(QScrollView::AlwaysOff); 302 m_disp->setHScrollBarMode(QScrollView::AlwaysOff);
303 m_disp->resize(qApp->desktop()->width(), qApp->desktop()->height()); 303 m_disp->resize(qApp->desktop()->width(), qApp->desktop()->height());
304 } else { 304 } else {
305 setUpdatesEnabled(false); 305 setUpdatesEnabled(false);
306 if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) { 306 if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) {
307 m_disp->setMinimumSize(QApplication::desktop()->size()/2); 307 m_disp->setMinimumSize(QApplication::desktop()->size()/2);
308 } else { 308 } else {
309 m_disp->setMinimumSize(10,10); 309 m_disp->setMinimumSize(10,10);
310 } 310 }
311 if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) { 311 if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) {
312 m_disp->reparent(0,QPoint(50,50)); 312 m_disp->reparent(0,QPoint(50,50));
313 } else { 313 } else {
314 m_disp->reparent(0,QPoint(0,0)); 314 m_disp->reparent(0,QPoint(0,0));
315 } 315 }
316 m_disp->setBackgroundColor(white); 316 m_disp->setBackgroundColor(white);
317 m_stack->addWidget(m_disp,ImageDisplay); 317 m_stack->addWidget(m_disp,ImageDisplay);
318 m_disp->setVScrollBarMode(QScrollView::Auto); 318 m_disp->setVScrollBarMode(QScrollView::Auto);
319 m_disp->setHScrollBarMode(QScrollView::Auto); 319 m_disp->setHScrollBarMode(QScrollView::Auto);
320 if (forceDisplay || m_disp->isVisible()) 320 if (forceDisplay || m_disp->isVisible())
321 m_stack->raiseWidget(m_disp); 321 m_stack->raiseWidget(m_disp);
322 if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) { 322 if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) {
323 m_disp->resize(m_disp->minimumSize()); 323 m_disp->resize(m_disp->minimumSize());
324 } 324 }
325 setUpdatesEnabled(true); 325 setUpdatesEnabled(true);
326 } 326 }
327 m_disp->setFullScreen(current,forceDisplay); 327 m_disp->setFullScreen(current,forceDisplay);
328} 328}
329 329
330void PMainWindow::slotFullScreenToggled(bool current) 330void PMainWindow::slotFullScreenToggled(bool current)
331{ 331{
332 setupViewWindow(current,true); 332 setupViewWindow(current,true);
333} 333}
334 334
335/** 335/**
336 * With big Screen the plan could be to 'detach' the image 336 * With big Screen the plan could be to 'detach' the image
337 * window if visible and to create a ne wone 337 * window if visible and to create a ne wone
338 * init* already supports it but I make no use of it for 338 * init* already supports it but I make no use of it for
339 * now. We set filename and raise 339 * now. We set filename and raise
340 * 340 *
341 * ### FIXME and talk to alwin 341 * ### FIXME and talk to alwin
342 */ 342 */
343void PMainWindow::slotShowInfo( const QString& inf ) { 343void PMainWindow::slotShowInfo( const QString& inf ) {
344 if (m_disp && m_disp->fullScreen() && m_disp->isVisible()) { 344 if (m_disp && m_disp->fullScreen() && m_disp->isVisible()) {
345 return; 345 return;
346 } 346 }
347 if ( !m_info ) { 347 if ( !m_info ) {
348 initInfo(); 348 initInfo();
349 } 349 }
350 m_info->setPath( inf ); 350 m_info->setPath( inf );
351 if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) { 351 if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) {
352 m_aNext->removeFrom(toolBar); 352 m_aNext->removeFrom(toolBar);
353 m_aPrevious->removeFrom(toolBar); 353 m_aPrevious->removeFrom(toolBar);
354 m_aNext->setEnabled(false); 354 m_aNext->setEnabled(false);
355 m_aPrevious->setEnabled(false); 355 m_aPrevious->setEnabled(false);
356 m_aDirUp->setEnabled(false); 356 m_aDirUp->setEnabled(false);
357 m_aShowInfo->setEnabled(false); 357 m_aShowInfo->setEnabled(false);
358 m_aViewfile->setEnabled(true); 358 m_aViewfile->setEnabled(true);
359 m_aStartSlide->setEnabled(false); 359 m_aStartSlide->setEnabled(false);
360 fsButton->hide(); 360 fsButton->hide();
361 } 361 }
362 m_stack->raiseWidget( ImageInfo ); 362 m_stack->raiseWidget( ImageInfo );
363} 363}
364 364
365void PMainWindow::slotDisplay( const QString& inf ) { 365void PMainWindow::slotDisplay( const QString& inf ) {
366 bool nwindow = false; 366 bool nwindow = false;
367 if ( !m_disp ) { 367 if ( !m_disp ) {
368 nwindow = true; 368 nwindow = true;
369 initDisp(); 369 initDisp();
370 } 370 }
371 m_disp->setImage( inf ); 371 m_disp->setImage( inf );
372 if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) { 372 if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) {
373 if (m_gPrevNext->isEnabled()==false) { 373 if (m_gPrevNext->isEnabled()==false) {
374 m_gPrevNext->addTo(toolBar); 374 m_gPrevNext->addTo(toolBar);
375 m_gPrevNext->setEnabled(true); 375 m_gPrevNext->setEnabled(true);
376 376
377 m_aDirUp->setEnabled(false); 377 m_aDirUp->setEnabled(false);
378 m_aShowInfo->setEnabled(true); 378 m_aShowInfo->setEnabled(true);
379 m_aViewfile->setEnabled(false); 379 m_aViewfile->setEnabled(false);
380 m_aStartSlide->setEnabled(false); 380 m_aStartSlide->setEnabled(false);
381 fsButton->hide(); 381 fsButton->hide();
382 } 382 }
383 } 383 }
384 if (!nwindow && m_disp->fullScreen()!=m_aFullScreen->isOn()) { 384 if (!nwindow && m_disp->fullScreen()!=m_aFullScreen->isOn()) {
385 slotFullScreenToggled(m_aFullScreen->isOn()); 385 slotFullScreenToggled(m_aFullScreen->isOn());
386 } 386 }
387 if (m_disp->fullScreen()) { 387 if (m_disp->fullScreen()) {
388 qwsDisplay()->requestFocus( m_disp->winId(), TRUE); 388 qwsDisplay()->requestFocus( m_disp->winId(), TRUE);
389 } else { 389 } else {
390 m_stack->raiseWidget( ImageDisplay ); 390 m_stack->raiseWidget( ImageDisplay );
391 } 391 }
392} 392}
393 393
394void PMainWindow::raiseIconView() { 394void PMainWindow::raiseIconView() {
395 setUpdatesEnabled(false); 395 setUpdatesEnabled(false);
396 if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) { 396 if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) {
397 m_gPrevNext->removeFrom(toolBar); 397 m_gPrevNext->removeFrom(toolBar);
398 m_gPrevNext->setEnabled(false); 398 m_gPrevNext->setEnabled(false);
399 m_aDirUp->setEnabled(true); 399 m_aDirUp->setEnabled(true);
400 m_aShowInfo->setEnabled(true); 400 m_aShowInfo->setEnabled(true);
401 m_aViewfile->setEnabled(true); 401 m_aViewfile->setEnabled(true);
402 m_aStartSlide->setEnabled(true); 402 m_aStartSlide->setEnabled(true);
403 fsButton->show(); 403 fsButton->show();
404 } 404 }
405 if (m_disp && m_disp->fullScreen() && m_disp->isVisible()) { 405 if (m_disp && m_disp->fullScreen() && m_disp->isVisible()) {
406 m_disp->stopSlide(); 406 m_disp->stopSlide();
407 m_disp->hide(); 407 m_disp->hide();
408 } 408 }
409 m_stack->raiseWidget( IconView ); 409 m_stack->raiseWidget( IconView );
410 setUpdatesEnabled(true); 410 setUpdatesEnabled(true);
411 repaint(); 411 repaint();
412} 412}
413 413
414void PMainWindow::slotReturn() { 414void PMainWindow::slotReturn() {
415 raiseIconView(); 415 raiseIconView();
416} 416}
417 417
418 418
419void PMainWindow::closeEvent( QCloseEvent* ev ) { 419void PMainWindow::closeEvent( QCloseEvent* ev ) {
420 /* 420 /*
421 * return from view 421 * return from view
422 * or properly quit 422 * or properly quit
423 */ 423 */
424 if (!m_setDocCalled) { 424 if (!m_setDocCalled) {
425 if ( m_stack->visibleWidget() == m_info || 425 if ( m_stack->visibleWidget() == m_info ||
426 m_stack->visibleWidget() == m_disp ) { 426 m_stack->visibleWidget() == m_disp ) {
427 ev->ignore(); 427 ev->ignore();
428 raiseIconView(); 428 raiseIconView();
429 return; 429 return;
430 } 430 }
431 } 431 }
432 if (m_disp && m_disp->fullScreen()) { 432 if (m_disp && m_disp->fullScreen()) {
433 /* otherwise opie-eye crashes in bigscreen mode! */ 433 /* otherwise opie-eye crashes in bigscreen mode! */
434 m_disp->reparent(0,QPoint(0,0)); 434 m_disp->reparent(0,QPoint(0,0));
435 m_stack->addWidget(m_disp,ImageDisplay); 435 m_stack->addWidget(m_disp,ImageDisplay);
436 } 436 }
437 ev->accept(); 437 ev->accept();
438 QTimer::singleShot(0, qApp, SLOT(closeAllWindows())); 438 QTimer::singleShot(0, qApp, SLOT(closeAllWindows()));
439} 439}
440 440
441void PMainWindow::setDocument( const QString& showImg ) 441void PMainWindow::setDocument( const QString& showImg )
442{ 442{
443 QString file = showImg; 443 QString file = showImg;
444 DocLnk lnk(showImg); 444 DocLnk lnk(showImg);
445 if (lnk.isValid() ) 445 if (lnk.isValid() )
446 file = lnk.file(); 446 file = lnk.file();
447 slotDisplay( file ); 447 slotDisplay( file );
448#if 0 448#if 0
449 if (!m_polishDone) { 449 if (!m_polishDone) {
450 QTimer::singleShot(0,this,SLOT(check_view_fullscreen())); 450 QTimer::singleShot(0,this,SLOT(check_view_fullscreen()));
451 } 451 }
452#endif 452#endif
453} 453}
454 454
455void PMainWindow::check_view_fullscreen() 455void PMainWindow::check_view_fullscreen()
456{ 456{
457 if (!m_view) return; 457 if (!m_view) return;
458 if (!m_view->hasFocus()&&m_aFullScreen->isOn()) { 458 if (!m_view->hasFocus()&&m_aFullScreen->isOn()) {
459 qwsDisplay()->requestFocus( m_disp->winId(), TRUE); 459 qwsDisplay()->requestFocus( m_disp->winId(), TRUE);
460 } 460 }
461} 461}
462 462
463void PMainWindow::slotSelectDir(int id) 463void PMainWindow::slotSelectDir(int id)
464{ 464{
465 emit changeDir( m_dev[fsMenu->text(id )] ); 465 emit changeDir( m_dev[fsMenu->text(id )] );
466} 466}
467 467
468void PMainWindow::dirChanged() 468void PMainWindow::dirChanged()
469{ 469{
470 fsMenu->clear(); 470 fsMenu->clear();
471 m_dev.clear(); 471 m_dev.clear();
472 472
473 /* home dir, too */ 473 /* home dir, too */
474 QString f = getenv( "HOME" ); 474 QString f = getenv( "HOME" );
475 if (!f.isEmpty()) { 475 if (!f.isEmpty()) {
476 m_dev.insert("Home directory",f); 476 m_dev.insert("Home directory",f);
477 fsMenu->insertItem("Home directory"); 477 fsMenu->insertItem("Home directory");
478 } 478 }
479 const QList<FileSystem> &fs = m_storage->fileSystems(); 479 const QList<FileSystem> &fs = m_storage->fileSystems();
480 QListIterator<FileSystem> it(fs ); 480 QListIterator<FileSystem> it(fs );
481 for ( ; it.current(); ++it ) { 481 for ( ; it.current(); ++it ) {
482 const QString disk = (*it)->name(); 482 const QString disk = (*it)->name();
483 const QString path = (*it)->path(); 483 const QString path = (*it)->path();
484 m_dev.insert( disk, path ); 484 m_dev.insert( disk, path );
485 fsMenu->insertItem( disk ); 485 fsMenu->insertItem( disk );
486 } 486 }
487} 487}
488 488
489void PMainWindow::showToolbar(bool how) 489void PMainWindow::showToolbar(bool how)
490{ 490{
491 if (!how) toolBar->hide(); 491 if (!how) toolBar->hide();
492 else toolBar->show(); 492 else toolBar->show();
493 if (autoSave) { 493 if (autoSave) {
494 m_cfg->writeEntry("showtoolbar",how); 494 m_cfg->writeEntry("showtoolbar",how);
495 } 495 }
496} 496}
497 497
498void PMainWindow::setupActions() 498void PMainWindow::setupActions()
499{ 499{
500 m_aDirUp = new QAction( tr( "Go dir up" ), Resource::loadIconSet( "up" ), 0, 0, this, 0, true ); 500 m_aDirUp = new QAction( tr( "Go dir up" ), Resource::loadIconSet( "up" ), 0, 0, this, 0, true );
501 m_aDirUp->setToggleAction(false); 501 m_aDirUp->setToggleAction(false);
502 connect(m_aDirUp,SIGNAL(activated()),m_view,SLOT(slotDirUp())); 502 connect(m_aDirUp,SIGNAL(activated()),m_view,SLOT(slotDirUp()));
503 503
504 if ( Ir::supported() ) { 504 if ( Ir::supported() ) {
505 m_aBeam = new QAction( tr( "Beam file" ), Resource::loadIconSet( "beam" ),0, 0, this, 0, true ); 505 m_aBeam = new QAction( tr( "Beam file" ), Resource::loadIconSet( "beam" ),0, 0, this, 0, true );
506 m_aBeam->setToggleAction(false); 506 m_aBeam->setToggleAction(false);
507 connect(m_aBeam,SIGNAL(activated()),m_view,SLOT(slotBeam())); 507 connect(m_aBeam,SIGNAL(activated()),m_view,SLOT(slotBeam()));
508 } else { 508 } else {
509 m_aBeam = 0; 509 m_aBeam = 0;
510 } 510 }
511 511
512 m_aShowInfo = new QAction( tr( "Show imageinfo" ), Resource::loadIconSet( "edit" ), 0, 0, this, 0, true ); 512 m_aShowInfo = new QAction( tr( "Show imageinfo" ), Resource::loadIconSet( "edit" ), 0, 0, this, 0, true );
513 m_aShowInfo->setToggleAction(false); 513 m_aShowInfo->setToggleAction(false);
514 connect(m_aShowInfo,SIGNAL(activated()),m_view,SLOT(slotImageInfo())); 514 connect(m_aShowInfo,SIGNAL(activated()),m_view,SLOT(slotImageInfo()));
515 515
516 m_aTrash = new QAction( tr( "Delete file" ), Resource::loadIconSet("trash"), 0, 0, this, 0, true ); 516 m_aTrash = new QAction( tr( "Delete file" ), Resource::loadIconSet("trash"), 0, 0, this, 0, true );
517 m_aTrash->setToggleAction(false); 517 m_aTrash->setToggleAction(false);
518 connect(m_aTrash,SIGNAL(activated()),m_view,SLOT(slotTrash())); 518 connect(m_aTrash,SIGNAL(activated()),m_view,SLOT(slotTrash()));
519 519
520 m_aViewfile = new QAction( tr( "Display image" ), Resource::loadIconSet("mag"), 0, 0, this, 0, true ); 520 m_aViewfile = new QAction( tr( "Display image" ), Resource::loadIconSet("mag"), 0, 0, this, 0, true );
521 m_aViewfile->setToggleAction(false); 521 m_aViewfile->setToggleAction(false);
522 connect(m_aViewfile,SIGNAL(activated()),m_view,SLOT(slotShowImage())); 522 connect(m_aViewfile,SIGNAL(activated()),m_view,SLOT(slotShowImage()));
523 523
524 m_aStartSlide = new QAction( tr( "Start slideshow" ), Resource::loadIconSet("play"),0, 0, this, 0, true ); 524 m_aStartSlide = new QAction( tr( "Start slideshow" ), Resource::loadIconSet("play"),0, 0, this, 0, true );
525 m_aStartSlide->setToggleAction(false); 525 m_aStartSlide->setToggleAction(false);
526 connect(m_aStartSlide,SIGNAL(activated()),m_view,SLOT(slotStartSlide())); 526 connect(m_aStartSlide,SIGNAL(activated()),m_view,SLOT(slotStartSlide()));
527 527
528 m_aHideToolbar = new QAction( tr( "Show toolbar" ), Resource::loadIconSet( "UtilsIcon" ), 0, 0, this, 0, true ); 528 m_aHideToolbar = new QAction( tr( "Show toolbar" ), Resource::loadIconSet( "UtilsIcon" ), 0, 0, this, 0, true );
529 m_aHideToolbar->setOn (true); 529 m_aHideToolbar->setOn (true);
530 connect(m_aHideToolbar,SIGNAL(toggled(bool)),this,SLOT(showToolbar(bool))); 530 connect(m_aHideToolbar,SIGNAL(toggled(bool)),this,SLOT(showToolbar(bool)));
531 531
532 m_aSetup = new QAction( tr( "Settings" ), Resource::loadIconSet("SettingsIcon"), 0, 0, this, 0, true ); 532 m_aSetup = new QAction( tr( "Settings" ), Resource::loadIconSet("SettingsIcon"), 0, 0, this, 0, true );
533 m_aSetup->setToggleAction(false); 533 m_aSetup->setToggleAction(false);
534 connect(m_aSetup,SIGNAL(activated()),this,SLOT(slotConfig())); 534 connect(m_aSetup,SIGNAL(activated()),this,SLOT(slotConfig()));
535 535
536 m_gListViewMode = new QActionGroup(this,"Select listmode",true); 536 m_gListViewMode = new QActionGroup(this,"Select listmode",true);
537 connect(m_gListViewMode,SIGNAL(selected(QAction*)),this,SLOT(listviewselected(QAction*))); 537 connect(m_gListViewMode,SIGNAL(selected(QAction*)),this,SLOT(listviewselected(QAction*)));
538 538
539 m_aDirLong = new QAction( tr( "Thumbnail and Imageinfo" ),Resource::loadIconSet("opie-eye/opie-eye-thumb"), 0, 0, this, 0, true ); 539 m_aDirLong = new QAction( tr( "Thumbnail and Imageinfo" ),Resource::loadIconSet("opie-eye/opie-eye-thumb"), 0, 0, this, 0, true );
540 m_aDirLong->setToggleAction(true); 540 m_aDirLong->setToggleAction(true);
541 m_aDirShort = new QAction( tr( "Thumbnail and name" ),Resource::loadIconSet("opie-eye/opie-eye-thumbonly"), 0, 0, this, 0, true ); 541 m_aDirShort = new QAction( tr( "Thumbnail and name" ),Resource::loadIconSet("opie-eye/opie-eye-thumbonly"), 0, 0, this, 0, true );
542 m_aDirShort->setToggleAction(true); 542 m_aDirShort->setToggleAction(true);
543 m_aDirName = new QAction( tr( "Name only" ), Resource::loadIconSet("opie-eye/opie-eye-textview"),0, 0, this, 0, true ); 543 m_aDirName = new QAction( tr( "Name only" ), Resource::loadIconSet("opie-eye/opie-eye-textview"),0, 0, this, 0, true );
544 m_aDirName->setToggleAction(true); 544 m_aDirName->setToggleAction(true);
545 int mode = m_cfg->readNumEntry("ListViewMode", 1); 545 int mode = m_cfg->readNumEntry("ListViewMode", 1);
546 if (mode < 1 || mode>3) mode = 1; 546 if (mode < 1 || mode>3) mode = 1;
547 switch (mode) { 547 switch (mode) {
548 case 3: 548 case 3:
549 m_aDirName->setOn(true); 549 m_aDirName->setOn(true);
550 break; 550 break;
551 case 2: 551 case 2:
552 m_aDirShort->setOn(true); 552 m_aDirShort->setOn(true);
553 break; 553 break;
554 case 1: 554 case 1:
555 default: 555 default:
556 m_aDirLong->setOn(true); 556 m_aDirLong->setOn(true);
557 } 557 }
558 m_gListViewMode->insert(m_aDirLong); 558 m_gListViewMode->insert(m_aDirLong);
559 m_gListViewMode->insert(m_aDirShort); 559 m_gListViewMode->insert(m_aDirShort);
560 m_gListViewMode->insert(m_aDirName); 560 m_gListViewMode->insert(m_aDirName);
561 561
562 m_gPrevNext = new QActionGroup(this,"imageprevnext",false); 562 m_gPrevNext = new QActionGroup(this,"imageprevnext",false);
563 m_aNext = new QAction( tr( "Next image" ), Resource::loadIconSet("forward"), 0, 0, this, 0, true ); 563 m_aNext = new QAction( tr( "Next image" ), Resource::loadIconSet("forward"), 0, 0, this, 0, true );
564 m_aNext->setToggleAction(false); 564 m_aNext->setToggleAction(false);
565 connect(m_aNext,SIGNAL(activated()),m_view,SLOT(slotShowNext())); 565 connect(m_aNext,SIGNAL(activated()),m_view,SLOT(slotShowNext()));
566 m_aPrevious = new QAction( tr( "Previous image" ), Resource::loadIconSet("back"), 0, 0, this, 0, true ); 566 m_aPrevious = new QAction( tr( "Previous image" ), Resource::loadIconSet("back"), 0, 0, this, 0, true );
567 m_aPrevious->setToggleAction(false); 567 m_aPrevious->setToggleAction(false);
568 connect(m_aPrevious,SIGNAL(activated()),m_view,SLOT(slotShowPrev())); 568 connect(m_aPrevious,SIGNAL(activated()),m_view,SLOT(slotShowPrev()));
569 m_gPrevNext->insert(m_aPrevious); 569 m_gPrevNext->insert(m_aPrevious);
570 m_gPrevNext->insert(m_aNext); 570 m_gPrevNext->insert(m_aNext);
571 571
572 m_aFullScreen = new QAction( tr( "Show images fullscreen" ), 572 m_aFullScreen = new QAction( tr( "Show images fullscreen" ),
573 Resource::loadIconSet("fullscreen"), 0, 0, this, 0, true ); 573 Resource::loadIconSet("fullscreen"), 0, 0, this, 0, true );
574 m_aFullScreen->setToggleAction(true); 574 m_aFullScreen->setToggleAction(true);
575 if (autoSave) { 575 if (autoSave) {
576 m_aFullScreen->setOn(m_cfg->readBoolEntry("fullscreen",false)); 576 m_aFullScreen->setOn(m_cfg->readBoolEntry("fullscreen",false));
577 } else { 577 } else {
578 m_aFullScreen->setOn(false); 578 m_aFullScreen->setOn(false);
579 } 579 }
580 connect(m_aFullScreen,SIGNAL(toggled(bool)),this,SLOT(slotFullScreenButton(bool))); 580 connect(m_aFullScreen,SIGNAL(toggled(bool)),this,SLOT(slotFullScreenButton(bool)));
581 581
582 m_gDisplayType = new QActionGroup(this,"imagedisplaytype",false); 582 m_gDisplayType = new QActionGroup(this,"imagedisplaytype",false);
583 m_aAutoRotate = new QAction( tr( "Auto rotate images" ), Resource::loadIconSet( "rotate" ), 0, 0, this, 0, true ); 583 m_aAutoRotate = new QAction( tr( "Auto rotate images" ), Resource::loadIconSet( "rotate" ), 0, 0, this, 0, true );
584 m_aAutoRotate->setToggleAction(true); 584 m_aAutoRotate->setToggleAction(true);
585 585
586 if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) { 586 if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) {
587 m_aAutoRotate->setOn(true); 587 m_aAutoRotate->setOn(true);
588 } else { 588 } else {
589 m_aAutoRotate->setOn(false); 589 m_aAutoRotate->setOn(false);
590 } 590 }
591 if (autoSave) { 591 if (autoSave) {
592 m_aAutoRotate->setOn(m_cfg->readBoolEntry("autorotate",m_aAutoRotate->isOn())); 592 m_aAutoRotate->setOn(m_cfg->readBoolEntry("autorotate",m_aAutoRotate->isOn()));
593 } 593 }
594 connect(m_aAutoRotate,SIGNAL(toggled(bool)),this,SLOT(slotRotateToggled(bool))); 594 connect(m_aAutoRotate,SIGNAL(toggled(bool)),this,SLOT(slotRotateToggled(bool)));
595 595
596 m_aUnscaled = new QAction( tr( "Show images unscaled" ), Resource::loadIconSet( "1to1" ), 0, 0, this, 0, true ); 596 m_aUnscaled = new QAction( tr( "Show images unscaled" ), Resource::loadIconSet( "1to1" ), 0, 0, this, 0, true );
597 m_aUnscaled->setToggleAction(true); 597 m_aUnscaled->setToggleAction(true);
598 connect(m_aUnscaled,SIGNAL(toggled(bool)),this,SLOT(slotScaleToggled(bool))); 598 connect(m_aUnscaled,SIGNAL(toggled(bool)),this,SLOT(slotScaleToggled(bool)));
599 if (autoSave) { 599 if (autoSave) {
600 m_aUnscaled->setOn(m_cfg->readBoolEntry("unscaled",false)); 600 m_aUnscaled->setOn(m_cfg->readBoolEntry("unscaled",false));
601 } else { 601 } else {
602 m_aUnscaled->setOn(false); 602 m_aUnscaled->setOn(false);
603 } 603 }
604 604
605 m_aZoomer = new QAction( tr( "Show zoomer window when unscaled" ), Resource::loadIconSet( "mag" ), 0, 0, this, 0, true ); 605 m_aZoomer = new QAction( tr( "Show zoomer window when unscaled" ), Resource::loadIconSet( "mag" ), 0, 0, this, 0, true );
606 m_aZoomer->setToggleAction(true); 606 m_aZoomer->setToggleAction(true);
607 if (autoSave) { 607 if (autoSave) {
608 m_aZoomer->setOn(m_cfg->readBoolEntry("zoomeron",true)); 608 m_aZoomer->setOn(m_cfg->readBoolEntry("zoomeron",true));
609 } else { 609 } else {
610 m_aZoomer->setOn (true); 610 m_aZoomer->setOn (true);
611 } 611 }
612 connect(m_aZoomer,SIGNAL(toggled(bool)),this,SLOT(slotZoomerToggled(bool))); 612 connect(m_aZoomer,SIGNAL(toggled(bool)),this,SLOT(slotZoomerToggled(bool)));
613 m_gDisplayType->insert(m_aAutoRotate); 613 m_gDisplayType->insert(m_aAutoRotate);
614 m_gDisplayType->insert(m_aUnscaled); 614 m_gDisplayType->insert(m_aUnscaled);
615 m_gDisplayType->insert(m_aZoomer); 615 m_gDisplayType->insert(m_aZoomer);
616 616
617 m_hGroup = new QActionGroup(this,"actioncollection",false); 617 m_hGroup = new QActionGroup(this,"actioncollection",false);
618 m_hGroup->insert(m_aFullScreen); 618 m_hGroup->insert(m_aFullScreen);
619} 619}
620 620
621void PMainWindow::setupToolbar() 621void PMainWindow::setupToolbar()
622{ 622{
623 toolBar = new QToolBar( this ); 623 toolBar = new QToolBar( this );
624 addToolBar(toolBar); 624 addToolBar(toolBar);
625 toolBar->setHorizontalStretchable( true ); 625 toolBar->setHorizontalStretchable( true );
626 setToolBarsMovable( false ); 626 setToolBarsMovable( false );
627 m_aDirUp->addTo( toolBar ); 627 m_aDirUp->addTo( toolBar );
628 628
629 fsButton = new PFileSystem( toolBar ); 629 fsButton = new PFileSystem( toolBar );
630 connect( fsButton, SIGNAL( changeDir( const QString& ) ), 630 connect( fsButton, SIGNAL( changeDir( const QString& ) ),
631 m_view, SLOT(slotChangeDir( const QString& ) ) ); 631 m_view, SLOT(slotChangeDir( const QString& ) ) );
632 connect( this, SIGNAL( changeDir( const QString& ) ), 632 connect( this, SIGNAL( changeDir( const QString& ) ),
633 m_view, SLOT(slotChangeDir( const QString& ) ) ); 633 m_view, SLOT(slotChangeDir( const QString& ) ) );
634 634
635 if (m_aBeam) { 635 if (m_aBeam) {
636 m_aBeam->addTo( toolBar ); 636 m_aBeam->addTo( toolBar );
637 } 637 }
638 m_aShowInfo->addTo(toolBar); 638 m_aShowInfo->addTo(toolBar);
639 m_aTrash->addTo(toolBar); 639 m_aTrash->addTo(toolBar);
640// m_aSetup->addTo(toolBar); 640// m_aSetup->addTo(toolBar);
641 641
642 m_gDisplayType->addTo(toolBar); 642 m_gDisplayType->addTo(toolBar);
643 643
644 if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) { 644 if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) {
645 m_gPrevNext->addTo(toolBar); 645 m_gPrevNext->addTo(toolBar);
646 } else { 646 } else {
647 m_gPrevNext->setEnabled(false); 647 m_gPrevNext->setEnabled(false);
648 } 648 }
649} 649}
650 650
651void PMainWindow::setupMenu() 651void PMainWindow::setupMenu()
652{ 652{
653 fileMenu = new QPopupMenu( menuBar() ); 653 fileMenu = new QPopupMenu( menuBar() );
654 menuBar()->insertItem( tr( "File" ), fileMenu ); 654 menuBar()->insertItem( tr( "File" ), fileMenu );
655 dispMenu = new QPopupMenu( menuBar() ); 655 dispMenu = new QPopupMenu( menuBar() );
656 menuBar()->insertItem( tr( "Show" ), dispMenu ); 656 menuBar()->insertItem( tr( "Show" ), dispMenu );
657 settingsMenu = new QPopupMenu( menuBar() ); 657 settingsMenu = new QPopupMenu( menuBar() );
658 menuBar()->insertItem( tr( "Settings" ), settingsMenu ); 658 menuBar()->insertItem( tr( "Settings" ), settingsMenu );
659 659
660 m_aViewfile->addTo(fileMenu); 660 m_aViewfile->addTo(fileMenu);
661 m_aShowInfo->addTo(fileMenu); 661 m_aShowInfo->addTo(fileMenu);
662 m_aStartSlide->addTo(fileMenu); 662 m_aStartSlide->addTo(fileMenu);
663 663
664 fileMenu->insertSeparator(); 664 fileMenu->insertSeparator();
665 m_aDirUp->addTo( fileMenu ); 665 m_aDirUp->addTo( fileMenu );
666 666
667 fsMenu = new QPopupMenu(fileMenu); 667 fsMenu = new QPopupMenu(fileMenu);
668 fileMenu->insertItem(Resource::loadIconSet( "cardmon/pcmcia" ),tr("Select filesystem"),fsMenu); 668 fileMenu->insertItem(Resource::loadIconSet( "cardmon/pcmcia" ),tr("Select filesystem"),fsMenu);
669 connect( fsMenu, SIGNAL( activated( int ) ), this, SLOT(slotSelectDir( int ) ) ); 669 connect( fsMenu, SIGNAL( activated( int ) ), this, SLOT(slotSelectDir( int ) ) );
670 dirChanged(); 670 dirChanged();
671 671
672 if ( m_aBeam ) { 672 if ( m_aBeam ) {
673 fileMenu->insertSeparator(); 673 fileMenu->insertSeparator();
674 m_aBeam->addTo( fileMenu ); 674 m_aBeam->addTo( fileMenu );
675 } 675 }
676 fileMenu->insertSeparator(); 676 fileMenu->insertSeparator();
677 m_aTrash->addTo(fileMenu); 677 m_aTrash->addTo(fileMenu);
678 678
679 listviewMenu = new QPopupMenu(dispMenu); 679 listviewMenu = new QPopupMenu(dispMenu);
680 dispMenu->insertItem(Resource::loadIconSet("opie-eye/opie-eye-thumb"),tr("Listview mode"),listviewMenu); 680 dispMenu->insertItem(Resource::loadIconSet("opie-eye/opie-eye-thumb"),tr("Listview mode"),listviewMenu);
681 m_gListViewMode->addTo(listviewMenu); 681 m_gListViewMode->addTo(listviewMenu);
682 dispMenu->insertSeparator(); 682 dispMenu->insertSeparator();
683 m_aFullScreen->addTo(dispMenu); 683 m_aFullScreen->addTo(dispMenu);
684 m_gDisplayType->addTo(dispMenu); 684 m_gDisplayType->addTo(dispMenu);
685 dispMenu->insertSeparator(); 685 dispMenu->insertSeparator();
686 m_gPrevNext->addTo(dispMenu); 686 m_gPrevNext->addTo(dispMenu);
687 687
688 m_aSetup->addTo(settingsMenu); 688 m_aSetup->addTo(settingsMenu);
689 m_aHideToolbar->addTo(settingsMenu); 689 m_aHideToolbar->addTo(settingsMenu);
690} 690}
691 691
692void PMainWindow::listviewselected(QAction*which) 692void PMainWindow::listviewselected(QAction*which)
693{ 693{
694 if (!which || which->isOn()==false) return; 694 if (!which || which->isOn()==false) return;
695 int val = 1; 695 int val = 1;
696 696
697 if (which==m_aDirName) { 697 if (which==m_aDirName) {
698 val = 3; 698 val = 3;
699 } else if (which==m_aDirShort) { 699 } else if (which==m_aDirShort) {
700 val = 2; 700 val = 2;
701 } else if (which==m_aDirLong) { 701 } else if (which==m_aDirLong) {
702 val = 1; 702 val = 1;
703 } 703 }
704 emit changeListMode(val); 704 emit changeListMode(val);
705} 705}
706 706
707void PMainWindow::readConfig() 707void PMainWindow::readConfig()
708{ 708{
709 autoSave =m_cfg->readBoolEntry("savestatus",true); 709 autoSave =m_cfg->readBoolEntry("savestatus",true);
710} 710}
711 711
712void PMainWindow::polish() 712void PMainWindow::polish()
713{ 713{
714 if (m_disp) { 714 if (m_disp) {
715 odebug << "======================\n" 715 odebug << "======================\n"
716 << "Called via setdocument\n" 716 << "Called via setdocument\n"
717 << "======================" << oendl; 717 << "======================" << oendl;
718 m_setDocCalled = true; 718 m_setDocCalled = true;
719 m_view->setDoccalled(true); 719 m_view->setDoccalled(true);
720 m_disp->setCloseIfHide(true); 720 m_disp->setCloseIfHide(true);
721 } else { 721 } else {
722 m_setDocCalled = false; 722 m_setDocCalled = false;
723 m_view->setDoccalled(false); 723 m_view->setDoccalled(false);
724 } 724 }
725 m_polishDone = true; 725 m_polishDone = true;
726 QMainWindow::polish(); 726 QMainWindow::polish();
727 if (m_setDocCalled) { 727 if (m_setDocCalled) {
728 if (m_aFullScreen->isOn()) { 728 if (m_aFullScreen->isOn()) {
729 QTimer::singleShot(0,this,SLOT(check_view_fullscreen())); 729 QTimer::singleShot(0,this,SLOT(check_view_fullscreen()));
730 } else if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) { 730 } else if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) {
731 } 731 }
732 } 732 }
733} 733}