kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-01-08 14:49:58 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Minor : update gui layout.

Browse Source 
Fix : change grid step doesn't applyed


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5754 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2019-03-04 08:55:06 +00:00
parent 79905d77f2
commit 1c2b3baba7
3 changed files with 116 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sources/diagram.cpp
View File

@@ -154,8 +154,8 @@ void Diagram::drawBackground(QPainter *p, const QRectF &r) {
//If user allow zoom out beyond of folio, we draw grid outside of border. //If user allow zoom out beyond of folio, we draw grid outside of border.
QSettings settings; QSettings settings;
int xGrid = settings.value("DiagramEditor_xGrid_sb", Diagram::xGrid).toInt(); int xGrid = settings.value("diagrameditor/Xgrid", Diagram::xGrid).toInt();
int yGrid = settings.value("DiagramEditor_yGrid_sb", Diagram::yGrid).toInt(); int yGrid = settings.value("diagrameditor/Ygrid", Diagram::yGrid).toInt();
QRectF rect = settings.value("diagrameditor/zoom-out-beyond-of-folio", false).toBool() ? QRectF rect = settings.value("diagrameditor/zoom-out-beyond-of-folio", false).toBool() ?
r : r :
border_and_titleblock.insideBorderRect().intersected(r); border_and_titleblock.insideBorderRect().intersected(r);
@@ -285,10 +285,10 @@ void Diagram::wheelEvent(QGraphicsSceneWheelEvent *event)
void Diagram::keyPressEvent(QKeyEvent *event) void Diagram::keyPressEvent(QKeyEvent *event)
{ {
QSettings settings; QSettings settings;
int xKeyGrid = settings.value("DiagramEditor_xKeyGrid_sb", Diagram::xKeyGrid).toInt(); int xKeyGrid = settings.value("diagrameditor/key_Xgrid", Diagram::xKeyGrid).toInt();
int yKeyGrid = settings.value("DiagramEditor_yKeyGrid_sb", Diagram::yKeyGrid).toInt(); int yKeyGrid = settings.value("diagrameditor/key_Ygrid", Diagram::yKeyGrid).toInt();
int xKeyGridFine = settings.value("DiagramEditor_xKeyGridFine_sb", Diagram::xKeyGridFine).toInt(); int xKeyGridFine = settings.value("iagrameditor/key_fine_Xgrid", Diagram::xKeyGridFine).toInt();
int yKeyGridFine = settings.value("DiagramEditor_yKeyGridFine_sb", Diagram::yKeyGridFine).toInt(); int yKeyGridFine = settings.value("diagrameditor/key_fine_Ygrid", Diagram::yKeyGridFine).toInt();
event->setAccepted(false); event->setAccepted(false);
if (m_event_interface) { if (m_event_interface) {

8
sources/ui/configpage/generalconfigurationpage.h
View File

@@ -1,4 +1,4 @@
/* /*
Copyright 2006-2019 The QElectroTech Team Copyright 2006-2019 The QElectroTech Team
This file is part of QElectroTech. This file is part of QElectroTech.
@@ -30,8 +30,8 @@ class GeneralConfigurationPage : public ConfigPage
Q_OBJECT Q_OBJECT
public: public:
explicit GeneralConfigurationPage(QWidget *parent = 0); explicit GeneralConfigurationPage(QWidget *parent = nullptr);
~GeneralConfigurationPage(); ~GeneralConfigurationPage() override;
virtual void applyConf() override; virtual void applyConf() override;
virtual QString title() const override; virtual QString title() const override;
@@ -50,7 +50,7 @@ class GeneralConfigurationPage : public ConfigPage
private: private:
void fillLang(); void fillLang();
private: private:

194
sources/ui/configpage/generalconfigurationpage.ui
View File

@@ -6,40 +6,16 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>998</width> <width>893</width>
<height>500</height> <height>481</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>500</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QGridLayout" name="gridLayout_5">
<item> <item row="0" column="0">
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>980</width>
<height>500</height>
</size>
</property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>0</number>
</property> </property>
@@ -474,16 +450,21 @@ Vous pouvez spécifier ici la valeur par défaut de ce champ pour les éléments
<property name="title"> <property name="title">
<string>Grille : 1 - 30</string> <string>Grille : 1 - 30</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_5"> <property name="flat">
<item row="0" column="0"> <bool>false</bool>
<widget class="QLabel" name="Label_Diagram_xGrid"> </property>
<property name="text"> <property name="checkable">
<string>DiagramEditor xGrid</string> <bool>false</bool>
</property> </property>
</widget> <layout class="QGridLayout" name="gridLayout_6">
</item> <item row="0" column="2">
<item row="0" column="1">
<widget class="QSpinBox" name="DiagramEditor_xGrid_sb"> <widget class="QSpinBox" name="DiagramEditor_xGrid_sb">
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
<property name="minimum"> <property name="minimum">
<number>1</number> <number>1</number>
</property> </property>
@@ -498,8 +479,28 @@ Vous pouvez spécifier ici la valeur par défaut de ce champ pour les éléments
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="0">
<widget class="QLabel" name="Label_Diagram_yGrid">
<property name="text">
<string>DiagramEditor yGrid</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="Label_Grid_Tip">
<property name="text">
<string>La Grille doite etre active pour pouvoir voir les modifications.</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QSpinBox" name="DiagramEditor_yGrid_sb"> <widget class="QSpinBox" name="DiagramEditor_yGrid_sb">
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
<property name="minimum"> <property name="minimum">
<number>1</number> <number>1</number>
</property> </property>
@@ -511,22 +512,15 @@ Vous pouvez spécifier ici la valeur par défaut de ce champ pour les éléments
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="0" column="0">
<widget class="QLabel" name="Label_Diagram_yGrid"> <widget class="QLabel" name="Label_Diagram_xGrid">
<property name="text"> <property name="text">
<string>DiagramEditor yGrid</string> <string>DiagramEditor xGrid</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="2"> <item row="0" column="1">
<widget class="QLabel" name="Label_Grid_Tip"> <spacer name="horizontalSpacer_6">
<property name="text">
<string>La Grille doite etre active pour pouvoir voir les modifications.</string>
</property>
</widget>
</item>
<item row="0" column="2">
<spacer name="horizontalSpacer_4">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
@@ -547,6 +541,50 @@ Vous pouvez spécifier ici la valeur par défaut de ce champ pour les éléments
<string>Déplacement au clavier : 1 - 30</string> <string>Déplacement au clavier : 1 - 30</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_10"> <layout class="QGridLayout" name="gridLayout_10">
<item row="0" column="2">
<widget class="QSpinBox" name="DiagramEditor_xKeyGrid_sb">
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>30</number>
</property>
<property name="singleStep">
<number>1</number>
</property>
<property name="value">
<number>10</number>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QSpinBox" name="DiagramEditor_yKeyGrid_sb">
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>30</number>
</property>
<property name="singleStep">
<number>1</number>
</property>
<property name="value">
<number>10</number>
</property>
</widget>
</item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="Label_Diagram_Key_xGrid"> <widget class="QLabel" name="Label_Diagram_Key_xGrid">
<property name="text"> <property name="text">
@@ -562,38 +600,6 @@ Vous pouvez spécifier ici la valeur par défaut de ce champ pour les éléments
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QSpinBox" name="DiagramEditor_xKeyGrid_sb">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>30</number>
</property>
<property name="singleStep">
<number>1</number>
</property>
<property name="value">
<number>10</number>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="DiagramEditor_yKeyGrid_sb">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>30</number>
</property>
<property name="singleStep">
<number>1</number>
</property>
<property name="value">
<number>10</number>
</property>
</widget>
</item>
<item row="0" column="2">
<spacer name="horizontalSpacer_5"> <spacer name="horizontalSpacer_5">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@@ -622,8 +628,14 @@ Vous pouvez spécifier ici la valeur par défaut de ce champ pour les éléments
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2"> <item row="1" column="3">
<widget class="QSpinBox" name="DiagramEditor_xKeyGridFine_sb"> <widget class="QSpinBox" name="DiagramEditor_yKeyGridFine_sb">
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
<property name="minimum"> <property name="minimum">
<number>1</number> <number>1</number>
</property> </property>
@@ -645,8 +657,14 @@ Vous pouvez spécifier ici la valeur par défaut de ce champ pour les éléments
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="2"> <item row="0" column="3">
<widget class="QSpinBox" name="DiagramEditor_yKeyGridFine_sb"> <widget class="QSpinBox" name="DiagramEditor_xKeyGridFine_sb">
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
<property name="minimum"> <property name="minimum">
<number>1</number> <number>1</number>
</property> </property>
@@ -661,8 +679,8 @@ Vous pouvez spécifier ici la valeur par défaut de ce champ pour les éléments
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="3"> <item row="0" column="2">
<spacer name="horizontalSpacer_6"> <spacer name="horizontalSpacer_4">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>