From 91a6da3c265558ec25a569a1cdd29e6dc01138b3 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <dismine@gmail.com>
Date: Tue, 2 Aug 2022 17:38:26 +0300
Subject: [PATCH] Fix menu on Mac OS X.

---
 ChangeLog.txt                   |  1 +
 src/app/puzzle/vpmainwindow.ui  | 55 +++++++++++++++------------
 src/app/tape/tmainwindow.ui     | 27 +++++++-------
 src/app/valentina/mainwindow.ui | 66 +++++++++++++++++++++++++++++++++
 4 files changed, 112 insertions(+), 37 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 959f22802..6f6fa7355 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -12,6 +12,7 @@
 - Fix main path validation. False positive double curve.
 - Fix Setup multisize measurements dialog. Improved handling Height dimension.
 - Fix updating dimension labels in Valentina app.
+- Fix menu on Mac OS X.
 
 # Valentina 0.7.51 April 18, 2022
 - Z value change for a layout piece.
diff --git a/src/app/puzzle/vpmainwindow.ui b/src/app/puzzle/vpmainwindow.ui
index d845231b8..be65b3300 100644
--- a/src/app/puzzle/vpmainwindow.ui
+++ b/src/app/puzzle/vpmainwindow.ui
@@ -2006,7 +2006,7 @@
     <string notr="true">Ctrl+O</string>
    </property>
    <property name="menuRole">
-    <enum>QAction::ApplicationSpecificRole</enum>
+    <enum>QAction::NoRole</enum>
    </property>
   </action>
   <action name="actionSave">
@@ -2024,7 +2024,7 @@
     <string notr="true">Ctrl+S</string>
    </property>
    <property name="menuRole">
-    <enum>QAction::ApplicationSpecificRole</enum>
+    <enum>QAction::NoRole</enum>
    </property>
   </action>
   <action name="actionSaveAs">
@@ -2042,7 +2042,7 @@
     <string notr="true">Ctrl+Shift+S</string>
    </property>
    <property name="menuRole">
-    <enum>QAction::ApplicationSpecificRole</enum>
+    <enum>QAction::NoRole</enum>
    </property>
   </action>
   <action name="actionImportRawLayout">
@@ -2052,6 +2052,9 @@
    <property name="text">
     <string>&amp;Import Raw Layout Data</string>
    </property>
+   <property name="menuRole">
+    <enum>QAction::NoRole</enum>
+   </property>
   </action>
   <action name="actionExit">
    <property name="enabled">
@@ -2083,7 +2086,7 @@
     <string notr="true">Ctrl+N</string>
    </property>
    <property name="menuRole">
-    <enum>QAction::ApplicationSpecificRole</enum>
+    <enum>QAction::NoRole</enum>
    </property>
   </action>
   <action name="actionAboutQt">
@@ -2187,7 +2190,7 @@
     <string>Add Sheet</string>
    </property>
    <property name="menuRole">
-    <enum>QAction::ApplicationSpecificRole</enum>
+    <enum>QAction::NoRole</enum>
    </property>
   </action>
   <action name="actionPrintLayout">
@@ -2199,7 +2202,7 @@
     <string>Print</string>
    </property>
    <property name="menuRole">
-    <enum>QAction::ApplicationSpecificRole</enum>
+    <enum>QAction::NoRole</enum>
    </property>
   </action>
   <action name="actionPrintPreviewLayout">
@@ -2211,7 +2214,7 @@
     <string>Print preview</string>
    </property>
    <property name="menuRole">
-    <enum>QAction::ApplicationSpecificRole</enum>
+    <enum>QAction::NoRole</enum>
    </property>
   </action>
   <action name="actionPrintTiledLayout">
@@ -2223,7 +2226,7 @@
     <string>Print tiled</string>
    </property>
    <property name="menuRole">
-    <enum>QAction::ApplicationSpecificRole</enum>
+    <enum>QAction::NoRole</enum>
    </property>
   </action>
   <action name="actionPrintPreviewTiledLayout">
@@ -2235,7 +2238,7 @@
     <string>Print preview tiled</string>
    </property>
    <property name="menuRole">
-    <enum>QAction::ApplicationSpecificRole</enum>
+    <enum>QAction::NoRole</enum>
    </property>
   </action>
   <action name="actionExportLayout">
@@ -2243,7 +2246,7 @@
     <string>Export</string>
    </property>
    <property name="menuRole">
-    <enum>QAction::ApplicationSpecificRole</enum>
+    <enum>QAction::NoRole</enum>
    </property>
   </action>
   <action name="actionPrintSheet">
@@ -2255,7 +2258,7 @@
     <string>Print</string>
    </property>
    <property name="menuRole">
-    <enum>QAction::ApplicationSpecificRole</enum>
+    <enum>QAction::NoRole</enum>
    </property>
   </action>
   <action name="actionPrintPreviewSheet">
@@ -2267,7 +2270,7 @@
     <string>Print preview</string>
    </property>
    <property name="menuRole">
-    <enum>QAction::ApplicationSpecificRole</enum>
+    <enum>QAction::NoRole</enum>
    </property>
   </action>
   <action name="actionPrintTiledSheet">
@@ -2279,7 +2282,7 @@
     <string>Print tiled</string>
    </property>
    <property name="menuRole">
-    <enum>QAction::ApplicationSpecificRole</enum>
+    <enum>QAction::NoRole</enum>
    </property>
   </action>
   <action name="actionPrintPreviewTiledSheet">
@@ -2291,7 +2294,7 @@
     <string>Print preview tiled</string>
    </property>
    <property name="menuRole">
-    <enum>QAction::ApplicationSpecificRole</enum>
+    <enum>QAction::NoRole</enum>
    </property>
   </action>
   <action name="actionExportSheet">
@@ -2299,7 +2302,7 @@
     <string>Export</string>
    </property>
    <property name="menuRole">
-    <enum>QAction::ApplicationSpecificRole</enum>
+    <enum>QAction::NoRole</enum>
    </property>
   </action>
   <action name="actionWatermarkEditor">
@@ -2314,7 +2317,7 @@
     <string>Create or edit a watermark</string>
    </property>
    <property name="menuRole">
-    <enum>QAction::ApplicationSpecificRole</enum>
+    <enum>QAction::NoRole</enum>
    </property>
   </action>
   <action name="actionEditCurrentWatermark">
@@ -2325,7 +2328,7 @@
     <string>Edit current</string>
    </property>
    <property name="menuRole">
-    <enum>QAction::ApplicationSpecificRole</enum>
+    <enum>QAction::NoRole</enum>
    </property>
   </action>
   <action name="actionLoadWatermark">
@@ -2340,7 +2343,7 @@
     <string>Load</string>
    </property>
    <property name="menuRole">
-    <enum>QAction::ApplicationSpecificRole</enum>
+    <enum>QAction::NoRole</enum>
    </property>
   </action>
   <action name="actionRemoveWatermark">
@@ -2355,12 +2358,13 @@
     <string>Remove</string>
    </property>
    <property name="menuRole">
-    <enum>QAction::ApplicationSpecificRole</enum>
+    <enum>QAction::NoRole</enum>
    </property>
   </action>
   <action name="actionZValueBottom">
    <property name="icon">
-    <iconset theme="go-bottom"/>
+    <iconset theme="go-bottom">
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Bottom</string>
@@ -2368,7 +2372,8 @@
   </action>
   <action name="actionZValueDown">
    <property name="icon">
-    <iconset theme="go-down"/>
+    <iconset theme="go-down">
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Down</string>
@@ -2376,7 +2381,8 @@
   </action>
   <action name="actionZValueUp">
    <property name="icon">
-    <iconset theme="go-up"/>
+    <iconset theme="go-up">
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Up</string>
@@ -2384,7 +2390,8 @@
   </action>
   <action name="actionZValueTop">
    <property name="icon">
-    <iconset theme="go-top"/>
+    <iconset theme="go-top">
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Top</string>
@@ -2417,8 +2424,8 @@
  </resources>
  <connections/>
  <buttongroups>
-  <buttongroup name="buttonGroupSheetOrientation"/>
   <buttongroup name="buttonGroupTileOrientation"/>
+  <buttongroup name="buttonGroupSheetOrientation"/>
   <buttongroup name="buttonGroupRotationDirection"/>
  </buttongroups>
 </ui>
diff --git a/src/app/tape/tmainwindow.ui b/src/app/tape/tmainwindow.ui
index 68e5ead11..51f60f573 100644
--- a/src/app/tape/tmainwindow.ui
+++ b/src/app/tape/tmainwindow.ui
@@ -14,7 +14,7 @@
    <string notr="true"/>
   </property>
   <property name="windowIcon">
-   <iconset resource="share/resources/tapeicon.qrc">
+   <iconset>
     <normaloff>:/tapeicon/64x64/logo.png</normaloff>:/tapeicon/64x64/logo.png</iconset>
   </property>
   <widget class="QWidget" name="centralWidget">
@@ -51,7 +51,7 @@
       </property>
       <widget class="QWidget" name="tabMeasurements">
        <attribute name="icon">
-        <iconset resource="share/resources/tapeicon.qrc">
+        <iconset>
          <normaloff>:/tapeicon/16x16/measurement.png</normaloff>:/tapeicon/16x16/measurement.png</iconset>
        </attribute>
        <attribute name="title">
@@ -626,7 +626,7 @@
                    <string notr="true">...</string>
                   </property>
                   <property name="icon">
-                   <iconset resource="share/resources/tapeicon.qrc">
+                   <iconset>
                     <normaloff>:/tapeicon/24x24/fx.png</normaloff>:/tapeicon/24x24/fx.png</iconset>
                   </property>
                   <property name="iconSize">
@@ -818,7 +818,7 @@
       </widget>
       <widget class="QWidget" name="tabInformation">
        <attribute name="icon">
-        <iconset resource="share/resources/tapeicon.qrc">
+        <iconset>
          <normaloff>:/tapeicon/16x16/info.png</normaloff>:/tapeicon/16x16/info.png</iconset>
        </attribute>
        <attribute name="title">
@@ -1382,7 +1382,7 @@
     <bool>false</bool>
    </property>
    <property name="icon">
-    <iconset resource="share/resources/tapeicon.qrc">
+    <iconset>
      <normaloff>:/tapeicon/24x24/red_plus.png</normaloff>:/tapeicon/24x24/red_plus.png</iconset>
    </property>
    <property name="text">
@@ -1397,7 +1397,7 @@
     <bool>false</bool>
    </property>
    <property name="icon">
-    <iconset resource="share/resources/tapeicon.qrc">
+    <iconset>
      <normaloff>:/tapeicon/24x24/orange_plus.png</normaloff>:/tapeicon/24x24/orange_plus.png</iconset>
    </property>
    <property name="text">
@@ -1415,7 +1415,7 @@
     <bool>false</bool>
    </property>
    <property name="icon">
-    <iconset resource="share/resources/tapeicon.qrc">
+    <iconset>
      <normaloff>:/tapeicon/24x24/padlock_opened.png</normaloff>:/tapeicon/24x24/padlock_opened.png</iconset>
    </property>
    <property name="text">
@@ -1514,6 +1514,9 @@
    <property name="toolTip">
     <string>Import from CSV</string>
    </property>
+   <property name="menuRole">
+    <enum>QAction::NoRole</enum>
+   </property>
   </action>
   <action name="actionMeasurementDiagram">
    <property name="checkable">
@@ -1523,7 +1526,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset resource="share/resources/tapeicon.qrc">
+    <iconset>
      <normaloff>:/tapeicon/24x24/mannequin.png</normaloff>:/tapeicon/24x24/mannequin.png</iconset>
    </property>
    <property name="text">
@@ -1622,7 +1625,7 @@
     <bool>false</bool>
    </property>
    <property name="icon">
-    <iconset resource="share/resources/tapeicon.qrc">
+    <iconset>
      <normaloff>:/tapeicon/24x24/separator.png</normaloff>:/tapeicon/24x24/separator.png</iconset>
    </property>
    <property name="text">
@@ -1646,12 +1649,10 @@
   <customwidget>
    <class>VPlainTextEdit</class>
    <extends>QPlainTextEdit</extends>
-   <header location="global">vplaintextedit.h</header>
+   <header>vplaintextedit.h</header>
   </customwidget>
  </customwidgets>
- <resources>
-  <include location="share/resources/tapeicon.qrc"/>
- </resources>
+ <resources/>
  <connections>
   <connection>
    <sender>actionMeasurementDiagram</sender>
diff --git a/src/app/valentina/mainwindow.ui b/src/app/valentina/mainwindow.ui
index c27633b6f..ca48c1d88 100644
--- a/src/app/valentina/mainwindow.ui
+++ b/src/app/valentina/mainwindow.ui
@@ -2698,6 +2698,9 @@
    <property name="shortcut">
     <string notr="true"/>
    </property>
+   <property name="menuRole">
+    <enum>QAction::NoRole</enum>
+   </property>
   </action>
   <action name="actionPrintTiled">
    <property name="enabled">
@@ -2716,6 +2719,9 @@
    <property name="shortcut">
     <string notr="true"/>
    </property>
+   <property name="menuRole">
+    <enum>QAction::NoRole</enum>
+   </property>
   </action>
   <action name="actionPrintPreview">
    <property name="enabled">
@@ -2734,6 +2740,9 @@
    <property name="shortcut">
     <string notr="true"/>
    </property>
+   <property name="menuRole">
+    <enum>QAction::NoRole</enum>
+   </property>
   </action>
   <action name="actionPrintPreviewTiled">
    <property name="enabled">
@@ -2752,6 +2761,9 @@
    <property name="shortcut">
     <string notr="true"/>
    </property>
+   <property name="menuRole">
+    <enum>QAction::NoRole</enum>
+   </property>
   </action>
   <action name="actionExportAs">
    <property name="enabled">
@@ -2770,6 +2782,9 @@
    <property name="shortcut">
     <string notr="true"/>
    </property>
+   <property name="menuRole">
+    <enum>QAction::NoRole</enum>
+   </property>
   </action>
   <action name="actionLoadIndividual">
    <property name="enabled">
@@ -2909,6 +2924,9 @@
    <property name="text">
     <string>Label template editor</string>
    </property>
+   <property name="menuRole">
+    <enum>QAction::NoRole</enum>
+   </property>
   </action>
   <action name="actionFinalMeasurements">
    <property name="enabled">
@@ -2928,6 +2946,9 @@
    <property name="text">
     <string>Export Final Measurements to CSV</string>
    </property>
+   <property name="menuRole">
+    <enum>QAction::NoRole</enum>
+   </property>
   </action>
   <action name="actionNextPatternPiece">
    <property name="enabled">
@@ -2939,6 +2960,9 @@
    <property name="shortcut">
     <string>Ctrl+PgDown</string>
    </property>
+   <property name="menuRole">
+    <enum>QAction::NoRole</enum>
+   </property>
   </action>
   <action name="actionPreviousPatternPiece">
    <property name="enabled">
@@ -2950,6 +2974,9 @@
    <property name="shortcut">
     <string>Ctrl+PgUp</string>
    </property>
+   <property name="menuRole">
+    <enum>QAction::NoRole</enum>
+   </property>
   </action>
   <action name="actionIncreaseLabelFont">
    <property name="enabled">
@@ -2992,6 +3019,9 @@
    <property name="text">
     <string>Original label font</string>
    </property>
+   <property name="menuRole">
+    <enum>QAction::NoRole</enum>
+   </property>
   </action>
   <action name="actionHideLabels">
    <property name="checkable">
@@ -3003,6 +3033,9 @@
    <property name="text">
     <string>Hide labels</string>
    </property>
+   <property name="menuRole">
+    <enum>QAction::NoRole</enum>
+   </property>
   </action>
   <action name="actionExportRecipe">
    <property name="checkable">
@@ -3014,6 +3047,9 @@
    <property name="text">
     <string>Export recipe</string>
    </property>
+   <property name="menuRole">
+    <enum>QAction::NoRole</enum>
+   </property>
   </action>
   <action name="actionShowMainPath">
    <property name="checkable">
@@ -3028,6 +3064,9 @@
    <property name="toolTip">
     <string>Globally show pieces main path</string>
    </property>
+   <property name="menuRole">
+    <enum>QAction::NoRole</enum>
+   </property>
   </action>
   <action name="actionLoadWatermark">
    <property name="enabled">
@@ -3040,6 +3079,9 @@
    <property name="text">
     <string>Load</string>
    </property>
+   <property name="menuRole">
+    <enum>QAction::NoRole</enum>
+   </property>
   </action>
   <action name="actionRemoveWatermark">
    <property name="enabled">
@@ -3052,6 +3094,9 @@
    <property name="text">
     <string>Remove</string>
    </property>
+   <property name="menuRole">
+    <enum>QAction::NoRole</enum>
+   </property>
   </action>
   <action name="actionEditCurrentWatermark">
    <property name="enabled">
@@ -3060,6 +3105,9 @@
    <property name="text">
     <string>Edit current</string>
    </property>
+   <property name="menuRole">
+    <enum>QAction::NoRole</enum>
+   </property>
   </action>
   <action name="actionWatermarkEditor">
    <property name="icon">
@@ -3072,6 +3120,9 @@
    <property name="toolTip">
     <string>Create or edit a watermark</string>
    </property>
+   <property name="menuRole">
+    <enum>QAction::NoRole</enum>
+   </property>
   </action>
   <action name="actionOpenPuzzle">
    <property name="text">
@@ -3080,6 +3131,9 @@
    <property name="toolTip">
     <string>Open the Puzzle app</string>
    </property>
+   <property name="menuRole">
+    <enum>QAction::NoRole</enum>
+   </property>
   </action>
   <action name="actionCreateManualLayout">
    <property name="enabled">
@@ -3091,6 +3145,9 @@
    <property name="toolTip">
     <string>Create manual layout</string>
    </property>
+   <property name="menuRole">
+    <enum>QAction::NoRole</enum>
+   </property>
   </action>
   <action name="actionUpdateManualLayout">
    <property name="enabled">
@@ -3102,11 +3159,17 @@
    <property name="toolTip">
     <string>Update manual layout</string>
    </property>
+   <property name="menuRole">
+    <enum>QAction::NoRole</enum>
+   </property>
   </action>
   <action name="actionShop">
    <property name="text">
     <string>Shop</string>
    </property>
+   <property name="menuRole">
+    <enum>QAction::NoRole</enum>
+   </property>
   </action>
   <action name="actionAddBackgroundImage">
    <property name="enabled">
@@ -3115,6 +3178,9 @@
    <property name="text">
     <string>Add background image</string>
    </property>
+   <property name="menuRole">
+    <enum>QAction::NoRole</enum>
+   </property>
   </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>