diff --git a/src/ui/dialog/dialog.h b/src/ui/dialog/dialog.h
index 2d1ef7af3b4bd10565a62d3ae21cb2d3308b4ff1..1a59a236cade797bfbd79207dd74c305df9d47d8 100644 (file)
--- a/src/ui/dialog/dialog.h
+++ b/src/ui/dialog/dialog.h
-/**
- * \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:
+/** @file
+ * @brief Base class for dialogs in Inkscape
+ */
+/* Authors:
* Bryce W. Harrington <bryce@bryceharrington.org>
* Gustav Broberg <broberg@kth.se>
*
* Bryce W. Harrington <bryce@bryceharrington.org>
* Gustav Broberg <broberg@kth.se>
*
@@ -38,50 +36,47 @@ void sp_retransientize(Inkscape::Application *inkscape, SPDesktop *desktop, gpoi
gboolean sp_retransientize_again(gpointer dlgPtr);
void sp_dialog_shutdown(GtkObject *object, gpointer dlgPtr);
gboolean sp_retransientize_again(gpointer dlgPtr);
void sp_dialog_shutdown(GtkObject *object, gpointer dlgPtr);
+/**
+ * @brief Base class for Inkscape dialogs
+ * This class provides certain common behaviors and styles wanted of all dialogs
+ * in the application. Fundamental parts of the dialog's behavior are controlled by
+ * a Dialog::Behavior subclass instance connected to the dialog.
+ */
class Dialog {
public:
Dialog(Behavior::BehaviorFactory behavior_factory, const char *prefs_path = NULL,
class Dialog {
public:
Dialog(Behavior::BehaviorFactory behavior_factory, const char *prefs_path = NULL,
- int verb_num = 0, const char *apply_label = NULL);
+ int verb_num = 0, Glib::ustring const &apply_label = "");
virtual ~Dialog();
virtual ~Dialog();
- virtual void onDesktopActivated (SPDesktop*);
+ virtual void onDesktopActivated(SPDesktop*);
virtual void onShutdown();
/** Hide and show dialogs */
virtual void onHideF12();
virtual void onShowF12();
virtual void onShutdown();
/** Hide and show dialogs */
virtual void onHideF12();
virtual void onShowF12();
- virtual operator Gtk::Widget&();
+ 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 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 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 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 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_sensitive(bool sensitive=true);
- virtual void set_response_sensitive(int response_id, bool setting);
virtual Glib::SignalProxy0<void> signal_show();
virtual Glib::SignalProxy0<void> signal_hide();
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 _user_hidden; // when it is closed by the user, to prevent repopping on f12
bool _hiddenF12;
bool _user_hidden; // when it is closed by the user, to prevent repopping on f12
bool _hiddenF12;
bool retransientize_suppress; // when true, do not retransientize (prevents races when switching new windows too fast)
protected:
bool retransientize_suppress; // when true, do not retransientize (prevents races when switching new windows too fast)
protected:
- const char *_prefs_path;
+ Glib::ustring const _prefs_path;
int _verb_num;
Glib::ustring _title;
int _verb_num;
Glib::ustring _title;
- const char *_apply_label;
+ Glib::ustring _apply_label;
/**
* Tooltips object for all descendants to use
*/
Gtk::Tooltips tooltips;
/**
* Tooltips object for all descendants to use
*/
Gtk::Tooltips tooltips;
- virtual void _onResponse(int response_id);
+ virtual void _handleResponse(int response_id);
+
virtual bool _onDeleteEvent (GdkEventAny*);
virtual bool _onDeleteEvent (GdkEventAny*);
+ virtual bool _onEvent(GdkEvent *event);
+ virtual bool _onKeyPress(GdkEventKey *event);
virtual void _apply();
virtual void _close();
virtual void _apply();
virtual void _close();
-
- static bool windowKeyPress(GdkEventKey *event);
+ virtual void _defocus();
Inkscape::Selection* _getSelection();
Inkscape::Selection* _getSelection();