X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fui%2Fdialog%2Fdialog.h;h=5a9e656457e3b7138231cf17dbb1d2098dae2165;hb=e7333a0a54c8d33b7397406dd76938aa430836d5;hp=dd3cdaafe43c57c992aeb60bd514d4766eed8435;hpb=36e966d91481707930ce369d9d577f307fd5fbaf;p=inkscape.git

diff --git a/src/ui/dialog/dialog.h b/src/ui/dialog/dialog.h
index dd3cdaafe..5a9e65645 100644
--- a/src/ui/dialog/dialog.h
+++ b/src/ui/dialog/dialog.h
@@ -1,11 +1,13 @@
 /**
- * \brief Base class for dialogs in Inkscape.  This class provides certain
- *        common behaviors and styles wanted of all dialogs in the application.
+ * \brief Base class for dialogs in Inkscape.  This class provides certain common behaviors and
+ *        styles wanted of all dialogs in the application.  Fundamental parts of the dialog's
+ *        behavior is controlled by a Dialog::Behavior subclass instance connected to the dialog.
  *
  * Author:
  *   Bryce W. Harrington <bryce@bryceharrington.org>
+ *   Gustav Broberg <broberg@kth.se>
  *
- * Copyright (C) 2004, 2005 Authors
+ * Copyright (C) 2004--2007 Authors
  *
  * Released under GNU GPL.  Read the file 'COPYING' for more information.
  */
@@ -16,53 +18,98 @@
 #include <gtkmm/dialog.h>
 #include <gtkmm/tooltips.h>
 
-namespace Inkscape { class Selection; }
+#include "dock-behavior.h"
+#include "floating-behavior.h"
+
 class SPDesktop;
 
+namespace Inkscape { 
+class Selection; 
+class Application; 
+}
+
 namespace Inkscape {
 namespace UI {
 namespace Dialog {
 
-class Dialog : public Gtk::Dialog {
+enum BehaviorType { FLOATING, DOCK };
+
+void sp_retransientize(Inkscape::Application *inkscape, SPDesktop *desktop, gpointer dlgPtr);
+gboolean sp_retransientize_again(gpointer dlgPtr);
+void sp_dialog_shutdown(GtkObject *object, gpointer dlgPtr);
+
+class Dialog {
+
 public:
-    Dialog(BaseObjectType *gobj); // fixme: remove this
 
-    Dialog(const char *prefs_path, int verb_num = 0, const char *apply_label = NULL);
+    Dialog(Behavior::BehaviorFactory behavior_factory, const char *prefs_path = NULL, 
+           int verb_num = 0, const char *apply_label = NULL);
 
     virtual ~Dialog();
 
     virtual void onDesktopActivated (SPDesktop*);
     virtual void onShutdown();
 
-    virtual void present();
-
     /** Hide and show dialogs */
-    virtual void   onHideF12();
-    virtual void   onShowF12();
+    virtual void onHideF12();
+    virtual void onShowF12();
+
+    virtual operator Gtk::Widget&();
+    virtual GtkWidget *gobj();
+    virtual void present();
+    virtual Gtk::VBox *get_vbox();
+    virtual void show();
+    virtual void hide();
+    virtual void show_all_children();
+    virtual void set_resizable(bool);
+    virtual void set_sensitive(bool sensitive=true);
+    virtual void set_default(Gtk::Widget&);
+    virtual void set_size_request(int, int);
+    virtual void size_request(Gtk::Requisition&);
+    virtual void get_position(int& x, int& y);
+    virtual void get_size(int& width, int& height);
+    virtual void resize(int width, int height);
+    virtual void move(int x, int y);
+    virtual void set_position(Gtk::WindowPosition position);
+    virtual void set_title(Glib::ustring title);
+
+    virtual void set_response_sensitive(int response_id, bool setting);
+    virtual Glib::SignalProxy0<void> signal_show();
+    virtual Glib::SignalProxy0<void> signal_hide();
+    virtual Glib::SignalProxy1<void, int> signal_response();
+
+    virtual Gtk::Button* add_button (const Glib::ustring& button_text, int response_id);
+    virtual Gtk::Button* add_button (const Gtk::StockID& stock_id, int response_id);
+    
+    virtual void set_default_response(int response_id);
 
-    bool           _hiddenF12;
     bool           _user_hidden; // when it is closed by the user, to prevent repopping on f12
+    bool           _hiddenF12;
 
     void           read_geometry();
     void           save_geometry();
 
-    const char           *_prefs_path;
-
     bool retransientize_suppress; // when true, do not retransientize (prevents races when switching new windows too fast)
 
 protected:
+    const char    *_prefs_path;
+    int            _verb_num;
+    Glib::ustring  _title;
+    const char    *_apply_label;
 
     /**
      * Tooltips object for all descendants to use
      */
     Gtk::Tooltips tooltips;
 
-    virtual void   on_response(int response_id);
-    virtual bool   on_delete_event (GdkEventAny*);
+    virtual void   _onResponse(int response_id);
+    virtual bool   _onDeleteEvent (GdkEventAny*);
+    virtual bool   _onEvent(GdkEvent *event);
+    virtual bool   _onKeyPress(GdkEventKey *event);
+
     virtual void   _apply();
     virtual void   _close();
-
-    static bool windowKeyPress( GtkWidget *widget, GdkEventKey *event );
+    virtual void   _defocus();
 
     Inkscape::Selection*   _getSelection();
 
@@ -72,10 +119,15 @@ protected:
     sigc::connection _shutdown_connection;
 
 private:
+    Behavior::Behavior* _behavior;
+
     Dialog(); // no constructor without params
 
     Dialog(Dialog const &d);            // no copy
     Dialog& operator=(Dialog const &d); // no assign
+
+    friend class Behavior::FloatingBehavior;
+    friend class Behavior::DockBehavior;
 };
 
 } // namespace Dialog