Group button.
--HG-- branch : feature
This commit is contained in:
parent
e2966b3f63
commit
844d3764c2
|
@ -2086,7 +2086,7 @@ void MainWindow::ActionDetails(bool checked)
|
|||
mode = Draw::Modeling;
|
||||
SetEnableTool(true);
|
||||
SetEnableWidgets(true);
|
||||
ui->toolBox->setCurrentIndex(4);
|
||||
ui->toolBox->setCurrentIndex(5);
|
||||
|
||||
if (qApp->patternType() == MeasurementsType::Standard)
|
||||
{
|
||||
|
@ -2161,7 +2161,7 @@ void MainWindow::ActionLayout(bool checked)
|
|||
mode = Draw::Layout;
|
||||
SetEnableTool(true);
|
||||
SetEnableWidgets(true);
|
||||
ui->toolBox->setCurrentIndex(5);
|
||||
ui->toolBox->setCurrentIndex(6);
|
||||
|
||||
mouseCoordinate->setText("");
|
||||
|
||||
|
@ -3042,6 +3042,7 @@ void MainWindow::SetEnableTool(bool enable)
|
|||
ui->toolButtonPointFromArcAndTangent->setEnabled(drawTools);
|
||||
ui->toolButtonArcWithLength->setEnabled(drawTools);
|
||||
ui->toolButtonTrueDarts->setEnabled(drawTools);
|
||||
ui->toolButtonGroup->setEnabled(drawTools);
|
||||
|
||||
ui->actionLast_tool->setEnabled(drawTools);
|
||||
|
||||
|
|
|
@ -48,14 +48,14 @@
|
|||
<string>Tools</string>
|
||||
</property>
|
||||
<property name="currentIndex">
|
||||
<number>2</number>
|
||||
<number>4</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="page">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>100</width>
|
||||
<width>130</width>
|
||||
<height>318</height>
|
||||
</rect>
|
||||
</property>
|
||||
|
@ -375,7 +375,7 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>100</width>
|
||||
<width>130</width>
|
||||
<height>58</height>
|
||||
</rect>
|
||||
</property>
|
||||
|
@ -700,7 +700,7 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>100</width>
|
||||
<width>130</width>
|
||||
<height>196</height>
|
||||
</rect>
|
||||
</property>
|
||||
|
@ -937,12 +937,52 @@
|
|||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="page_7">
|
||||
<attribute name="icon">
|
||||
<iconset resource="../../libs/vmisc/share/resources/icon.qrc">
|
||||
<normaloff>:/icon/16x16/operations.png</normaloff>:/icon/16x16/operations.png</iconset>
|
||||
</attribute>
|
||||
<attribute name="label">
|
||||
<string>Operations</string>
|
||||
</attribute>
|
||||
<attribute name="toolTip">
|
||||
<string>Operations</string>
|
||||
</attribute>
|
||||
<layout class="QFormLayout" name="formLayout_7">
|
||||
<item row="0" column="0">
|
||||
<widget class="QToolButton" name="toolButtonGroup">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Create new group</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string notr="true">...</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="share/resources/toolicon.qrc">
|
||||
<normaloff>:/toolicon/32x32/group_plus.png</normaloff>:/toolicon/32x32/group_plus.png</iconset>
|
||||
</property>
|
||||
<property name="iconSize">
|
||||
<size>
|
||||
<width>32</width>
|
||||
<height>32</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="checkable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="page_5">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>100</width>
|
||||
<width>130</width>
|
||||
<height>58</height>
|
||||
</rect>
|
||||
</property>
|
||||
|
@ -1028,8 +1068,8 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>87</width>
|
||||
<height>58</height>
|
||||
<width>130</width>
|
||||
<height>356</height>
|
||||
</rect>
|
||||
</property>
|
||||
<attribute name="icon">
|
||||
|
|
|
@ -62,5 +62,7 @@
|
|||
<file>toolicon/32x32/cubic_bezier@2x.png</file>
|
||||
<file>toolicon/32x32/cubic_bezier_path.png</file>
|
||||
<file>toolicon/32x32/cubic_bezier_path@2x.png</file>
|
||||
<file>toolicon/32x32/group_plus.png</file>
|
||||
<file>toolicon/32x32/group_plus@2x.png</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
|
BIN
src/app/valentina/share/resources/toolicon/32x32/group_plus.png
Normal file
BIN
src/app/valentina/share/resources/toolicon/32x32/group_plus.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
After Width: | Height: | Size: 2.2 KiB |
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32" viewBox="0 0 32 32">
|
||||
<path d="M32 4h-4v-4h-4v4h-4v4h4v4h4v-4h4z" fill="#444444"></path>
|
||||
<path d="M26.996 13.938c0.576 0.64 1.1 1.329 1.563 2.062-1.197 1.891-2.79 3.498-4.67 4.697-2.362 1.507-5.090 2.303-7.889 2.303s-5.527-0.796-7.889-2.303c-1.88-1.199-3.473-2.805-4.67-4.697 1.197-1.891 2.79-3.498 4.67-4.697 0.122-0.078 0.246-0.154 0.371-0.228-0.311 0.854-0.482 1.776-0.482 2.737 0 4.418 3.582 8 8 8s8-3.582 8-8c0-0.022-0.001-0.043-0.001-0.065-3.415-0.879-5.947-3.957-5.998-7.635-0.657-0.074-1.325-0.113-2.001-0.113-6.979 0-13.028 4.064-16 10 2.972 5.936 9.021 10 16 10s13.027-4.064 16-10c-0.551-1.101-1.209-2.137-1.958-3.095-0.915 0.537-1.946 0.897-3.046 1.034zM13 10c1.657 0 3 1.343 3 3s-1.343 3-3 3-3-1.343-3-3 1.343-3 3-3z" fill="#444444"></path>
|
||||
</svg>
|
After Width: | Height: | Size: 1017 B |
|
@ -55,5 +55,7 @@
|
|||
<file>icon/16x16/toolsectioncurve@2x.png</file>
|
||||
<file>icon/16x16/toolsectionline@2x.png</file>
|
||||
<file>icon/16x16/toolsectionpoint@2x.png</file>
|
||||
<file>icon/16x16/operations.png</file>
|
||||
<file>icon/16x16/operations@2x.png</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
|
BIN
src/libs/vmisc/share/resources/icon/16x16/operations.png
Normal file
BIN
src/libs/vmisc/share/resources/icon/16x16/operations.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 448 B |
BIN
src/libs/vmisc/share/resources/icon/16x16/operations@2x.png
Normal file
BIN
src/libs/vmisc/share/resources/icon/16x16/operations@2x.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 2.1 KiB |
Loading…
Reference in New Issue
Block a user