summaryrefslogtreecommitdiff
authoralwin <alwin>2004-04-20 22:58:27 (UTC)
committer alwin <alwin>2004-04-20 22:58:27 (UTC)
commitc61b410ba0051c266501933f7f675291684613f8 (patch) (side-by-side diff)
tree2bdb8278bb271bcb305652dea528709735b0a08d
parent4348554f74290f477af9a338cdabf363883c9472 (diff)
downloadopie-c61b410ba0051c266501933f7f675291684613f8.zip
opie-c61b410ba0051c266501933f7f675291684613f8.tar.gz
opie-c61b410ba0051c266501933f7f675291684613f8.tar.bz2
some gui stuff - fullscreen now works better on smallscreen, bigscreen
has some more problems...
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/graphics/opie-eye/gui/imageview.cpp46
-rw-r--r--noncore/graphics/opie-eye/gui/imageview.h8
-rw-r--r--noncore/graphics/opie-eye/gui/mainwindow.cpp63
-rw-r--r--noncore/graphics/opie-eye/gui/mainwindow.h5
4 files changed, 105 insertions, 17 deletions
diff --git a/noncore/graphics/opie-eye/gui/imageview.cpp b/noncore/graphics/opie-eye/gui/imageview.cpp
index 88a8bc6..5b34ca2 100644
--- a/noncore/graphics/opie-eye/gui/imageview.cpp
+++ b/noncore/graphics/opie-eye/gui/imageview.cpp
@@ -2,26 +2,30 @@
#include <opie2/odebug.h>
#include <opie2/oconfig.h>
#include <opie2/okeyconfigwidget.h>
#include <qpe/resource.h>
+#include <qpe/qpeapplication.h>
+#include <qpopupmenu.h>
using namespace Opie::Core;
ImageView::ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name, WFlags fl )
: Opie::MM::OImageScrollView(parent,name,fl)
{
m_viewManager = 0;
m_cfg = cfg;
m_isFullScreen = false;
+ QPEApplication::setStylusOperation(viewport(),QPEApplication::RightOnHold);
initKeys();
}
ImageView::~ImageView()
{
+ odebug << "Delete Imageview" << oendl;
if (m_viewManager) {
delete m_viewManager;
}
}
Opie::Core::OKeyConfigManager* ImageView::manager()
@@ -45,20 +49,30 @@ void ImageView::initKeys()
lst.append( Opie::Core::OKeyPair::leftArrowKey() );
lst.append( Opie::Core::OKeyPair::rightArrowKey() );
lst.append( Opie::Core::OKeyPair(Qt::Key_Escape,0));
m_viewManager = new Opie::Core::OKeyConfigManager(m_cfg, "image_view_keys",
lst, false,this, "image_view_keys" );
+
m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("View Image Info"), "imageviewinfo",
Resource::loadPixmap("1to1"), ViewInfo,
Opie::Core::OKeyPair(Qt::Key_I,0),
this, SLOT(slotShowImageInfo())));
+ m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Toggle autorotate"), "imageautorotate",
+ Resource::loadPixmap("rotate"), Autorotate,
+ Opie::Core::OKeyPair(Qt::Key_R,0),
+ this, SIGNAL(toggleAutorotate())));
+ m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Toggle autoscale"), "imageautoscale",
+ Resource::loadPixmap("1to1"), Autoscale,
+ Opie::Core::OKeyPair(Qt::Key_S,0),
+ this, SIGNAL(toggleAutoscale())));
+
m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Switch to next image"), "imageshownext",
Resource::loadPixmap("forward"), ShowNext,
- Opie::Core::OKeyPair(Qt::Key_N,0),
+ Opie::Core::OKeyPair(Qt::Key_Return,0),
this, SIGNAL(dispNext())));
m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Switch to previous image"), "imageshowprev",
Resource::loadPixmap("back"), ShowPrevious,
Opie::Core::OKeyPair(Qt::Key_P,0),
this, SIGNAL(dispPrev())));
m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Toggle fullscreen"), "imagefullscreen",
@@ -82,6 +96,36 @@ void ImageView::keyReleaseEvent(QKeyEvent * e)
}
void ImageView::slotShowImageInfo()
{
emit dispImageInfo(m_lastName);
}
+
+void ImageView::contentsMousePressEvent ( QMouseEvent * e)
+{
+ if (e->button()==1) {
+ return OImageScrollView::contentsMousePressEvent(e);
+ }
+ if (!fullScreen()) return;
+#if 0
+ // doesn't work right (repainting problems)
+ odebug << "Popup " << oendl;
+ QPopupMenu *m = new QPopupMenu(0);
+ if (!m) return;
+ m->insertItem(tr("Previous image"),ShowPrevious);
+ m->insertItem(tr("Next image"),ShowNext);
+ m->insertSeparator();
+ m->insertItem(tr("Toggle fullscreen"),FullScreen);
+ m->insertItem(tr("Toggle autoscale"),Autoscale);
+ m->insertItem(tr("Toggle autorotate"),Autorotate);
+ m->insertItem(tr("Toggle thumbnail"),Zoomer);
+ m->setFocus();
+ m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) );
+ delete m;
+ parentWidget()->showFullScreen();
+#endif
+}
+
+void ImageView::setFullScreen(bool how)
+{
+ m_isFullScreen = how;
+}
diff --git a/noncore/graphics/opie-eye/gui/imageview.h b/noncore/graphics/opie-eye/gui/imageview.h
index 6bf930f..445bee9 100644
--- a/noncore/graphics/opie-eye/gui/imageview.h
+++ b/noncore/graphics/opie-eye/gui/imageview.h
@@ -17,34 +17,40 @@ class ImageView:public Opie::MM::OImageScrollView
enum ActionIds {
ViewInfo,
FullScreen,
ShowNext,
ShowPrevious,
Zoomer,
+ Autorotate,
+ Autoscale
};
public:
ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name = 0, WFlags fl = 0 );
virtual ~ImageView();
Opie::Core::OKeyConfigManager* manager();
- void setFullScreen(bool how){m_isFullScreen = how;}
+ void setFullScreen(bool how);
bool fullScreen(){return m_isFullScreen;}
signals:
void dispImageInfo(const QString&);
void dispNext();
void dispPrev();
void toggleFullScreen();
void hideMe();
void toggleZoomer();
+ void toggleAutoscale();
+ void toggleAutorotate();
protected:
Opie::Core::OConfig * m_cfg;
Opie::Core::OKeyConfigManager*m_viewManager;
void initKeys();
bool m_isFullScreen:1;
protected slots:
virtual void slotShowImageInfo();
virtual void keyReleaseEvent(QKeyEvent * e);
+ virtual void contentsMousePressEvent ( QMouseEvent * e);
};
+
#endif
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp
index 0484f73..a784f5b 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.cpp
+++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp
@@ -27,24 +27,25 @@
#include <qtoolbar.h>
#include <qtoolbutton.h>
#include <qlayout.h>
#include <qdialog.h>
#include <qmap.h>
#include <qtimer.h>
-
+#include <qframe.h>
OPIE_EXPORT_APP_V2( Opie::Core::OApplicationFactory<PMainWindow>,"Opie Eye" )
PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
: QMainWindow( wid, name, style ), m_info( 0 ), m_disp( 0 )
{
setCaption( QObject::tr("Opie Eye Caramba" ) );
m_cfg = new Opie::Core::OConfig("phunkview");
m_cfg->setGroup("Zecke_view" );
+ tFrame = 0;
// qDebug( "Process-wide OApplication object @ %0x", oApp );
/*
* Initialize ToolBar and IconView
* And Connect Them
*/
QToolBar *bar = new QToolBar( this );
@@ -125,29 +126,31 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style)
rotateButton->setOn(false);
autoRotate = false;
}
connect(rotateButton,SIGNAL(toggled(bool)),this,SLOT(slotRotateToggled(bool)));
- btn = new QToolButton(bar);
- btn->setIconSet( Resource::loadIconSet( "1to1" ) );
- btn->setToggleButton(true);
- btn->setOn(false);
- connect(btn,SIGNAL(toggled(bool)),this,SLOT(slotScaleToggled(bool)));
+ scaleButton = new QToolButton(bar);
+ scaleButton->setIconSet( Resource::loadIconSet( "1to1" ) );
+ scaleButton->setToggleButton(true);
+ scaleButton->setOn(false);
+ connect(scaleButton,SIGNAL(toggled(bool)),this,SLOT(slotScaleToggled(bool)));
autoScale = true;
zoomButton = new QToolButton(bar);
zoomButton->setIconSet( Resource::loadIconSet( "mag" ) );
zoomButton->setToggleButton(true);
zoomButton->setOn(true);
connect(zoomButton,SIGNAL(toggled(bool)),this,SLOT(slotZoomerToggled(bool)));
zoomerOn = true;
}
PMainWindow::~PMainWindow() {
odebug << "Shutting down" << oendl;
+ if (tFrame) delete tFrame;
+ odebug << "Shutting down done" << oendl;
}
void PMainWindow::slotToggleZoomer()
{
if (!m_disp) return;
bool cur = zoomButton->isOn();
@@ -159,12 +162,27 @@ void PMainWindow::slotZoomerToggled(bool how)
zoomerOn = how;
if (m_disp) {
m_disp->setShowZoomer(zoomerOn);
}
}
+void PMainWindow::slotToggleAutorotate()
+{
+ if (!m_disp) return;
+ if (!rotateButton->isEnabled()) return;
+ bool cur = rotateButton->isOn();
+ rotateButton->setOn(!cur);
+}
+
+void PMainWindow::slotToggleAutoscale()
+{
+ if (!m_disp) return;
+ bool cur = scaleButton->isOn();
+ scaleButton->setOn(!cur);
+}
+
void PMainWindow::slotRotateToggled(bool how)
{
autoRotate = how;
if (m_disp) {
m_disp->setAutoRotate(how);
}
@@ -292,12 +310,14 @@ void PMainWindow::initDisp() {
connect(m_disp,SIGNAL(dispImageInfo(const QString&)),this,SLOT(slotShowInfo(const QString&)));
connect(m_disp,SIGNAL(dispNext()),m_view,SLOT(slotShowNext()));
connect(m_disp,SIGNAL(dispPrev()),m_view,SLOT(slotShowPrev()));
connect(m_disp,SIGNAL(toggleFullScreen()),this,SLOT(slotToggleFullScreen()));
connect(m_disp,SIGNAL(hideMe()),this,SLOT(raiseIconView()));
connect(m_disp,SIGNAL(toggleZoomer()),this,SLOT(slotToggleZoomer()));
+ connect(m_disp,SIGNAL(toggleAutoscale()),this,SLOT(slotToggleAutoscale()));
+ connect(m_disp,SIGNAL(toggleAutorotate()),this,SLOT(slotToggleAutorotate()));
}
}
void PMainWindow::slotToggleFullScreen()
{
odebug << "Toggle full " << oendl;
@@ -305,19 +325,28 @@ void PMainWindow::slotToggleFullScreen()
bool current = !m_disp->fullScreen();
m_disp->setFullScreen(current);
odebug << "Current = " << current << oendl;
if (current) {
odebug << "full" << oendl;
m_disp->setBackgroundColor(black);
- m_disp->reparent(0,QPoint(0,0));
+ if (!tFrame) {
+ tFrame = new QWidget(0,0,WType_TopLevel|WStyle_NoBorder|WStyle_StaysOnTop);
+ tFrame->resize(qApp->desktop()->width(), qApp->desktop()->height());
+ tFrame->setMinimumSize(qApp->desktop()->width(), qApp->desktop()->height());
+ }
+ m_disp->reparent(tFrame,QPoint(0,0));
m_disp->setVScrollBarMode(QScrollView::AlwaysOff);
m_disp->setHScrollBarMode(QScrollView::AlwaysOff);
m_disp->resize(qApp->desktop()->width(), qApp->desktop()->height());
- m_disp->showFullScreen();
+ tFrame->showFullScreen();
} else {
odebug << "window" << oendl;
+ m_disp->reparent(0,QPoint(0,0));
+ m_disp->showNormal();
+ /* don't forget it! */
+ tFrame->hide();
m_disp->setBackgroundColor(white);
m_stack->addWidget(m_disp,ImageDisplay);
m_disp->setVScrollBarMode(QScrollView::Auto);
m_disp->setHScrollBarMode(QScrollView::Auto);
m_stack->raiseWidget(m_disp);
if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) {
@@ -332,26 +361,26 @@ void PMainWindow::slotToggleFullScreen()
* init* already supports it but I make no use of it for
* now. We set filename and raise
*
* ### FIXME and talk to alwin
*/
void PMainWindow::slotShowInfo( const QString& inf ) {
+ if (m_disp && m_disp->fullScreen() && m_disp->isVisible()) {
+ return;
+ }
if ( !m_info ) {
initInfo();
}
m_info->setPath( inf );
if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) {
prevButton->hide();
nextButton->hide();
upButton->hide();
fsButton->hide();
viewModeButton->hide();
}
- if (m_disp && m_disp->fullScreen() && m_disp->isVisible()) {
- m_disp->hide();
- }
m_stack->raiseWidget( ImageInfo );
}
void PMainWindow::slotDisplay( const QString& inf ) {
if ( !m_disp ) {
initDisp();
@@ -362,13 +391,14 @@ void PMainWindow::slotDisplay( const QString& inf ) {
nextButton->show();
upButton->hide();
fsButton->hide();
viewModeButton->hide();
}
if (m_disp->fullScreen()) {
- m_disp->show();
+ tFrame->setActiveWindow();
+ tFrame->showFullScreen();
} else {
m_stack->raiseWidget( ImageDisplay );
}
}
void PMainWindow::slotReturn() {
@@ -380,16 +410,21 @@ void PMainWindow::closeEvent( QCloseEvent* ev ) {
/*
* return from view
* or properly quit
*/
if ( m_stack->visibleWidget() == m_info ||
m_stack->visibleWidget() == m_disp ) {
- raiseIconView();
ev->ignore();
+ raiseIconView();
return;
}
+ if (m_disp && m_disp->fullScreen()) {
+ /* otherwise opie-eye crashes in bigscreen mode! */
+ m_disp->reparent(0,QPoint(0,0));
+ m_stack->addWidget(m_disp,ImageDisplay);
+ }
ev->accept();
QTimer::singleShot(0, qApp, SLOT(closeAllWindows()));
}
void PMainWindow::raiseIconView() {
if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) {
@@ -397,13 +432,13 @@ void PMainWindow::raiseIconView() {
nextButton->hide();
upButton->show();
fsButton->show();
viewModeButton->show();
}
if (m_disp && m_disp->fullScreen() && m_disp->isVisible()) {
- m_disp->hide();
+ tFrame->hide();
}
m_stack->raiseWidget( IconView );
}
void PMainWindow::setDocument( const QString& showImg ) {
QString file = showImg;
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.h b/noncore/graphics/opie-eye/gui/mainwindow.h
index e51a3ff..1f90f9f 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.h
+++ b/noncore/graphics/opie-eye/gui/mainwindow.h
@@ -41,12 +41,14 @@ public slots:
void slotDisplay( const QString& inf );
void slotReturn();
void slotRotateToggled(bool);
void slotScaleToggled(bool);
void slotZoomerToggled(bool);
void slotToggleZoomer();
+ void slotToggleAutorotate();
+ void slotToggleAutoscale();
void setDocument( const QString& );
virtual void slotToggleFullScreen();
protected slots:
void raiseIconView();
void closeEvent( QCloseEvent* );
@@ -62,14 +64,15 @@ private:
PIconView* m_view;
imageinfo *m_info;
ImageView *m_disp;
bool autoRotate;
bool autoScale;
bool zoomerOn;
+ QWidget*tFrame;
QToolButton*rotateButton,*upButton,*fsButton,*viewModeButton;
- QToolButton*nextButton,*prevButton,*zoomButton;
+ QToolButton*nextButton,*prevButton,*zoomButton,*scaleButton;
private slots:
void slotConfig();
};
#endif