diff --git a/icons/assets-panel.png b/icons/assets-panel.png
new file mode 100644
index 000000000..901542615
Binary files /dev/null and b/icons/assets-panel.png differ
diff --git a/icons/timeline-panel.png b/icons/timeline-panel.png
index 91bf10a96..e61a0aea1 100644
Binary files a/icons/timeline-panel.png and b/icons/timeline-panel.png differ
diff --git a/icons/timeline-panel.svg b/icons/timeline-panel.svg
index f77c1c0a0..306f56c9b 100644
--- a/icons/timeline-panel.svg
+++ b/icons/timeline-panel.svg
@@ -14,7 +14,7 @@
id="svg2677"
sodipodi:version="0.32"
inkscape:version="0.46"
- sodipodi:docname="timeline.svg"
+ sodipodi:docname="timeline-panel.svg"
version="1.0"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
inkscape:export-filename="/home/joel/workspace/lumiera/lumiera/icons/timeline.png"
@@ -331,16 +331,84 @@
y1="9"
x2="16"
y2="9" />
+
+
+
+
+
+
+
+ id="mask2463">
+ height="16"
+ x="0"
+ y="0" />
-
+
-
-
+ d="M 0 4 L 0 5 L 0 6 L 0 10 L 0 11 L 0 12 L 16 12 L 16 11 L 15 11 L 15 10 L 16 10 L 16 6 L 15 6 L 15 5 L 16 5 L 16 4 L 0 4 z M 1 5 L 2 5 L 2 6 L 1 6 L 1 5 z M 3 5 L 4 5 L 4 6 L 3 6 L 3 5 z M 5 5 L 6 5 L 6 6 L 5 6 L 5 5 z M 7 5 L 8 5 L 8 6 L 7 6 L 7 5 z M 9 5 L 10 5 L 10 6 L 9 6 L 9 5 z M 11 5 L 12 5 L 12 6 L 11 6 L 11 5 z M 13 5 L 14 5 L 14 6 L 13 6 L 13 5 z M 1 10 L 2 10 L 2 11 L 1 11 L 1 10 z M 3 10 L 4 10 L 4 11 L 3 11 L 3 10 z M 5 10 L 6 10 L 6 11 L 5 11 L 5 10 z M 7 10 L 8 10 L 8 11 L 7 11 L 7 10 z M 9 10 L 10 10 L 10 11 L 9 11 L 9 10 z M 11 10 L 12 10 L 12 11 L 11 11 L 11 10 z M 13 10 L 14 10 L 14 11 L 13 11 L 13 10 z "
+ style="fill:url(#linearGradient2444);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
+ style="fill:url(#linearGradient2433);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
add(Action::create("ViewMenu", _("_View")));
- actionGroup->add(Action::create("ViewViewer", Gtk::StockID("viewer_panel")),
- sigc::mem_fun(*this, &Actions::on_menu_view_viewer));
+ actionGroup->add(Action::create("ViewAssets", Gtk::StockID("assets_panel")),
+ sigc::mem_fun(*this, &Actions::on_menu_view_assets));
actionGroup->add(Action::create("ViewTimeline", Gtk::StockID("timeline_panel")),
sigc::mem_fun(*this, &Actions::on_menu_view_timeline));
+ actionGroup->add(Action::create("ViewViewer", Gtk::StockID("viewer_panel")),
+ sigc::mem_fun(*this, &Actions::on_menu_view_viewer));
+
// Help Menu
actionGroup->add(Action::create("HelpMenu", _("_Help")) );
@@ -80,8 +83,9 @@ namespace workspace {
Actions::register_stock_items()
{
RefPtr factory = IconFactory::create();
- add_stock_item(factory, "viewer-panel.png", "viewer_panel", _("_Viewer"));
+ add_stock_item(factory, "assets-panel.png", "assets_panel", _("_Assets"));
add_stock_item(factory, "timeline-panel.png", "timeline_panel", _("_Timeline"));
+ add_stock_item(factory, "viewer-panel.png", "viewer_panel", _("_Viewer"));
factory->add_default(); //Add factory to list of factories.
}
@@ -147,9 +151,9 @@ namespace workspace {
}
void
- Actions::on_menu_view_viewer()
+ Actions::on_menu_view_assets()
{
- //workspaceWindow.viewer_panel.show();
+ //workspaceWindow.timeline_panel.show();
}
void
@@ -158,6 +162,12 @@ namespace workspace {
//workspaceWindow.timeline_panel.show();
}
+ void
+ Actions::on_menu_view_viewer()
+ {
+ //workspaceWindow.viewer_panel.show();
+ }
+
void
Actions::on_menu_help_about()
{
diff --git a/src/gui/workspace/actions.hpp b/src/gui/workspace/actions.hpp
index 9b9092250..1c2c2ff05 100644
--- a/src/gui/workspace/actions.hpp
+++ b/src/gui/workspace/actions.hpp
@@ -66,8 +66,9 @@ class WorkspaceWindow;
void on_menu_edit_preferences();
- void on_menu_view_viewer();
+ void on_menu_view_assets();
void on_menu_view_timeline();
+ void on_menu_view_viewer();
void on_menu_help_about();
diff --git a/src/gui/workspace/workspace-window.cpp b/src/gui/workspace/workspace-window.cpp
index c203c7584..c2c46d61b 100644
--- a/src/gui/workspace/workspace-window.cpp
+++ b/src/gui/workspace/workspace-window.cpp
@@ -91,8 +91,9 @@ namespace workspace {
" "
" "
" "
"