From d0c039f10b282f3c1c6f61794872c1b097cdfb42 Mon Sep 17 00:00:00 2001
From: Jabiertxof <jabier.arraiza@marker.es>
Date: Wed, 27 Mar 2019 18:28:03 +0100
Subject: Remove the expander code. Retain only for LPE default settings

---
 .../Tango/scalable/actions/contract-symbolic.svg   | 29 ----------------------
 share/icons/Tango/scalable/actions/contract.svg    | 29 ++++++++++++++++++++++
 .../Tango/scalable/actions/expand-symbolic.svg     | 29 ----------------------
 share/icons/Tango/scalable/actions/expand.svg      | 29 ++++++++++++++++++++++
 .../hicolor/scalable/actions/contract-symbolic.svg | 29 ----------------------
 share/icons/hicolor/scalable/actions/contract.svg  | 29 ++++++++++++++++++++++
 .../hicolor/scalable/actions/expand-symbolic.svg   | 29 ----------------------
 share/icons/hicolor/scalable/actions/expand.svg    | 29 ++++++++++++++++++++++
 share/ui/style.css                                 |  9 ++++---
 src/live_effects/effect.cpp                        |  1 +
 10 files changed, 122 insertions(+), 120 deletions(-)
 delete mode 100644 share/icons/Tango/scalable/actions/contract-symbolic.svg
 create mode 100644 share/icons/Tango/scalable/actions/contract.svg
 delete mode 100644 share/icons/Tango/scalable/actions/expand-symbolic.svg
 create mode 100644 share/icons/Tango/scalable/actions/expand.svg
 delete mode 100644 share/icons/hicolor/scalable/actions/contract-symbolic.svg
 create mode 100644 share/icons/hicolor/scalable/actions/contract.svg
 delete mode 100644 share/icons/hicolor/scalable/actions/expand-symbolic.svg
 create mode 100644 share/icons/hicolor/scalable/actions/expand.svg

diff --git a/share/icons/Tango/scalable/actions/contract-symbolic.svg b/share/icons/Tango/scalable/actions/contract-symbolic.svg
deleted file mode 100644
index de48f30ef..000000000
--- a/share/icons/Tango/scalable/actions/contract-symbolic.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
-<svg xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" id="svg1" width="16" height="16" viewBox="0 0 16 16">
-<sodipodi:namedview 
-    objecttolerance="10" 
-    gridtolerance="10" 
-    guidetolerance="10" 
-    id="namedview" 
-    showgrid="true" 
-    inkscape:zoom="27.166187"
-    inkscape:cx="7.4837792"
-    inkscape:cy="8.9906751"
-    inkscape:window-x="0" 
-    inkscape:window-y="27"> 
-    <inkscape:grid type="xygrid" id="grid"/>
-  </sodipodi:namedview>
-  <g inkscape:groupmode="layer"
-     id="layer"
-     inkscape:label="contract">
-    <path 
-       id="rect22048" 
-       d="M 0,0 H 16 V 16 H 0 Z" 
-       style="opacity:0;fill:none" />
-    <path
-       style="opacity:1;fill:#000000"
-       d="m 2.8110378,1.0813837 c -0.9582284,0 -1.7296541,0.7714257 -1.7296541,1.7296541 V 13.188962 c 0,0.958228 0.7714257,1.729655 1.7296541,1.729655 H 13.188962 c 0.958228,0 1.729655,-0.771427 1.729655,-1.729655 V 2.8110378 c 0,-0.9582284 -0.771427,-1.7296541 -1.729655,-1.7296541 z M 12.50487,6.6706662 V 9.3462248 H 3.4951294 V 6.6706662 Z"
-       id="path8690" />
-   </g>
-</svg>
diff --git a/share/icons/Tango/scalable/actions/contract.svg b/share/icons/Tango/scalable/actions/contract.svg
new file mode 100644
index 000000000..de48f30ef
--- /dev/null
+++ b/share/icons/Tango/scalable/actions/contract.svg
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
+<svg xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" id="svg1" width="16" height="16" viewBox="0 0 16 16">
+<sodipodi:namedview 
+    objecttolerance="10" 
+    gridtolerance="10" 
+    guidetolerance="10" 
+    id="namedview" 
+    showgrid="true" 
+    inkscape:zoom="27.166187"
+    inkscape:cx="7.4837792"
+    inkscape:cy="8.9906751"
+    inkscape:window-x="0" 
+    inkscape:window-y="27"> 
+    <inkscape:grid type="xygrid" id="grid"/>
+  </sodipodi:namedview>
+  <g inkscape:groupmode="layer"
+     id="layer"
+     inkscape:label="contract">
+    <path 
+       id="rect22048" 
+       d="M 0,0 H 16 V 16 H 0 Z" 
+       style="opacity:0;fill:none" />
+    <path
+       style="opacity:1;fill:#000000"
+       d="m 2.8110378,1.0813837 c -0.9582284,0 -1.7296541,0.7714257 -1.7296541,1.7296541 V 13.188962 c 0,0.958228 0.7714257,1.729655 1.7296541,1.729655 H 13.188962 c 0.958228,0 1.729655,-0.771427 1.729655,-1.729655 V 2.8110378 c 0,-0.9582284 -0.771427,-1.7296541 -1.729655,-1.7296541 z M 12.50487,6.6706662 V 9.3462248 H 3.4951294 V 6.6706662 Z"
+       id="path8690" />
+   </g>
+</svg>
diff --git a/share/icons/Tango/scalable/actions/expand-symbolic.svg b/share/icons/Tango/scalable/actions/expand-symbolic.svg
deleted file mode 100644
index a4fa697bf..000000000
--- a/share/icons/Tango/scalable/actions/expand-symbolic.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
-<svg xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" id="svg1" width="16" height="16" viewBox="0 0 16 16">
-<sodipodi:namedview 
-    objecttolerance="10" 
-    gridtolerance="10" 
-    guidetolerance="10" 
-    id="namedview" 
-    showgrid="true" 
-    inkscape:zoom="27.166187"
-    inkscape:cx="7.4837792"
-    inkscape:cy="8.9906751"
-    inkscape:window-x="0" 
-    inkscape:window-y="27"> 
-    <inkscape:grid type="xygrid" id="grid"/>
-  </sodipodi:namedview>
-  <g inkscape:groupmode="layer"
-     id="layer"
-     inkscape:label="expand">
-    <path 
-       id="rect22048" 
-       d="M 0,0 H 16 V 16 H 0 Z" 
-       style="opacity:0;fill:none" />
-    <path
-       style="opacity:1;fill:#000000"
-       d="m 2.8110378,1.0813837 c -0.9582284,0 -1.7296541,0.7714257 -1.7296541,1.7296541 V 13.188962 c 0,0.958228 0.7714257,1.729655 1.7296541,1.729655 H 13.188962 c 0.958228,0 1.729655,-0.771427 1.729655,-1.729655 V 2.8110378 c 0,-0.9582284 -0.771427,-1.7296541 -1.729655,-1.7296541 z m 3.8478046,2.4103675 h 2.6671131 v 3.178915 H 12.50487 V 9.3462248 H 9.3259555 V 12.508249 H 6.6588424 V 9.3462248 H 3.4951294 V 6.6706662 h 3.163713 z"
-       id="path8690" />
-   </g>
-</svg>
diff --git a/share/icons/Tango/scalable/actions/expand.svg b/share/icons/Tango/scalable/actions/expand.svg
new file mode 100644
index 000000000..a4fa697bf
--- /dev/null
+++ b/share/icons/Tango/scalable/actions/expand.svg
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
+<svg xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" id="svg1" width="16" height="16" viewBox="0 0 16 16">
+<sodipodi:namedview 
+    objecttolerance="10" 
+    gridtolerance="10" 
+    guidetolerance="10" 
+    id="namedview" 
+    showgrid="true" 
+    inkscape:zoom="27.166187"
+    inkscape:cx="7.4837792"
+    inkscape:cy="8.9906751"
+    inkscape:window-x="0" 
+    inkscape:window-y="27"> 
+    <inkscape:grid type="xygrid" id="grid"/>
+  </sodipodi:namedview>
+  <g inkscape:groupmode="layer"
+     id="layer"
+     inkscape:label="expand">
+    <path 
+       id="rect22048" 
+       d="M 0,0 H 16 V 16 H 0 Z" 
+       style="opacity:0;fill:none" />
+    <path
+       style="opacity:1;fill:#000000"
+       d="m 2.8110378,1.0813837 c -0.9582284,0 -1.7296541,0.7714257 -1.7296541,1.7296541 V 13.188962 c 0,0.958228 0.7714257,1.729655 1.7296541,1.729655 H 13.188962 c 0.958228,0 1.729655,-0.771427 1.729655,-1.729655 V 2.8110378 c 0,-0.9582284 -0.771427,-1.7296541 -1.729655,-1.7296541 z m 3.8478046,2.4103675 h 2.6671131 v 3.178915 H 12.50487 V 9.3462248 H 9.3259555 V 12.508249 H 6.6588424 V 9.3462248 H 3.4951294 V 6.6706662 h 3.163713 z"
+       id="path8690" />
+   </g>
+</svg>
diff --git a/share/icons/hicolor/scalable/actions/contract-symbolic.svg b/share/icons/hicolor/scalable/actions/contract-symbolic.svg
deleted file mode 100644
index de48f30ef..000000000
--- a/share/icons/hicolor/scalable/actions/contract-symbolic.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
-<svg xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" id="svg1" width="16" height="16" viewBox="0 0 16 16">
-<sodipodi:namedview 
-    objecttolerance="10" 
-    gridtolerance="10" 
-    guidetolerance="10" 
-    id="namedview" 
-    showgrid="true" 
-    inkscape:zoom="27.166187"
-    inkscape:cx="7.4837792"
-    inkscape:cy="8.9906751"
-    inkscape:window-x="0" 
-    inkscape:window-y="27"> 
-    <inkscape:grid type="xygrid" id="grid"/>
-  </sodipodi:namedview>
-  <g inkscape:groupmode="layer"
-     id="layer"
-     inkscape:label="contract">
-    <path 
-       id="rect22048" 
-       d="M 0,0 H 16 V 16 H 0 Z" 
-       style="opacity:0;fill:none" />
-    <path
-       style="opacity:1;fill:#000000"
-       d="m 2.8110378,1.0813837 c -0.9582284,0 -1.7296541,0.7714257 -1.7296541,1.7296541 V 13.188962 c 0,0.958228 0.7714257,1.729655 1.7296541,1.729655 H 13.188962 c 0.958228,0 1.729655,-0.771427 1.729655,-1.729655 V 2.8110378 c 0,-0.9582284 -0.771427,-1.7296541 -1.729655,-1.7296541 z M 12.50487,6.6706662 V 9.3462248 H 3.4951294 V 6.6706662 Z"
-       id="path8690" />
-   </g>
-</svg>
diff --git a/share/icons/hicolor/scalable/actions/contract.svg b/share/icons/hicolor/scalable/actions/contract.svg
new file mode 100644
index 000000000..de48f30ef
--- /dev/null
+++ b/share/icons/hicolor/scalable/actions/contract.svg
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
+<svg xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" id="svg1" width="16" height="16" viewBox="0 0 16 16">
+<sodipodi:namedview 
+    objecttolerance="10" 
+    gridtolerance="10" 
+    guidetolerance="10" 
+    id="namedview" 
+    showgrid="true" 
+    inkscape:zoom="27.166187"
+    inkscape:cx="7.4837792"
+    inkscape:cy="8.9906751"
+    inkscape:window-x="0" 
+    inkscape:window-y="27"> 
+    <inkscape:grid type="xygrid" id="grid"/>
+  </sodipodi:namedview>
+  <g inkscape:groupmode="layer"
+     id="layer"
+     inkscape:label="contract">
+    <path 
+       id="rect22048" 
+       d="M 0,0 H 16 V 16 H 0 Z" 
+       style="opacity:0;fill:none" />
+    <path
+       style="opacity:1;fill:#000000"
+       d="m 2.8110378,1.0813837 c -0.9582284,0 -1.7296541,0.7714257 -1.7296541,1.7296541 V 13.188962 c 0,0.958228 0.7714257,1.729655 1.7296541,1.729655 H 13.188962 c 0.958228,0 1.729655,-0.771427 1.729655,-1.729655 V 2.8110378 c 0,-0.9582284 -0.771427,-1.7296541 -1.729655,-1.7296541 z M 12.50487,6.6706662 V 9.3462248 H 3.4951294 V 6.6706662 Z"
+       id="path8690" />
+   </g>
+</svg>
diff --git a/share/icons/hicolor/scalable/actions/expand-symbolic.svg b/share/icons/hicolor/scalable/actions/expand-symbolic.svg
deleted file mode 100644
index a4fa697bf..000000000
--- a/share/icons/hicolor/scalable/actions/expand-symbolic.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
-<svg xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" id="svg1" width="16" height="16" viewBox="0 0 16 16">
-<sodipodi:namedview 
-    objecttolerance="10" 
-    gridtolerance="10" 
-    guidetolerance="10" 
-    id="namedview" 
-    showgrid="true" 
-    inkscape:zoom="27.166187"
-    inkscape:cx="7.4837792"
-    inkscape:cy="8.9906751"
-    inkscape:window-x="0" 
-    inkscape:window-y="27"> 
-    <inkscape:grid type="xygrid" id="grid"/>
-  </sodipodi:namedview>
-  <g inkscape:groupmode="layer"
-     id="layer"
-     inkscape:label="expand">
-    <path 
-       id="rect22048" 
-       d="M 0,0 H 16 V 16 H 0 Z" 
-       style="opacity:0;fill:none" />
-    <path
-       style="opacity:1;fill:#000000"
-       d="m 2.8110378,1.0813837 c -0.9582284,0 -1.7296541,0.7714257 -1.7296541,1.7296541 V 13.188962 c 0,0.958228 0.7714257,1.729655 1.7296541,1.729655 H 13.188962 c 0.958228,0 1.729655,-0.771427 1.729655,-1.729655 V 2.8110378 c 0,-0.9582284 -0.771427,-1.7296541 -1.729655,-1.7296541 z m 3.8478046,2.4103675 h 2.6671131 v 3.178915 H 12.50487 V 9.3462248 H 9.3259555 V 12.508249 H 6.6588424 V 9.3462248 H 3.4951294 V 6.6706662 h 3.163713 z"
-       id="path8690" />
-   </g>
-</svg>
diff --git a/share/icons/hicolor/scalable/actions/expand.svg b/share/icons/hicolor/scalable/actions/expand.svg
new file mode 100644
index 000000000..a4fa697bf
--- /dev/null
+++ b/share/icons/hicolor/scalable/actions/expand.svg
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
+<svg xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" id="svg1" width="16" height="16" viewBox="0 0 16 16">
+<sodipodi:namedview 
+    objecttolerance="10" 
+    gridtolerance="10" 
+    guidetolerance="10" 
+    id="namedview" 
+    showgrid="true" 
+    inkscape:zoom="27.166187"
+    inkscape:cx="7.4837792"
+    inkscape:cy="8.9906751"
+    inkscape:window-x="0" 
+    inkscape:window-y="27"> 
+    <inkscape:grid type="xygrid" id="grid"/>
+  </sodipodi:namedview>
+  <g inkscape:groupmode="layer"
+     id="layer"
+     inkscape:label="expand">
+    <path 
+       id="rect22048" 
+       d="M 0,0 H 16 V 16 H 0 Z" 
+       style="opacity:0;fill:none" />
+    <path
+       style="opacity:1;fill:#000000"
+       d="m 2.8110378,1.0813837 c -0.9582284,0 -1.7296541,0.7714257 -1.7296541,1.7296541 V 13.188962 c 0,0.958228 0.7714257,1.729655 1.7296541,1.729655 H 13.188962 c 0.958228,0 1.729655,-0.771427 1.729655,-1.729655 V 2.8110378 c 0,-0.9582284 -0.771427,-1.7296541 -1.729655,-1.7296541 z m 3.8478046,2.4103675 h 2.6671131 v 3.178915 H 12.50487 V 9.3462248 H 9.3259555 V 12.508249 H 6.6588424 V 9.3462248 H 3.4951294 V 6.6706662 h 3.163713 z"
+       id="path8690" />
+   </g>
+</svg>
diff --git a/share/ui/style.css b/share/ui/style.css
index 4f7c54ac4..78fc3877c 100644
--- a/share/ui/style.css
+++ b/share/ui/style.css
@@ -410,7 +410,8 @@ combobox window.popup scrolledwindow treeview separator {
 }
 
 /*https://stackoverflow.com/questions/50076541/override-icons-used-in-the-tree-view */
-treeview.view.expander, expander arrow {-gtk-icon-source: -gtk-icontheme("expand-symbolic");margin-right:4px;}
-treeview.view.expander:checked, expander arrow:checked {-gtk-icon-source: -gtk-icontheme("contract-symbolic");}
-treeview.view.expander:dir(rtl), expander:dir(rtl) arrow { margin-left:4px; margin-right:0;}
-
+.symbolic treeview.view.bigexpander,.symbolic .bigexpander arrow {-gtk-icon-source: -gtk-icontheme("expand-symbolic");margin-right:4px;}
+.symbolic treeview.view.bigexpander:checked,.symbolic .bigexpander arrow:checked {-gtk-icon-source: -gtk-icontheme("contract-symbolic");}
+.regular treeview.view.bigexpander,.regular .bigexpander arrow {-gtk-icon-source: -gtk-icontheme("expand");margin-right:4px;}
+.regular treeview.view.bigexpander:checked,.regular .bigexpander arrow:checked {-gtk-icon-source: -gtk-icontheme("contract");}
+treeview.view.bigexpander:dir(rtl), .bigexpander:dir(rtl) arrow { margin-left:4px; margin-right:0;}
diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index 0c027a57f..3c778499d 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -1580,6 +1580,7 @@ Effect::defaultParamSet()
     expander->set_use_markup(true);
     expander->add(*vbox_expander);
     expander->set_expanded(defaultsopen);
+    expander->get_style_context()->add_class("bigexpander");
     expander->property_expanded().signal_changed().connect(sigc::bind<0>(sigc::mem_fun(*this, &Effect::onDefaultsExpanderChanged), expander ));
     if (has_params) {
         Gtk::Widget *vboxwidg = dynamic_cast<Gtk::Widget *>(expander);
-- 
cgit v1.2.3