[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [labplot] src: Added settings page for Worksheet.
From: Alexander Semke <alexander.semke () web ! de>
Date: 2016-12-08 6:01:24
Message-ID: E1cErlk-0006qn-MV () code ! kde ! org
[Download RAW message or body]
Git commit 61c3ec9695eb722502ab4ce18e60e7891e41cc6c by Alexander Semke.
Committed on 08/12/2016 at 06:01.
Pushed by asemke into branch 'master'.
Added settings page for Worksheet.
M +5 -4 src/CMakeLists.txt
M +7 -1 src/kdefrontend/SettingsDialog.cpp
M +3 -1 src/kdefrontend/SettingsDialog.h
M +14 -98 src/kdefrontend/SettingsGeneralPage.cpp
M +1 -2 src/kdefrontend/SettingsGeneralPage.h
C +19 -70 src/kdefrontend/SettingsWorksheetPage.cpp [from: \
src/kdefrontend/SettingsGeneralPage.cpp - 056% similarity] C +9 -11 \
src/kdefrontend/SettingsWorksheetPage.h [from: src/kdefrontend/SettingsGeneralPage.h \
- 081% similarity] A +165 -0 src/kdefrontend/ui/settingsworksheetpage.ui
https://commits.kde.org/labplot/61c3ec9695eb722502ab4ce18e60e7891e41cc6c
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ae230611..e6d3f73a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,13 +7,14 @@ set(TOOLS_DIR tools)
set(CMAKE_AUTOMOC ON)
set(GUI_SOURCES
- ${KDEFRONTEND_DIR}/GuiObserver.cpp
+ ${KDEFRONTEND_DIR}/GuiObserver.cpp
${KDEFRONTEND_DIR}/GuiTools.cpp
${KDEFRONTEND_DIR}/HistoryDialog.cpp
${KDEFRONTEND_DIR}/LabPlot.cpp
- ${KDEFRONTEND_DIR}/MainWin.cpp
+ ${KDEFRONTEND_DIR}/MainWin.cpp
${KDEFRONTEND_DIR}/SettingsDialog.cpp
${KDEFRONTEND_DIR}/SettingsGeneralPage.cpp
+ ${KDEFRONTEND_DIR}/SettingsWorksheetPage.cpp
${KDEFRONTEND_DIR}/SettingsPage.h
${KDEFRONTEND_DIR}/TemplateHandler.cpp
${KDEFRONTEND_DIR}/ThemeHandler.cpp
@@ -55,11 +56,10 @@ set(GUI_SOURCES
${KDEFRONTEND_DIR}/spreadsheet/SortDialog.cpp
${KDEFRONTEND_DIR}/spreadsheet/StatisticsDialog.cpp
${KDEFRONTEND_DIR}/worksheet/ExportWorksheetDialog.cpp
- ${KDEFRONTEND_DIR}/worksheet/GridDialog.cpp
+ ${KDEFRONTEND_DIR}/worksheet/GridDialog.cpp
${KDEFRONTEND_DIR}/worksheet/DynamicPresenterWidget.cpp
${KDEFRONTEND_DIR}/worksheet/PresenterWidget.cpp
${KDEFRONTEND_DIR}/worksheet/SlidingPanel.cpp
-
${KDEFRONTEND_DIR}/widgets/ConstantsWidget.cpp
${KDEFRONTEND_DIR}/widgets/ThemesWidget.cpp
${KDEFRONTEND_DIR}/widgets/ExpressionTextEdit.cpp
@@ -82,6 +82,7 @@ set(UI_SOURCES
${KDEFRONTEND_DIR}/ui/fitparameterswidget.ui
${KDEFRONTEND_DIR}/ui/labelwidget.ui
${KDEFRONTEND_DIR}/ui/settingsgeneralpage.ui
+ ${KDEFRONTEND_DIR}/ui/settingsworksheetpage.ui
${KDEFRONTEND_DIR}/ui/settingsprintingpage.ui
${KDEFRONTEND_DIR}/ui/datasources/asciioptionswidget.ui
${KDEFRONTEND_DIR}/ui/datasources/binaryoptionswidget.ui
diff --git a/src/kdefrontend/SettingsDialog.cpp b/src/kdefrontend/SettingsDialog.cpp
index b6486415..958f779d 100644
--- a/src/kdefrontend/SettingsDialog.cpp
+++ b/src/kdefrontend/SettingsDialog.cpp
@@ -3,7 +3,7 @@
Project : LabPlot
--------------------------------------------------------------------
Copyright : (C) 2008-2016 by Alexander Semke (alexander.semke@web.de)
- Description : general settings dialog
+ Description : application settings dialog
***************************************************************************/
@@ -27,6 +27,7 @@
***************************************************************************/
#include "SettingsDialog.h"
#include "SettingsGeneralPage.h"
+#include "SettingsWorksheetPage.h"
#include <KMessageBox>
@@ -53,6 +54,11 @@ SettingsDialog::SettingsDialog(QWidget* parent) : \
KPageDialog(parent), m_changed generalFrame->setIcon(KIcon("system-run"));
connect(generalPage, SIGNAL(settingsChanged()), this, SLOT(changed()));
+ worksheetPage = new SettingsWorksheetPage(this);
+ KPageWidgetItem* worksheetFrame = addPage(worksheetPage, i18n("Worksheet"));
+ worksheetFrame->setIcon(KIcon(QLatin1String("labplot-worksheet")));
+ connect(worksheetPage, SIGNAL(settingsChanged()), this, SLOT(changed()));
+
KConfigGroup conf(KSharedConfig::openConfig(), "SettingsDialog");
restoreDialogSize(conf);
}
diff --git a/src/kdefrontend/SettingsDialog.h b/src/kdefrontend/SettingsDialog.h
index cdf138cc..e4be110e 100644
--- a/src/kdefrontend/SettingsDialog.h
+++ b/src/kdefrontend/SettingsDialog.h
@@ -3,7 +3,7 @@
Project : LabPlot
--------------------------------------------------------------------
Copyright : (C) 2008-2016 by Alexander Semke (alexander.semke@web.de)
- Description : general settings dialog
+ Description : application settings dialog
***************************************************************************/
@@ -31,6 +31,7 @@
#include <KPageDialog>
class SettingsGeneralPage;
+class SettingsWorksheetPage;
class SettingsDialog : public KPageDialog {
Q_OBJECT
@@ -48,6 +49,7 @@ class SettingsDialog : public KPageDialog {
private:
bool m_changed;
SettingsGeneralPage* generalPage;
+ SettingsWorksheetPage* worksheetPage;
void applySettings();
void restoreDefaults();
diff --git a/src/kdefrontend/SettingsGeneralPage.cpp \
b/src/kdefrontend/SettingsGeneralPage.cpp index 80b54cd7..7f996659 100644
--- a/src/kdefrontend/SettingsGeneralPage.cpp
+++ b/src/kdefrontend/SettingsGeneralPage.cpp
@@ -27,12 +27,7 @@
***************************************************************************/
#include "SettingsGeneralPage.h"
-#include "MainWin.h"
-#include "tools/TeXRenderer.h"
-
-#include <KDialog>
#include <KLocale>
-#include <kfiledialog.h>
/**
* \brief Page for the 'General' settings of the Labplot settings dialog.
@@ -43,45 +38,24 @@ SettingsGeneralPage::SettingsGeneralPage(QWidget* parent) : \
SettingsPage(parent) ui.setupUi(this);
retranslateUi();
- ui.lLatexWarning->setPixmap( KIcon("state-warning").pixmap(QSize(48,48)) );
-
- //add available TeX typesetting engines
- if (TeXRenderer::executableExists(QLatin1String("lualatex")))
- ui.cbTexEngine->addItem(QLatin1String("LuaLaTeX"), QLatin1String("lualatex"));
-
- if (TeXRenderer::executableExists(QLatin1String("xelatex")))
- ui.cbTexEngine->addItem(QLatin1String("XeLaTex"), QLatin1String("xelatex"));
-
- if (TeXRenderer::executableExists(QLatin1String("pdflatex")))
- ui.cbTexEngine->addItem(QLatin1String("pdfLaTeX"), QLatin1String("pdflatex"));
-
- if (TeXRenderer::executableExists(QLatin1String("latex")))
- ui.cbTexEngine->addItem(QLatin1String("LaTeX"), QLatin1String("latex"));
-
connect(ui.cbLoadOnStart, SIGNAL(currentIndexChanged(int)), this, SLOT(changed()) \
); connect(ui.cbInterface, SIGNAL(currentIndexChanged(int)), this, \
SLOT(interfaceChanged(int)) ); connect(ui.cbMdiVisibility, \
SIGNAL(currentIndexChanged(int)), this, SLOT(changed()) ); connect(ui.cbTabPosition, \
SIGNAL(currentIndexChanged(int)), this, SLOT(changed()) ); connect(ui.chkAutoSave, \
SIGNAL(stateChanged(int)), this, SLOT(changed()) );
- connect(ui.sbAutoSaveInterval, SIGNAL(valueChanged(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)) \
);
loadSettings();
interfaceChanged(ui.cbInterface->currentIndex());
}
void SettingsGeneralPage::applySettings() {
- KConfigGroup group = KGlobal::config()->group( "General" );
- group.writeEntry("LoadOnStart", ui.cbLoadOnStart->currentIndex());
- group.writeEntry("ViewMode", ui.cbInterface->currentIndex());
- group.writeEntry("TabPosition", ui.cbTabPosition->currentIndex());
- group.writeEntry("MdiWindowVisibility", ui.cbMdiVisibility->currentIndex());
- group.writeEntry("AutoSave", ui.chkAutoSave->isChecked());
- group.writeEntry("AutoSaveInterval", ui.sbAutoSaveInterval->value());
- group.writeEntry("DoubleBuffering", ui.chkDoubleBuffering->isChecked());
- group.writeEntry("LaTeXEngine", \
ui.cbTexEngine->itemData(ui.cbTexEngine->currentIndex())); + KConfigGroup group = \
KGlobal::config()->group(QLatin1String("Settings_General")); \
+ group.writeEntry(QLatin1String("LoadOnStart"), ui.cbLoadOnStart->currentIndex()); \
+ group.writeEntry(QLatin1String("ViewMode"), ui.cbInterface->currentIndex()); \
+ group.writeEntry(QLatin1String("TabPosition"), ui.cbTabPosition->currentIndex()); \
+ group.writeEntry(QLatin1String("MdiWindowVisibility"), \
ui.cbMdiVisibility->currentIndex()); + group.writeEntry(QLatin1String("AutoSave"), \
ui.chkAutoSave->isChecked()); + group.writeEntry(QLatin1String("AutoSaveInterval"), \
ui.sbAutoSaveInterval->value()); }
void SettingsGeneralPage::restoreDefaults() {
@@ -89,23 +63,13 @@ void SettingsGeneralPage::restoreDefaults() {
}
void SettingsGeneralPage::loadSettings() {
- const KConfigGroup group = KGlobal::config()->group( "General" );
- ui.cbLoadOnStart->setCurrentIndex(group.readEntry("LoadOnStart", 0));
- ui.cbInterface->setCurrentIndex(group.readEntry("ViewMode", 0));
- ui.cbTabPosition->setCurrentIndex(group.readEntry("TabPosition", 0));
- ui.cbMdiVisibility->setCurrentIndex(group.readEntry("MdiWindowVisibility", 0));
- ui.chkAutoSave->setChecked(group.readEntry<bool>("AutoSave", 0));
- ui.sbAutoSaveInterval->setValue(group.readEntry("AutoSaveInterval", 0));
- ui.chkDoubleBuffering->setChecked(group.readEntry<bool>("DoubleBuffering", 1));
-
- QString engine = group.readEntry("LaTeXEngine", "");
- int index = -1;
- if (engine.isEmpty())
- index = ui.cbTexEngine->findData("xelatex");
- else
- index = ui.cbTexEngine->findData(engine);
-
- ui.cbTexEngine->setCurrentIndex(index);
+ const KConfigGroup group = \
KGlobal::config()->group(QLatin1String("Setttings_General")); \
+ ui.cbLoadOnStart->setCurrentIndex(group.readEntry(QLatin1String("LoadOnStart"), \
0)); + ui.cbInterface->setCurrentIndex(group.readEntry(QLatin1String("ViewMode"), \
0)); + ui.cbTabPosition->setCurrentIndex(group.readEntry(QLatin1String("TabPosition"), \
0)); + ui.cbMdiVisibility->setCurrentIndex(group.readEntry(QLatin1String("MdiWindowVisibility"), \
0)); + ui.chkAutoSave->setChecked(group.readEntry<bool>(QLatin1String("AutoSave"), \
0)); + ui.sbAutoSaveInterval->setValue(group.readEntry(QLatin1String("AutoSaveInterval"), \
0)); }
void SettingsGeneralPage::retranslateUi() {
@@ -144,51 +108,3 @@ void SettingsGeneralPage::interfaceChanged(int index) {
ui.cbMdiVisibility->setVisible(!tabbedView);
changed();
}
-
-/*!
- checks whether all tools required for latex typesetting are available. shows a \
warning if not.
- \sa TeXRenderer::active()
- */
-void SettingsGeneralPage::checkTeX(int engineIndex) {
- if (engineIndex == -1) {
- ui.lLatexWarning->show();
- ui.lLatexWarning->setToolTip(i18n("No LaTeX installation found or selected. LaTeX \
typesetting not possible."));
- return;
- }
-
- //engine found, check the precense of other required tools (s.a. TeXRenderer.cpp):
- //to convert the generated PDF/PS files to PNG we need 'convert' from the \
ImageMagic package
- if (!TeXRenderer::executableExists(QLatin1String("convert"))) {
- ui.lLatexWarning->show();
- ui.lLatexWarning->setToolTip(i18n("No 'convert' found. LaTeX typesetting not \
possible."));
- return;
- }
-
- QString engine = ui.cbTexEngine->itemData(engineIndex).toString();
- if (engine=="latex") {
- //to convert the generated PS files to DVI we need 'dvips'
- if (!TeXRenderer::executableExists(QLatin1String("dvips"))) {
- ui.lLatexWarning->show();
- ui.lLatexWarning->setToolTip(i18n("No 'dvips' found. LaTeX typesetting not \
possible."));
- return;
- }
- }
-
-#ifdef _WIN32
- if (!TeXRenderer::executableExists(QLatin1String("gswin32c.exe"))) {
- ui.lLatexWarning->show();
- ui.lLatexWarning->setToolTip(i18n("No Ghostscript found. LaTeX typesetting not \
possible."));
- return;
- }
-#endif
-
-#ifdef _WIN64
- if (!TeXRenderer::executableExists(QLatin1String("gswin64c.exe"))) {
- ui.lLatexWarning->show();
- ui.lLatexWarning->setToolTip(i18n("No Ghostscript found. LaTeX typesetting not \
possible."));
- return;
- }
-#endif
-
- ui.lLatexWarning->hide();
-}
diff --git a/src/kdefrontend/SettingsGeneralPage.h \
b/src/kdefrontend/SettingsGeneralPage.h index a5b6cf07..428cde89 100644
--- a/src/kdefrontend/SettingsGeneralPage.h
+++ b/src/kdefrontend/SettingsGeneralPage.h
@@ -37,7 +37,7 @@ class SettingsGeneralPage : public SettingsPage {
Q_OBJECT
public:
- explicit SettingsGeneralPage(QWidget* parent);
+ explicit SettingsGeneralPage(QWidget*);
virtual void applySettings();
virtual void restoreDefaults();
@@ -52,7 +52,6 @@ private:
private slots:
void interfaceChanged(int);
void changed();
- void checkTeX(int);
signals:
void settingsChanged();
diff --git a/src/kdefrontend/SettingsGeneralPage.cpp \
b/src/kdefrontend/SettingsWorksheetPage.cpp similarity index 56%
copy from src/kdefrontend/SettingsGeneralPage.cpp
copy to src/kdefrontend/SettingsWorksheetPage.cpp
index 80b54cd7..4d37b784 100644
--- a/src/kdefrontend/SettingsGeneralPage.cpp
+++ b/src/kdefrontend/SettingsWorksheetPage.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- File : SettingsGeneralPage.cpp
+ File : SettingsWorksheetPage.cpp
Project : LabPlot
Description : general settings page
--------------------------------------------------------------------
@@ -26,24 +26,22 @@
* *
***************************************************************************/
-#include "SettingsGeneralPage.h"
+#include "SettingsWorksheetPage.h"
#include "MainWin.h"
#include "tools/TeXRenderer.h"
-#include <KDialog>
#include <KLocale>
#include <kfiledialog.h>
/**
* \brief Page for the 'General' settings of the Labplot settings dialog.
*/
-SettingsGeneralPage::SettingsGeneralPage(QWidget* parent) : SettingsPage(parent),
+SettingsWorksheetPage::SettingsWorksheetPage(QWidget* parent) : \
SettingsPage(parent), m_changed(false) {
ui.setupUi(this);
- retranslateUi();
- ui.lLatexWarning->setPixmap( KIcon("state-warning").pixmap(QSize(48,48)) );
+ ui.lLatexWarning->setPixmap( \
KIcon(QLatin1String("state-warning")).pixmap(QSize(48,48)) );
//add available TeX typesetting engines
if (TeXRenderer::executableExists(QLatin1String("lualatex")))
@@ -58,98 +56,49 @@ SettingsGeneralPage::SettingsGeneralPage(QWidget* parent) : \
SettingsPage(parent) if (TeXRenderer::executableExists(QLatin1String("latex")))
ui.cbTexEngine->addItem(QLatin1String("LaTeX"), QLatin1String("latex"));
- connect(ui.cbLoadOnStart, SIGNAL(currentIndexChanged(int)), this, SLOT(changed()) \
);
- connect(ui.cbInterface, SIGNAL(currentIndexChanged(int)), this, \
SLOT(interfaceChanged(int)) );
- connect(ui.cbMdiVisibility, SIGNAL(currentIndexChanged(int)), this, SLOT(changed()) \
);
- connect(ui.cbTabPosition, SIGNAL(currentIndexChanged(int)), this, SLOT(changed()) \
);
- connect(ui.chkAutoSave, SIGNAL(stateChanged(int)), this, SLOT(changed()) );
- connect(ui.sbAutoSaveInterval, SIGNAL(valueChanged(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)) \
);
loadSettings();
- interfaceChanged(ui.cbInterface->currentIndex());
}
-void SettingsGeneralPage::applySettings() {
- KConfigGroup group = KGlobal::config()->group( "General" );
- group.writeEntry("LoadOnStart", ui.cbLoadOnStart->currentIndex());
- group.writeEntry("ViewMode", ui.cbInterface->currentIndex());
- group.writeEntry("TabPosition", ui.cbTabPosition->currentIndex());
- group.writeEntry("MdiWindowVisibility", ui.cbMdiVisibility->currentIndex());
- group.writeEntry("AutoSave", ui.chkAutoSave->isChecked());
- group.writeEntry("AutoSaveInterval", ui.sbAutoSaveInterval->value());
- group.writeEntry("DoubleBuffering", ui.chkDoubleBuffering->isChecked());
- group.writeEntry("LaTeXEngine", \
ui.cbTexEngine->itemData(ui.cbTexEngine->currentIndex())); +void \
SettingsWorksheetPage::applySettings() { + KConfigGroup group = \
KGlobal::config()->group(QLatin1String("Settings_Worksheet")); \
+ group.writeEntry(QLatin1String("PresenterModeInteractive"), \
ui.chkPresenterModeInteractive->isChecked()); \
+ group.writeEntry(QLatin1String("DoubleBuffering"), \
ui.chkDoubleBuffering->isChecked()); + group.writeEntry(QLatin1String("LaTeXEngine"), \
ui.cbTexEngine->itemData(ui.cbTexEngine->currentIndex())); }
-void SettingsGeneralPage::restoreDefaults() {
+void SettingsWorksheetPage::restoreDefaults() {
loadSettings();
}
-void SettingsGeneralPage::loadSettings() {
- const KConfigGroup group = KGlobal::config()->group( "General" );
- ui.cbLoadOnStart->setCurrentIndex(group.readEntry("LoadOnStart", 0));
- ui.cbInterface->setCurrentIndex(group.readEntry("ViewMode", 0));
- ui.cbTabPosition->setCurrentIndex(group.readEntry("TabPosition", 0));
- ui.cbMdiVisibility->setCurrentIndex(group.readEntry("MdiWindowVisibility", 0));
- ui.chkAutoSave->setChecked(group.readEntry<bool>("AutoSave", 0));
- ui.sbAutoSaveInterval->setValue(group.readEntry("AutoSaveInterval", 0));
- ui.chkDoubleBuffering->setChecked(group.readEntry<bool>("DoubleBuffering", 1));
-
- QString engine = group.readEntry("LaTeXEngine", "");
+void SettingsWorksheetPage::loadSettings() {
+ const KConfigGroup group = \
KGlobal::config()->group(QLatin1String("Settings_Worksheet")); \
+ ui.chkPresenterModeInteractive->setChecked(group.readEntry(QLatin1String("PresenterModeInteractive"), \
false)); + ui.chkDoubleBuffering->setChecked(group.readEntry(QLatin1String("DoubleBuffering"), \
true)); +
+ QString engine = group.readEntry(QLatin1String("LaTeXEngine"), "");
int index = -1;
if (engine.isEmpty())
- index = ui.cbTexEngine->findData("xelatex");
+ index = ui.cbTexEngine->findData(QLatin1String("xelatex"));
else
index = ui.cbTexEngine->findData(engine);
ui.cbTexEngine->setCurrentIndex(index);
}
-void SettingsGeneralPage::retranslateUi() {
- ui.cbLoadOnStart->clear();
- ui.cbLoadOnStart->addItem(i18n("Do nothing"));
- ui.cbLoadOnStart->addItem(i18n("Create new empty project"));
- ui.cbLoadOnStart->addItem(i18n("Create new project with worksheet"));
- ui.cbLoadOnStart->addItem(i18n("Load last used project"));
-
- ui.cbInterface->clear();
- ui.cbInterface->addItem(i18n("Sub-window view"));
- ui.cbInterface->addItem(i18n("Tabbed view"));
-
- ui.cbMdiVisibility->clear();
- ui.cbMdiVisibility->addItem(i18n("Show windows of the current folder only"));
- ui.cbMdiVisibility->addItem(i18n("Show windows of the current folder and its \
subfolders only"));
- ui.cbMdiVisibility->addItem(i18n("Show all windows"));
-
- ui.cbTabPosition->clear();
- ui.cbTabPosition->addItem(i18n("Top"));
- ui.cbTabPosition->addItem(i18n("Bottom"));
- ui.cbTabPosition->addItem(i18n("Left"));
- ui.cbTabPosition->addItem(i18n("Right"));
-}
-
-void SettingsGeneralPage::changed() {
+void SettingsWorksheetPage::changed() {
m_changed = true;
emit settingsChanged();
}
-void SettingsGeneralPage::interfaceChanged(int index) {
- bool tabbedView = (index==1);
- ui.lTabPosition->setVisible(tabbedView);
- ui.cbTabPosition->setVisible(tabbedView);
- ui.lMdiVisibility->setVisible(!tabbedView);
- ui.cbMdiVisibility->setVisible(!tabbedView);
- changed();
-}
-
/*!
checks whether all tools required for latex typesetting are available. shows a \
warning if not. \sa TeXRenderer::active()
*/
-void SettingsGeneralPage::checkTeX(int engineIndex) {
+void SettingsWorksheetPage::checkTeX(int engineIndex) {
if (engineIndex == -1) {
ui.lLatexWarning->show();
ui.lLatexWarning->setToolTip(i18n("No LaTeX installation found or selected. LaTeX \
typesetting not possible."));
diff --git a/src/kdefrontend/SettingsGeneralPage.h \
b/src/kdefrontend/SettingsWorksheetPage.h similarity index 81%
copy from src/kdefrontend/SettingsGeneralPage.h
copy to src/kdefrontend/SettingsWorksheetPage.h
index a5b6cf07..fd7bd769 100644
--- a/src/kdefrontend/SettingsGeneralPage.h
+++ b/src/kdefrontend/SettingsWorksheetPage.h
@@ -1,10 +1,10 @@
/***************************************************************************
- File : SettingsGeneralPage.h
+ File : SettingsWorksheetPage.h
Project : LabPlot
- Description : general settings page
+ Description : settings page for Worksheet
--------------------------------------------------------------------
--------------------------------------------------------------------
- Copyright : (C) 2011-2016 by Alexander Semke (alexander.semke@web.de)
+ Copyright : (C) 2016 by Alexander Semke (alexander.semke@web.de)
***************************************************************************/
@@ -27,30 +27,28 @@
* *
***************************************************************************/
-#ifndef SETTINGSGENERALPAGE_H
-#define SETTINGSGENERALPAGE_H
+#ifndef SETTINGSWORKSHEETGENERALPAGE_H
+#define SETTINGSWORKSHEETGENERALPAGE_H
#include "SettingsPage.h"
-#include "ui_settingsgeneralpage.h"
+#include "ui_settingsworksheetpage.h"
-class SettingsGeneralPage : public SettingsPage {
+class SettingsWorksheetPage : public SettingsPage {
Q_OBJECT
public:
- explicit SettingsGeneralPage(QWidget* parent);
+ explicit SettingsWorksheetPage(QWidget*);
virtual void applySettings();
virtual void restoreDefaults();
private:
- Ui::SettingsGeneralPage ui;
+ Ui::SettingsWorksheetPage ui;
bool m_changed;
void loadSettings();
- void retranslateUi();
private slots:
- void interfaceChanged(int);
void changed();
void checkTeX(int);
diff --git a/src/kdefrontend/ui/settingsworksheetpage.ui \
b/src/kdefrontend/ui/settingsworksheetpage.ui new file mode 100644
index 00000000..c0821808
--- /dev/null
+++ b/src/kdefrontend/ui/settingsworksheetpage.ui
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SettingsWorksheetPage</class>
+ <widget class="QWidget" name="SettingsWorksheetPage">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>599</width>
+ <height>399</height>
+ </rect>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0" colspan="2">
+ <widget class="QLabel" name="lPresenterMode">
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text">
+ <string>Presenter Mode</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" colspan="2">
+ <widget class="QCheckBox" name="chkPresenterModeInteractive">
+ <property name="text">
+ <string>interactive</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <spacer name="verticalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>13</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="3" column="0" colspan="2">
+ <widget class="QLabel" name="lPerformance">
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text">
+ <string>Performance</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0" colspan="2">
+ <widget class="QCheckBox" name="chkDoubleBuffering">
+ <property name="text">
+ <string>enable double-buffering</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1">
+ <spacer name="verticalSpacer_4">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>13</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="6" column="0">
+ <widget class="QLabel" name="lTex">
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text">
+ <string>LaTeX</string>
+ </property>
+ </widget>
+ </item>
+ <item row="7" column="0" colspan="2">
+ <widget class="QLabel" name="lTexEngine">
+ <property name="text">
+ <string>Typesetting engine</string>
+ </property>
+ </widget>
+ </item>
+ <item row="7" column="2">
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="7" column="3">
+ <widget class="QComboBox" name="cbTexEngine">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="7" column="4">
+ <widget class="QLabel" name="lLatexWarning">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::Box</enum>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="8" column="0">
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>156</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic