palo/valentina
1
0
Fork 0
mirror of https://gitlab.com/smart-pattern/valentina.git synced 2024-09-27 19:01:32 +02:00
Code Issues Projects Releases Wiki Activity

Fix menu on Mac OS X.

Browse source
This commit is contained in:
Roman Telezhynskyi 2022-08-02 17:38:26 +03:00
parent 57dd27cec0
commit 91a6da3c26
4 changed files with 112 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog.txt
View file

@ -12,6 +12,7 @@
- Fix main path validation. False positive double curve. - Fix main path validation. False positive double curve.
- Fix Setup multisize measurements dialog. Improved handling Height dimension. - Fix Setup multisize measurements dialog. Improved handling Height dimension.
- Fix updating dimension labels in Valentina app. - Fix updating dimension labels in Valentina app.
- Fix menu on Mac OS X.
# Valentina 0.7.51 April 18, 2022 # Valentina 0.7.51 April 18, 2022
- Z value change for a layout piece. - Z value change for a layout piece.

55
src/app/puzzle/vpmainwindow.ui
View file

@ -2006,7 +2006,7 @@
<string notr="true">Ctrl+O</string> <string notr="true">Ctrl+O</string>
</property> </property>
<property name="menuRole"> <property name="menuRole">
<enum>QAction::ApplicationSpecificRole</enum> <enum>QAction::NoRole</enum>
</property> </property>
</action> </action>
<action name="actionSave"> <action name="actionSave">
@ -2024,7 +2024,7 @@
<string notr="true">Ctrl+S</string> <string notr="true">Ctrl+S</string>
</property> </property>
<property name="menuRole"> <property name="menuRole">
<enum>QAction::ApplicationSpecificRole</enum> <enum>QAction::NoRole</enum>
</property> </property>
</action> </action>
<action name="actionSaveAs"> <action name="actionSaveAs">
@ -2042,7 +2042,7 @@
<string notr="true">Ctrl+Shift+S</string> <string notr="true">Ctrl+Shift+S</string>
</property> </property>
<property name="menuRole"> <property name="menuRole">
<enum>QAction::ApplicationSpecificRole</enum> <enum>QAction::NoRole</enum>
</property> </property>
</action> </action>
<action name="actionImportRawLayout"> <action name="actionImportRawLayout">
@ -2052,6 +2052,9 @@
<property name="text"> <property name="text">
<string>&amp;Import Raw Layout Data</string> <string>&amp;Import Raw Layout Data</string>
</property> </property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
</property>
</action> </action>
<action name="actionExit"> <action name="actionExit">
<property name="enabled"> <property name="enabled">
@ -2083,7 +2086,7 @@
<string notr="true">Ctrl+N</string> <string notr="true">Ctrl+N</string>
</property> </property>
<property name="menuRole"> <property name="menuRole">
<enum>QAction::ApplicationSpecificRole</enum> <enum>QAction::NoRole</enum>
</property> </property>
</action> </action>
<action name="actionAboutQt"> <action name="actionAboutQt">
@ -2187,7 +2190,7 @@
<string>Add Sheet</string> <string>Add Sheet</string>
</property> </property>
<property name="menuRole"> <property name="menuRole">
<enum>QAction::ApplicationSpecificRole</enum> <enum>QAction::NoRole</enum>
</property> </property>
</action> </action>
<action name="actionPrintLayout"> <action name="actionPrintLayout">
@ -2199,7 +2202,7 @@
<string>Print</string> <string>Print</string>
</property> </property>
<property name="menuRole"> <property name="menuRole">
<enum>QAction::ApplicationSpecificRole</enum> <enum>QAction::NoRole</enum>
</property> </property>
</action> </action>
<action name="actionPrintPreviewLayout"> <action name="actionPrintPreviewLayout">
@ -2211,7 +2214,7 @@
<string>Print preview</string> <string>Print preview</string>
</property> </property>
<property name="menuRole"> <property name="menuRole">
<enum>QAction::ApplicationSpecificRole</enum> <enum>QAction::NoRole</enum>
</property> </property>
</action> </action>
<action name="actionPrintTiledLayout"> <action name="actionPrintTiledLayout">
@ -2223,7 +2226,7 @@
<string>Print tiled</string> <string>Print tiled</string>
</property> </property>
<property name="menuRole"> <property name="menuRole">
<enum>QAction::ApplicationSpecificRole</enum> <enum>QAction::NoRole</enum>
</property> </property>
</action> </action>
<action name="actionPrintPreviewTiledLayout"> <action name="actionPrintPreviewTiledLayout">
@ -2235,7 +2238,7 @@
<string>Print preview tiled</string> <string>Print preview tiled</string>
</property> </property>
<property name="menuRole"> <property name="menuRole">
<enum>QAction::ApplicationSpecificRole</enum> <enum>QAction::NoRole</enum>
</property> </property>
</action> </action>
<action name="actionExportLayout"> <action name="actionExportLayout">
@ -2243,7 +2246,7 @@
<string>Export</string> <string>Export</string>
</property> </property>
<property name="menuRole"> <property name="menuRole">
<enum>QAction::ApplicationSpecificRole</enum> <enum>QAction::NoRole</enum>
</property> </property>
</action> </action>
<action name="actionPrintSheet"> <action name="actionPrintSheet">
@ -2255,7 +2258,7 @@
<string>Print</string> <string>Print</string>
</property> </property>
<property name="menuRole"> <property name="menuRole">
<enum>QAction::ApplicationSpecificRole</enum> <enum>QAction::NoRole</enum>
</property> </property>
</action> </action>
<action name="actionPrintPreviewSheet"> <action name="actionPrintPreviewSheet">
@ -2267,7 +2270,7 @@
<string>Print preview</string> <string>Print preview</string>
</property> </property>
<property name="menuRole"> <property name="menuRole">
<enum>QAction::ApplicationSpecificRole</enum> <enum>QAction::NoRole</enum>
</property> </property>
</action> </action>
<action name="actionPrintTiledSheet"> <action name="actionPrintTiledSheet">
@ -2279,7 +2282,7 @@
<string>Print tiled</string> <string>Print tiled</string>
</property> </property>
<property name="menuRole"> <property name="menuRole">
<enum>QAction::ApplicationSpecificRole</enum> <enum>QAction::NoRole</enum>
</property> </property>
</action> </action>
<action name="actionPrintPreviewTiledSheet"> <action name="actionPrintPreviewTiledSheet">
@ -2291,7 +2294,7 @@
<string>Print preview tiled</string> <string>Print preview tiled</string>
</property> </property>
<property name="menuRole"> <property name="menuRole">
<enum>QAction::ApplicationSpecificRole</enum> <enum>QAction::NoRole</enum>
</property> </property>
</action> </action>
<action name="actionExportSheet"> <action name="actionExportSheet">
@ -2299,7 +2302,7 @@
<string>Export</string> <string>Export</string>
</property> </property>
<property name="menuRole"> <property name="menuRole">
<enum>QAction::ApplicationSpecificRole</enum> <enum>QAction::NoRole</enum>
</property> </property>
</action> </action>
<action name="actionWatermarkEditor"> <action name="actionWatermarkEditor">
@ -2314,7 +2317,7 @@
<string>Create or edit a watermark</string> <string>Create or edit a watermark</string>
</property> </property>
<property name="menuRole"> <property name="menuRole">
<enum>QAction::ApplicationSpecificRole</enum> <enum>QAction::NoRole</enum>
</property> </property>
</action> </action>
<action name="actionEditCurrentWatermark"> <action name="actionEditCurrentWatermark">
@ -2325,7 +2328,7 @@
<string>Edit current</string> <string>Edit current</string>
</property> </property>
<property name="menuRole"> <property name="menuRole">
<enum>QAction::ApplicationSpecificRole</enum> <enum>QAction::NoRole</enum>
</property> </property>
</action> </action>
<action name="actionLoadWatermark"> <action name="actionLoadWatermark">
@ -2340,7 +2343,7 @@
<string>Load</string> <string>Load</string>
</property> </property>
<property name="menuRole"> <property name="menuRole">
<enum>QAction::ApplicationSpecificRole</enum> <enum>QAction::NoRole</enum>
</property> </property>
</action> </action>
<action name="actionRemoveWatermark"> <action name="actionRemoveWatermark">
@ -2355,12 +2358,13 @@
<string>Remove</string> <string>Remove</string>
</property> </property>
<property name="menuRole"> <property name="menuRole">
<enum>QAction::ApplicationSpecificRole</enum> <enum>QAction::NoRole</enum>
</property> </property>
</action> </action>
<action name="actionZValueBottom"> <action name="actionZValueBottom">
<property name="icon"> <property name="icon">
<iconset theme="go-bottom"/> <iconset theme="go-bottom">
<normaloff>.</normaloff>.</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Bottom</string> <string>Bottom</string>
@ -2368,7 +2372,8 @@
</action> </action>
<action name="actionZValueDown"> <action name="actionZValueDown">
<property name="icon"> <property name="icon">
<iconset theme="go-down"/> <iconset theme="go-down">
<normaloff>.</normaloff>.</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Down</string> <string>Down</string>
@ -2376,7 +2381,8 @@
</action> </action>
<action name="actionZValueUp"> <action name="actionZValueUp">
<property name="icon"> <property name="icon">
<iconset theme="go-up"/> <iconset theme="go-up">
<normaloff>.</normaloff>.</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Up</string> <string>Up</string>
@ -2384,7 +2390,8 @@
</action> </action>
<action name="actionZValueTop"> <action name="actionZValueTop">
<property name="icon"> <property name="icon">
<iconset theme="go-top"/> <iconset theme="go-top">
<normaloff>.</normaloff>.</iconset>
</property> </property>
<property name="text"> <property name="text">
<string>Top</string> <string>Top</string>
@ -2417,8 +2424,8 @@
</resources> </resources>
<connections/> <connections/>
<buttongroups> <buttongroups>
<buttongroup name="buttonGroupSheetOrientation"/>
<buttongroup name="buttonGroupTileOrientation"/> <buttongroup name="buttonGroupTileOrientation"/>
<buttongroup name="buttonGroupSheetOrientation"/>
<buttongroup name="buttonGroupRotationDirection"/> <buttongroup name="buttonGroupRotationDirection"/>
</buttongroups> </buttongroups>
</ui> </ui>

27
src/app/tape/tmainwindow.ui
View file

@ -14,7 +14,7 @@
<string notr="true"/> <string notr="true"/>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="share/resources/tapeicon.qrc"> <iconset>
<normaloff>:/tapeicon/64x64/logo.png</normaloff>:/tapeicon/64x64/logo.png</iconset> <normaloff>:/tapeicon/64x64/logo.png</normaloff>:/tapeicon/64x64/logo.png</iconset>
</property> </property>
<widget class="QWidget" name="centralWidget"> <widget class="QWidget" name="centralWidget">
@ -51,7 +51,7 @@
</property> </property>
<widget class="QWidget" name="tabMeasurements"> <widget class="QWidget" name="tabMeasurements">
<attribute name="icon"> <attribute name="icon">
<iconset resource="share/resources/tapeicon.qrc"> <iconset>
<normaloff>:/tapeicon/16x16/measurement.png</normaloff>:/tapeicon/16x16/measurement.png</iconset> <normaloff>:/tapeicon/16x16/measurement.png</normaloff>:/tapeicon/16x16/measurement.png</iconset>
</attribute> </attribute>
<attribute name="title"> <attribute name="title">
@ -626,7 +626,7 @@
<string notr="true">...</string> <string notr="true">...</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="share/resources/tapeicon.qrc"> <iconset>
<normaloff>:/tapeicon/24x24/fx.png</normaloff>:/tapeicon/24x24/fx.png</iconset> <normaloff>:/tapeicon/24x24/fx.png</normaloff>:/tapeicon/24x24/fx.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
@ -818,7 +818,7 @@
</widget> </widget>
<widget class="QWidget" name="tabInformation"> <widget class="QWidget" name="tabInformation">
<attribute name="icon"> <attribute name="icon">
<iconset resource="share/resources/tapeicon.qrc"> <iconset>
<normaloff>:/tapeicon/16x16/info.png</normaloff>:/tapeicon/16x16/info.png</iconset> <normaloff>:/tapeicon/16x16/info.png</normaloff>:/tapeicon/16x16/info.png</iconset>
</attribute> </attribute>
<attribute name="title"> <attribute name="title">
@ -1382,7 +1382,7 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="share/resources/tapeicon.qrc"> <iconset>
<normaloff>:/tapeicon/24x24/red_plus.png</normaloff>:/tapeicon/24x24/red_plus.png</iconset> <normaloff>:/tapeicon/24x24/red_plus.png</normaloff>:/tapeicon/24x24/red_plus.png</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -1397,7 +1397,7 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="share/resources/tapeicon.qrc"> <iconset>
<normaloff>:/tapeicon/24x24/orange_plus.png</normaloff>:/tapeicon/24x24/orange_plus.png</iconset> <normaloff>:/tapeicon/24x24/orange_plus.png</normaloff>:/tapeicon/24x24/orange_plus.png</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -1415,7 +1415,7 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="share/resources/tapeicon.qrc"> <iconset>
<normaloff>:/tapeicon/24x24/padlock_opened.png</normaloff>:/tapeicon/24x24/padlock_opened.png</iconset> <normaloff>:/tapeicon/24x24/padlock_opened.png</normaloff>:/tapeicon/24x24/padlock_opened.png</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -1514,6 +1514,9 @@
<property name="toolTip"> <property name="toolTip">
<string>Import from CSV</string> <string>Import from CSV</string>
</property> </property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
</property>
</action> </action>
<action name="actionMeasurementDiagram"> <action name="actionMeasurementDiagram">
<property name="checkable"> <property name="checkable">
@ -1523,7 +1526,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="share/resources/tapeicon.qrc"> <iconset>
<normaloff>:/tapeicon/24x24/mannequin.png</normaloff>:/tapeicon/24x24/mannequin.png</iconset> <normaloff>:/tapeicon/24x24/mannequin.png</normaloff>:/tapeicon/24x24/mannequin.png</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -1622,7 +1625,7 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="share/resources/tapeicon.qrc"> <iconset>
<normaloff>:/tapeicon/24x24/separator.png</normaloff>:/tapeicon/24x24/separator.png</iconset> <normaloff>:/tapeicon/24x24/separator.png</normaloff>:/tapeicon/24x24/separator.png</iconset>
</property> </property>
<property name="text"> <property name="text">
@ -1646,12 +1649,10 @@
<customwidget> <customwidget>
<class>VPlainTextEdit</class> <class>VPlainTextEdit</class>
<extends>QPlainTextEdit</extends> <extends>QPlainTextEdit</extends>
<header location="global">vplaintextedit.h</header> <header>vplaintextedit.h</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources> <resources/>
<include location="share/resources/tapeicon.qrc"/>
</resources>
<connections> <connections>
<connection> <connection>
<sender>actionMeasurementDiagram</sender> <sender>actionMeasurementDiagram</sender>

66
src/app/valentina/mainwindow.ui
View file

@ -2698,6 +2698,9 @@
<property name="shortcut"> <property name="shortcut">
<string notr="true"/> <string notr="true"/>
</property> </property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
</property>
</action> </action>
<action name="actionPrintTiled"> <action name="actionPrintTiled">
<property name="enabled"> <property name="enabled">
@ -2716,6 +2719,9 @@
<property name="shortcut"> <property name="shortcut">
<string notr="true"/> <string notr="true"/>
</property> </property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
</property>
</action> </action>
<action name="actionPrintPreview"> <action name="actionPrintPreview">
<property name="enabled"> <property name="enabled">
@ -2734,6 +2740,9 @@
<property name="shortcut"> <property name="shortcut">
<string notr="true"/> <string notr="true"/>
</property> </property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
</property>
</action> </action>
<action name="actionPrintPreviewTiled"> <action name="actionPrintPreviewTiled">
<property name="enabled"> <property name="enabled">
@ -2752,6 +2761,9 @@
<property name="shortcut"> <property name="shortcut">
<string notr="true"/> <string notr="true"/>
</property> </property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
</property>
</action> </action>
<action name="actionExportAs"> <action name="actionExportAs">
<property name="enabled"> <property name="enabled">
@ -2770,6 +2782,9 @@
<property name="shortcut"> <property name="shortcut">
<string notr="true"/> <string notr="true"/>
</property> </property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
</property>
</action> </action>
<action name="actionLoadIndividual"> <action name="actionLoadIndividual">
<property name="enabled"> <property name="enabled">
@ -2909,6 +2924,9 @@
<property name="text"> <property name="text">
<string>Label template editor</string> <string>Label template editor</string>
</property> </property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
</property>
</action> </action>
<action name="actionFinalMeasurements"> <action name="actionFinalMeasurements">
<property name="enabled"> <property name="enabled">
@ -2928,6 +2946,9 @@
<property name="text"> <property name="text">
<string>Export Final Measurements to CSV</string> <string>Export Final Measurements to CSV</string>
</property> </property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
</property>
</action> </action>
<action name="actionNextPatternPiece"> <action name="actionNextPatternPiece">
<property name="enabled"> <property name="enabled">
@ -2939,6 +2960,9 @@
<property name="shortcut"> <property name="shortcut">
<string>Ctrl+PgDown</string> <string>Ctrl+PgDown</string>
</property> </property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
</property>
</action> </action>
<action name="actionPreviousPatternPiece"> <action name="actionPreviousPatternPiece">
<property name="enabled"> <property name="enabled">
@ -2950,6 +2974,9 @@
<property name="shortcut"> <property name="shortcut">
<string>Ctrl+PgUp</string> <string>Ctrl+PgUp</string>
</property> </property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
</property>
</action> </action>
<action name="actionIncreaseLabelFont"> <action name="actionIncreaseLabelFont">
<property name="enabled"> <property name="enabled">
@ -2992,6 +3019,9 @@
<property name="text"> <property name="text">
<string>Original label font</string> <string>Original label font</string>
</property> </property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
</property>
</action> </action>
<action name="actionHideLabels"> <action name="actionHideLabels">
<property name="checkable"> <property name="checkable">
@ -3003,6 +3033,9 @@
<property name="text"> <property name="text">
<string>Hide labels</string> <string>Hide labels</string>
</property> </property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
</property>
</action> </action>
<action name="actionExportRecipe"> <action name="actionExportRecipe">
<property name="checkable"> <property name="checkable">
@ -3014,6 +3047,9 @@
<property name="text"> <property name="text">
<string>Export recipe</string> <string>Export recipe</string>
</property> </property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
</property>
</action> </action>
<action name="actionShowMainPath"> <action name="actionShowMainPath">
<property name="checkable"> <property name="checkable">
@ -3028,6 +3064,9 @@
<property name="toolTip"> <property name="toolTip">
<string>Globally show pieces main path</string> <string>Globally show pieces main path</string>
</property> </property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
</property>
</action> </action>
<action name="actionLoadWatermark"> <action name="actionLoadWatermark">
<property name="enabled"> <property name="enabled">
@ -3040,6 +3079,9 @@
<property name="text"> <property name="text">
<string>Load</string> <string>Load</string>
</property> </property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
</property>
</action> </action>
<action name="actionRemoveWatermark"> <action name="actionRemoveWatermark">
<property name="enabled"> <property name="enabled">
@ -3052,6 +3094,9 @@
<property name="text"> <property name="text">
<string>Remove</string> <string>Remove</string>
</property> </property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
</property>
</action> </action>
<action name="actionEditCurrentWatermark"> <action name="actionEditCurrentWatermark">
<property name="enabled"> <property name="enabled">
@ -3060,6 +3105,9 @@
<property name="text"> <property name="text">
<string>Edit current</string> <string>Edit current</string>
</property> </property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
</property>
</action> </action>
<action name="actionWatermarkEditor"> <action name="actionWatermarkEditor">
<property name="icon"> <property name="icon">
@ -3072,6 +3120,9 @@
<property name="toolTip"> <property name="toolTip">
<string>Create or edit a watermark</string> <string>Create or edit a watermark</string>
</property> </property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
</property>
</action> </action>
<action name="actionOpenPuzzle"> <action name="actionOpenPuzzle">
<property name="text"> <property name="text">
@ -3080,6 +3131,9 @@
<property name="toolTip"> <property name="toolTip">
<string>Open the Puzzle app</string> <string>Open the Puzzle app</string>
</property> </property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
</property>
</action> </action>
<action name="actionCreateManualLayout"> <action name="actionCreateManualLayout">
<property name="enabled"> <property name="enabled">
@ -3091,6 +3145,9 @@
<property name="toolTip"> <property name="toolTip">
<string>Create manual layout</string> <string>Create manual layout</string>
</property> </property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
</property>
</action> </action>
<action name="actionUpdateManualLayout"> <action name="actionUpdateManualLayout">
<property name="enabled"> <property name="enabled">
@ -3102,11 +3159,17 @@
<property name="toolTip"> <property name="toolTip">
<string>Update manual layout</string> <string>Update manual layout</string>
</property> </property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
</property>
</action> </action>
<action name="actionShop"> <action name="actionShop">
<property name="text"> <property name="text">
<string>Shop</string> <string>Shop</string>
</property> </property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
</property>
</action> </action>
<action name="actionAddBackgroundImage"> <action name="actionAddBackgroundImage">
<property name="enabled"> <property name="enabled">
@ -3115,6 +3178,9 @@
<property name="text"> <property name="text">
<string>Add background image</string> <string>Add background image</string>
</property> </property>
<property name="menuRole">
<enum>QAction::NoRole</enum>
</property>
</action> </action>
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>