diff --git a/src/app/tape/share/resources/tapeicon.qrc b/src/app/tape/share/resources/tapeicon.qrc index 24fdeb957..0c85d664d 100644 --- a/src/app/tape/share/resources/tapeicon.qrc +++ b/src/app/tape/share/resources/tapeicon.qrc @@ -5,5 +5,9 @@ tapeicon/16x16/measurement.png tapeicon/24x24/equal.png tapeicon/24x24/fx.png + tapeicon/24x24/orange_plus.png + tapeicon/24x24/red_plus.png + tapeicon/24x24/padlock_locked.png + tapeicon/24x24/padlock_opened.png diff --git a/src/app/tape/share/resources/tapeicon/24x24/orange_plus.png b/src/app/tape/share/resources/tapeicon/24x24/orange_plus.png new file mode 100644 index 000000000..b5361b547 Binary files /dev/null and b/src/app/tape/share/resources/tapeicon/24x24/orange_plus.png differ diff --git a/src/app/tape/share/resources/tapeicon/24x24/padlock_locked.png b/src/app/tape/share/resources/tapeicon/24x24/padlock_locked.png new file mode 100644 index 000000000..7a25deb3a Binary files /dev/null and b/src/app/tape/share/resources/tapeicon/24x24/padlock_locked.png differ diff --git a/src/app/tape/share/resources/tapeicon/24x24/padlock_opened.png b/src/app/tape/share/resources/tapeicon/24x24/padlock_opened.png new file mode 100644 index 000000000..588e13cdc Binary files /dev/null and b/src/app/tape/share/resources/tapeicon/24x24/padlock_opened.png differ diff --git a/src/app/tape/share/resources/tapeicon/24x24/red_plus.png b/src/app/tape/share/resources/tapeicon/24x24/red_plus.png new file mode 100644 index 000000000..89c331133 Binary files /dev/null and b/src/app/tape/share/resources/tapeicon/24x24/red_plus.png differ diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp index 69334e438..164d619e5 100644 --- a/src/app/tape/tmainwindow.cpp +++ b/src/app/tape/tmainwindow.cpp @@ -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; diff --git a/src/app/tape/tmainwindow.ui b/src/app/tape/tmainwindow.ui index 5e4b3423a..0346fc15b 100644 --- a/src/app/tape/tmainwindow.ui +++ b/src/app/tape/tmainwindow.ui @@ -6,12 +6,12 @@ 0 0 - 599 - 569 + 536 + 694 - TMainWindow + @@ -28,6 +28,9 @@ + + Remove measurement + 0 @@ -121,28 +124,28 @@ Details - + Name: - + false - + Value: - + @@ -261,56 +264,56 @@ - + Base value: - + false - + In sizes: - + false - + In heights: - + false - + Description: - + false @@ -323,6 +326,59 @@ + + + + + + false + + + Move measurement up + + + ... + + + + + + + + + + false + + + Move measurement down + + + ... + + + + + + + + + + + + + + false + + + ... + + + + + + + + @@ -345,7 +401,7 @@ - + Measurement type @@ -372,6 +428,9 @@ + + false + Show in folder @@ -415,7 +474,11 @@ - + + + false + + @@ -425,7 +488,11 @@ - + + + false + + @@ -436,6 +503,9 @@ + + false + yyyy-MM-dd @@ -449,7 +519,11 @@ - + + + false + + @@ -459,7 +533,11 @@ - + + + false + + @@ -470,6 +548,9 @@ + + false + 0 @@ -489,7 +570,7 @@ 0 0 - 599 + 536 25 @@ -503,6 +584,8 @@ + + @@ -528,30 +611,68 @@ + + true + + + Qt::ToolButtonTextUnderIcon + TopToolBarArea false + + + + + + + + + + + Open ... + + false + + + + + + Save + + false + + + + + + Save As ... + + + + + Quit @@ -562,15 +683,64 @@ + + + + + About Tape + + + + + New + + + false + + + + :/tapeicon/24x24/red_plus.png:/tapeicon/24x24/red_plus.png + + + Add known + + + + + false + + + + :/tapeicon/24x24/orange_plus.png:/tapeicon/24x24/orange_plus.png + + + Add custom + + + + + true + + + false + + + + :/tapeicon/24x24/padlock_opened.png:/tapeicon/24x24/padlock_opened.png + + + Read only + + diff --git a/src/app/valentina/dialogs/dialogincrements.ui b/src/app/valentina/dialogs/dialogincrements.ui index 4afd8c90a..45c72deec 100644 --- a/src/app/valentina/dialogs/dialogincrements.ui +++ b/src/app/valentina/dialogs/dialogincrements.ui @@ -39,7 +39,7 @@ QTabWidget::North - 0 + 1 @@ -118,8 +118,8 @@ 0 0 - 939 - 411 + 559 + 82 diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-down.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-down.png old mode 100644 new mode 100755 index a74287892..9b3106049 Binary files a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-down.png and b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-down.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-up.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-up.png new file mode 100755 index 000000000..eab659e79 Binary files /dev/null and b/src/libs/vmisc/share/resources/icons/win.icon.theme/16x16/actions/go-up.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/go-up.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/go-up.png new file mode 100755 index 000000000..61dff461b Binary files /dev/null and b/src/libs/vmisc/share/resources/icons/win.icon.theme/24x24/actions/go-up.png differ diff --git a/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/go-up.png b/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/go-up.png new file mode 100755 index 000000000..7bd9856e3 Binary files /dev/null and b/src/libs/vmisc/share/resources/icons/win.icon.theme/32x32/actions/go-up.png differ diff --git a/src/libs/vmisc/share/resources/theme.qrc b/src/libs/vmisc/share/resources/theme.qrc index f89a5ca50..12f35f3b4 100644 --- a/src/libs/vmisc/share/resources/theme.qrc +++ b/src/libs/vmisc/share/resources/theme.qrc @@ -68,5 +68,8 @@ icons/win.icon.theme/24x24/actions/document-print-preview.png icons/win.icon.theme/32x32/actions/document-print-preview.png icons/win.icon.theme/32x32/emblems/emblem-system.png + icons/win.icon.theme/16x16/actions/go-up.png + icons/win.icon.theme/24x24/actions/go-up.png + icons/win.icon.theme/32x32/actions/go-up.png