summaryrefslogtreecommitdiff
authoralwin <alwin>2005-03-24 12:16:23 (UTC)
committer alwin <alwin>2005-03-24 12:16:23 (UTC)
commit4fbd94e2fd6432bb15e24e40be59426b309cbb9d (patch) (side-by-side diff)
treeb78ecad37012bb66d956e22dbaa8cfcdb8cf67fc
parentc635023dd68edd0cb0cbb2827b926f33e27e0404 (diff)
downloadopie-4fbd94e2fd6432bb15e24e40be59426b309cbb9d.zip
opie-4fbd94e2fd6432bb15e24e40be59426b309cbb9d.tar.gz
opie-4fbd94e2fd6432bb15e24e40be59426b309cbb9d.tar.bz2
- increased max-thumbnail-size
- shortcuts for inc/dec brightness - make max thumbnail size as a static so there is one point in code where it is stored and not 4 time over the whole code
Diffstat (more/less context) (show 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
@@ -47,8 +47,8 @@ BaseSetup::BaseSetup(Opie::Core::OConfig *a_cfg,QWidget * parent, const char * n
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" );
@@ -74,12 +74,13 @@ BaseSetup::BaseSetup(Opie::Core::OConfig *a_cfg,QWidget * parent, const char * n
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);
}
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
@@ -36,6 +36,10 @@
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
*/
@@ -222,8 +226,8 @@ PIconView::PIconView( QWidget* wid, Opie::Core::OConfig* cfg )
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();
@@ -408,8 +412,8 @@ void PIconView::resetView() {
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;
@@ -422,7 +426,7 @@ void PIconView::resetView() {
calculateGrid();
}
} else {
- m_iconsize = 64;
+ m_iconsize = sDEF_ICON_SIZE;
}
slotViewChanged(m_views->currentItem());
m_internalReset = false;
@@ -833,11 +837,11 @@ void PIconView::slotChangeMode( int mode ) {
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;
@@ -888,7 +892,7 @@ void PIconView::calculateGrid(QResizeEvent* re)
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;
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
@@ -37,6 +37,10 @@ public:
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&);
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
@@ -29,6 +29,7 @@ ImageView::ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name
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()?
@@ -39,11 +40,28 @@ ImageView::ImageView(Opie::Core::OConfig *cfg, QWidget* parent, const char* name
} 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;
@@ -60,11 +78,12 @@ void ImageView::systemMessage( const QCString& msg, const QByteArray& data )
}
}
-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()
@@ -174,6 +193,15 @@ void ImageView::initKeys()
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();
}
@@ -223,6 +251,10 @@ void ImageView::contentsMousePressEvent ( QMouseEvent * e)
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()) );
@@ -235,6 +267,9 @@ void ImageView::contentsMousePressEvent ( QMouseEvent * e)
if (m_gDisplayType) {
m_gDisplayType->removeFrom(m);
}
+ if (m_gBright) {
+ m_gBright->removeFrom(m);
+ }
delete m;
}
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
@@ -29,7 +29,9 @@ class ImageView:public Opie::MM::OImageScrollView
ShowPrevious,
Zoomer,
Autorotate,
- Autoscale
+ Autoscale,
+ Incbrightness,
+ Decbrightness
};
public:
@@ -40,7 +42,7 @@ public:
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:
@@ -52,6 +54,8 @@ signals:
void toggleZoomer();
void toggleAutoscale();
void toggleAutorotate();
+ void incBrightness();
+ void decBrightness();
protected:
Opie::Core::OConfig * m_cfg;
@@ -65,7 +69,7 @@ protected:
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;
@@ -75,6 +79,8 @@ public slots:
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();
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
@@ -265,7 +265,7 @@ void PMainWindow::initDisp() {
// 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());
@@ -279,6 +279,8 @@ void PMainWindow::initDisp() {
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());
}
}
@@ -380,6 +382,7 @@ void PMainWindow::slotDisplay( const QString& inf ) {
initDisp();
m_disp->setIntensity(m_Intensity);
m_setCurrentBrightness->setEnabled(true);
+ m_hBright->setEnabled(true);
}
m_disp->setImage( inf );
if (m_SmallWindow) {
@@ -643,6 +646,11 @@ void PMainWindow::setupActions()
}
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()
@@ -651,7 +659,7 @@ void PMainWindow::setupBrightness()
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);
}
}
@@ -724,6 +732,10 @@ void PMainWindow::setupMenu()
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);
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
@@ -91,9 +91,10 @@ private:
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();