From 53f987e63d003837772e43a887e4e6dae710aea0 Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Mon, 13 Apr 2009 12:45:14 +0100 Subject: [PATCH] Did some tidying --- src/gui/panels/panel.hpp | 45 +++++++++++++++++---------------- src/gui/panels/viewer-panel.hpp | 2 +- src/gui/widgets/panel-bar.cpp | 4 +-- 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/src/gui/panels/panel.hpp b/src/gui/panels/panel.hpp index 9614e9b30..8db6ace47 100644 --- a/src/gui/panels/panel.hpp +++ b/src/gui/panels/panel.hpp @@ -41,29 +41,29 @@ class WorkspaceWindow; namespace panels { /** -* The main lumiera panel window -*/ + * The main lumiera panel window + */ class Panel : public Gtk::VBox { protected: /** - * Constructs a panel object - * @param workspace_window The window that owns this panel. - * @param name The internal name of this panel - * @param long_name The name to display on the caption - * @param behavior The GDL behaviour of this item + * Constructs a panel object + * @param workspace_window The window that owns this panel. + * @param name The internal name of this panel + * @param long_name The name to display on the caption + * @param behavior The GDL behaviour of this item */ Panel(workspace::WorkspaceWindow &workspace_window, const gchar *name, const gchar *long_name, GdlDockItemBehavior behavior = GDL_DOCK_ITEM_BEH_NORMAL); /** - * Constructs a panel object with a stock item for a caption - * @param owner_window The window that owns this panel. - * @param name The internal name of this panel - * @param long_name The name to display on the caption - * @param stock_id The id of the stock item to display on the caption - * @param behavior The GDL behaviour of this item + * Constructs a panel object with a stock item for a caption + * @param owner_window The window that owns this panel. + * @param name The internal name of this panel + * @param long_name The name to display on the caption + * @param stock_id The id of the stock item to display on the caption + * @param behavior The GDL behaviour of this item */ Panel(workspace::WorkspaceWindow &owner_window, const gchar *name, const gchar *long_name, const gchar *stock_id, @@ -76,31 +76,32 @@ public: ~Panel(); /** - * Returns a pointer to the underlying GdlDockItem structure + * Returns a pointer to the underlying GdlDockItem structure */ GdlDockItem* get_dock_item() const; /** - * Shows or hides the panel. - * @param show A value of true will show the panel, - * false will hide it. */ + * Shows or hides the panel. + * @param show A value of true will show the panel, false will hide + * it. + **/ void show(bool show = true); /** - * Returns true if the panel is currently visible. + * Returns true if the panel is currently visible. */ bool is_shown() const; /** - * Returns a reference to the owner workspace window object. + * Returns a reference to the owner workspace window object. **/ workspace::WorkspaceWindow& get_workspace_window(); private: /** - * @internal Used by both constructors - * The internal constructor for this class, whose purpose - * is to set up the internal container widgets. + * @internal Used by both constructors + * The internal constructor for this class, whose purpose + * is to set up the internal container widgets. */ void internal_setup(); diff --git a/src/gui/panels/viewer-panel.hpp b/src/gui/panels/viewer-panel.hpp index f01b85689..ecaac8f5d 100644 --- a/src/gui/panels/viewer-panel.hpp +++ b/src/gui/panels/viewer-panel.hpp @@ -67,7 +67,7 @@ protected: /** * The video display widget, which will display the video. **/ - gui::widgets::VideoDisplayWidget display; + widgets::VideoDisplayWidget display; }; } // namespace panels diff --git a/src/gui/widgets/panel-bar.cpp b/src/gui/widgets/panel-bar.cpp index 3ed8464cc..115943fad 100644 --- a/src/gui/widgets/panel-bar.cpp +++ b/src/gui/widgets/panel-bar.cpp @@ -128,9 +128,7 @@ PanelBar::on_size_allocate(Gtk::Allocation& allocation) void PanelBar::on_panel_type(int type_index) -{ - g_message("on_panel_type %d", type_index); - +{ workspace::PanelManager &manager = panel.get_workspace_window(). get_panel_manager(); manager.switch_panel(panel, type_index);