fix tooggled value and po glade fila added

4 files changed, 77 insertions, 92 deletions

diff --git a/po/POTFILES.ui.in b/po/POTFILES.ui.in
index 89101d608..6c475ecca 100644
--- a/po/POTFILES.ui.in
+++ b/po/POTFILES.ui.in
@@ -1,4 +1,5 @@
 ../share/ui/dialog-css.glade
 ../share/ui/dialog-livepatheffect-add.glade
+../share/ui/dialog-livepatheffect-effect.glade
 ../share/ui/dialog-trace.glade
 ../share/ui/inkscape-application.glade
diff --git a/share/ui/dialog-livepatheffect-add.glade b/share/ui/dialog-livepatheffect-add.glade
index a04954378..28ab7d2dd 100644
--- a/share/ui/dialog-livepatheffect-add.glade
+++ b/share/ui/dialog-livepatheffect-add.glade
@@ -107,7 +107,7 @@
                             <property name="draw_indicator">False</property>
                             <child>
                               <object class="GtkImage" id="LPESelectorEffectPackLessImage">
-                                <property name="name">LPESelectorEffectFavShowImage</property>
+                                <property name="name">LPESelectorEffectPackLessImage</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="halign">center</property>
@@ -115,15 +115,12 @@
                                 <property name="pixel_size">22</property>
                                 <property name="icon_name">pack-less</property>
                                 <property name="icon_size">2</property>
-                                <style>
-                                  <class name="fab"/>
-                                </style>
                               </object>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
                             <property name="position">0</property>
                             <property name="non_homogeneous">True</property>
                           </packing>
@@ -139,7 +136,7 @@
                             <property name="group">LPESelectorEffectRadioPackLess</property>
                             <child>
                               <object class="GtkImage" id="LPESelectorEffectPackMoreImage">
-                                <property name="name">LPESelectorEffectFavShowImage</property>
+                                <property name="name">LPESelectorEffectPackMoreImage</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="halign">center</property>
@@ -147,15 +144,12 @@
                                 <property name="pixel_size">22</property>
                                 <property name="icon_name">pack-more</property>
                                 <property name="icon_size">2</property>
-                                <style>
-                                  <class name="fab"/>
-                                </style>
                               </object>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
                             <property name="position">1</property>
                             <property name="non_homogeneous">True</property>
                           </packing>
@@ -171,7 +165,7 @@
                             <property name="group">LPESelectorEffectRadioPackLess</property>
                             <child>
                               <object class="GtkImage" id="LPESelectorEffectListImage">
-                                <property name="name">LPESelectorEffectFavShowImage</property>
+                                <property name="name">LPESelectorEffectListImage</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="halign">center</property>
@@ -179,16 +173,14 @@
                                 <property name="pixel_size">22</property>
                                 <property name="icon_name">hamburger-menu</property>
                                 <property name="icon_size">2</property>
-                                <style>
-                                  <class name="fab"/>
-                                </style>
                               </object>
                             </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
-                            <property name="fill">True</property>
+                            <property name="fill">False</property>
                             <property name="position">2</property>
+                            <property name="non_homogeneous">True</property>
                           </packing>
                         </child>
                       </object>
@@ -196,6 +188,7 @@
                         <property name="expand">False</property>
                         <property name="fill">False</property>
                         <property name="position">2</property>
+                        <property name="non_homogeneous">True</property>
                       </packing>
                     </child>
                     <child>
@@ -357,7 +350,7 @@
       </object>
     </child>
   </object>
-    <object class="GtkPopover" id="LPESelectorEffectInfoPop">
+  <object class="GtkPopover" id="LPESelectorEffectInfoPop">
     <property name="name">LPESelectorEffectInfoPop</property>
     <property name="can_focus">False</property>
     <property name="no_show_all">True</property>
@@ -367,41 +360,75 @@
     <property name="modal">False</property>
     <property name="transitions_enabled">False</property>
     <child>
-    <object class="GtkEventBox" id="LPESelectorEffectInfoEventBox">
-    <property name="name">LPESelectorEffectInfoEventBox</property>
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkBox">
+      <object class="GtkEventBox" id="LPESelectorEffectInfoEventBox">
+        <property name="name">LPESelectorEffectInfoEventBox</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
             <child>
-              <object class="GtkImage" id="LPESelectorEffectInfoIcon">
-                <property name="name">LPESelectorEffectInfoIcon</property>
+              <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="halign">start</property>
-                <property name="pixel_size">40</property>
-                <property name="icon_name">align-vertical-baseline</property>
-                <property name="icon_size">6</property>
+                <child>
+                  <object class="GtkImage" id="LPESelectorEffectInfoIcon">
+                    <property name="name">LPESelectorEffectInfoIcon</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="pixel_size">40</property>
+                    <property name="icon_name">align-vertical-baseline</property>
+                    <property name="icon_size">6</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="LPESelectorEffectInfoName">
+                    <property name="name">LPESelectorEffectInfoName</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Name</property>
+                    <property name="justify">center</property>
+                    <property name="wrap">True</property>
+                    <property name="max_width_chars">20</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">False</property>
+                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="LPESelectorEffectInfoName">
-                <property name="name">LPESelectorEffectInfoName</property>
+              <object class="GtkSeparator">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="LPESelectorEffectInfoDescription">
+                <property name="name">LPESelectorEffectInfoDescription</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Name</property>
+                <property name="label" translatable="yes">Description</property>
                 <property name="justify">center</property>
                 <property name="wrap">True</property>
                 <property name="max_width_chars">20</property>
@@ -409,47 +436,13 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkSeparator">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="LPESelectorEffectInfoDescription">
-            <property name="name">LPESelectorEffectInfoDescription</property>
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Description</property>
-            <property name="justify">center</property>
-            <property name="wrap">True</property>
-            <property name="max_width_chars">20</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
         </child>
       </object>
     </child>
-  </object>
-    </child>
     <style>
       <class name="popover symbolic"/>
     </style>
diff --git a/share/ui/style.css b/share/ui/style.css
index 380b66078..bc931bb00 100644
--- a/share/ui/style.css
+++ b/share/ui/style.css
@@ -91,6 +91,10 @@ image {
     -gtk-icon-style: regular;
 }
 
+.regular .symbolic image {
+    -gtk-icon-style: symbolic;
+}
+
 .inverted,
 .dark .forcebright,
 .bright .forcedark {
@@ -288,14 +292,14 @@ spinbutton undershoot {
     color: @theme_fg_color;
 }
 
-#LPEDialogSelector.LPEPackLess flowboxchild {
+#LPEDialogSelector.LPEPackMore flowboxchild {
 margin:5px 1px 0px;
 padding:3px 3px 10px 3px;
 } 
-#LPEDialogSelector.LPEPackLess flowboxchild label {
+#LPEDialogSelector.LPEPackMore flowboxchild label {
 font-size:14px;
 } 
-#LPEDialogSelector.LPEPackLess #LPESelectorEffectInfoPop label{
+#LPEDialogSelector.LPEPackMore #LPESelectorEffectInfoPop label{
 font-size:13px;
 }
 
diff --git a/src/ui/dialog/livepatheffect-add.cpp b/src/ui/dialog/livepatheffect-add.cpp
index c89a0fe7e..fa1571be6 100644
--- a/src/ui/dialog/livepatheffect-add.cpp
+++ b/src/ui/dialog/livepatheffect-add.cpp
@@ -97,10 +97,9 @@ LivePathEffectAdd::LivePathEffectAdd()
     _builder->get_widget("LPEScrolled", _LPEScrolled);
     _builder->get_widget("LPESelectorEffectEventFavShow", _LPESelectorEffectEventFavShow);
     _builder->get_widget("LPESelectorEffectInfoEventBox", _LPESelectorEffectInfoEventBox);
-    _builder->get_widget("LPESelectorEffectRadioList", _LPESelectorEffectRadioList);
     _builder->get_widget("LPESelectorEffectRadioPackLess", _LPESelectorEffectRadioPackLess);
     _builder->get_widget("LPESelectorEffectRadioPackMore", _LPESelectorEffectRadioPackMore);
-
+    _builder->get_widget("LPESelectorEffectRadioList", _LPESelectorEffectRadioList);
 
     _LPEFilter->signal_search_changed().connect(sigc::mem_fun(*this, &LivePathEffectAdd::on_search));
     _LPEDialogSelector->add_events(Gdk::POINTER_MOTION_MASK | Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK |
@@ -203,12 +202,12 @@ LivePathEffectAdd::LivePathEffectAdd()
     _LPESelectorFlowBox->set_activate_on_single_click(false);
     _visiblelpe = _LPESelectorFlowBox->get_children().size();
     _LPEInfo->set_visible(false);
-    _LPESelectorEffectRadioList->signal_clicked().connect(
-        sigc::bind(sigc::mem_fun(*this, &LivePathEffectAdd::viewChanged), 2));
     _LPESelectorEffectRadioPackLess->signal_clicked().connect(
-        sigc::bind(sigc::mem_fun(*this, &LivePathEffectAdd::viewChanged), 1));
-    _LPESelectorEffectRadioPackMore->signal_clicked().connect(
         sigc::bind(sigc::mem_fun(*this, &LivePathEffectAdd::viewChanged), 0));
+    _LPESelectorEffectRadioPackMore->signal_clicked().connect(
+        sigc::bind(sigc::mem_fun(*this, &LivePathEffectAdd::viewChanged), 1));
+    _LPESelectorEffectRadioList->signal_clicked().connect(
+        sigc::bind(sigc::mem_fun(*this, &LivePathEffectAdd::viewChanged), 2));
     _LPESelectorEffectEventFavShow->signal_enter_notify_event().connect(sigc::bind<GtkWidget *>(
         sigc::mem_fun(*this, &LivePathEffectAdd::mouseover), GTK_WIDGET(_LPESelectorEffectEventFavShow->gobj())));
     _LPESelectorEffectEventFavShow->signal_leave_notify_event().connect(sigc::bind<GtkWidget *>(
@@ -247,7 +246,6 @@ LivePathEffectAdd::LivePathEffectAdd()
             _LPESelectorEffectRadioList->set_active();
             viewChanged(2);
     }
-    // viewChanged();
 }
 const LivePathEffect::EnumEffectData<LivePathEffect::EffectType> *LivePathEffectAdd::getActiveData()
 {
@@ -259,36 +257,25 @@ void LivePathEffectAdd::viewChanged(gint mode)
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     bool changed = false;
     if (mode == 2 && !_LPEDialogSelector->get_style_context()->has_class("LPEList")) {
-        prefs->setInt("/dialogs/livepatheffect/dialogmode", 2);
         _LPEDialogSelector->get_style_context()->add_class("LPEList");
         _LPEDialogSelector->get_style_context()->remove_class("LPEPackLess");
         _LPEDialogSelector->get_style_context()->remove_class("LPEPackMore");
-        _LPESelectorEffectRadioList->get_style_context()->add_class("active");
-        _LPESelectorEffectRadioPackLess->get_style_context()->remove_class("active");
-        _LPESelectorEffectRadioPackMore->get_style_context()->remove_class("active");
         _LPESelectorFlowBox->set_max_children_per_line(1);
         changed = true;
     } else if (mode == 1 && !_LPEDialogSelector->get_style_context()->has_class("LPEPackMore")) {
-        prefs->setInt("/dialogs/livepatheffect/dialogmode", 1);
-        _LPESelectorEffectRadioList->get_style_context()->remove_class("active");
-        _LPESelectorEffectRadioPackLess->get_style_context()->remove_class("active");
-        _LPESelectorEffectRadioPackMore->get_style_context()->add_class("active");
         _LPEDialogSelector->get_style_context()->remove_class("LPEList");
         _LPEDialogSelector->get_style_context()->remove_class("LPEPackLess");
         _LPEDialogSelector->get_style_context()->add_class("LPEPackMore");
         _LPESelectorFlowBox->set_max_children_per_line(30);
         changed = true;
     } else if (mode == 0 && !_LPEDialogSelector->get_style_context()->has_class("LPEPackLess")) {
-        prefs->setInt("/dialogs/livepatheffect/dialogmode", 0);
-        _LPESelectorEffectRadioList->get_style_context()->remove_class("active");
-        _LPESelectorEffectRadioPackLess->get_style_context()->add_class("active");
-        _LPESelectorEffectRadioPackMore->get_style_context()->remove_class("active");
         _LPEDialogSelector->get_style_context()->remove_class("LPEList");
         _LPEDialogSelector->get_style_context()->add_class("LPEPackLess");
         _LPEDialogSelector->get_style_context()->remove_class("LPEPackMore");
         _LPESelectorFlowBox->set_max_children_per_line(30);
         changed = true;
     }
+    prefs->setInt("/dialogs/livepatheffect/dialogmode", mode);
     if (changed) {
         _LPESelectorFlowBox->unset_sort_func();
         _LPESelectorFlowBox->set_sort_func(sigc::mem_fun(this, &LivePathEffectAdd::on_sort));