diff --git a/conf/dlgpresentationbase.ui b/conf/dlgpresentationbase.ui
index e6145d9db..89cb61770 100644
--- a/conf/dlgpresentationbase.ui
+++ b/conf/dlgpresentationbase.ui
@@ -6,23 +6,14 @@
0
0
400
- 352
+ 396
6
-
- 0
-
-
- 0
-
-
- 0
-
-
+
0
-
@@ -34,16 +25,7 @@
6
-
- 9
-
-
- 9
-
-
- 9
-
-
+
9
-
@@ -51,16 +33,7 @@
6
-
- 0
-
-
- 0
-
-
- 0
-
-
+
0
-
@@ -104,36 +77,15 @@
6
-
- 9
-
-
- 9
-
-
- 9
-
-
+
9
-
-
- 0
-
-
+
0
-
- 0
-
-
- 0
-
-
- 6
-
-
+
6
-
@@ -150,110 +102,6 @@
-
-
-
- Default transition:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
-
-
- Blinds Vertical
-
-
- -
-
- Blinds Horizontal
-
-
- -
-
- Box In
-
-
- -
-
- Box Out
-
-
- -
-
- Dissolve
-
-
- -
-
- Glitter Down
-
-
- -
-
- Glitter Right
-
-
- -
-
- Glitter Right-Down
-
-
- -
-
- Random Transition
-
-
- -
-
- Replace
-
-
- -
-
- Split Horizontal In
-
-
- -
-
- Split Horizontal Out
-
-
- -
-
- Split Vertical In
-
-
- -
-
- Split Vertical Out
-
-
- -
-
- Wipe Down
-
-
- -
-
- Wipe Right
-
-
- -
-
- Wipe Left
-
-
- -
-
- Wipe Up
-
-
-
-
- -
Mouse cursor:
@@ -263,7 +111,7 @@
- -
+
-
-
@@ -301,6 +149,125 @@
+ -
+
+
+ Enable transitions
+
+
+ true
+
+
+ true
+
+
+
-
+
+
+ Default transition:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
-
+
+ Blinds Vertical
+
+
+ -
+
+ Blinds Horizontal
+
+
+ -
+
+ Box In
+
+
+ -
+
+ Box Out
+
+
+ -
+
+ Dissolve
+
+
+ -
+
+ Glitter Down
+
+
+ -
+
+ Glitter Right
+
+
+ -
+
+ Glitter Right-Down
+
+
+ -
+
+ Random Transition
+
+
+ -
+
+ Replace
+
+
+ -
+
+ Split Horizontal In
+
+
+ -
+
+ Split Horizontal Out
+
+
+ -
+
+ Split Vertical In
+
+
+ -
+
+ Split Vertical Out
+
+
+ -
+
+ Wipe Down
+
+
+ -
+
+ Wipe Right
+
+
+ -
+
+ Wipe Left
+
+
+ -
+
+ Wipe Up
+
+
+
+
+
+
+
-
@@ -310,16 +277,7 @@
6
-
- 9
-
-
- 9
-
-
- 9
-
-
+
9
-
@@ -327,16 +285,7 @@
6
-
- 0
-
-
- 0
-
-
- 0
-
-
+
0
-
@@ -365,7 +314,7 @@
QSizePolicy::Expanding
-
+
318
16
diff --git a/conf/okular.kcfg b/conf/okular.kcfg
index c3b2bf1d0..7794bd2f8 100644
--- a/conf/okular.kcfg
+++ b/conf/okular.kcfg
@@ -137,6 +137,9 @@
Qt::red
+
+ true
+
diff --git a/ui/presentationwidget.cpp b/ui/presentationwidget.cpp
index 971149237..23ba0cf2e 100644
--- a/ui/presentationwidget.cpp
+++ b/ui/presentationwidget.cpp
@@ -692,7 +692,7 @@ void PresentationWidget::generatePage( bool disableTransition )
#endif
// start transition on pages that have one
- if ( !disableTransition )
+ if ( !disableTransition && Okular::Settings::slidesTransitionsEnabled() )
{
const Okular::PageTransition * transition = m_frameIndex != -1 ?
m_frames[ m_frameIndex ]->page->transition() : 0;