[Kde-imaging] extragear/graphics/kipi-plugins/slideshow
Valerio Fuoglio
valerio.fuoglio at gmail.com
Mon Oct 6 01:22:38 CEST 2008
SVN commit 868298 by vfuoglio:
ToolBar restyle
CCMAIL: kde-imaging at kde.org
GUI:
M +2 -1 CMakeLists.txt
AM slideplaybackwidget.cpp [License: GPL (v2+)]
AM slideplaybackwidget.h [License: GPL (v2+)]
A slideplaybackwidget.ui
M +36 -37 slideshow.cpp
M +3 -2 slideshow.h
M +35 -34 slideshowgl.cpp
M +2 -2 slideshowgl.h
--- trunk/extragear/graphics/kipi-plugins/slideshow/CMakeLists.txt #868297:868298
@@ -3,7 +3,6 @@
)
SET(kipiplugin_slideshow_PART_SRCS common.cpp
- toolbar.cpp
kbeffect.cpp
screenproperties.cpp
slideshowkb.cpp
@@ -15,6 +14,7 @@
soundtrackdialog.cpp
advanceddialog.cpp
playbackwidget.cpp
+ slideplaybackwidget.cpp
slideshow.cpp
slideshowconfig.cpp
slideshowgl.cpp
@@ -27,6 +27,7 @@
captiondialog.ui
advanceddialog.ui
soundtrackdialog.ui
+ slideplaybackwidget.ui
playbackwidget.ui
)
** trunk/extragear/graphics/kipi-plugins/slideshow/slideplaybackwidget.cpp #property svn:eol-style
+ native
** trunk/extragear/graphics/kipi-plugins/slideshow/slideplaybackwidget.h #property svn:eol-style
+ native
--- trunk/extragear/graphics/kipi-plugins/slideshow/slideshow.cpp #868297:868298
@@ -41,7 +41,6 @@
#include <qfont.h>
#include <qmatrix.h>
#include <qtextcodec.h>
-//Added by qt3to4:
#include <QKeyEvent>
#include <Q3PointArray>
#include <QMouseEvent>
@@ -55,9 +54,9 @@
#include <kdebug.h>
#include <kurl.h>
#include <KConfigGroup>
+
// Local includes.
-#include "toolbar.h"
#include "slideshow.h"
#include "slideshow.moc"
@@ -82,28 +81,28 @@
paletteSelection.setColor(QPalette::Window, QColor(0, 0, 0));
setPalette(paletteSelection);
- m_toolBar = new ToolBar(this);
- m_toolBar->hide();
+ m_slidePlaybackWidget = new SlidePlaybackWidget(this);
+ m_slidePlaybackWidget->hide();
if (!m_sharedData->loop)
{
- m_toolBar->setEnabledPrev(false);
+ m_slidePlaybackWidget->setEnabledPrev(false);
}
- connect(m_toolBar, SIGNAL(signalPause()),
+ connect(m_slidePlaybackWidget, SIGNAL(signalPause()),
this, SLOT(slotPause()));
- connect(m_toolBar, SIGNAL(signalPlay()),
+ connect(m_slidePlaybackWidget, SIGNAL(signalPlay()),
this, SLOT(slotPlay()));
- connect(m_toolBar, SIGNAL(signalNext()),
+ connect(m_slidePlaybackWidget, SIGNAL(signalNext()),
this, SLOT(slotNext()));
- connect(m_toolBar, SIGNAL(signalPrev()),
+ connect(m_slidePlaybackWidget, SIGNAL(signalPrev()),
this, SLOT(slotPrev()));
- connect(m_toolBar, SIGNAL(signalClose()),
+ connect(m_slidePlaybackWidget, SIGNAL(signalClose()),
this, SLOT(slotClose()));
// ---------------------------------------------------------------
@@ -323,8 +322,8 @@
if (!m_sharedData->loop)
{
- m_toolBar->setEnabledPrev(m_fileIndex > 0);
- m_toolBar->setEnabledNext(m_fileIndex < num - 1);
+ m_slidePlaybackWidget->setEnabledPrev(m_fileIndex > 0);
+ m_slidePlaybackWidget->setEnabledNext(m_fileIndex < num - 1);
}
QPixmap* oldPixmap = m_currImage;
@@ -381,8 +380,8 @@
if (!m_sharedData->loop)
{
- m_toolBar->setEnabledPrev(m_fileIndex > 0);
- m_toolBar->setEnabledNext(m_fileIndex < num - 1);
+ m_slidePlaybackWidget->setEnabledPrev(m_fileIndex > 0);
+ m_slidePlaybackWidget->setEnabledNext(m_fileIndex < num - 1);
}
QPixmap* oldPixmap = m_currImage;
@@ -581,9 +580,9 @@
// p.drawText(100, 150, i18n("Click To Exit..."));
// p.end();
update();
- m_toolBar->setEnabledPlay(false);
- m_toolBar->setEnabledNext(false);
- m_toolBar->setEnabledPrev(false);
+ m_slidePlaybackWidget->setEnabledPlay(false);
+ m_slidePlaybackWidget->setEnabledNext(false);
+ m_slidePlaybackWidget->setEnabledPrev(false);
}
void SlideShow::keyPressEvent(QKeyEvent *event)
@@ -591,7 +590,7 @@
if (!event)
return;
- m_toolBar->keyPressEvent(event);
+ m_slidePlaybackWidget->keyPressEvent(event);
}
void SlideShow::mousePressEvent(QMouseEvent *e)
@@ -602,13 +601,13 @@
if (e->button() == Qt::LeftButton)
{
m_timer->stop();
- m_toolBar->setPaused(true);
+ m_slidePlaybackWidget->setPaused(true);
slotNext();
}
else if (e->button() == Qt::RightButton && m_fileIndex - 1 >= 0)
{
m_timer->stop();
- m_toolBar->setPaused(true);
+ m_slidePlaybackWidget->setPaused(true);
slotPrev();
}
}
@@ -619,7 +618,7 @@
m_mouseMoveTimer->setSingleShot(true);
m_mouseMoveTimer->start(1000);
- if (!m_toolBar->canHide())
+ if (!m_slidePlaybackWidget->canHide())
return;
QPoint pos(e->pos());
@@ -627,38 +626,38 @@
if ((pos.y() > (m_deskY + 20)) &&
(pos.y() < (m_deskY + m_deskHeight - 20 - 1)))
{
- if (m_toolBar->isHidden())
+ if (m_slidePlaybackWidget->isHidden())
return;
else
- m_toolBar->hide();
+ m_slidePlaybackWidget->hide();
return;
}
- int w = m_toolBar->width();
+ int w = m_slidePlaybackWidget->width();
- int h = m_toolBar->height();
+ int h = m_slidePlaybackWidget->height();
if (pos.y() < (m_deskY + 20))
{
if (pos.x() <= (m_deskX + m_deskWidth / 2))
// position top left
- m_toolBar->move(m_deskX, m_deskY);
+ m_slidePlaybackWidget->move(m_deskX, m_deskY);
else
// position top right
- m_toolBar->move(m_deskX + m_deskWidth - w - 1, m_deskY);
+ m_slidePlaybackWidget->move(m_deskX + m_deskWidth - w - 1, m_deskY);
}
else
{
if (pos.x() <= (m_deskX + m_deskWidth / 2))
// position bot left
- m_toolBar->move(m_deskX, m_deskY + m_deskHeight - h - 1);
+ m_slidePlaybackWidget->move(m_deskX, m_deskY + m_deskHeight - h - 1);
else
// position bot right
- m_toolBar->move(m_deskX + m_deskWidth - w - 1, m_deskY + m_deskHeight - h - 1);
+ m_slidePlaybackWidget->move(m_deskX + m_deskWidth - w - 1, m_deskY + m_deskHeight - h - 1);
}
- m_toolBar->show();
+ m_slidePlaybackWidget->show();
}
void SlideShow::wheelEvent(QWheelEvent *e)
@@ -673,13 +672,13 @@
if (delta < 0)
{
m_timer->stop();
- m_toolBar->setPaused(true);
+ m_slidePlaybackWidget->setPaused(true);
slotNext();
}
else if (delta > 0 && m_fileIndex - 1 >= 0)
{
m_timer->stop();
- m_toolBar->setPaused(true);
+ m_slidePlaybackWidget->setPaused(true);
slotPrev();
}
}
@@ -1351,17 +1350,17 @@
{
m_timer->stop();
- if (m_toolBar->isHidden())
+ if (m_slidePlaybackWidget->isHidden())
{
- int w = m_toolBar->width();
- m_toolBar->move(m_deskWidth - w - 1, 0);
- m_toolBar->show();
+ int w = m_slidePlaybackWidget->width();
+ m_slidePlaybackWidget->move(m_deskWidth - w - 1, 0);
+ m_slidePlaybackWidget->show();
}
}
void SlideShow::slotPlay()
{
- m_toolBar->hide();
+ m_slidePlaybackWidget->hide();
slotTimeOut();
}
--- trunk/extragear/graphics/kipi-plugins/slideshow/slideshow.h #868297:868298
@@ -53,6 +53,7 @@
// Local includes.
#include "slideshowloader.h"
+#include "slideplaybackwidget.h"
#include "common.h"
class QTimer;
@@ -63,7 +64,7 @@
namespace KIPISlideShowPlugin
{
-class ToolBar;
+class SlidePlaybackWidget;
class SlideShow;
@@ -168,7 +169,7 @@
double m_fx, m_fy, m_alpha, m_fd;
int* m_intArray;
- ToolBar* m_toolBar;
+ SlidePlaybackWidget* m_slidePlaybackWidget;
QTimer* m_mouseMoveTimer;
int m_deskX;
--- trunk/extragear/graphics/kipi-plugins/slideshow/slideshowgl.cpp #868297:868298
@@ -72,32 +72,32 @@
m_sharedData = sharedData;
- m_toolBar = new ToolBar(this);
- m_toolBar->hide();
+ m_slidePlaybackWidget = new SlidePlaybackWidget(this);
+ m_slidePlaybackWidget->hide();
if (!m_sharedData->loop)
{
- m_toolBar->setEnabledPrev(false);
+ m_slidePlaybackWidget->setEnabledPrev(false);
}
- connect(m_toolBar, SIGNAL(signalPause()),
+ connect(m_slidePlaybackWidget, SIGNAL(signalPause()),
SLOT(slotPause()));
- connect(m_toolBar, SIGNAL(signalPlay()),
+ connect(m_slidePlaybackWidget, SIGNAL(signalPlay()),
SLOT(slotPlay()));
- connect(m_toolBar, SIGNAL(signalNext()),
+ connect(m_slidePlaybackWidget, SIGNAL(signalNext()),
SLOT(slotNext()));
- connect(m_toolBar, SIGNAL(signalPrev()),
+ connect(m_slidePlaybackWidget, SIGNAL(signalPrev()),
SLOT(slotPrev()));
- connect(m_toolBar, SIGNAL(signalClose()),
+ connect(m_slidePlaybackWidget, SIGNAL(signalClose()),
SLOT(slotClose()));
m_playbackWidget = new PlaybackWidget(this, m_sharedData->soundtrackUrls, m_sharedData);
m_playbackWidget->hide();
- int w = m_toolBar->width();
+ int w = m_slidePlaybackWidget->width();
- m_toolBar->move(m_deskX + m_deskWidth - w - 1, m_deskY);
+ m_slidePlaybackWidget->move(m_deskX + m_deskWidth - w - 1, m_deskY);
m_playbackWidget->move(m_deskX, m_deskY);
// -- Minimal texture size (opengl specs) --------------
@@ -178,6 +178,7 @@
delete m_timer;
delete m_mouseMoveTimer;
delete m_playbackWidget;
+ delete m_slidePlaybackWidget;
if (m_texture[0])
glDeleteTextures(1, &m_texture[0]);
@@ -263,7 +264,7 @@
if (!event)
return;
- m_toolBar->keyPressEvent(event);
+ m_slidePlaybackWidget->keyPressEvent(event);
m_playbackWidget->keyPressEvent(event);
}
@@ -276,13 +277,13 @@
if (e->button() == Qt::LeftButton)
{
m_timer->stop();
- m_toolBar->setPaused(true);
+ m_slidePlaybackWidget->setPaused(true);
slotNext();
}
else if (e->button() == Qt::RightButton && m_fileIndex - 1 >= 0)
{
m_timer->stop();
- m_toolBar->setPaused(true);
+ m_slidePlaybackWidget->setPaused(true);
slotPrev();
}
}
@@ -293,7 +294,7 @@
m_mouseMoveTimer->setSingleShot(true);
m_mouseMoveTimer->start(1000);
- if (!m_toolBar->canHide() || !m_playbackWidget->canHide())
+ if (!m_slidePlaybackWidget->canHide() || !m_playbackWidget->canHide())
return;
QPoint pos(e->pos());
@@ -301,18 +302,18 @@
if ((pos.y() > (m_deskY + 20)) &&
(pos.y() < (m_deskY + m_deskHeight - 20 - 1)))
{
- if (m_toolBar->isHidden() || m_playbackWidget->isHidden())
+ if (m_slidePlaybackWidget->isHidden() || m_playbackWidget->isHidden())
return;
else
{
- m_toolBar->hide();
+ m_slidePlaybackWidget->hide();
m_playbackWidget->hide();
}
return;
}
- m_toolBar->show();
+ m_slidePlaybackWidget->show();
m_playbackWidget->show();
}
@@ -329,13 +330,13 @@
if (delta < 0)
{
m_timer->stop();
- m_toolBar->setPaused(true);
+ m_slidePlaybackWidget->setPaused(true);
slotNext();
}
else if (delta > 0 && m_fileIndex - 1 >= 0)
{
m_timer->stop();
- m_toolBar->setPaused(true);
+ m_slidePlaybackWidget->setPaused(true);
slotPrev();
}
}
@@ -420,16 +421,16 @@
{
m_fileIndex = num - 1;
m_endOfShow = true;
- m_toolBar->setEnabledPlay(false);
- m_toolBar->setEnabledNext(false);
- m_toolBar->setEnabledPrev(false);
+ m_slidePlaybackWidget->setEnabledPlay(false);
+ m_slidePlaybackWidget->setEnabledNext(false);
+ m_slidePlaybackWidget->setEnabledPrev(false);
}
}
if (!m_sharedData->loop && !m_endOfShow)
{
- m_toolBar->setEnabledPrev(m_fileIndex > 0);
- m_toolBar->setEnabledNext(m_fileIndex < num - 1);
+ m_slidePlaybackWidget->setEnabledPrev(m_fileIndex > 0);
+ m_slidePlaybackWidget->setEnabledNext(m_fileIndex < num - 1);
}
m_tex1First = !m_tex1First;
@@ -453,16 +454,16 @@
{
m_fileIndex = 0;
m_endOfShow = true;
- m_toolBar->setEnabledPlay(false);
- m_toolBar->setEnabledNext(false);
- m_toolBar->setEnabledPrev(false);
+ m_slidePlaybackWidget->setEnabledPlay(false);
+ m_slidePlaybackWidget->setEnabledNext(false);
+ m_slidePlaybackWidget->setEnabledPrev(false);
}
}
if (!m_sharedData->loop && !m_endOfShow)
{
- m_toolBar->setEnabledPrev(m_fileIndex > 0);
- m_toolBar->setEnabledNext(m_fileIndex < num - 1);
+ m_slidePlaybackWidget->setEnabledPrev(m_fileIndex > 0);
+ m_slidePlaybackWidget->setEnabledNext(m_fileIndex < num - 1);
}
m_tex1First = !m_tex1First;
@@ -1590,17 +1591,17 @@
{
m_timer->stop();
- if (m_toolBar->isHidden())
+ if (m_slidePlaybackWidget->isHidden())
{
- int w = m_toolBar->width();
- m_toolBar->move(m_deskWidth - w - 1, 0);
- m_toolBar->show();
+ int w = m_slidePlaybackWidget->width();
+ m_slidePlaybackWidget->move(m_deskWidth - w - 1, 0);
+ m_slidePlaybackWidget->show();
}
}
void SlideShowGL::slotPlay()
{
- m_toolBar->hide();
+ m_slidePlaybackWidget->hide();
slotTimeOut();
}
--- trunk/extragear/graphics/kipi-plugins/slideshow/slideshowgl.h #868297:868298
@@ -40,7 +40,7 @@
// Local includes
#include "slideshowloader.h"
-#include "toolbar.h"
+#include "slideplaybackwidget.h"
#include "playbackwidget.h"
#include "common.h"
@@ -151,7 +151,7 @@
int m_dir;
float m_points[40][40][3];
- ToolBar* m_toolBar;
+ SlidePlaybackWidget* m_slidePlaybackWidget;
PlaybackWidget* m_playbackWidget;
QTimer* m_mouseMoveTimer;
More information about the Kde-imaging
mailing list