r10949@tres: ted | 2006-02-16 08:33:36 -0800

 Basic help dialog coming up and working.

diff --git a/src/extension/Makefile_insert b/src/extension/Makefile_insert
index d4590cfe6c9476fde7f821b8109ed030083b7ecc..dcc831e726b8283ee6f4d2325d886469fb64de8d 100644 (file)
--- a/src/extension/Makefile_insert
+++ b/src/extension/Makefile_insert
@@ -15,6 +15,8 @@ extension_libextension_a_SOURCES =    \
        extension/dependency.h \
        extension/error-file.cpp \
        extension/error-file.h \
+       extension/helpdialog.cpp \
+       extension/helpdialog.h \
        extension/init.cpp      \
        extension/init.h        \
        extension/parameter.h \

diff --git a/src/extension/helpdialog.cpp b/src/extension/helpdialog.cpp
index de82c110d7784ccee6766fc893c01c55fb81dfb0..235e9010b3f9bb986fdde592478150288758af5f 100644 (file)
--- a/src/extension/helpdialog.cpp
+++ b/src/extension/helpdialog.cpp
@@ -8,11 +8,14 @@
  */
 
 #include <gtkmm/stock.h>
+#include <gtkmm/dialog.h>
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/textview.h>
 #include <glibmm/i18n.h>
 
 #include "../dialogs/dialog-events.h"
 
-#include "prefdialog.h"
+#include "helpdialog.h"
 
 namespace Inkscape {
 namespace Extension {
@@ -24,7 +27,7 @@ HelpDialog::HelpDialog (Glib::ustring name, gchar const * help) :
     textview->set_editable(false);
     textview->set_wrap_mode(Gtk::WRAP_WORD);
     textview->show();
-    textview->get_buffer()->set_text(help, help + g_strlen(help));
+    textview->get_buffer()->set_text(help, help + strlen(help));
 
     Gtk::ScrolledWindow * scrollwindow = new Gtk::ScrolledWindow();
     scrollwindow->add(*textview);
@@ -33,7 +36,7 @@ HelpDialog::HelpDialog (Glib::ustring name, gchar const * help) :
     scrollwindow->show();
 
     Gtk::VBox * vbox = this->get_vbox();
-    vbox->pack_start(*scrolledwindow, true, true, 5);
+    vbox->pack_start(*scrollwindow, true, true, 5);
 
     Gtk::Button * ok = add_button(Gtk::Stock::OK, Gtk::RESPONSE_OK);
     set_default_response(Gtk::RESPONSE_OK);

diff --git a/src/extension/prefdialog.cpp b/src/extension/prefdialog.cpp
index aacf5eec32237ba22b8103b20cda068a2ccb59dd..ec4ae041f71fe199867af008170cc385be756fa7 100644 (file)
--- a/src/extension/prefdialog.cpp
+++ b/src/extension/prefdialog.cpp
@@ -13,6 +13,7 @@
 #include "../dialogs/dialog-events.h"
 
 #include "prefdialog.h"
+#include "helpdialog.h"
 
 namespace Inkscape {
 namespace Extension {
@@ -36,15 +37,15 @@ PrefDialog::PrefDialog (Glib::ustring name, gchar const * help, Gtk::Widget * co
     return;
 }
 
-Gtk::ResponseType
+int
 PrefDialog::run (void) {
-    Gtk::ResponseType resp = Gtk::RESPONSE_HELP;
+    int resp = Gtk::RESPONSE_HELP;
     while (resp == Gtk::RESPONSE_HELP) {
         resp = Gtk::Dialog::run();
         if (resp == Gtk::RESPONSE_HELP) {
             HelpDialog help(_name, _help);
-            help->run();
-            help->hide();
+            help.run();
+            help.hide();
         }
     }
     return resp;

diff --git a/src/extension/prefdialog.h b/src/extension/prefdialog.h
index bf30eda36617535eea455986be0ba56667f85f4c..371f06376a677eb4263ff41d7a444b7596e6f82a 100644 (file)
--- a/src/extension/prefdialog.h
+++ b/src/extension/prefdialog.h
@@ -28,7 +28,7 @@ class PrefDialog : public Gtk::Dialog {
 
 public:
     PrefDialog (Glib::ustring name, gchar const * help, Gtk::Widget * controls);
-    Gtk::ResponseType run (void);
+    int run (void);
 
 };