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

List:       kde-commits
Subject:    [labplot] src: Use proper config group for the presenter mode in WorksheetView and some minor fixes.
From:       Alexander Semke <alexander.semke () web ! de>
Date:       2016-12-08 6:12:38
Message-ID: E1cErwc-0003Iq-B3 () code ! kde ! org
[Download RAW message or body]

Git commit 789329c7ae24d023192f4f13ae93cdba7feb891d by Alexander Semke.
Committed on 08/12/2016 at 06:10.
Pushed by asemke into branch 'master'.

Use proper config group for the presenter mode in WorksheetView and some minor fixes.

M  +2    -2    src/commonfrontend/worksheet/WorksheetView.cpp
M  +2    -0    src/kdefrontend/SettingsDialog.cpp
M  +1    -0    src/kdefrontend/SettingsWorksheetPage.cpp
M  +0    -3    src/kdefrontend/worksheet/PresenterWidget.cpp

https://commits.kde.org/labplot/789329c7ae24d023192f4f13ae93cdba7feb891d

diff --git a/src/commonfrontend/worksheet/WorksheetView.cpp \
b/src/commonfrontend/worksheet/WorksheetView.cpp index b4cf426e..162b4448 100644
--- a/src/commonfrontend/worksheet/WorksheetView.cpp
+++ b/src/commonfrontend/worksheet/WorksheetView.cpp
@@ -1635,10 +1635,10 @@ void WorksheetView::cartesianPlotNavigationChanged(QAction* \
action) {  }
 
 void WorksheetView::presenterMode() {
-	KConfigGroup group = KGlobal::config()->group(QLatin1String("Worksheet"));
+	KConfigGroup group = KGlobal::config()->group(QLatin1String("Settings_Worksheet"));
 
 	//show dynamic presenter widget, if enabled
-	if (group.readEntry("PresenterModeDynamic", false)) {
+	if (group.readEntry("PresenterModeInteractive", false)) {
 		DynamicPresenterWidget* dynamicPresenterWidget = new \
DynamicPresenterWidget(m_worksheet);  dynamicPresenterWidget->showFullScreen();
 		return;
diff --git a/src/kdefrontend/SettingsDialog.cpp b/src/kdefrontend/SettingsDialog.cpp
index 958f779d..acb92094 100644
--- a/src/kdefrontend/SettingsDialog.cpp
+++ b/src/kdefrontend/SettingsDialog.cpp
@@ -96,6 +96,7 @@ void SettingsDialog::changed() {
 void SettingsDialog::applySettings() {
 	m_changed = false;
 	generalPage->applySettings();
+	worksheetPage->applySettings();
 	KGlobal::config()->sync();	
 	emit settingsChanged();
 }
@@ -103,4 +104,5 @@ void SettingsDialog::applySettings() {
 void SettingsDialog::restoreDefaults(){
 	m_changed = false;
 	generalPage->restoreDefaults();
+	worksheetPage->restoreDefaults();
 }
diff --git a/src/kdefrontend/SettingsWorksheetPage.cpp \
b/src/kdefrontend/SettingsWorksheetPage.cpp index 4d37b784..a22f15e5 100644
--- a/src/kdefrontend/SettingsWorksheetPage.cpp
+++ b/src/kdefrontend/SettingsWorksheetPage.cpp
@@ -56,6 +56,7 @@ SettingsWorksheetPage::SettingsWorksheetPage(QWidget* parent) : \
SettingsPage(par  if (TeXRenderer::executableExists(QLatin1String("latex")))
 		ui.cbTexEngine->addItem(QLatin1String("LaTeX"), QLatin1String("latex"));
 
+	connect(ui.chkPresenterModeInteractive, SIGNAL(stateChanged(int)), this, \
SLOT(changed()) );  connect(ui.chkDoubleBuffering, SIGNAL(stateChanged(int)), this, \
SLOT(changed()) );  connect(ui.cbTexEngine, SIGNAL(currentIndexChanged(int)), this, \
SLOT(changed()) );  connect(ui.cbTexEngine, SIGNAL(currentIndexChanged(int)), this, \
                SLOT(checkTeX(int)) );
diff --git a/src/kdefrontend/worksheet/PresenterWidget.cpp \
b/src/kdefrontend/worksheet/PresenterWidget.cpp index cbefb146..20b42c21 100644
--- a/src/kdefrontend/worksheet/PresenterWidget.cpp
+++ b/src/kdefrontend/worksheet/PresenterWidget.cpp
@@ -29,13 +29,10 @@ Copyright            : (C) 2016 by Fabian Kristof \
(fkristofszabolcs@gmail.com)  
 #include <QKeyEvent>
 #include <QLabel>
-#include <QHBoxLayout>
 #include <QDesktopWidget>
 #include <QApplication>
-#include <QFontMetrics>
 #include <QTimeLine>
 #include <QPushButton>
-#include <QPalette>
 
 #include <KLocalizedString>
 


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