changeset
The border between the canvas and left tool box is now resizable
Tue, 27 Mar 2018 13:01:02 +0300
- author
- Teemu Piippo <teemu@hecknology.net>
- date
- Tue, 27 Mar 2018 13:01:02 +0300
- changeset 1349
- 45d8eec8bd52
- parent 1348
- ecad65ee47f2
- child 1350
- eb2d3bc4fc73
The border between the canvas and left tool box is now resizable
--- a/src/configurationoptions.txt Tue Mar 27 12:49:15 2018 +0300 +++ b/src/configurationoptions.txt Tue Mar 27 13:01:02 2018 +0300 @@ -70,6 +70,7 @@ option DrawAngles = false option MainWindowState = QByteArray {} option MainWindowGeometry = QByteArray {} +option MainSplitterState = QByteArray {} # File management options option Libraries = QVector<Library> {}
--- a/src/mainwindow.cpp Tue Mar 27 12:49:15 2018 +0300 +++ b/src/mainwindow.cpp Tue Mar 27 13:01:02 2018 +0300 @@ -63,6 +63,12 @@ ui.setupUi (this); this->restoreGeometry(config::mainWindowGeometry()); this->restoreState(config::mainWindowState()); + + if (config::mainSplitterState().isEmpty()) + this->ui.splitter->setSizes({this->width() * 2 / 3, this->width() / 3}); + else + this->ui.splitter->restoreState(config::mainSplitterState()); + m_updatingTabs = false; m_tabs = new QTabBar; m_tabs->setTabsClosable (true); @@ -420,6 +426,7 @@ // Store the state of the main window before closing. config::setMainWindowGeometry(this->saveGeometry()); config::setMainWindowState(this->saveState()); + config::setMainSplitterState(this->ui.splitter->saveState()); settingsObject().sync(); event->accept(); }
--- a/src/mainwindow.ui Tue Mar 27 12:49:15 2018 +0300 +++ b/src/mainwindow.ui Tue Mar 27 13:01:02 2018 +0300 @@ -20,209 +20,213 @@ <widget class="QWidget" name="centralwidget"> <layout class="QVBoxLayout" name="verticalLayout"> <item> - <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0"> - <item> - <widget class="QStackedWidget" name="rendererStack"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="frameShape"> - <enum>QFrame::StyledPanel</enum> + <widget class="QSplitter" name="splitter"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <widget class="QStackedWidget" name="rendererStack"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> + </property> + </widget> + <widget class="QToolBox" name="toolBox"> + <property name="currentIndex"> + <number>1</number> + </property> + <widget class="QWidget" name="page"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>871</width> + <height>364</height> + </rect> </property> - <property name="frameShadow"> - <enum>QFrame::Raised</enum> - </property> - </widget> - </item> - <item> - <widget class="QToolBox" name="toolBox"> - <property name="currentIndex"> - <number>2</number> - </property> - <widget class="QWidget" name="page"> + <attribute name="label"> + <string>Header</string> + </attribute> + <widget class="HeaderEdit" name="header" native="true"> <property name="geometry"> <rect> - <x>0</x> - <y>0</y> - <width>465</width> - <height>362</height> - </rect> - </property> - <attribute name="label"> - <string>Header</string> - </attribute> - <layout class="QVBoxLayout" name="verticalLayout_6"> - <item> - <widget class="HeaderEdit" name="header" native="true"/> - </item> - </layout> - </widget> - <widget class="QWidget" name="pageDocument"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>465</width> - <height>362</height> - </rect> - </property> - <attribute name="label"> - <string>Document</string> - </attribute> - <layout class="QVBoxLayout" name="verticalLayout_2"> - <item> - <widget class="QListView" name="objectList"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="selectionMode"> - <enum>QAbstractItemView::ExtendedSelection</enum> - </property> - </widget> - </item> - </layout> - </widget> - <widget class="QWidget" name="pageEditModeOptions"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>465</width> - <height>362</height> + <x>9</x> + <y>9</y> + <width>447</width> + <height>344</height> </rect> </property> - <attribute name="label"> - <string>Tool Options</string> - </attribute> - <layout class="QVBoxLayout" name="verticalLayout_4"> - <item> - <widget class="QGroupBox" name="groupBox"> - <property name="title"> - <string>Circle Tool Options</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout_5"> - <item> - <layout class="QFormLayout" name="formLayout"> - <item row="0" column="0"> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string>Divisions:</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string>Segments:</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <layout class="QHBoxLayout" name="horizontalLayout_2"> - <item> - <widget class="QSpinBox" name="ringToolSegments"> - <property name="enabled"> - <bool>true</bool> - </property> - <property name="minimum"> - <number>1</number> - </property> - <property name="maximum"> - <number>16</number> - </property> - <property name="value"> - <number>16</number> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="ringToolSegmentsLabel"> - <property name="text"> - <string>a / b</string> - </property> - </widget> - </item> - </layout> - </item> - <item row="0" column="1"> - <widget class="QComboBox" name="ringToolDivisions"> - <property name="currentIndex"> - <number>1</number> - </property> - <item> - <property name="text"> - <string>8</string> - </property> - </item> - <item> - <property name="text"> - <string>16</string> - </property> - </item> - <item> - <property name="text"> - <string>48</string> - </property> - </item> - </widget> - </item> - </layout> - </item> - </layout> - </widget> - </item> - <item> - <spacer name="verticalSpacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - <widget class="QWidget" name="pagePrimitives"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>465</width> - <height>362</height> - </rect> - </property> - <attribute name="label"> - <string>Primitives</string> - </attribute> - <layout class="QVBoxLayout" name="verticalLayout_3"> - <item> - <widget class="QTreeView" name="primitives"> - <property name="dragDropMode"> - <enum>QAbstractItemView::DragOnly</enum> - </property> - <attribute name="headerVisible"> - <bool>false</bool> - </attribute> - <attribute name="headerDefaultSectionSize"> - <number>0</number> - </attribute> - </widget> - </item> - </layout> </widget> </widget> - </item> - </layout> + <widget class="QWidget" name="pageDocument"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>871</width> + <height>364</height> + </rect> + </property> + <attribute name="label"> + <string>Document</string> + </attribute> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QListView" name="objectList"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="selectionMode"> + <enum>QAbstractItemView::ExtendedSelection</enum> + </property> + </widget> + </item> + </layout> + </widget> + <widget class="QWidget" name="pageEditModeOptions"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>871</width> + <height>364</height> + </rect> + </property> + <attribute name="label"> + <string>Tool Options</string> + </attribute> + <layout class="QVBoxLayout" name="verticalLayout_4"> + <item> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Circle Tool Options</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout_5"> + <item> + <layout class="QFormLayout" name="formLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Divisions:</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Segments:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QSpinBox" name="ringToolSegments"> + <property name="enabled"> + <bool>true</bool> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>16</number> + </property> + <property name="value"> + <number>16</number> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="ringToolSegmentsLabel"> + <property name="text"> + <string>a / b</string> + </property> + </widget> + </item> + </layout> + </item> + <item row="0" column="1"> + <widget class="QComboBox" name="ringToolDivisions"> + <property name="currentIndex"> + <number>1</number> + </property> + <item> + <property name="text"> + <string>8</string> + </property> + </item> + <item> + <property name="text"> + <string>16</string> + </property> + </item> + <item> + <property name="text"> + <string>48</string> + </property> + </item> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + </item> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <widget class="QWidget" name="pagePrimitives"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>871</width> + <height>364</height> + </rect> + </property> + <attribute name="label"> + <string>Primitives</string> + </attribute> + <layout class="QVBoxLayout" name="verticalLayout_3"> + <item> + <widget class="QTreeView" name="primitives"> + <property name="dragDropMode"> + <enum>QAbstractItemView::DragOnly</enum> + </property> + <attribute name="headerVisible"> + <bool>false</bool> + </attribute> + <attribute name="headerDefaultSectionSize"> + <number>0</number> + </attribute> + </widget> + </item> + </layout> + </widget> + </widget> + </widget> </item> </layout> </widget>
