Move example transitions from "Transitions" to "Examples/Transitions"

sfrias · May 21, 2020 · c236ab7 · c236ab7
1 parent b47ee87
commit c236ab7
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 5 deletions.
diff --git a/examples/shaderEffects/eWipe.gre b/examples/shaderEffects/eWipe.gre
@@ -14,7 +14,7 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<ShaderEffect name="Wipe" menuPath="Transitions">
+<ShaderEffect name="Wipe" menuPath="Examples/Transitions">
     <Properties>
         <Property name="sharpness" type="float" min="0" max="1" step="0.01" ini="0" glValue="true"/>
         <Property name="direction" type="float" min="-9999" max="9999" step="1" ini="0" glValue="true"/>

diff --git a/examples/shaderEffects/eWipeLeft.gre b/examples/shaderEffects/eWipeLeft.gre
@@ -14,7 +14,7 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<ShaderEffect name="Wipe Left" menuPath="Transitions">
+<ShaderEffect name="Wipe Left" menuPath="Examples/Transitions">
     <Properties>
         <Property name="sharpness" type="float" min="0" max="1" step="0.01" ini="0" glValue="true"/>
         <Property name="time"      type="float" min="0" max="1" step="0.01" ini="0" glValue="true" influenceScaled="true"/>

diff --git a/examples/shaderEffects/eWipeRight.gre b/examples/shaderEffects/eWipeRight.gre
@@ -14,7 +14,7 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<ShaderEffect name="Wipe Right" menuPath="Transitions">
+<ShaderEffect name="Wipe Right" menuPath="Examples/Transitions">
     <Properties>
         <Property name="sharpness" type="float" min="0" max="1" step="0.01" ini="0" glValue="true"/>
         <Property name="time"      type="float" min="0" max="1" step="0.01" ini="0" glValue="true" influenceScaled="true"/>

diff --git a/src/core/RasterEffects/rastereffectmenucreator.h b/src/core/RasterEffects/rastereffectmenucreator.h
@@ -42,8 +42,9 @@ struct CORE_EXPORT RasterEffectMenuCreator {
             if(path.isEmpty()) {
                 menu->addPlainAction<Target>(name, adder);
             } else {
-                auto childMenu = menu->childMenu(path);
-                if(!childMenu) childMenu = menu->addMenu(path);
+                const auto pathList = path.split('/');
+                auto childMenu = menu->childMenu(pathList);
+                if(!childMenu) childMenu = menu->addMenu(pathList);
                 childMenu->addPlainAction<Target>(name, adder);
             }
         };

diff --git a/src/core/typemenu.h b/src/core/typemenu.h
@@ -97,6 +97,16 @@ class CORE_EXPORT TypeMenu {
         return child.get();
     }
 
+    TTypeMenu * addMenu(const QStringList& titles) {
+        TTypeMenu* menu = this;
+        for(const auto& title : titles) {
+            const auto menuT = menu->childMenu(title);
+            if(menuT) menu = menuT;
+            else menu = menu->addMenu(title);
+        }
+        return menu;
+    }
+
     TTypeMenu* childMenu(const QString& path) {
         for(const auto& child : mChildMenus) {
             if(child->mQMenu->title() == path)
@@ -105,6 +115,15 @@ class CORE_EXPORT TypeMenu {
         return nullptr;
     }
 
+    TTypeMenu* childMenu(const QStringList& path) {
+        TTypeMenu* menu = this;
+        for(const auto& subPath : path) {
+            menu = menu->childMenu(subPath);
+            if(!menu) return nullptr;
+        }
+        return menu;
+    }
+
     QAction* addSeparator() {
         return mQMenu->addSeparator();
     }