[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [labplot] src/kdefrontend: Removed worksheet related settings from the "General" page.
From: Alexander Semke <alexander.semke () web ! de>
Date: 2016-12-10 16:32:46
Message-ID: E1cFkZq-0007yz-9D () code ! kde ! org
[Download RAW message or body]
Git commit 992482cb1a571f3cf2bc8eebe062fd07d1c921e5 by Alexander Semke.
Committed on 10/12/2016 at 16:32.
Pushed by asemke into branch 'master'.
Removed worksheet related settings from the "General" page.
M +0 -3 src/kdefrontend/SettingsDialog.cpp
M +56 -154 src/kdefrontend/ui/settingsgeneralpage.ui
M +1 -1 src/kdefrontend/ui/settingsworksheetpage.ui
https://commits.kde.org/labplot/992482cb1a571f3cf2bc8eebe062fd07d1c921e5
diff --git a/src/kdefrontend/SettingsDialog.cpp b/src/kdefrontend/SettingsDialog.cpp
index acb92094..35ac8d9f 100644
--- a/src/kdefrontend/SettingsDialog.cpp
+++ b/src/kdefrontend/SettingsDialog.cpp
@@ -38,9 +38,6 @@
*
*/
SettingsDialog::SettingsDialog(QWidget* parent) : KPageDialog(parent), m_changed(false) {
- const QSize minSize = minimumSize();
- setMinimumSize(QSize(512, minSize.height()));
-
setFaceType(List);
setCaption(i18n("Preferences"));
setWindowIcon(KIcon("preferences-other"));
diff --git a/src/kdefrontend/ui/settingsgeneralpage.ui b/src/kdefrontend/ui/settingsgeneralpage.ui
index ee5d82cd..6891ccdf 100644
--- a/src/kdefrontend/ui/settingsgeneralpage.ui
+++ b/src/kdefrontend/ui/settingsgeneralpage.ui
@@ -7,90 +7,46 @@
<x>0</x>
<y>0</y>
<width>679</width>
- <height>741</height>
+ <height>556</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="label_3">
- <property name="text">
- <string>Startup</string>
- </property>
- </widget>
- </item>
- <item row="0" column="3">
- <spacer>
+ <item row="7" column="6" colspan="2">
+ <spacer name="horizontalSpacer">
<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>
+ <width>327</width>
+ <height>17</height>
</size>
</property>
</spacer>
</item>
- <item row="1" column="0">
- <widget class="QLabel" name="lInterface">
- <property name="text">
- <string>Interface</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0" colspan="2">
- <widget class="QLabel" name="lTabPosition">
- <property name="text">
- <string>Tab position</string>
+ <item row="7" column="4">
+ <widget class="QSpinBox" name="sbAutoSaveInterval">
+ <property name="minimum">
+ <number>1</number>
</property>
- </widget>
- </item>
- <item row="3" column="0" colspan="3">
- <widget class="QLabel" name="lMdiVisibility">
- <property name="text">
- <string>Sub-Window visibility</string>
+ <property name="value">
+ <number>5</number>
</property>
</widget>
</item>
- <item row="4" column="2">
- <spacer name="verticalSpacer_2">
+ <item row="8" column="2">
+ <spacer name="verticalSpacer">
<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>
+ <height>156</height>
</size>
</property>
</spacer>
</item>
- <item row="5" column="0" colspan="2">
- <widget class="QLabel" name="lAutoSave">
- <property name="font">
- <font>
- <weight>75</weight>
- <bold>true</bold>
- </font>
- </property>
- <property name="text">
- <string>Auto-Save</string>
- </property>
- </widget>
- </item>
- <item row="6" column="0">
- <widget class="QCheckBox" name="chkAutoSave">
- <property name="text">
- <string>enabled</string>
- </property>
- </widget>
- </item>
<item row="7" column="0" colspan="2">
<widget class="QLabel" name="lAutoSaveInterval">
<property name="text">
@@ -98,38 +54,35 @@
</property>
</widget>
</item>
- <item row="7" column="4">
- <widget class="QSpinBox" name="sbAutoSaveInterval">
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="value">
- <number>5</number>
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Startup</string>
</property>
</widget>
</item>
- <item row="7" column="5">
- <widget class="QLabel" name="lAutoSaveIntervalUnit">
+ <item row="6" column="0">
+ <widget class="QCheckBox" name="chkAutoSave">
<property name="text">
- <string>min.</string>
+ <string>enabled</string>
</property>
</widget>
</item>
- <item row="7" column="6" colspan="2">
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <item row="5" column="0" colspan="2">
+ <widget class="QLabel" name="lAutoSave">
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>327</width>
- <height>17</height>
- </size>
+ <property name="text">
+ <string>Auto-Save</string>
</property>
- </spacer>
+ </widget>
</item>
- <item row="8" column="1">
- <spacer name="verticalSpacer_3">
+ <item row="4" column="2">
+ <spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
@@ -144,30 +97,24 @@
</property>
</spacer>
</item>
- <item row="9" column="0" colspan="2">
- <widget class="QLabel" name="lPerformance">
- <property name="font">
- <font>
- <weight>75</weight>
- <bold>true</bold>
- </font>
- </property>
+ <item row="2" column="0" colspan="2">
+ <widget class="QLabel" name="lTabPosition">
<property name="text">
- <string>Performance</string>
+ <string>Tab position</string>
</property>
</widget>
</item>
- <item row="10" column="0" colspan="3">
- <widget class="QCheckBox" name="chkDoubleBuffering">
+ <item row="3" column="0" colspan="3">
+ <widget class="QLabel" name="lMdiVisibility">
<property name="text">
- <string>Double-Buffering</string>
+ <string>Sub-Window visibility</string>
</property>
</widget>
</item>
- <item row="11" column="0">
- <spacer name="verticalSpacer_4">
+ <item row="0" column="3">
+ <spacer>
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
@@ -175,81 +122,36 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
- <height>13</height>
+ <height>20</height>
</size>
</property>
</spacer>
</item>
- <item row="12" 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="13" column="0" colspan="3">
- <widget class="QLabel" name="lTexEngine">
+ <item row="1" column="0">
+ <widget class="QLabel" name="lInterface">
<property name="text">
- <string>Typesetting engine</string>
- </property>
- </widget>
- </item>
- <item row="13" column="4" colspan="3">
- <widget class="QComboBox" name="cbTexEngine">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <string>Interface</string>
</property>
</widget>
</item>
- <item row="13" column="7">
- <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>
+ <item row="7" column="5">
+ <widget class="QLabel" name="lAutoSaveIntervalUnit">
<property name="text">
- <string/>
+ <string>min.</string>
</property>
</widget>
</item>
- <item row="14" column="2">
- <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 row="0" column="4" colspan="4">
+ <widget class="KComboBox" name="cbLoadOnStart"/>
</item>
- <item row="3" column="4" colspan="3">
- <widget class="KComboBox" name="cbMdiVisibility"/>
+ <item row="1" column="4" colspan="4">
+ <widget class="KComboBox" name="cbInterface"/>
</item>
- <item row="2" column="4" colspan="3">
+ <item row="2" column="4" colspan="4">
<widget class="KComboBox" name="cbTabPosition"/>
</item>
- <item row="1" column="4" colspan="3">
- <widget class="KComboBox" name="cbInterface"/>
- </item>
- <item row="0" column="4" colspan="3">
- <widget class="KComboBox" name="cbLoadOnStart"/>
+ <item row="3" column="4" colspan="4">
+ <widget class="KComboBox" name="cbMdiVisibility"/>
</item>
</layout>
</widget>
diff --git a/src/kdefrontend/ui/settingsworksheetpage.ui b/src/kdefrontend/ui/settingsworksheetpage.ui
index c0821808..91147a38 100644
--- a/src/kdefrontend/ui/settingsworksheetpage.ui
+++ b/src/kdefrontend/ui/settingsworksheetpage.ui
@@ -122,7 +122,7 @@
<item row="7" column="3">
<widget class="QComboBox" name="cbTexEngine">
<property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic