author | alwin <alwin> | 2004-11-01 01:58:25 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-11-01 01:58:25 (UTC) |
commit | d69955ef9cddc3acc37b9dc96945cd4bae56eed5 (patch) (side-by-side diff) | |
tree | 7982a6da8f8141292eb0a1c09ce384784af2801d /noncore/graphics | |
parent | 01fb5d6957984fe6fe5ed2109a024be7e8159d16 (diff) | |
download | opie-d69955ef9cddc3acc37b9dc96945cd4bae56eed5.zip opie-d69955ef9cddc3acc37b9dc96945cd4bae56eed5.tar.gz opie-d69955ef9cddc3acc37b9dc96945cd4bae56eed5.tar.bz2 |
some menu working
some debug messages removed
tried to remove some interesting effects when switching view mode
-rw-r--r-- | noncore/graphics/opie-eye/gui/imageinfoui.cpp | 1 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/imageview.cpp | 7 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/imageview.h | 2 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.cpp | 54 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.h | 4 |
5 files changed, 45 insertions, 23 deletions
diff --git a/noncore/graphics/opie-eye/gui/imageinfoui.cpp b/noncore/graphics/opie-eye/gui/imageinfoui.cpp index e70d6a6..7afb62d 100644 --- a/noncore/graphics/opie-eye/gui/imageinfoui.cpp +++ b/noncore/graphics/opie-eye/gui/imageinfoui.cpp @@ -57,5 +57,4 @@ Opie::Core::OKeyConfigManager* imageinfo::manager() void imageinfo::initKeys() { - odebug << "init imageinfo keys" << oendl; #if 0 if (!m_cfg) { diff --git a/noncore/graphics/opie-eye/gui/imageview.cpp b/noncore/graphics/opie-eye/gui/imageview.cpp index c7e48cb..86db732 100644 --- a/noncore/graphics/opie-eye/gui/imageview.cpp +++ b/noncore/graphics/opie-eye/gui/imageview.cpp @@ -88,5 +88,5 @@ void ImageView::initKeys() odebug << "init imageview keys" << oendl; if (!m_cfg) { - m_cfg = new Opie::Core::OConfig("phunkview"); + m_cfg = new Opie::Core::OConfig("opie-eye"); m_cfg->setGroup("image_view_keys" ); } @@ -191,5 +191,5 @@ void ImageView::contentsMousePressEvent ( QMouseEvent * e) } -void ImageView::setFullScreen(bool how) +void ImageView::setFullScreen(bool how,bool force) { m_isFullScreen = how; @@ -197,5 +197,5 @@ void ImageView::setFullScreen(bool how) m_ignore_next_in = true; setFixedSize(qApp->desktop()->size()); - showFullScreen(); + if (force) showFullScreen(); } else { setMinimumSize(10,10); @@ -235,4 +235,3 @@ void ImageView::enableFullscreen() showFullScreen(); setUpdatesEnabled(true); - } diff --git a/noncore/graphics/opie-eye/gui/imageview.h b/noncore/graphics/opie-eye/gui/imageview.h index 640905a..2408211 100644 --- a/noncore/graphics/opie-eye/gui/imageview.h +++ b/noncore/graphics/opie-eye/gui/imageview.h @@ -35,5 +35,5 @@ public: virtual ~ImageView(); Opie::Core::OKeyConfigManager* manager(); - void setFullScreen(bool how); + void setFullScreen(bool how,bool force=true); bool fullScreen(){return m_isFullScreen;} virtual void enableFullscreen(); diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp index 570ee45..ece51a1 100644 --- a/noncore/graphics/opie-eye/gui/mainwindow.cpp +++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp @@ -44,6 +44,6 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) { setCaption( QObject::tr("Opie Eye Caramba" ) ); - m_cfg = new Opie::Core::OConfig("phunkview"); - m_cfg->setGroup("Zecke_view" ); + m_cfg = new Opie::Core::OConfig("opie-eye"); + m_cfg->setGroup("main" ); m_storage = new StorageInfo(); @@ -109,5 +109,4 @@ void PMainWindow::slotToggleAutoscale() void PMainWindow::slotRotateToggled(bool how) { - odebug << "Autorotate: " << how << oendl; autoRotate = how; if (m_disp) { @@ -227,8 +226,10 @@ void PMainWindow::initT( const char* name, T** ptr, int id) { } + void PMainWindow::initInfo() { initT<imageinfo>( "Image Info", &m_info, ImageInfo ); connect(m_info,SIGNAL(dispImage(const QString&)),this,SLOT(slotDisplay(const QString&))); } + void PMainWindow::initDisp() { initT<ImageView>( "Image ScrollView", &m_disp, ImageDisplay ); @@ -257,15 +258,30 @@ void PMainWindow::initDisp() { void PMainWindow::slotToggleFullScreen() { - odebug << "Toggle full " << oendl; bool current = !m_aFullScreen->isOn(); m_aFullScreen->setOn(current); } -void PMainWindow::slotFullScreenToggled(bool current) +void PMainWindow::slotFullScreenButton(bool current) +{ + if (m_disp) odebug << "Disp fenster ist hidden: "<<m_disp->isHidden()<<oendl; + if (!m_disp) return; + + /* I can not solve this effects here - it seems that we require some + status variable, too. so we will live with some interesting effects + meanwhile */ +#if 0 + bool th = m_disp->isHidden(); + setupViewWindow(current, false); + /* realy - after setting up the fullscreenmode while the window is hidden + it is unvisibile not hidden!!!!! Hell. */ + if (th) m_disp->hide(); +#endif + setupViewWindow(current, true); +} + +void PMainWindow::setupViewWindow(bool current, bool forceDisplay) { - odebug << "slotFullScreenToggled " << current << oendl; if (!m_disp) return; if (current) { - odebug << "full" << oendl; m_disp->setBackgroundColor(black); m_disp->reparent(0, WStyle_Customize | WStyle_NoBorder, QPoint(0,0)); @@ -275,5 +291,4 @@ void PMainWindow::slotFullScreenToggled(bool current) } else { setUpdatesEnabled(false); - odebug << "window" << oendl; if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) { m_disp->setMinimumSize(QApplication::desktop()->size()/2); @@ -290,5 +305,6 @@ void PMainWindow::slotFullScreenToggled(bool current) m_disp->setVScrollBarMode(QScrollView::Auto); m_disp->setHScrollBarMode(QScrollView::Auto); - m_stack->raiseWidget(m_disp); + if (forceDisplay || m_disp->isVisible()) + m_stack->raiseWidget(m_disp); if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) { m_disp->resize(m_disp->minimumSize()); @@ -296,5 +312,10 @@ void PMainWindow::slotFullScreenToggled(bool current) setUpdatesEnabled(true); } - m_disp->setFullScreen(current); + m_disp->setFullScreen(current,forceDisplay); +} + +void PMainWindow::slotFullScreenToggled(bool current) +{ + setupViewWindow(current,true); } @@ -330,5 +351,4 @@ void PMainWindow::slotShowInfo( const QString& inf ) { void PMainWindow::slotDisplay( const QString& inf ) { - odebug << "slotDisplay: " << inf << oendl; if ( !m_disp ) { initDisp(); @@ -348,5 +368,4 @@ void PMainWindow::slotDisplay( const QString& inf ) { } if (m_disp->fullScreen()) { - //m_disp->showFullScreen(); qwsDisplay()->requestFocus( m_disp->winId(), TRUE); } else { @@ -519,5 +538,5 @@ void PMainWindow::setupActions() m_aFullScreen->setToggleAction(true); m_aFullScreen->setOn(false); - connect(m_aFullScreen,SIGNAL(toggled(bool)),this,SLOT(slotFullScreenToggled(bool))); + connect(m_aFullScreen,SIGNAL(toggled(bool)),this,SLOT(slotFullScreenButton(bool))); m_gDisplayType = new QActionGroup(this,"imagedisplaytype",false); @@ -570,5 +589,5 @@ void PMainWindow::setupToolbar() m_aShowInfo->addTo(toolBar); m_aTrash->addTo(toolBar); - m_aSetup->addTo(toolBar); +// m_aSetup->addTo(toolBar); m_gDisplayType->addTo(toolBar); @@ -587,4 +606,6 @@ void PMainWindow::setupMenu() dispMenu = new QPopupMenu( menuBar() ); menuBar()->insertItem( tr( "Show" ), dispMenu ); + settingsMenu = new QPopupMenu( menuBar() ); + menuBar()->insertItem( tr( "Settings" ), settingsMenu ); m_aViewfile->addTo(fileMenu); @@ -605,8 +626,6 @@ void PMainWindow::setupMenu() } fileMenu->insertSeparator(); - m_aSetup->addTo(fileMenu); m_aTrash->addTo(fileMenu); - m_aHideToolbar->addTo(dispMenu); listviewMenu = new QPopupMenu(dispMenu); dispMenu->insertItem(Resource::loadIconSet("opie-eye/opie-eye-thumb"),tr("Listview mode"),listviewMenu); @@ -617,4 +636,7 @@ void PMainWindow::setupMenu() dispMenu->insertSeparator(); m_gPrevNext->addTo(dispMenu); + + m_aSetup->addTo(settingsMenu); + m_aHideToolbar->addTo(settingsMenu); } diff --git a/noncore/graphics/opie-eye/gui/mainwindow.h b/noncore/graphics/opie-eye/gui/mainwindow.h index 65151fc..703965b 100644 --- a/noncore/graphics/opie-eye/gui/mainwindow.h +++ b/noncore/graphics/opie-eye/gui/mainwindow.h @@ -65,4 +65,5 @@ protected slots: void showToolbar(bool); void listviewselected(QAction*); + void slotFullScreenButton(bool); private: @@ -70,4 +71,5 @@ private: void initInfo(); void initDisp(); + void setupViewWindow(bool full, bool forceDisplay); private: @@ -82,5 +84,5 @@ private: QToolButton*fsButton; QToolBar *toolBar; - QPopupMenu *fileMenu,*dispMenu,*fsMenu,*listviewMenu; + QPopupMenu *fileMenu,*dispMenu,*fsMenu,*listviewMenu,*settingsMenu; QAction*m_aShowInfo,*m_aBeam,*m_aTrash,*m_aViewfile,*m_aDirUp,*m_aStartSlide; QAction*m_aHideToolbar,*m_aSetup,*m_aDirName,*m_aDirShort,*m_aDirLong; |