From 71b8e79fedb130b6d557e5105ec535ad97ba6145 Mon Sep 17 00:00:00 2001 From: gouldtj Date: Wed, 29 Mar 2006 05:42:11 +0000 Subject: [PATCH] r10986@tres: ted | 2006-02-27 21:19:52 -0800 Converting things to be a little less like the preferences dialog. Now there are notebook pages. Things will start flipping a little more so that the notebook pages are really what is getting controlled. --- src/ui/dialog/extension-editor.cpp | 18 ++++++++++-------- src/ui/dialog/extension-editor.h | 17 +++++++++++------ 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/ui/dialog/extension-editor.cpp b/src/ui/dialog/extension-editor.cpp index e20ac4592..7cbde9e1f 100644 --- a/src/ui/dialog/extension-editor.cpp +++ b/src/ui/dialog/extension-editor.cpp @@ -14,9 +14,12 @@ # include #endif +#include + #include #include #include +#include #include "extension-editor.h" #include "verbs.h" @@ -68,13 +71,12 @@ ExtensionEditor::ExtensionEditor() //Pages Gtk::VBox* vbox_page = Gtk::manage(new Gtk::VBox()); - Gtk::Frame* title_frame = Gtk::manage(new Gtk::Frame()); hbox_list_page->pack_start(*vbox_page, true, true, 0); - title_frame->add(_page_title); - vbox_page->pack_start(*title_frame, false, false, 0); - vbox_page->pack_start(_page_frame, true, true, 0); - _page_frame.set_shadow_type(Gtk::SHADOW_IN); - title_frame->set_shadow_type(Gtk::SHADOW_IN); + Gtk::Notebook * notebook = Gtk::manage(new Gtk::Notebook()); + notebook->append_page(_notebook_info, *Gtk::manage(new Gtk::Label(_("Information")))); + notebook->append_page(_notebook_help, *Gtk::manage(new Gtk::Label(_("Help")))); + notebook->append_page(_notebook_params, *Gtk::manage(new Gtk::Label(_("Parameters")))); + vbox_page->pack_start(*notebook, true, true, 0); Inkscape::Extension::db.foreach(dbfunc, this); @@ -123,10 +125,10 @@ ExtensionEditor::on_pagelist_selection_changed (void) Glib::RefPtr selection = _page_list.get_selection(); Gtk::TreeModel::iterator iter = selection->get_selected(); if (iter) { - _page_frame.remove(); + // _page_frame.remove(); Gtk::TreeModel::Row row = *iter; // _current_page = row[_page_list_columns._col_page]; - _page_title.set_markup("" + row[_page_list_columns._col_name] + ""); + // _page_title.set_markup("" + row[_page_list_columns._col_name] + ""); // _page_frame.add(*_current_page); // _current_page->show(); Glib::ustring id = row[_page_list_columns._col_id]; diff --git a/src/ui/dialog/extension-editor.h b/src/ui/dialog/extension-editor.h index aebe35049..65eb0c97e 100644 --- a/src/ui/dialog/extension-editor.h +++ b/src/ui/dialog/extension-editor.h @@ -38,10 +38,16 @@ public: static void show_help (gchar const * extension_id); protected: - Gtk::Frame _page_frame; - Gtk::Label _page_title; - Gtk::TreeView _page_list; + /** \brief The view of the list of extensions on the left of the dialog */ + Gtk::TreeView _page_list; + /** \brief The model for the list of extensions */ Glib::RefPtr _page_list_model; + /** \brief The notebook page that contains information */ + Gtk::VBox _notebook_info; + /** \brief The notebook page that contains help info */ + Gtk::VBox _notebook_help; + /** \brief The notebook page that holds all the parameters */ + Gtk::VBox _notebook_params; //Pagelist model columns: class PageListModelColumns : public Gtk::TreeModel::ColumnRecord { @@ -57,10 +63,9 @@ protected: }; PageListModelColumns _page_list_columns; - Gtk::TreeModel::Path _path_tools; - Gtk::TreeModel::Path _path_shapes; - private: + /** \brief A 'global' variable to help search through and select + an item in the extension list */ Glib::ustring _selection_search; ExtensionEditor(ExtensionEditor const &d); -- 2.30.2