From 46a310ad8cfa55ff376be23c46405d2492bcfe9d Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@airwebreathe.org.uk>
Date: Sat, 14 Mar 2009 15:09:18 +0000
Subject: [PATCH] Relocated Timeline Toolbar into the grip

---
 src/gui/panels/timeline-panel.cpp | 17 ++---------------
 src/gui/panels/timeline-panel.hpp | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/src/gui/panels/timeline-panel.cpp b/src/gui/panels/timeline-panel.cpp
index f942e1950..05de3bc87 100644
--- a/src/gui/panels/timeline-panel.cpp
+++ b/src/gui/panels/timeline-panel.cpp
@@ -79,7 +79,7 @@ TimelinePanel::TimelinePanel(workspace::WorkspaceWindow
   // Setup the toolbar
   timeIndicatorButton.set_label_widget(timeIndicator);
   
-  toolbar.append(timeIndicatorButton);
+  //toolbar.append(timeIndicatorButton);
   
   toolbar.append(previousButton);
   toolbar.append(rewindButton);
@@ -102,23 +102,10 @@ TimelinePanel::TimelinePanel(workspace::WorkspaceWindow
   toolbar.append(zoomIn, mem_fun(this, &TimelinePanel::on_zoom_in));
   toolbar.append(zoomOut, mem_fun(this, &TimelinePanel::on_zoom_out));
   
-  toolbar.set_toolbar_style(TOOLBAR_ICONS);
-  
-/*#if 0
-  toolbar.set_icon_size(WindowManager::MenuIconSize);
-#else
-  TODO("This code soon be removed when we drop Etch compatibility");
-  
-  // Temporary bodge for etch compatibility - will be removed soon
-  gtk_toolbar_set_icon_size (toolbar.gobj(),
-    (GtkIconSize)(int)WindowManager::MenuIconSize);
-#endif*/
-  
   toolbar.show_all();
   panelBar.pack_start(toolbar, PACK_EXPAND_WIDGET);
   
-  // Add the toolbar
-  //pack_start(toolbar, PACK_SHRINK);
+  // Add the notebook
   pack_start(notebook, PACK_EXPAND_WIDGET);
   
   // Set the initial UI state
diff --git a/src/gui/panels/timeline-panel.hpp b/src/gui/panels/timeline-panel.hpp
index 4df1efe32..b574c950b 100644
--- a/src/gui/panels/timeline-panel.hpp
+++ b/src/gui/panels/timeline-panel.hpp
@@ -116,20 +116,20 @@ private:
   Gtk::Label timeIndicator;
   Gtk::ToolButton timeIndicatorButton;
   
-  Gtk::ToolButton previousButton;
-  Gtk::ToolButton rewindButton;
-  Gtk::ToolButton playPauseButton;
-  Gtk::ToolButton stopButton;
-  Gtk::ToolButton forwardButton;
-  Gtk::ToolButton nextButton;
+  MiniButton previousButton;
+  MiniButton rewindButton;
+  MiniButton playPauseButton;
+  MiniButton stopButton;
+  MiniButton forwardButton;
+  MiniButton nextButton;
     
-  Gtk::ToggleToolButton arrowTool;
-  Gtk::ToggleToolButton iBeamTool;
+  MiniToggleButton arrowTool;
+  MiniToggleButton iBeamTool;
   
   Gtk::SeparatorToolItem seperator1;
   
-  Gtk::ToolButton zoomIn;
-  Gtk::ToolButton zoomOut;
+  MiniButton zoomIn;
+  MiniButton zoomOut;
   
   Gtk::SeparatorToolItem seperator2;