mirror of
https://gitlab.com/smart-pattern/valentina.git
synced 2024-06-25 22:04:29 +02:00
New actions.
--HG-- branch : feature
This commit is contained in:
Roman Telezhynskyi
parent
11ef76d0ae
commit
e72c54318a
|
|
@ -5,5 +5,9 @@
|
|||
<file>tapeicon/16x16/measurement.png</file>
|
||||
<file>tapeicon/24x24/equal.png</file>
|
||||
<file>tapeicon/24x24/fx.png</file>
|
||||
<file>tapeicon/24x24/orange_plus.png</file>
|
||||
<file>tapeicon/24x24/red_plus.png</file>
|
||||
<file>tapeicon/24x24/padlock_locked.png</file>
|
||||
<file>tapeicon/24x24/padlock_opened.png</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
|
|
|||
BIN
src/app/tape/share/resources/tapeicon/24x24/orange_plus.png
Normal file
BIN
src/app/tape/share/resources/tapeicon/24x24/orange_plus.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 355 B |
BIN
src/app/tape/share/resources/tapeicon/24x24/padlock_locked.png
Normal file
BIN
src/app/tape/share/resources/tapeicon/24x24/padlock_locked.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 375 B |
BIN
src/app/tape/share/resources/tapeicon/24x24/padlock_opened.png
Normal file
BIN
src/app/tape/share/resources/tapeicon/24x24/padlock_opened.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 385 B |
BIN
src/app/tape/share/resources/tapeicon/24x24/red_plus.png
Normal file
BIN
src/app/tape/share/resources/tapeicon/24x24/red_plus.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 383 B |
|
|
@ -171,6 +171,8 @@ void TMainWindow::InitNew(MeasurementsType type)
|
|||
|
||||
if (type == MeasurementsType::Standard)
|
||||
{
|
||||
ui->labelMType->setText(tr("Standard measurements"));
|
||||
|
||||
// Tab Measurements
|
||||
delete ui->labelValue;
|
||||
delete ui->horizontalLayoutValue;
|
||||
|
|
@ -189,6 +191,8 @@ void TMainWindow::InitNew(MeasurementsType type)
|
|||
}
|
||||
else
|
||||
{
|
||||
ui->labelMType->setText(tr("Individual measurements"));
|
||||
|
||||
// Tab Measurements
|
||||
delete ui->labelBaseValue;
|
||||
delete ui->doubleSpinBoxBaseValue;
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>599</width>
|
||||
<height>569</height>
|
||||
<width>536</width>
|
||||
<height>694</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>TMainWindow</string>
|
||||
<string notr="true"/>
|
||||
</property>
|
||||
<property name="windowIcon">
|
||||
<iconset resource="share/resources/tapeicon.qrc">
|
||||
|
|
@ -28,6 +28,9 @@
|
|||
</item>
|
||||
<item>
|
||||
<widget class="QTabWidget" name="tabWidget">
|
||||
<property name="toolTip">
|
||||
<string>Remove measurement</string>
|
||||
</property>
|
||||
<property name="currentIndex">
|
||||
<number>0</number>
|
||||
</property>
|
||||
|
|
@ -121,28 +124,28 @@
|
|||
<string>Details</string>
|
||||
</property>
|
||||
<layout class="QFormLayout" name="formLayout">
|
||||
<item row="0" column="0">
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Name:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<item row="2" column="1">
|
||||
<widget class="QLineEdit" name="lineEdit">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<item row="4" column="0">
|
||||
<widget class="QLabel" name="labelValue">
|
||||
<property name="text">
|
||||
<string>Value:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<item row="4" column="1">
|
||||
<layout class="QHBoxLayout" name="horizontalLayoutValue">
|
||||
<item>
|
||||
<widget class="QPlainTextEdit" name="plainTextEditFormula">
|
||||
|
|
@ -261,56 +264,56 @@
|
|||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<item row="5" column="0">
|
||||
<widget class="QLabel" name="labelBaseValue">
|
||||
<property name="text">
|
||||
<string>Base value:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<item row="5" column="1">
|
||||
<widget class="QDoubleSpinBox" name="doubleSpinBoxBaseValue">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0">
|
||||
<item row="6" column="0">
|
||||
<widget class="QLabel" name="labelInSizes">
|
||||
<property name="text">
|
||||
<string>In sizes:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="1">
|
||||
<item row="6" column="1">
|
||||
<widget class="QDoubleSpinBox" name="doubleSpinBoxInSizes">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="0">
|
||||
<item row="7" column="0">
|
||||
<widget class="QLabel" name="labelInHeights">
|
||||
<property name="text">
|
||||
<string>In heights:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="1">
|
||||
<item row="7" column="1">
|
||||
<widget class="QDoubleSpinBox" name="doubleSpinBoxInHeights">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="0">
|
||||
<item row="8" column="0">
|
||||
<widget class="QLabel" name="label_7">
|
||||
<property name="text">
|
||||
<string>Description:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="1">
|
||||
<item row="8" column="1">
|
||||
<widget class="QPlainTextEdit" name="plainTextEdit">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
|
|
@ -323,6 +326,59 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="0">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item alignment="Qt::AlignLeft">
|
||||
<widget class="QToolButton" name="toolButtonUp">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Move measurement up</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string notr="true">...</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset theme="go-up"/>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item alignment="Qt::AlignLeft">
|
||||
<widget class="QToolButton" name="toolButtonDown">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Move measurement down</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string notr="true">...</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset theme="go-down"/>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
||||
<item alignment="Qt::AlignRight">
|
||||
<widget class="QToolButton" name="toolButtonRemove">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string notr="true">...</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset theme="list-remove"/>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -345,7 +401,7 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QLabel" name="label_22">
|
||||
<widget class="QLabel" name="labelMType">
|
||||
<property name="text">
|
||||
<string>Measurement type</string>
|
||||
</property>
|
||||
|
|
@ -372,6 +428,9 @@
|
|||
</item>
|
||||
<item alignment="Qt::AlignRight">
|
||||
<widget class="QPushButton" name="pushButtonShowInFolder">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Show in folder</string>
|
||||
</property>
|
||||
|
|
@ -415,7 +474,11 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="4" column="1">
|
||||
<widget class="QLineEdit" name="lineEditGivenName"/>
|
||||
<widget class="QLineEdit" name="lineEditGivenName">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="0">
|
||||
<widget class="QLabel" name="labelFamilyName">
|
||||
|
|
@ -425,7 +488,11 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="5" column="1">
|
||||
<widget class="QLineEdit" name="lineEditFamilyName"/>
|
||||
<widget class="QLineEdit" name="lineEditFamilyName">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="0">
|
||||
<widget class="QLabel" name="labelBirthDate">
|
||||
|
|
@ -436,6 +503,9 @@
|
|||
</item>
|
||||
<item row="6" column="1">
|
||||
<widget class="QDateEdit" name="dateEditBirthDate">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="displayFormat">
|
||||
<string>yyyy-MM-dd</string>
|
||||
</property>
|
||||
|
|
@ -449,7 +519,11 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="7" column="1">
|
||||
<widget class="QComboBox" name="comboBoxSex"/>
|
||||
<widget class="QComboBox" name="comboBoxSex">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="8" column="0">
|
||||
<widget class="QLabel" name="labelEmail">
|
||||
|
|
@ -459,7 +533,11 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="8" column="1">
|
||||
<widget class="QLineEdit" name="lineEditEmail"/>
|
||||
<widget class="QLineEdit" name="lineEditEmail">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="9" column="0">
|
||||
<widget class="QLabel" name="labelNotes">
|
||||
|
|
@ -470,6 +548,9 @@
|
|||
</item>
|
||||
<item row="9" column="1">
|
||||
<widget class="QPlainTextEdit" name="plainTextEditNotes">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
|
|
@ -489,7 +570,7 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>599</width>
|
||||
<width>536</width>
|
||||
<height>25</height>
|
||||
</rect>
|
||||
</property>
|
||||
|
|
@ -503,6 +584,8 @@
|
|||
<addaction name="actionSave"/>
|
||||
<addaction name="actionSaveAs"/>
|
||||
<addaction name="separator"/>
|
||||
<addaction name="actionReadOnly"/>
|
||||
<addaction name="separator"/>
|
||||
<addaction name="actionQuit"/>
|
||||
</widget>
|
||||
<widget class="QMenu" name="menuWindow">
|
||||
|
|
@ -528,30 +611,68 @@
|
|||
<addaction name="menuHelp"/>
|
||||
</widget>
|
||||
<widget class="QToolBar" name="mainToolBar">
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="toolButtonStyle">
|
||||
<enum>Qt::ToolButtonTextUnderIcon</enum>
|
||||
</property>
|
||||
<attribute name="toolBarArea">
|
||||
<enum>TopToolBarArea</enum>
|
||||
</attribute>
|
||||
<attribute name="toolBarBreak">
|
||||
<bool>false</bool>
|
||||
</attribute>
|
||||
<addaction name="actionNew"/>
|
||||
<addaction name="actionOpen"/>
|
||||
<addaction name="actionSave"/>
|
||||
<addaction name="actionAddKnown"/>
|
||||
<addaction name="actionAddCustom"/>
|
||||
<addaction name="actionReadOnly"/>
|
||||
</widget>
|
||||
<widget class="QStatusBar" name="statusBar"/>
|
||||
<action name="actionOpen">
|
||||
<property name="icon">
|
||||
<iconset theme="document-open">
|
||||
<normaloff/>
|
||||
</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Open ...</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionSave">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset theme="document-save">
|
||||
<normaloff/>
|
||||
</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Save</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionSaveAs">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset theme="document-save-as">
|
||||
<normaloff/>
|
||||
</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Save As ...</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionQuit">
|
||||
<property name="icon">
|
||||
<iconset theme="application-exit">
|
||||
<normaloff/>
|
||||
</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Quit</string>
|
||||
</property>
|
||||
|
|
@ -562,15 +683,64 @@
|
|||
</property>
|
||||
</action>
|
||||
<action name="actionAboutTape">
|
||||
<property name="icon">
|
||||
<iconset theme="help-about">
|
||||
<normaloff/>
|
||||
</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>About Tape</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionNew">
|
||||
<property name="icon">
|
||||
<iconset theme="document-new">
|
||||
<normaloff/>
|
||||
</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>New</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionAddKnown">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="share/resources/tapeicon.qrc">
|
||||
<normaloff>:/tapeicon/24x24/red_plus.png</normaloff>:/tapeicon/24x24/red_plus.png</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Add known</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionAddCustom">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="share/resources/tapeicon.qrc">
|
||||
<normaloff>:/tapeicon/24x24/orange_plus.png</normaloff>:/tapeicon/24x24/orange_plus.png</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Add custom</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionReadOnly">
|
||||
<property name="checkable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="share/resources/tapeicon.qrc">
|
||||
<normaloff>:/tapeicon/24x24/padlock_opened.png</normaloff>:/tapeicon/24x24/padlock_opened.png</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Read only</string>
|
||||
</property>
|
||||
</action>
|
||||
</widget>
|
||||
<layoutdefault spacing="6" margin="11"/>
|
||||
<resources>
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
<enum>QTabWidget::North</enum>
|
||||
</property>
|
||||
<property name="currentIndex">
|
||||
<number>0</number>
|
||||
<number>1</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="tabStandard">
|
||||
<property name="sizePolicy">
|
||||
|
|
@ -118,8 +118,8 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>939</width>
|
||||
<height>411</height>
|
||||
<width>559</width>
|
||||
<height>82</height>
|
||||
</rect>
|
||||
</property>
|
||||
<attribute name="icon">
|
||||
|
|
|
|||
BIN
src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-down.png
Normal file → Executable file
BIN
src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-down.png
Normal file → Executable file
Binary file not shown.
|
Before Width: | Height: | Size: 756 B After Width: | Height: | Size: 828 B |
BIN
src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-up.png
Executable file
BIN
src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-up.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 816 B |
BIN
src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/go-up.png
Executable file
BIN
src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/go-up.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 1.4 KiB |
BIN
src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/go-up.png
Executable file
BIN
src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/go-up.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 2.2 KiB |
|
|
@ -68,5 +68,8 @@
|
|||
<file alias="24x24/actions/document-print-preview.png">icons/win.icon.theme/24x24/actions/document-print-preview.png</file>
|
||||
<file alias="32x32/actions/document-print-preview.png">icons/win.icon.theme/32x32/actions/document-print-preview.png</file>
|
||||
<file alias="32x32/emblems/emblem-system.png">icons/win.icon.theme/32x32/emblems/emblem-system.png</file>
|
||||
<file>icons/win.icon.theme/16x16/actions/go-up.png</file>
|
||||
<file>icons/win.icon.theme/24x24/actions/go-up.png</file>
|
||||
<file>icons/win.icon.theme/32x32/actions/go-up.png</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
|
|
|||
Loading…
Reference in a new issue