[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [labplot] src/commonfrontend/worksheet: Read the worksheet presenter mode (static vs. dynamic) from 
From:       Alexander Semke <alexander.semke () web ! de>
Date:       2016-12-07 20:40:03
Message-ID: E1cEj0V-0001pA-4A () code ! kde ! org
[Download RAW message or body]

Git commit 80397f2950282b786f1a9c473de12058f69f6cb8 by Alexander Semke.
Committed on 07/12/2016 at 20:37.
Pushed by asemke into branch 'master'.

Read the worksheet presenter mode (static vs. dynamic) from global settings.

M  +13   -6    src/commonfrontend/worksheet/WorksheetView.cpp

https://commits.kde.org/labplot/80397f2950282b786f1a9c473de12058f69f6cb8

diff --git a/src/commonfrontend/worksheet/WorksheetView.cpp \
b/src/commonfrontend/worksheet/WorksheetView.cpp index 6df79a84..b4cf426e 100644
--- a/src/commonfrontend/worksheet/WorksheetView.cpp
+++ b/src/commonfrontend/worksheet/WorksheetView.cpp
@@ -50,6 +50,8 @@
 #include <KAction>
 #include <KLocale>
 #include <KMessageBox>
+#include <KConfigGroup>
+#include <KGlobal>
 
 #include <limits>
 
@@ -1633,8 +1635,16 @@ void WorksheetView::cartesianPlotNavigationChanged(QAction* \
action) {  }
 
 void WorksheetView::presenterMode() {
+	KConfigGroup group = KGlobal::config()->group(QLatin1String("Worksheet"));
 
-	//check worksheet presenting mode config here
+	//show dynamic presenter widget, if enabled
+	if (group.readEntry("PresenterModeDynamic", false)) {
+		DynamicPresenterWidget* dynamicPresenterWidget = new \
DynamicPresenterWidget(m_worksheet); +		dynamicPresenterWidget->showFullScreen();
+		return;
+	}
+
+	//show static presenter widget (default)
 	QRectF sourceRect(scene()->sceneRect());
 
 	int w = Worksheet::convertFromSceneUnits(sourceRect.width(), \
Worksheet::Millimeter); @@ -1662,9 +1672,6 @@ void WorksheetView::presenterMode() {
 	exportPaint(&painter, targetRect, sourceRect, true);
 	painter.end();
 
-	/*PresenterWidget* presenterWidget = new PresenterWidget(QPixmap::fromImage(image), \
                m_worksheet->name());
-	presenterWidget->showFullScreen();*/
-
-	DynamicPresenterWidget* dynamicPresenterWidget = new \
                DynamicPresenterWidget(m_worksheet);
-	dynamicPresenterWidget->showFullScreen();
+	PresenterWidget* presenterWidget = new PresenterWidget(QPixmap::fromImage(image), \
m_worksheet->name()); +	presenterWidget->showFullScreen();
 }


[prev in list] [next in list] [prev in thread] [next in thread]