From 9dfd4ca4ed44a2db831e58a3a6235b1a8ff54c88 Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@joel-desktop.(none)>
Date: Thu, 14 Aug 2008 23:15:47 +0100
Subject: [PATCH] Fixed the broken view menu, corrected some tabs, and removed
 some left over debug code

---
 src/gui/window-manager.cpp    |  7 -----
 src/gui/window-manager.hpp    | 54 +++++++++++++++++------------------
 src/gui/workspace/actions.cpp |  9 ++++--
 3 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/src/gui/window-manager.cpp b/src/gui/window-manager.cpp
index 9ffc84a20..926d4ecac 100644
--- a/src/gui/window-manager.cpp
+++ b/src/gui/window-manager.cpp
@@ -31,13 +31,6 @@ namespace gui {
 WindowManager::WindowManager()
 {
   register_stock_items();
-  
-  g_message("get_home_dir() : %s", get_home_dir().c_str());
-  g_message("get_tmp_dir() : %s", get_tmp_dir().c_str());
-  g_message("get_current_dir() : %s", get_current_dir().c_str());
-  g_message("get_user_data_dir() : %s", get_user_data_dir().c_str());
-  g_message("get_user_config_dir() : %s", get_user_config_dir().c_str());
-  g_message("get_user_cache_dir () : %s", get_user_cache_dir().c_str());  
 }
 
 bool
diff --git a/src/gui/window-manager.hpp b/src/gui/window-manager.hpp
index 1c93fddfd..f9fc408ab 100644
--- a/src/gui/window-manager.hpp
+++ b/src/gui/window-manager.hpp
@@ -34,36 +34,36 @@
 namespace lumiera {
 namespace gui {
 
-  class WindowManager
-  {
-  public:
-    WindowManager();
+class WindowManager
+{
+public:
+  WindowManager();
 
-    bool set_theme(Glib::ustring path);
+  bool set_theme(Glib::ustring path);
+  
+  static GdkColor read_style_colour_property(
+    Gtk::Widget &widget, const gchar *property_name,
+    guint16 red, guint16 green, guint16 blue);
     
-    static GdkColor read_style_colour_property(
-      Gtk::Widget &widget, const gchar *property_name,
-      guint16 red, guint16 green, guint16 blue);
-      
-  private:
-    /**
-     * Registers application stock items: icons and
-     * labels associated with IDs */
-    static void register_stock_items();
+private:
+  /**
+   * Registers application stock items: icons and
+   * labels associated with IDs */
+  static void register_stock_items();
 
-    static bool add_stock_item_set(
-      const Glib::RefPtr<Gtk::IconFactory>& factory,
-      const Glib::ustring& icon_name,
-      const Glib::ustring& id,
-      const Glib::ustring& label);
-      
-    static bool add_stock_icon(Gtk::IconSet &icon_set,
-      const Glib::ustring& icon_name, int size);
-                          
-    static bool add_stock_icon_source(Gtk::IconSet &icon_set,
-      const Glib::ustring& base_dir,
-      const Glib::ustring& icon_name, int size);
-  };
+  static bool add_stock_item_set(
+    const Glib::RefPtr<Gtk::IconFactory>& factory,
+    const Glib::ustring& icon_name,
+    const Glib::ustring& id,
+    const Glib::ustring& label);
+    
+  static bool add_stock_icon(Gtk::IconSet &icon_set,
+    const Glib::ustring& icon_name, int size);
+                        
+  static bool add_stock_icon_source(Gtk::IconSet &icon_set,
+    const Glib::ustring& base_dir,
+    const Glib::ustring& icon_name, int size);
+};
 
 }   // namespace gui
 }   // namespace lumiera
diff --git a/src/gui/workspace/actions.cpp b/src/gui/workspace/actions.cpp
index 2bcb9c40a..db8528b46 100644
--- a/src/gui/workspace/actions.cpp
+++ b/src/gui/workspace/actions.cpp
@@ -68,17 +68,20 @@ Actions::Actions(WorkspaceWindow &workspace_window) :
   // View Menu
   actionGroup->add(Action::create("ViewMenu", _("_View")));
   
-  assetsPanelAction = ToggleAction::create("ViewAssets", Gtk::StockID("assets_panel"));
+  assetsPanelAction = ToggleAction::create("ViewAssets",
+    Gtk::StockID("panel_assets"));
   assetsPanelAction->signal_toggled().connect(
     sigc::mem_fun(*this, &Actions::on_menu_view_assets));
   actionGroup->add(assetsPanelAction);
   
-  timelinePanelAction = ToggleAction::create("ViewTimeline", Gtk::StockID("timeline_panel"));
+  timelinePanelAction = ToggleAction::create("ViewTimeline",
+    Gtk::StockID("panel_timeline"));
   timelinePanelAction->signal_toggled().connect(
     sigc::mem_fun(*this, &Actions::on_menu_view_timeline));
   actionGroup->add(timelinePanelAction);
 
-  viewerPanelAction = ToggleAction::create("ViewViewer", Gtk::StockID("viewer_panel"));
+  viewerPanelAction = ToggleAction::create("ViewViewer",
+    Gtk::StockID("panel_viewer"));
   viewerPanelAction->signal_toggled().connect(
     sigc::mem_fun(*this, &Actions::on_menu_view_viewer));
   actionGroup->add(viewerPanelAction);