Code

marked forgotten translatable message
[inkscape.git] / src / ui / dialog / filter-effects-dialog.h
index da528c0a22da5857054eaf7fb151c04bcac3fbbf..ccffb2a67d78be6356540bf913328b11d05dcca2 100644 (file)
@@ -1,7 +1,7 @@
-/**
- * \brief Filter Effects dialog
- *
- * Authors:
+/** @file
+ * @brief Filter Effects dialog
+ */
+/* Authors:
  *   Nicholas Bishop <nicholasbishop@gmail.com>
  *   Rodrigo Kumpera <kumpera@gmail.com>
  *
@@ -87,6 +87,7 @@ private:
         };
 
         static void on_activate_desktop(Application*, SPDesktop*, FilterModifier*);
+        static void on_deactivate_desktop(Application*, SPDesktop*, FilterModifier*);
         void on_document_replaced(SPDesktop*, SPDocument*)
         {
             update_filters();
@@ -223,16 +224,12 @@ private:
     void update_color_matrix();
     void update_primitive_infobox();
 
-    // Filter effect selection
-    FilterModifier _filter_modifier;
-
     // Primitives Info Box  
     Gtk::Label _infobox_desc;
     Gtk::Image _infobox_icon;
 
     // View/add primitives
     Gtk::VBox _primitive_box;
-    PrimitiveList _primitive_list;
     UI::Widget::ComboBoxEnum<NR::FilterPrimitiveType> _add_primitive_type;
     Gtk::Button _add_primitive;
 
@@ -242,6 +239,7 @@ private:
     Gtk::VBox _settings_tab1;
     Gtk::Label _empty_settings;
     Gtk::Label _no_filter_selected;
+    bool _settings_initialized;
 
     class Settings;
     class MatrixAttr;
@@ -267,6 +265,11 @@ private:
     bool _locked;
     bool _attr_lock;
 
+    // These go last since they depend on the prior initialization of
+    // other FilterEffectsDialog members
+    FilterModifier _filter_modifier;
+    PrimitiveList _primitive_list;
+
     FilterEffectsDialog(FilterEffectsDialog const &d);
     FilterEffectsDialog& operator=(FilterEffectsDialog const &d);
 };