1 files changed, 154 insertions, 10 deletions

diff --git a/src/ui/dialog/livepatheffect-add.cpp b/src/ui/dialog/livepatheffect-add.cpp
index e72ca745d..9137f529d 100644
--- a/src/ui/dialog/livepatheffect-add.cpp
+++ b/src/ui/dialog/livepatheffect-add.cpp
@@ -18,15 +18,45 @@
 #include "live_effects/effect.h"
 #include "livepatheffect-add.h"
 #include <glibmm/i18n.h>
+#include "preferences.h"
 
 namespace Inkscape {
 namespace UI {
 namespace Dialog {
 
+bool sp_has_fav(Glib::ustring effect){
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    Glib::ustring favlist = prefs->getString("/dialogs/livepatheffect/favs");
+    size_t pos = favlist.find(effect);
+	if (pos != std::string::npos){
+        return true;
+    }
+    return false;
+}
+
+void sp_add_fav(Glib::ustring effect){
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    Glib::ustring favlist = prefs->getString("/dialogs/livepatheffect/favs");
+    if (!sp_has_fav(effect)) {
+        prefs->setString("/dialogs/livepatheffect/favs", favlist + effect + ";");
+    }
+}
+
+void sp_remove_fav(Glib::ustring effect){
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    Glib::ustring favlist = prefs->getString("/dialogs/livepatheffect/favs");
+    effect += ";";
+    size_t pos = favlist.find(effect);
+	if (pos != std::string::npos)
+	{
+      	favlist.erase(pos, effect.length());
+        prefs->setString("/dialogs/livepatheffect/favs", favlist);
+	}
+}
+
 LivePathEffectAdd::LivePathEffectAdd()
     : converter(Inkscape::LivePathEffect::LPETypeConverter)
 {
-    add_events(Gdk::POINTER_MOTION_MASK | Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK |  Gdk::ENTER_NOTIFY_MASK | Gdk::LEAVE_NOTIFY_MASK );
     Glib::ustring gladefile = get_filename(Inkscape::IO::Resource::UIS, "dialog-livepatheffect-add.ui");
     try {
         _builder = Gtk::Builder::create_from_file(gladefile);
@@ -39,6 +69,8 @@ LivePathEffectAdd::LivePathEffectAdd()
     _builder->get_widget("LPESelectorEffectInfo", _LPESelectorEffectInfo);
     _builder->get_widget("LPEFilter", _LPEFilter);
     _builder->get_widget("LPEInfo", _LPEInfo);
+    _builder->get_widget("LPEExperimentals", _LPEExperimentals);
+    _builder->get_widget("LPEScrolled", _LPEScrolled);
     _LPEFilter->signal_search_changed().connect(sigc::mem_fun(*this, &LivePathEffectAdd::on_search));
     Glib::ustring effectgladefile = get_filename(Inkscape::IO::Resource::UIS, "dialog-livepatheffect-add-effect.ui");
     for (int i = 0; i < static_cast<int>(converter._length); ++i) {
@@ -49,6 +81,8 @@ LivePathEffectAdd::LivePathEffectAdd()
             g_warning("Glade file loading failed for filter effect dialog");
             return;
         }
+        Gtk::Box *LPESelectorEffect;
+        builder_effect->get_widget("LPESelectorEffect", LPESelectorEffect);
         const LivePathEffect::EnumEffectData<LivePathEffect::EffectType> *data = &converter.data(i);
         Gtk::Label *LPEName;
         builder_effect->get_widget("LPEName", LPEName);
@@ -56,21 +90,32 @@ LivePathEffectAdd::LivePathEffectAdd()
         Gtk::Label *LPEDescription;
         builder_effect->get_widget("LPEDescription", LPEDescription);
         LPEDescription->set_text(converter.get_description(data->id));
+        Gtk::ToggleButton *LPEExperimental;
+        builder_effect->get_widget("LPEExperimental", LPEExperimental);
+        bool active = converter.get_experimental(data->id)?true:false;
+        LPEExperimental->set_active(active);
         Gtk::Image *LPEIcon;
         builder_effect->get_widget("LPEIcon", LPEIcon);
         LPEIcon->set_from_icon_name(converter.get_icon(data->id), Gtk::BuiltinIconSize(Gtk::ICON_SIZE_DIALOG));
         Gtk::EventBox *LPESelectorEffectInfoLauncher;
         builder_effect->get_widget("LPESelectorEffectInfoLauncher", LPESelectorEffectInfoLauncher);
         LPESelectorEffectInfoLauncher->signal_button_press_event().connect(sigc::bind<Glib::RefPtr<Gtk::Builder> >(sigc::mem_fun(*this, &LivePathEffectAdd::pop_description), builder_effect));
-        Gtk::Box *LPESelectorEffect;
-        builder_effect->get_widget("LPESelectorEffect", LPESelectorEffect);
+        Gtk::EventBox *LPESelectorEffectFavLauncher;
+        builder_effect->get_widget("LPESelectorEffectFavLauncher", LPESelectorEffectFavLauncher);
+        Gtk::EventBox *LPESelectorEffectFavLauncherTop;
+        builder_effect->get_widget("LPESelectorEffectFavLauncherTop", LPESelectorEffectFavLauncherTop);
+        LPESelectorEffectFavLauncher   ->signal_button_press_event().connect(sigc::bind<Glib::RefPtr<Gtk::Builder> >(sigc::mem_fun(*this, &LivePathEffectAdd::fav_toggler), builder_effect));
+        LPESelectorEffectFavLauncherTop->signal_button_press_event().connect(sigc::bind<Glib::RefPtr<Gtk::Builder> >(sigc::mem_fun(*this, &LivePathEffectAdd::fav_toggler), builder_effect));
         _LPESelectorFlowBox->insert(*LPESelectorEffect, i);
     }
     _visiblelpe = _LPESelectorFlowBox->get_children().size();
     _LPESelectorFlowBox->signal_child_activated().connect(sigc::mem_fun(*this, &LivePathEffectAdd::on_activate));
-    _LPEDialogSelector->set_title(_("Live Efects Selector"));
     _LPEDialogSelector->show_all_children();
+    _LPEDialogSelector->add_events(Gdk::POINTER_MOTION_MASK | Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK |  Gdk::ENTER_NOTIFY_MASK | Gdk::LEAVE_NOTIFY_MASK );    
     _LPEInfo->set_visible(false);
+    _LPESelectorFlowBox->set_sort_func(sigc::mem_fun(*this, &LivePathEffectAdd::on_sort));
+    _LPESelectorFlowBox->set_filter_func(sigc::mem_fun(*this, &LivePathEffectAdd::on_filter));
+    _LPEExperimentals->property_active().signal_changed().connect(sigc::mem_fun(*this, &LivePathEffectAdd::reload_effect_list));
 }
 
 void LivePathEffectAdd::on_activate(Gtk::FlowBoxChild *child)
@@ -83,7 +128,7 @@ void LivePathEffectAdd::on_activate(Gtk::FlowBoxChild *child)
         Gtk::Box *box = dynamic_cast<Gtk::Box *>(leitem->get_child());
         if (box) {
             std::vector<Gtk::Widget *> contents = box->get_children();
-            Gtk::Box *actions = dynamic_cast<Gtk::Box *>(contents[3]);
+            Gtk::Box *actions = dynamic_cast<Gtk::Box *>(contents[4]);
             if (actions) {
                 actions->set_visible(false);
             }
@@ -125,15 +170,55 @@ bool LivePathEffectAdd::pop_description(GdkEventButton* evt, Glib::RefPtr<Gtk::B
     return true;
 }
 
-bool LivePathEffectAdd::on_filter(Gtk::FlowBoxChild *child)
+bool LivePathEffectAdd::fav_toggler(GdkEventButton* evt, Glib::RefPtr<Gtk::Builder> builder_effect)
 {
-    if (_LPEFilter->get_text().length() < 4) {
-        _visiblelpe = _LPESelectorFlowBox->get_children().size();
-        return true;
+    Gtk::Box *LPESelectorEffect;
+    builder_effect->get_widget("LPESelectorEffect", LPESelectorEffect);
+    Gtk::Label *LPEName;
+    builder_effect->get_widget("LPEName", LPEName);
+    Gtk::EventBox *LPESelectorEffectFavLauncher;
+    builder_effect->get_widget("LPESelectorEffectFavLauncher", LPESelectorEffectFavLauncher);
+    Gtk::Image *favimg = dynamic_cast<Gtk::Image *>(LPESelectorEffectFavLauncher->get_child());
+    Gtk::EventBox *LPESelectorEffectFavLauncherTop;
+    builder_effect->get_widget("LPESelectorEffectFavLauncherTop", LPESelectorEffectFavLauncherTop);
+    Gtk::Image *favimgtop = dynamic_cast<Gtk::Image *>(LPESelectorEffectFavLauncherTop->get_child());
+    if (favimg && favimgtop) {
+        if (sp_has_fav(LPEName->get_text())){
+            //favimg->set_from_icon_name("draw-star-outline", Gtk::IconSize(30));
+            LPESelectorEffectFavLauncherTop->set_visible(false);
+            LPESelectorEffectFavLauncherTop->hide();
+            sp_remove_fav(LPEName->get_text());
+            LPESelectorEffect->get_parent()->get_style_context()->remove_class("lpefav");
+            _LPESelectorFlowBox->invalidate_sort();
+        } else {
+            //favimg->set_from_icon_name("draw-star", Gtk::IconSize(30));
+            LPESelectorEffectFavLauncherTop->set_visible(true);
+            LPESelectorEffectFavLauncherTop->show();
+            sp_add_fav(LPEName->get_text());
+            LPESelectorEffect->get_parent()->get_style_context()->add_class("lpefav");
+            Glib::RefPtr< Gtk::Adjustment > vadjust = _LPEScrolled->get_vadjustment();
+            vadjust->set_value(vadjust->get_lower());    
+            _LPESelectorFlowBox->invalidate_sort();
+        }
     }
+    return true;
+}
+
+bool LivePathEffectAdd::on_filter(Gtk::FlowBoxChild *child)
+{
     Gtk::Box *box = dynamic_cast<Gtk::Box *>(child->get_child());
     if (box) {
         std::vector<Gtk::Widget *> contents = box->get_children();
+        Gtk::ToggleButton *experimental = dynamic_cast<Gtk::ToggleButton *>(contents[3]);
+        if (experimental) {
+            if (experimental->get_active() && !_LPEExperimentals->get_active()) {
+                return false;
+            }
+        }
+        if (_LPEFilter->get_text().length() < 1) {
+            _visiblelpe++;
+            return true;
+        }
         Gtk::Label *lpename = dynamic_cast<Gtk::Label *>(contents[1]);
         if (lpename) {
             size_t s = lpename->get_text().uppercase().find(_LPEFilter->get_text().uppercase(), 0);
@@ -154,10 +239,15 @@ bool LivePathEffectAdd::on_filter(Gtk::FlowBoxChild *child)
     return false;
 }
 
+void LivePathEffectAdd::reload_effect_list()
+{
+    _LPESelectorFlowBox->invalidate_filter();
+}
+
 void LivePathEffectAdd::on_search()
 {
     _visiblelpe = 0;
-    _LPESelectorFlowBox->set_filter_func(sigc::mem_fun(*this, &LivePathEffectAdd::on_filter));
+    _LPESelectorFlowBox->invalidate_filter();
     if (_visiblelpe == 0) {
         _LPEInfo->set_text(_("Your search do a empty result, please try again"));
         _LPEInfo->set_visible(true);
@@ -168,6 +258,55 @@ void LivePathEffectAdd::on_search()
     }
 }
 
+int LivePathEffectAdd::on_sort(Gtk::FlowBoxChild *child1, Gtk::FlowBoxChild *child2)
+{
+    Glib::ustring name1 = "";
+    Glib::ustring name2 = "";
+    Gtk::Box *box = dynamic_cast<Gtk::Box *>(child1->get_child());
+    if (box) {
+        std::vector<Gtk::Widget *> contents = box->get_children();
+        Gtk::Label *lpename = dynamic_cast<Gtk::Label *>(contents[1]);
+        name1 = lpename->get_text();
+        Gtk::Overlay *overlay = dynamic_cast<Gtk::Overlay *>(contents[0]);
+        if (overlay) {
+            std::vector<Gtk::Widget *> contents_overlay = overlay->get_children();
+            Gtk::EventBox *LPESelectorEffectFavLauncherTop = dynamic_cast<Gtk::EventBox *>(contents_overlay[1]);
+            if (LPESelectorEffectFavLauncherTop) {
+                if (sp_has_fav(name1)){
+                    LPESelectorEffectFavLauncherTop->set_visible(true);
+                    LPESelectorEffectFavLauncherTop->show();
+                    child1->get_style_context()->add_class("lpefav");
+                } else {
+                    LPESelectorEffectFavLauncherTop->set_visible(false);
+                    LPESelectorEffectFavLauncherTop->hide();
+                    child1->get_style_context()->remove_class("lpefav");
+                }
+            }
+        }
+    }
+    box = dynamic_cast<Gtk::Box *>(child2->get_child());
+    if (box) {
+        std::vector<Gtk::Widget *> contents = box->get_children();
+        Gtk::Label *lpename = dynamic_cast<Gtk::Label *>(contents[1]);
+        name2 = lpename->get_text();
+    }
+    
+    std::vector<Glib::ustring> effect;
+    effect.push_back(name1);
+    effect.push_back(name2);
+    sort(effect.begin(), effect.end());
+    if (sp_has_fav(name1) && sp_has_fav(name2)) {
+        return effect[0] == name1?-1:1;
+    } 
+    if (sp_has_fav(name1)) {
+        return -1;
+    }
+    if (effect[0] == name1 && !sp_has_fav(name2)) {
+        return -1;
+    }
+    return 1;
+}
+
 void LivePathEffectAdd::onAdd()
 {
     onClose();
@@ -188,7 +327,12 @@ void LivePathEffectAdd::onKeyEvent(GdkEventKey* evt)
 void LivePathEffectAdd::show(SPDesktop *desktop)
 {
     LivePathEffectAdd &dial = instance();
+    dial._LPESelectorFlowBox->invalidate_filter();
+    dial._LPESelectorFlowBox->invalidate_sort();
+    Glib::RefPtr< Gtk::Adjustment > vadjust = dial._LPEScrolled->get_vadjustment();
+    vadjust->set_value(vadjust->get_lower());
     dial._LPEDialogSelector->run();
+    dial._LPEDialogSelector->hide();
 }
 
 } // namespace Dialog