summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/graphics/opie-eye/gui/basesetup.cpp11
-rw-r--r--noncore/graphics/opie-eye/gui/iconview.cpp22
-rw-r--r--noncore/graphics/opie-eye/gui/iconview.h4
-rw-r--r--noncore/graphics/opie-eye/gui/imageview.cpp37
-rw-r--r--noncore/graphics/opie-eye/gui/imageview.h12
-rw-r--r--noncore/graphics/opie-eye/gui/mainwindow.cpp16
-rw-r--r--noncore/graphics/opie-eye/gui/mainwindow.h3
7 files changed, 84 insertions, 21 deletions
diff --git a/noncore/graphics/opie-eye/gui/basesetup.cpp b/noncore/graphics/opie-eye/gui/basesetup.cpp
index b0fefbf..fe51321 100644
--- a/noncore/graphics/opie-eye/gui/basesetup.cpp
+++ b/noncore/graphics/opie-eye/gui/basesetup.cpp
@@ -44,14 +44,14 @@ BaseSetup::BaseSetup(Opie::Core::OConfig *a_cfg,QWidget * parent, const char * n
m_IconsizeLayout->addWidget( m_IconsizeLabel, 0, 0 );
m_MainLayout->addLayout(m_IconsizeLayout);
m_Intensity = new QSpinBox( this, "m_Intensity" );
m_Intensity->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::Fixed));
m_Intensity->setButtonSymbols( QSpinBox::PlusMinus );
- m_Intensity->setMaxValue( 255 );
- m_Intensity->setMinValue(-255);
+ m_Intensity->setMaxValue( 100 );
+ m_Intensity->setMinValue(-100);
m_Intensity->setValue( 0 );
m_IntensityLayout->addWidget( m_Intensity, 0, 1 );
m_IntensityLabel = new QLabel( this, "m_IntensityLabel" );
m_IntensityLabel->setText(tr("Default display brightness:"));
m_IntensityLayout->addWidget(m_IntensityLabel, 0, 0 );
m_MainLayout->addLayout(m_IntensityLayout);
@@ -71,18 +71,19 @@ BaseSetup::BaseSetup(Opie::Core::OConfig *a_cfg,QWidget * parent, const char * n
int stime = m_cfg->readNumEntry("slideshowtimeout",2);
if (stime<0) stime=2;
if (stime>60) stime=60;
m_SlideShowTime->setValue(stime);
m_SaveStateAuto->setChecked(m_cfg->readBoolEntry("savestatus",true));
stime = m_cfg->readNumEntry("iconsize", 32);
+ /* must equal to s(MAX/MIN_ICONSIZE) in iconview.cpp! */
if (stime<12)stime = 12;
- if (stime>64)stime = 64;
+ if (stime>128)stime = 128;
m_Iconsize->setValue(stime);
stime = m_cfg->readNumEntry("intensity",0);
- if (stime<-255) stime = -255;
- if (stime>255) stime = 255;
+ if (stime<-100) stime = -100;
+ if (stime>100) stime = 100;
m_Intensity->setValue(stime);
}
BaseSetup::~BaseSetup()
{
}
diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp
index b2443e8..59091a8 100644
--- a/noncore/graphics/opie-eye/gui/iconview.cpp
+++ b/noncore/graphics/opie-eye/gui/iconview.cpp
@@ -33,12 +33,16 @@
#include <qtimer.h>
#include <qstyle.h>
using Opie::Core::OKeyConfigItem;
+const int PIconView::sMAX_ICON_SIZE = 128;
+const int PIconView::sMIN_ICON_SIZE = 12;
+const int PIconView::sDEF_ICON_SIZE = 64;
+
/*
* The Icons, Request Cache and IconViewItem for the IconView
*/
namespace {
static QPixmap* _dirPix = 0;
static QPixmap* _unkPix = 0;
@@ -219,14 +223,14 @@ PIconView::PIconView( QWidget* wid, Opie::Core::OConfig* cfg )
if (m_mode >1) {
m_view->setResizeMode(QIconView::Adjust);
} else {
m_view->setResizeMode(QIconView::Fixed);
}
m_iconsize = m_cfg->readNumEntry("iconsize", 32);
- if (m_iconsize<12)m_iconsize = 12;
- if (m_iconsize>64)m_iconsize = 64;
+ if (m_iconsize<sMIN_ICON_SIZE)m_iconsize = sMIN_ICON_SIZE;
+ if (m_iconsize>sMAX_ICON_SIZE)m_iconsize = sMAX_ICON_SIZE;
calculateGrid();
initKeys();
loadViews();
}
@@ -405,27 +409,27 @@ void PIconView::resetView() {
// Also invalidate the cache. We can't cancel the operations anyway
g_stringPix.clear();
g_stringInf.clear();
if (m_mode>1) {
int osize = m_iconsize;
m_iconsize = m_cfg->readNumEntry("iconsize", 32);
- if (m_iconsize<12)m_iconsize = 12;
- if (m_iconsize>64)m_iconsize = 64;
+ if (m_iconsize<sMIN_ICON_SIZE)m_iconsize = sMIN_ICON_SIZE;
+ if (m_iconsize>sMAX_ICON_SIZE)m_iconsize = sMAX_ICON_SIZE;
if (osize != m_iconsize) {
if (_dirPix){
delete _dirPix;
_dirPix = 0;
}
if (_cpyPix){
delete _cpyPix;
_cpyPix = 0;
}
calculateGrid();
}
} else {
- m_iconsize = 64;
+ m_iconsize = sDEF_ICON_SIZE;
}
slotViewChanged(m_views->currentItem());
m_internalReset = false;
}
void PIconView::polish()
@@ -830,17 +834,17 @@ void PIconView::slotChangeMode( int mode ) {
if (m_mode >1) {
m_view->setResizeMode(QIconView::Adjust);
} else {
m_view->setResizeMode(QIconView::Fixed);
}
if (m_mode==1) {
- m_iconsize = 64;
+ m_iconsize = sDEF_ICON_SIZE;
} else {
m_iconsize = m_cfg->readNumEntry("iconsize", 32);
- if (m_iconsize<12)m_iconsize = 12;
- if (m_iconsize>64)m_iconsize = 64;
+ if (m_iconsize<sMIN_ICON_SIZE)m_iconsize = sMIN_ICON_SIZE;
+ if (m_iconsize>sMAX_ICON_SIZE)m_iconsize = sMAX_ICON_SIZE;
}
if (_dirPix){
delete _dirPix;
_dirPix = 0;
}
if (_cpyPix){
@@ -885,13 +889,13 @@ void PIconView::calculateGrid(QResizeEvent* re)
m_view->setItemTextPos( pos );
switch (m_mode) {
case 2:
m_view->setSpacing(2);
m_view->setGridX(m_iconsize);
m_view->setGridY(-1);
- cache = (int)((double)64/(double)m_iconsize*40.0);
+ cache = (int)((double)sDEF_ICON_SIZE/(double)m_iconsize*80.0);
odebug << "cache size: " << cache << oendl;
PPixmapCache::self()->setMaxImages(cache);
break;
case 3:
m_view->setSpacing(10);
m_view->setGridX( fontMetrics().width("testimage.jpg")+20);
diff --git a/noncore/graphics/opie-eye/gui/iconview.h b/noncore/graphics/opie-eye/gui/iconview.h
index 6e08fd8..a546b88 100644
--- a/noncore/graphics/opie-eye/gui/iconview.h
+++ b/noncore/graphics/opie-eye/gui/iconview.h
@@ -34,12 +34,16 @@ public:
~PIconView();
void resetView();
Opie::Core::OKeyConfigManager* manager();
void setDoccalled(bool);
+ static const int sMAX_ICON_SIZE;
+ static const int sMIN_ICON_SIZE;
+ static const int sDEF_ICON_SIZE;
+
signals:
void sig_showInfo( const QString& );
void sig_display(const QString&);
void sig_startslide(int timeout);
public slots:
diff --git a/noncore/graphics/opie-eye/gui/imageview.cpp b/noncore/graphics/opie-eye/gui/imageview.cpp
index 6c3f9cb..994fe12 100644
--- a/noncore/graphics/opie-eye/gui/imageview.cpp
+++ b/noncore/graphics/opie-eye/gui/imageview.cpp
@@ -26,27 +26,45 @@ ImageView::ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name
QPEApplication::setStylusOperation(viewport(),QPEApplication::RightOnHold);
initKeys();
m_slideValue = 5;
m_gDisplayType = 0;
m_gPrevNext = 0;
m_hGroup = 0;
+ m_gBright = 0;
m_Rotated = false;
closeIfHide = false;
int min = QApplication::desktop()->size().width()>QApplication::desktop()->size().height()?
QApplication::desktop()->size().height():QApplication::desktop()->size().width();
if (min>320) {
// bigscreen
setMinimumSize(min/3,min/3);
} else {
setMinimumSize(10,10);
}
+ connect(this,SIGNAL(incBrightness()),this,SLOT(slotIncBrightness()));
+ connect(this,SIGNAL(decBrightness()),this,SLOT(slotDecBrightness()));
+
m_sysChannel = new QCopChannel( "QPE/System", this );
connect( m_sysChannel, SIGNAL( received(const QCString&,const QByteArray&) ),
this, SLOT( systemMessage(const QCString&,const QByteArray&) ) );
}
+void ImageView::slotIncBrightness()
+{
+ int lb = Intensity()+5;
+ if (lb>100) lb=100;
+ setIntensity(lb,true);
+}
+
+void ImageView::slotDecBrightness()
+{
+ int lb = Intensity()-5;
+ if (lb<-100) lb=-100;
+ setIntensity(lb,true);
+}
+
void ImageView::systemMessage( const QCString& msg, const QByteArray& data )
{
int _newrotation;
QDataStream stream( data, IO_ReadOnly );
odebug << "received system message: " << msg << oendl;
if ( msg == "setCurrentRotation(int)" )
@@ -57,17 +75,18 @@ void ImageView::systemMessage( const QCString& msg, const QByteArray& data )
m_rotation = _newrotation;
return;
}
}
}
-void ImageView::setMenuActions(QActionGroup*hGroup,QActionGroup*nextprevGroup, QActionGroup*disptypeGroup)
+void ImageView::setMenuActions(QActionGroup*hGroup,QActionGroup*nextprevGroup, QActionGroup*disptypeGroup,QActionGroup*brightGroup)
{
m_gDisplayType = disptypeGroup;
m_gPrevNext = nextprevGroup;
m_hGroup = hGroup;
+ m_gBright = brightGroup;
}
ImageView::~ImageView()
{
odebug << "Destructor imageview" << oendl;
delete m_viewManager;
@@ -171,12 +190,21 @@ void ImageView::initKeys()
Opie::Core::OKeyPair(Qt::Key_F,0),
this, SIGNAL(toggleFullScreen())));
m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Toggle thumbnail"), "imagezoomer",
Resource::loadPixmap("mag"), Zoomer,
Opie::Core::OKeyPair(Qt::Key_T,0),
this, SIGNAL(toggleZoomer())));
+
+ m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Increase brightness"), "incbrightness",
+ Resource::loadPixmap("up"), Incbrightness,
+ Opie::Core::OKeyPair(Qt::Key_B,0),
+ this, SIGNAL(incBrightness())));
+ m_viewManager->addKeyConfig( Opie::Core::OKeyConfigItem(tr("Decrease brightness"), "decbrightness",
+ Resource::loadPixmap("down"), Decbrightness,
+ Opie::Core::OKeyPair(Qt::Key_D,0),
+ this, SIGNAL(decBrightness())));
m_viewManager->handleWidget( this );
m_viewManager->load();
}
void ImageView::keyReleaseEvent(QKeyEvent * e)
{
@@ -220,24 +248,31 @@ void ImageView::contentsMousePressEvent ( QMouseEvent * e)
m_gPrevNext->addTo(m);
}
if (m_gDisplayType) {
m->insertSeparator();
m_gDisplayType->addTo(m);
}
+ if (m_gBright) {
+ m->insertSeparator();
+ m_gBright->addTo(m);
+ }
}
m->setFocus();
m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) );
if (m_hGroup) {
m_hGroup->removeFrom(m);
}
if (m_gPrevNext) {
m_gPrevNext->removeFrom(m);
}
if (m_gDisplayType) {
m_gDisplayType->removeFrom(m);
}
+ if (m_gBright) {
+ m_gBright->removeFrom(m);
+ }
delete m;
}
void ImageView::setFullScreen(bool how,bool force)
{
m_isFullScreen = how;
diff --git a/noncore/graphics/opie-eye/gui/imageview.h b/noncore/graphics/opie-eye/gui/imageview.h
index e8c8df7..b5801a6 100644
--- a/noncore/graphics/opie-eye/gui/imageview.h
+++ b/noncore/graphics/opie-eye/gui/imageview.h
@@ -26,35 +26,39 @@ class ImageView:public Opie::MM::OImageScrollView
ViewInfo,
FullScreen,
ShowNext,
ShowPrevious,
Zoomer,
Autorotate,
- Autoscale
+ Autoscale,
+ Incbrightness,
+ Decbrightness
};
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,bool force=true);
bool fullScreen(){return m_isFullScreen;}
virtual void enableFullscreen();
void stopSlide();
- void setMenuActions(QActionGroup*hGroup,QActionGroup*nextprevGroup, QActionGroup*disptypeGroup);
+ void setMenuActions(QActionGroup*hGroup,QActionGroup*nextprevGroup, QActionGroup*disptypeGroup,QActionGroup*brightGroup);
void setCloseIfHide(bool);
signals:
void dispImageInfo(const QString&);
void dispNext();
void dispPrev();
void toggleFullScreen();
void hideMe();
void toggleZoomer();
void toggleAutoscale();
void toggleAutorotate();
+ void incBrightness();
+ void decBrightness();
protected:
Opie::Core::OConfig * m_cfg;
Opie::Core::OKeyConfigManager*m_viewManager;
void initKeys();
bool m_isFullScreen:1;
@@ -62,22 +66,24 @@ protected:
bool m_Rotated:1;
int focus_in_count;
QTimer*m_slideTimer;
int m_slideValue;
virtual void focusInEvent ( QFocusEvent * );
- QActionGroup *m_gDisplayType,*m_gPrevNext,*m_hGroup;
+ QActionGroup *m_gDisplayType,*m_gPrevNext,*m_hGroup,*m_gBright;
bool closeIfHide:1;
QCopChannel* m_sysChannel;
int m_rotation;
public slots:
virtual void hide();
virtual void startSlide(int);
virtual void nextSlide();
virtual void systemMessage( const QCString&, const QByteArray& );
+ virtual void slotIncBrightness();
+ virtual void slotDecBrightness();
protected slots:
virtual void slotShowImageInfo();
virtual void keyReleaseEvent(QKeyEvent * e);
virtual void contentsMousePressEvent ( QMouseEvent * e);
};
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp
index d11e4e1..4ee252f 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.cpp
+++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp
@@ -262,13 +262,13 @@ void PMainWindow::initInfo() {
void PMainWindow::initDisp() {
initT<ImageView>( "Image ScrollView", &m_disp, ImageDisplay );
if (m_disp) {
// if (m_stack->mode() != Opie::Ui::OWidgetStack::SmallScreen) {
//m_disp->setMinimumSize(QApplication::desktop()->size()/2);
// }
- m_disp->setMenuActions(m_hGroup,m_gPrevNext,m_gDisplayType);
+ m_disp->setMenuActions(m_hGroup,m_gPrevNext,m_gDisplayType,m_hBright);
m_disp->setAutoScale(!m_aUnscaled->isOn());
m_disp->setAutoRotate(m_aAutoRotate->isOn());
m_disp->setShowZoomer(m_aZoomer->isOn());
m_disp->setBackgroundColor(white);
connect(m_disp,SIGNAL(dispImageInfo(const QString&)),this,SLOT(slotShowInfo(const QString&)));
connect(m_disp,SIGNAL(dispNext()),m_view,SLOT(slotShowNext()));
@@ -276,12 +276,14 @@ void PMainWindow::initDisp() {
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()));
connect(m_view,SIGNAL(sig_startslide(int)),m_disp,SLOT(startSlide(int)));
+ connect(m_IncBrightness,SIGNAL(activated()),m_disp,SLOT(slotIncBrightness()));
+ connect(m_DecBrightness,SIGNAL(activated()),m_disp,SLOT(slotDecBrightness()));
slotFullScreenToggled(m_aFullScreen->isOn());
}
}
void PMainWindow::slotToggleFullScreen()
{
@@ -377,12 +379,13 @@ void PMainWindow::slotDisplay( const QString& inf ) {
bool nwindow = false;
if ( !m_disp ) {
nwindow = true;
initDisp();
m_disp->setIntensity(m_Intensity);
m_setCurrentBrightness->setEnabled(true);
+ m_hBright->setEnabled(true);
}
m_disp->setImage( inf );
if (m_SmallWindow) {
if (m_gPrevNext->isEnabled()==false) {
m_gPrevNext->addTo(toolBar);
fsButton->hide();
@@ -640,21 +643,26 @@ void PMainWindow::setupActions()
connect(m_aForceSmall,SIGNAL(toggled(bool)),this,SLOT(slotForceSmall(bool)));
} else {
m_aForceSmall = 0;
}
m_setCurrentBrightness = new QAction(tr("Display brightness..."), 0, 0, this, 0, false);
connect(m_setCurrentBrightness,SIGNAL(activated()),this,SLOT(setupBrightness()));
+ m_IncBrightness = new QAction(tr("Increase brightness by 5"),Resource::loadIconSet( "up" ),0, 0, this, 0, false);
+ m_DecBrightness = new QAction(tr("Decrease brightness by 5"),Resource::loadIconSet( "down" ),0, 0, this, 0, false);
+ m_hBright = new QActionGroup(this,"actioncollection",false),
+ m_hBright->insert(m_IncBrightness);
+ m_hBright->insert(m_DecBrightness);
}
void PMainWindow::setupBrightness()
{
if (!m_disp) {
return;
}
int lb = m_disp->Intensity();
- if (Valuebox(0,-255,255,lb,lb)) {
+ if (Valuebox(0,-100,100,lb,lb)) {
m_disp->setIntensity(lb,true);
}
}
void PMainWindow::setupToolbar()
{
@@ -721,12 +729,16 @@ void PMainWindow::setupMenu()
m_aFullScreen->addTo(dispMenu);
m_gDisplayType->addTo(dispMenu);
dispMenu->insertSeparator();
m_gPrevNext->addTo(dispMenu);
m_setCurrentBrightness->addTo(dispMenu);
m_setCurrentBrightness->setEnabled(false);
+ dispMenu->insertSeparator();
+ m_hBright->addTo(dispMenu);
+ m_hBright->setEnabled(false);
+
if (m_aForceSmall) {
dispMenu->insertSeparator();
m_aForceSmall->addTo(dispMenu);
}
m_aSetup->addTo(settingsMenu);
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.h b/noncore/graphics/opie-eye/gui/mainwindow.h
index 62b446b..c3b51f6 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.h
+++ b/noncore/graphics/opie-eye/gui/mainwindow.h
@@ -88,15 +88,16 @@ private:
int m_Intensity;
QToolButton*fsButton;
QToolBar *toolBar;
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;
- QActionGroup *m_gListViewMode,*m_gDisplayType,*m_gPrevNext,*m_hGroup;
+ QActionGroup *m_gListViewMode,*m_gDisplayType,*m_gPrevNext,*m_hGroup,*m_hBright;
QAction *m_aNext,*m_aPrevious,*m_aFullScreen;
QAction *m_aAutoRotate,*m_aUnscaled,*m_aZoomer,*m_aForceSmall,*m_setCurrentBrightness;
+ QAction *m_IncBrightness,*m_DecBrightness;
/* init funs */
void readConfig();
void setupActions();
void setupToolbar();
void setupMenu();