From 84374507671b5976728b83cd3246679cf65d9d59 Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Fri, 16 May 2008 19:23:12 +0100 Subject: [PATCH] More work on icons --- icons/assets-panel.png | Bin 0 -> 540 bytes icons/timeline-panel.png | Bin 447 -> 453 bytes icons/timeline-panel.svg | 116 ++++++++++++++++++------- src/gui/Makefile.am | 11 ++- src/gui/panels/assets-panel.cpp | 2 +- src/gui/workspace/actions.cpp | 20 +++-- src/gui/workspace/actions.hpp | 3 +- src/gui/workspace/workspace-window.cpp | 3 +- 8 files changed, 111 insertions(+), 44 deletions(-) create mode 100644 icons/assets-panel.png diff --git a/icons/assets-panel.png b/icons/assets-panel.png new file mode 100644 index 0000000000000000000000000000000000000000..9015426153054c0b529b4d9ebdfa06a221d568ac GIT binary patch literal 540 zcmV+%0^|LOP)Vhlm95D^5CAW0*NO~l4h2`Gn+SSXee3p=k!DITN| zloYWEXca63MGv(U^qPobY>b#9Dp8{0UEbTVcsUg#cu}XB*@6F?*_nZVGy!PT%rNk5 zliHE-nb49(%`}10vsV}N{rqDUTQ;Bo7$dnCNIoxON&^{bA}^laGjk880qPdu^yOBT zEWa_clc&Tx2f*4|8y`gof^!a2aQL`dICk+4OK+dE`@k5lTlYsTutSWPkfmY@o;2kB zMZE(6RQjtR27v0WeY98J5hzgEvJDN{um$>(l@Gjpa+{MEra-d|pH&4=2yN1juSixu z;fgT;7AQWtIU$FSo`duYWUHV7)eJ(4YRG+92Ww!@-u*n7y$)#60)BA&kYbGBD?sJP zdQc>%Uxr2wvM|?-q){`MfcjsaLA`SadgR1;mgk#Ysp6f7xO?jg<1;~QC+VXy zJ@MAA0M19>h5)Ouem$!j+riU-~Y#ZtnKd2kxFF@Gk?R(=ynaW?xnwCgX&&m z1weh}{RBYc~1N zGA7O*oifT}%9w~fR>s7?2Y-3;aJujVL0oXjajNBK73k}B;KvQl_cIQy_O^vU%iwh7GBIt60>v9C5h>osUt~*_02}r y%<5)VyWtw!X4V`zK0dj2EH^kL+?{a$pXnTgN1ipT4s-ed0000P-*3uG0(9{w|Al&c!yyx5owX{jGr2{XA_u-tgoO8T5j#(u9 zg}VP@fOmLwkXF^QsAg0ZRYfEo=CS|9N35%=)kG?_gNPs^M1PSW5`Ft0HmPWe`2Z)! zrvMc41ptac34pWmIRLdv4S+_y0YIzS0-$}>#=9wAr$b}Q#@I|~ETOUVH{RK1i_loi zh=s=Tvhu|K+TNIVLu0GHbpxCmFwV{m0GO5glg5q&Fe~?m(;e11+(_fXS-9U%ev)fu zVbc+G@+|Lq6jOr|FRRbwnpxh~UkN&S!sG{ydV{;@mRvK-i3y;K$M_os(%>V!Z07*qoM6N<$f{?POKmY&$ 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 { " " " " " " - " " + " " " " + " " " " " " " "