benn/lumiera_
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Relocated Timeline Toolbar into the grip

Browse source
This commit is contained in:
Joel Holdsworth 2009-03-14 15:09:18 +00:00
parent 6ce9aff38b
commit 46a310ad8c
2 changed files with 12 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/gui/panels/timeline-panel.cpp
View file

@ -79,7 +79,7 @@ TimelinePanel::TimelinePanel(workspace::WorkspaceWindow
// Setup the toolbar // Setup the toolbar
timeIndicatorButton.set_label_widget(timeIndicator); timeIndicatorButton.set_label_widget(timeIndicator);
toolbar.append(timeIndicatorButton); //toolbar.append(timeIndicatorButton);
toolbar.append(previousButton); toolbar.append(previousButton);
toolbar.append(rewindButton); toolbar.append(rewindButton);
@ -102,23 +102,10 @@ TimelinePanel::TimelinePanel(workspace::WorkspaceWindow
toolbar.append(zoomIn, mem_fun(this, &TimelinePanel::on_zoom_in)); toolbar.append(zoomIn, mem_fun(this, &TimelinePanel::on_zoom_in));
toolbar.append(zoomOut, mem_fun(this, &TimelinePanel::on_zoom_out)); 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(); toolbar.show_all();
panelBar.pack_start(toolbar, PACK_EXPAND_WIDGET); panelBar.pack_start(toolbar, PACK_EXPAND_WIDGET);
// Add the toolbar // Add the notebook
//pack_start(toolbar, PACK_SHRINK);
pack_start(notebook, PACK_EXPAND_WIDGET); pack_start(notebook, PACK_EXPAND_WIDGET);
// Set the initial UI state // Set the initial UI state

20
src/gui/panels/timeline-panel.hpp
View file

@ -116,20 +116,20 @@ private:
Gtk::Label timeIndicator; Gtk::Label timeIndicator;
Gtk::ToolButton timeIndicatorButton; Gtk::ToolButton timeIndicatorButton;
Gtk::ToolButton previousButton; MiniButton previousButton;
Gtk::ToolButton rewindButton; MiniButton rewindButton;
Gtk::ToolButton playPauseButton; MiniButton playPauseButton;
Gtk::ToolButton stopButton; MiniButton stopButton;
Gtk::ToolButton forwardButton; MiniButton forwardButton;
Gtk::ToolButton nextButton; MiniButton nextButton;
Gtk::ToggleToolButton arrowTool; MiniToggleButton arrowTool;
Gtk::ToggleToolButton iBeamTool; MiniToggleButton iBeamTool;
Gtk::SeparatorToolItem seperator1; Gtk::SeparatorToolItem seperator1;
Gtk::ToolButton zoomIn; MiniButton zoomIn;
Gtk::ToolButton zoomOut; MiniButton zoomOut;
Gtk::SeparatorToolItem seperator2; Gtk::SeparatorToolItem seperator2;