Fix typo in an array causing a write off the end. Causes bug if no

[inkscape.git] / src / ui / dialog / find.h

diff --git a/src/ui/dialog/find.h b/src/ui/dialog/find.h
index d969236b8f0a079146fa26df76f328faa10ea2ef..2d79b37adae510e0f7835f7fca456509dff33999 100644 (file)
--- a/src/ui/dialog/find.h
+++ b/src/ui/dialog/find.h
@@ -12,12 +12,12 @@
 #ifndef INKSCAPE_UI_DIALOG_FIND_H
 #define INKSCAPE_UI_DIALOG_FIND_H
 
-#include <gtkmm/notebook.h>
 #include <glibmm/i18n.h>
 
-#include "dialog.h"
+#include "ui/widget/panel.h"
 #include "ui/widget/button.h"
 #include "ui/widget/entry.h" 
+#include <gtkmm/separator.h>
 
 #include "message-stack.h"
 #include "helper/window.h"
@@ -28,27 +28,27 @@
 #include "selection.h"
 #include "desktop-handles.h" 
 
-#include "dialog-events.h"
-#include "../prefs-utils.h"
-#include "../verbs.h"
-#include "../interface.h"
-#include "../sp-text.h"
-#include "../sp-flowtext.h"
-#include "../text-editing.h"
-#include "../sp-tspan.h"
-#include "../selection-chemistry.h"
-#include "../sp-defs.h"
-#include "../sp-rect.h"
-#include "../sp-ellipse.h"
-#include "../sp-star.h"
-#include "../sp-spiral.h"
-#include "../sp-path.h"
-#include "../sp-line.h"
-#include "../sp-polyline.h"
-#include "../sp-item-group.h"
-#include "../sp-use.h"
-#include "../sp-image.h"
-#include "../sp-offset.h"
+#include "dialogs/dialog-events.h"
+#include "prefs-utils.h"
+#include "verbs.h"
+#include "interface.h"
+#include "sp-text.h"
+#include "sp-flowtext.h"
+#include "text-editing.h"
+#include "sp-tspan.h"
+#include "selection-chemistry.h"
+#include "sp-defs.h"
+#include "sp-rect.h"
+#include "sp-ellipse.h"
+#include "sp-star.h"
+#include "sp-spiral.h"
+#include "sp-path.h"
+#include "sp-line.h"
+#include "sp-polyline.h"
+#include "sp-item-group.h"
+#include "sp-use.h"
+#include "sp-image.h"
+#include "sp-offset.h"
 #include <xml/repr.h>
 
 using namespace Inkscape::UI::Widget;
@@ -57,12 +57,12 @@ namespace Inkscape {
 namespace UI {
 namespace Dialog {
 
-class Find : public Dialog {
+class Find : public UI::Widget::Panel {
 public:
     Find();
     virtual ~Find();
 
-    static Find *create() { return new Find(); }
+    static Find &getInstance() { return *new Find(); }
 
 protected:
     // Widgets:
@@ -88,11 +88,13 @@ protected:
     CheckButton    _check_groups;
     CheckButton    _check_clones;
     CheckButton    _check_images;
-    CheckButton    _check_offsets;
+    CheckButton    _check_offsets;  
     
     // Button-click handlers
     void    onClear();
-    void    onFind();
+    void    onFind();             
+    void    onToggleAlltypes();
+    void    onToggleShapes();    
 
 
     // onFind helper functions
@@ -106,7 +108,8 @@ protected:
     GSList *    filter_list (GSList *l, bool exact);
     GSList *    all_items (SPObject *r, GSList *l, bool hidden, bool locked);
     GSList *    all_selection_items (Inkscape::Selection *s, GSList *l, SPObject *ancestor, bool hidden, bool locked);
-    
+
+    void        squeeze_window();
     
 private:
     Find(Find const &d);