[Synfig-devl] Carlos Lopez : Revert changes from outline grow development.
Author: Carlos Lopez Date: Fri Jan 27 20:02:47 2012 +0100 Revert changes from outline grow development. I've not found a way to avoid endless loop for exported or imported canvas parameter. --- .../src/modules/mod_geometry/advanced_outline.cpp | 39 +--- .../src/modules/mod_geometry/advanced_outline.h| 21 +- synfig-core/src/modules/mod_geometry/outline.cpp | 221 +--- synfig-core/src/modules/mod_geometry/outline.h | 32 ++- synfig-core/src/synfig/canvas.cpp |2 - synfig-core/src/synfig/context.cpp | 19 -- synfig-core/src/synfig/context.h |9 +- synfig-core/src/synfig/layer_pastecanvas.cpp | 33 +--- synfig-core/src/synfig/layer_pastecanvas.h |5 - synfig-studio/src/gui/duckmatic.cpp| 14 +- 10 files changed, 239 insertions(+), 156 deletions(-) Diff: http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig/synfig;a=commitdiff;h=6c1954ff651b2948138bb7ce3d08de47607dbe09 -- Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 ___ Synfig-devl mailing list Synfig-devl@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Merge branch 'jcome_preview_window' into jcome
Author: Yu Chen Date: Thu Jan 26 22:46:55 2012 +0800 Merge branch 'jcome_preview_window' into jcome --- -- Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 ___ Synfig-devl mailing list Synfig-devl@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Keep preview window above
Author: Yu Chen
Date: Thu Jan 26 22:44:03 2012 +0800
Keep preview window above
---
synfig-studio/src/gui/dialogs/dialog_preview.cpp |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/synfig-studio/src/gui/dialogs/dialog_preview.cpp
b/synfig-studio/src/gui/dialogs/dialog_preview.cpp
index 65ebe59..eb556a5 100644
--- a/synfig-studio/src/gui/dialogs/dialog_preview.cpp
+++ b/synfig-studio/src/gui/dialogs/dialog_preview.cpp
@@ -63,6 +63,7 @@ Dialog_Preview::Dialog_Preview()
settings(this,"preview")
{
set_title(_("Preview Window"));
+ set_keep_above();
add(preview_table);
preview_table.attach(preview, 0, 1, 0, 1);
show_all_children();
--
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
___
Synfig-devl mailing list
Synfig-devl@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Add extra sapce between diff button groups for a more clear UI layout
Author: Yu Chen Date: Thu Jan 26 09:52:30 2012 +0800 Add extra sapce between diff button groups for a more clear UI layout --- synfig-studio/src/gui/canvasview.cpp | 10 +- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/synfig-studio/src/gui/canvasview.cpp b/synfig-studio/src/gui/canvasview.cpp index 4dd81a8..fceb7be 100644 --- a/synfig-studio/src/gui/canvasview.cpp +++ b/synfig-studio/src/gui/canvasview.cpp @@ -1267,18 +1267,18 @@ CanvasView::create_display_bar() displaybar->attach(*toggleducksdial, 0, 1, 0, 1, Gtk::SHRINK, Gtk::SHRINK); - displaybar->attach(*separator1, 1, 2, 0, 1, Gtk::FILL, Gtk::FILL); + displaybar->attach(*separator1, 1, 2, 0, 1, Gtk::FILL, Gtk::FILL, 8); displaybar->attach(*resolutiondial, 2, 3, 0, 1, Gtk::SHRINK, Gtk::SHRINK); - displaybar->attach(*separator2, 3, 4, 0, 1, Gtk::FILL, Gtk::FILL); + displaybar->attach(*separator2, 3, 4, 0, 1, Gtk::FILL, Gtk::FILL, 8); displaybar->attach(*quality_spin, 4, 5, 0, 1, Gtk::SHRINK, Gtk::SHRINK); - displaybar->attach(*separator3, 5, 6, 0, 1, Gtk::FILL, Gtk::FILL); + displaybar->attach(*separator3, 5, 6, 0, 1, Gtk::FILL, Gtk::FILL, 8); displaybar->attach(*show_grid, 6, 7, 0, 1, Gtk::SHRINK, Gtk::SHRINK); displaybar->attach(*snap_grid, 7, 8, 0, 1, Gtk::SHRINK, Gtk::SHRINK); - displaybar->attach(*separator4, 8, 9, 0, 1, Gtk::FILL, Gtk::FILL); + displaybar->attach(*separator4, 8, 9, 0, 1, Gtk::FILL, Gtk::FILL, 8); displaybar->attach(*past_onion_spin, 9, 10, 0, 1, Gtk::SHRINK, Gtk::SHRINK); displaybar->attach(*onion_skin, 10, 11, 0, 1, Gtk::SHRINK, Gtk::SHRINK); displaybar->attach(*future_onion_spin, 11, 12, 0, 1, Gtk::SHRINK, Gtk::SHRINK); - displaybar->attach(*separator5, 12, 13, 0, 1, Gtk::FILL, Gtk::FILL); + displaybar->attach(*separator5, 12, 13, 0, 1, Gtk::FILL, Gtk::FILL, 8); displaybar->attach(*render_options_button, 13, 14, 0, 1, Gtk::SHRINK, Gtk::SHRINK); displaybar->attach(*preview_options_button, 14, 15, 0, 1, Gtk::SHRINK, Gtk::SHRINK); -- Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 ___ Synfig-devl mailing list Synfig-devl@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Merge branch 'jcome_preview_window' into jcome
Author: Yu Chen Date: Thu Jan 26 01:33:48 2012 +0800 Merge branch 'jcome_preview_window' into jcome --- -- Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 ___ Synfig-devl mailing list Synfig-devl@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Merge branch 'master' into jcome
Author: Yu Chen Date: Thu Jan 26 01:33:34 2012 +0800 Merge branch 'master' into jcome --- -- Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 ___ Synfig-devl mailing list Synfig-devl@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Merge git://synfig.git.sourceforge.net/gitroot/synfig/synfig
Author: Yu Chen Date: Thu Jan 26 01:33:11 2012 +0800 Merge git://synfig.git.sourceforge.net/gitroot/synfig/synfig --- -- Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 ___ Synfig-devl mailing list Synfig-devl@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Place preview content in the center of preview window
Author: Yu Chen Date: Tue Jan 10 00:18:31 2012 +0800 Place preview content in the center of preview window --- synfig-studio/src/gui/preview.cpp |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/synfig-studio/src/gui/preview.cpp b/synfig-studio/src/gui/preview.cpp index 7f232d2..c02f859 100644 --- a/synfig-studio/src/gui/preview.cpp +++ b/synfig-studio/src/gui/preview.cpp @@ -593,7 +593,8 @@ bool studio::Widget_Preview::redraw(GdkEventExpose */*heh*/) Gdk::Cairo::set_source_pixbuf( cr, //cairo context pxnew, //pixbuf - 0, 0 //coordinates to place upper left corner of pixbuf + //coordinates to place center of the preview window + (draw_area.get_width() - nw) / 2, (draw_area.get_height() - nh) / 2 ); cr->paint(); cr->restore(); -- Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 ___ Synfig-devl mailing list Synfig-devl@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Remove the experienced code
Author: Yu Chen
Date: Tue Jan 10 00:05:03 2012 +0800
Remove the experienced code
---
synfig-studio/src/gui/preview.cpp |4 +---
synfig-studio/src/gui/preview.h |1 -
2 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/synfig-studio/src/gui/preview.cpp
b/synfig-studio/src/gui/preview.cpp
index 625a7f6..7f232d2 100644
--- a/synfig-studio/src/gui/preview.cpp
+++ b/synfig-studio/src/gui/preview.cpp
@@ -299,7 +299,6 @@ void studio::Preview::frame_finish(const Preview_Target
*targ)
Widget_Preview::Widget_Preview():
Gtk::Table(1, 5),
- align_preview(0.5, 0.5, 0.8, 0.8),
adj_time_scrub(0, 0, 1000, 0, 10, 0),
scr_time_scrub(adj_time_scrub),
b_loop(/*_("Loop")*/),
@@ -428,8 +427,7 @@ Widget_Preview::Widget_Preview():
disp_sound.set_size_request(-1,32);
// attach all widgets
- attach(align_preview, 0, 1, 0, 1, Gtk::EXPAND|Gtk::FILL,
Gtk::EXPAND|Gtk::FILL, 8);
- align_preview.add(draw_area);
+ attach(draw_area, 0, 1, 0, 1, Gtk::EXPAND|Gtk::FILL,
Gtk::EXPAND|Gtk::FILL, 0);
attach(scr_time_scrub, 0, 1, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK);
attach(*controller, 0, 1, 2, 3, Gtk::EXPAND|Gtk::FILL,
Gtk::SHRINK|Gtk::FILL);
attach(*lastrendered, 0, 1, 3, 4, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK);
diff --git a/synfig-studio/src/gui/preview.h b/synfig-studio/src/gui/preview.h
index a996ede..65d3cde 100644
--- a/synfig-studio/src/gui/preview.h
+++ b/synfig-studio/src/gui/preview.h
@@ -166,7 +166,6 @@ public:
class Widget_Preview : public Gtk::Table
{
- Gtk::Alignment align_preview;
Gtk::DrawingAreadraw_area;
Gtk::Adjustment adj_time_scrub; //the adjustment for the
managed scrollbar
// Gtk::HScrollbar scr_time_scrub;
--
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
___
Synfig-devl mailing list
Synfig-devl@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Replace vertical line with whitespace to group up lockkeyframe buttons and animate mode button
Author: Yu Chen Date: Tue Jan 3 16:04:51 2012 +0800 Replace vertical line with whitespace to group up lockkeyframe buttons and animate mode button --- synfig-studio/src/gui/canvasview.cpp |7 --- synfig-studio/src/gui/canvasview.h |1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/synfig-studio/src/gui/canvasview.cpp b/synfig-studio/src/gui/canvasview.cpp index 74ce9a1..3726a99 100644 --- a/synfig-studio/src/gui/canvasview.cpp +++ b/synfig-studio/src/gui/canvasview.cpp @@ -1050,8 +1050,9 @@ CanvasView::create_time_bar() timeslider->set_size_request(-1,header_height-header_height/3+1); widget_kf_list->set_size_request(-1,header_height/3+1); - Gtk::VSeparator *separator1 = Gtk::manage(new class Gtk::VSeparator()); -separator1->show(); + Gtk::Alignment *space = Gtk::manage(new Gtk::Alignment()); + space->set_size_request(8); +space->show(); //Attach widgets to the timebar //timebar->attach(*manage(disp_audio), 1, 5, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK); @@ -1061,7 +1062,7 @@ CanvasView::create_time_bar() timebar->attach(*timeslider, 1, 3, 1, 2, Gtk::FILL|Gtk::SHRINK, Gtk::FILL|Gtk::SHRINK); timebar->attach(*time_window_scroll, 2, 3, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK); timebar->attach(*keyframedial, 3, 4, 0, 2, Gtk::SHRINK, Gtk::SHRINK); - timebar->attach(*separator1, 4, 5, 0, 2, Gtk::FILL, Gtk::FILL); + timebar->attach(*space, 4, 5, 0, 2, Gtk::FILL, Gtk::FILL); timebar->attach(*animatebutton, 5, 6, 0, 2, Gtk::SHRINK, Gtk::SHRINK); //timebar->attach(*keyframebutton, 1, 2, 3, 4, Gtk::SHRINK, Gtk::SHRINK); diff --git a/synfig-studio/src/gui/canvasview.h b/synfig-studio/src/gui/canvasview.h index be9ce2f..dadedca 100644 --- a/synfig-studio/src/gui/canvasview.h +++ b/synfig-studio/src/gui/canvasview.h @@ -43,6 +43,7 @@ #include #include #include +#include #include #include -- Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 ___ Synfig-devl mailing list Synfig-devl@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Merge branch 'jcome' into jcome_preview_window
Author: Yu Chen Date: Tue Jan 3 16:07:32 2012 +0800 Merge branch 'jcome' into jcome_preview_window --- -- Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 ___ Synfig-devl mailing list Synfig-devl@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Merge branch 'jcome' into jcome_preview_window
Author: Yu Chen Date: Tue Jan 3 15:31:18 2012 +0800 Merge branch 'jcome' into jcome_preview_window --- -- Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 ___ Synfig-devl mailing list Synfig-devl@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Merge branch 'master' into jcome
Author: Yu Chen Date: Tue Jan 3 15:30:58 2012 +0800 Merge branch 'master' into jcome --- -- Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 ___ Synfig-devl mailing list Synfig-devl@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Use whitespaces to group up the tool buttons, and add an Alignment widget to center preview (draw) area.
Author: Yu Chen
Date: Tue Jan 3 15:11:26 2012 +0800
Use whitespaces to group up the tool buttons, and add an Alignment widget to
center preview (draw) area.
---
synfig-studio/src/gui/preview.cpp | 27 +++
synfig-studio/src/gui/preview.h |2 ++
2 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/synfig-studio/src/gui/preview.cpp
b/synfig-studio/src/gui/preview.cpp
index 77420c2..625a7f6 100644
--- a/synfig-studio/src/gui/preview.cpp
+++ b/synfig-studio/src/gui/preview.cpp
@@ -298,7 +298,8 @@ void studio::Preview::frame_finish(const Preview_Target
*targ)
icon->show();
Widget_Preview::Widget_Preview():
- Gtk::Table(1, 5, false),
+ Gtk::Table(1, 5),
+ align_preview(0.5, 0.5, 0.8, 0.8),
adj_time_scrub(0, 0, 1000, 0, 10, 0),
scr_time_scrub(adj_time_scrub),
b_loop(/*_("Loop")*/),
@@ -375,21 +376,22 @@ Widget_Preview::Widget_Preview():
controller->pack_start(*next_framebutton, Gtk::PACK_SHRINK, 0);
- //separator
-Gtk::VSeparator *vsep1 = manage(new Gtk::VSeparator);
-// vsep1->set_visible(false);
- controller->pack_start(*vsep1,Gtk::PACK_SHRINK, 4);
- vsep1->set_visible(Gtk::VISIBILITY_NONE);
+ //spacing
+ Gtk::Alignment *space = Gtk::manage(new Gtk::Alignment());
+ space->set_size_request(8);
+ controller->pack_start(*space, false, true);
+
//loop
button = &b_loop;
IMAGIFY_BUTTON(button,"synfig-animate_loop", _("Loop"));
controller->pack_start(b_loop, Gtk::PACK_SHRINK,0);
- // separator
- Gtk::VSeparator *vsep = manage(new Gtk::VSeparator);
+ //spacing
+ Gtk::Alignment *space1 = Gtk::manage(new Gtk::Alignment());
+space1->set_size_request(24);
+controller->pack_start(*space1, false, true);
- controller->pack_start(*vsep,Gtk::PACK_SHRINK, 12);
//halt render
button = manage(new Gtk::Button(/*_("Halt Render")*/));
@@ -426,7 +428,8 @@ Widget_Preview::Widget_Preview():
disp_sound.set_size_request(-1,32);
// attach all widgets
- attach(draw_area, 0, 1, 0, 1);
+ attach(align_preview, 0, 1, 0, 1, Gtk::EXPAND|Gtk::FILL,
Gtk::EXPAND|Gtk::FILL, 8);
+ align_preview.add(draw_area);
attach(scr_time_scrub, 0, 1, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK);
attach(*controller, 0, 1, 2, 3, Gtk::EXPAND|Gtk::FILL,
Gtk::SHRINK|Gtk::FILL);
attach(*lastrendered, 0, 1, 3, 4, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK);
@@ -601,8 +604,8 @@ bool studio::Widget_Preview::redraw(GdkEventExpose */*heh*/)
{
Glib::RefPtr
layout(Pango::Layout::create(get_pango_context()));
Glib::ustring
timecode(Time((double)timedisp).round(preview->get_global_fps())
-
.get_string(preview->get_global_fps(),
-
App::get_time_format()));
+ .get_string(preview->get_global_fps(),
+ App::get_time_format()));
//synfig::info("Time for preview draw is: %s for time
%g", timecode.c_str(), adj_time_scrub.get_value());
cr->save();
diff --git a/synfig-studio/src/gui/preview.h b/synfig-studio/src/gui/preview.h
index a8c7767..a996ede 100644
--- a/synfig-studio/src/gui/preview.h
+++ b/synfig-studio/src/gui/preview.h
@@ -39,6 +39,7 @@
#include
#include
#include
+#include
#include
#include
@@ -165,6 +166,7 @@ public:
class Widget_Preview : public Gtk::Table
{
+ Gtk::Alignment align_preview;
Gtk::DrawingAreadraw_area;
Gtk::Adjustment adj_time_scrub; //the adjustment for the
managed scrollbar
// Gtk::HScrollbar scr_time_scrub;
--
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
___
Synfig-devl mailing list
Synfig-devl@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Code cleanup
Author: Yu Chen
Date: Sat Dec 31 23:55:53 2011 +0800
Code cleanup
---
synfig-studio/src/gui/preview.cpp | 43
1 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/synfig-studio/src/gui/preview.cpp
b/synfig-studio/src/gui/preview.cpp
index e115fef..77420c2 100644
--- a/synfig-studio/src/gui/preview.cpp
+++ b/synfig-studio/src/gui/preview.cpp
@@ -298,13 +298,13 @@ void studio::Preview::frame_finish(const Preview_Target
*targ)
icon->show();
Widget_Preview::Widget_Preview():
- Gtk::Table(5, 4, false),
- adj_time_scrub(0,0,1000,0,10,0),
+ Gtk::Table(1, 5, false),
+ adj_time_scrub(0, 0, 1000, 0, 10, 0),
scr_time_scrub(adj_time_scrub),
b_loop(/*_("Loop")*/),
currentindex(0),
audiotime(0),
- adj_sound(0,0,4),
+ adj_sound(0, 0, 4),
l_lasttime("0s"),
playing(false)
{
@@ -371,50 +371,55 @@ Widget_Preview::Widget_Preview():
next_framebutton->add(*icon2);
next_framebutton->set_relief(Gtk::RELIEF_NONE);
next_framebutton->show();
-
next_framebutton->signal_clicked().connect(sigc::bind(sigc::mem_fun(*this,&Widget_Preview::seek_frame),1));
+
next_framebutton->signal_clicked().connect(sigc::bind(sigc::mem_fun(*this,&Widget_Preview::seek_frame),
1));
controller->pack_start(*next_framebutton, Gtk::PACK_SHRINK, 0);
- //todo: add a space between next frame button and loop button
-
+ //separator
+Gtk::VSeparator *vsep1 = manage(new Gtk::VSeparator);
+// vsep1->set_visible(false);
+ controller->pack_start(*vsep1,Gtk::PACK_SHRINK, 4);
+ vsep1->set_visible(Gtk::VISIBILITY_NONE);
+
+ //loop
button = &b_loop;
- IMAGIFY_BUTTON(button,"synfig-animate_loop",_("Loop"));
- controller->pack_start(b_loop,Gtk::PACK_SHRINK,0);
+ IMAGIFY_BUTTON(button,"synfig-animate_loop", _("Loop"));
+ controller->pack_start(b_loop, Gtk::PACK_SHRINK,0);
// separator
Gtk::VSeparator *vsep = manage(new Gtk::VSeparator);
- controller->pack_start(*vsep,Gtk::PACK_SHRINK,0);
+ controller->pack_start(*vsep,Gtk::PACK_SHRINK, 12);
//halt render
button = manage(new Gtk::Button(/*_("Halt Render")*/));
button->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::stoprender));
- IMAGIFY_BUTTON(button,Gtk::Stock::STOP,_("Halt render"));
+ IMAGIFY_BUTTON(button,Gtk::Stock::STOP, _("Halt render"));
- controller->pack_start(*button,Gtk::PACK_SHRINK,0);
+ controller->pack_start(*button, Gtk::PACK_SHRINK, 0);
//re-preview
button = manage(new Gtk::Button(/*_("Re-Preview")*/));
button->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::repreview));
- IMAGIFY_BUTTON(button,Gtk::Stock::EDIT,_("Re-preview"));
+ IMAGIFY_BUTTON(button, Gtk::Stock::EDIT, _("Re-preview"));
- controller->pack_start(*button,Gtk::PACK_SHRINK,0);
+ controller->pack_start(*button, Gtk::PACK_SHRINK, 0);
//erase all
button = manage(new Gtk::Button(/*_("Erase All")*/));
button->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::eraseall));
- IMAGIFY_BUTTON(button,Gtk::Stock::CLEAR,_("Erase all rendered
frame(s)"));
+ IMAGIFY_BUTTON(button, Gtk::Stock::CLEAR, _("Erase all rendered
frame(s)"));
- controller->pack_start(*button,Gtk::PACK_SHRINK,0);
+ controller->pack_start(*button, Gtk::PACK_SHRINK, 0);
controller->show_all();
//3rd row: last rendered frame
Gtk::HBox *lastrendered = manage(new Gtk::HBox);
Gtk::Label *label = manage(new Gtk::Label(_("Last rendered: ")));
- lastrendered->pack_start(*label,Gtk::PACK_SHRINK,10);
+ lastrendered->pack_start(*label, Gtk::PACK_SHRINK, 10);
//l_lasttime.show();
- lastrendered->pack_start(l_lasttime,Gtk::PACK_SHRINK,0);
+ lastrendered->pack_start(l_lasttime, Gtk::PACK_SHRINK, 0);
lastrendered->show_all();
//5th row: sound track
@@ -423,8 +428,8 @@ Widget_Preview::Widget_Preview():
// attach all widgets
attach(draw_area, 0, 1, 0, 1);
attach(scr_time_scrub, 0, 1, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK);
- attach(*controller,0,1,2,3,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK|Gtk::FILL);
- attach(*lastrendered,0,1,3,4,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK);
+ attach(*controller, 0, 1, 2, 3, Gtk::EXPAND|Gtk::FILL,
Gtk::SHRINK|Gtk::FILL);
+ attach(*lastrendered, 0, 1, 3, 4, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK);
// attach(disp_sound,0,1,4,5,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK);
show_all();
--
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus
[Synfig-devl] Yu Chen : Replace dialog with window widget for preview window so that we have a close button available on all platform
Author: Yu Chen
Date: Sat Dec 31 10:40:59 2011 +0800
Replace dialog with window widget for preview window so that we have a close
button available on all platform
---
synfig-studio/src/gui/dialogs/dialog_preview.cpp | 10 +++---
synfig-studio/src/gui/dialogs/dialog_preview.h |8 +++-
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/synfig-studio/src/gui/dialogs/dialog_preview.cpp
b/synfig-studio/src/gui/dialogs/dialog_preview.cpp
index e9e4cc3..65ebe59 100644
--- a/synfig-studio/src/gui/dialogs/dialog_preview.cpp
+++ b/synfig-studio/src/gui/dialogs/dialog_preview.cpp
@@ -59,10 +59,14 @@ using namespace Gtk;
//dialog_preview stuff...
Dialog_Preview::Dialog_Preview()
-:Dialog(_("Preview Window"),false,true),
+:preview_table(1, 1, true),
settings(this,"preview")
{
- get_vbox()->pack_start(preview);
+ set_title(_("Preview Window"));
+ add(preview_table);
+ preview_table.attach(preview, 0, 1, 0, 1);
+ show_all_children();
+
}
Dialog_Preview::~Dialog_Preview()
@@ -78,7 +82,7 @@ void Dialog_Preview::set_preview(etl::handle prev)
void Dialog_Preview::on_hide()
{
- Dialog::on_hide();
+ Window::on_hide();
preview.pause();
preview.stoprender();
}
diff --git a/synfig-studio/src/gui/dialogs/dialog_preview.h
b/synfig-studio/src/gui/dialogs/dialog_preview.h
index 72ba7b0..03aad73 100644
--- a/synfig-studio/src/gui/dialogs/dialog_preview.h
+++ b/synfig-studio/src/gui/dialogs/dialog_preview.h
@@ -51,7 +51,7 @@ struct PreviewInfo
bool overbegin,overend;
};
-class Dialog_Preview : public Gtk::Dialog
+class Dialog_Preview : public Gtk::Window
{
Widget_Preview preview;
DialogSettings settings;
@@ -69,6 +69,12 @@ public:
virtual void on_hide();
//other forwarding functions...
+
+ //child widgets:
+
+protected:
+ Gtk::Table preview_table;
+
}; // END of Dialog_Preview
class Dialog_PreviewOptions : public Gtk::Dialog
--
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
___
Synfig-devl mailing list
Synfig-devl@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Merge git://synfig.git.sourceforge.net/gitroot/synfig/synfig
Author: Yu Chen Date: Sat Dec 31 08:21:20 2011 +0800 Merge git://synfig.git.sourceforge.net/gitroot/synfig/synfig --- -- Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 ___ Synfig-devl mailing list Synfig-devl@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Cleanup code
Author: Yu Chen Date: Fri Dec 30 06:12:46 2011 +0800 Cleanup code --- synfig-studio/src/gui/preview.cpp | 15 --- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/synfig-studio/src/gui/preview.cpp b/synfig-studio/src/gui/preview.cpp index a83862c..e115fef 100644 --- a/synfig-studio/src/gui/preview.cpp +++ b/synfig-studio/src/gui/preview.cpp @@ -325,21 +325,6 @@ Widget_Preview::Widget_Preview(): disp_sound.signal_start_scrubbing().connect(sigc::mem_fun(*this,&Widget_Preview::scrub_updated)); disp_sound.signal_scrub().connect(sigc::mem_fun(*this,&Widget_Preview::scrub_updated)); - /* - - - | | - | | - | | - | | - | | - | | - | | - - - |loop|play|stop | hbox - |lastl|lastt|rerender|haltrend | hbox - | - |sound | - */ Gtk::Button *button = 0; Gtk::Image *icon = 0; -- Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 ___ Synfig-devl mailing list Synfig-devl@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Improve tooltips according HIG
Author: Yu Chen
Date: Fri Dec 30 05:45:51 2011 +0800
Improve tooltips according HIG
---
synfig-studio/src/gui/preview.cpp |8
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/synfig-studio/src/gui/preview.cpp
b/synfig-studio/src/gui/preview.cpp
index 5005a4e..a83862c 100644
--- a/synfig-studio/src/gui/preview.cpp
+++ b/synfig-studio/src/gui/preview.cpp
@@ -404,21 +404,21 @@ Widget_Preview::Widget_Preview():
//halt render
button = manage(new Gtk::Button(/*_("Halt Render")*/));
button->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::stoprender));
- IMAGIFY_BUTTON(button,Gtk::Stock::STOP,_("Halt Render"));
+ IMAGIFY_BUTTON(button,Gtk::Stock::STOP,_("Halt render"));
controller->pack_start(*button,Gtk::PACK_SHRINK,0);
//re-preview
button = manage(new Gtk::Button(/*_("Re-Preview")*/));
button->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::repreview));
- IMAGIFY_BUTTON(button,Gtk::Stock::EDIT,_("Re-Preview"));
+ IMAGIFY_BUTTON(button,Gtk::Stock::EDIT,_("Re-preview"));
controller->pack_start(*button,Gtk::PACK_SHRINK,0);
//erase all
button = manage(new Gtk::Button(/*_("Erase All")*/));
button->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::eraseall));
- IMAGIFY_BUTTON(button,Gtk::Stock::CLEAR,_("Erase All"));
+ IMAGIFY_BUTTON(button,Gtk::Stock::CLEAR,_("Erase all rendered
frame(s)"));
controller->pack_start(*button,Gtk::PACK_SHRINK,0);
@@ -426,7 +426,7 @@ Widget_Preview::Widget_Preview():
//3rd row: last rendered frame
Gtk::HBox *lastrendered = manage(new Gtk::HBox);
- Gtk::Label *label = manage(new Gtk::Label(_("Last Rendered: ")));
+ Gtk::Label *label = manage(new Gtk::Label(_("Last rendered: ")));
lastrendered->pack_start(*label,Gtk::PACK_SHRINK,10);
//l_lasttime.show();
lastrendered->pack_start(l_lasttime,Gtk::PACK_SHRINK,0);
--
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
___
Synfig-devl mailing list
Synfig-devl@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Cleanup code
Author: Yu Chen
Date: Fri Dec 30 05:41:06 2011 +0800
Cleanup code
---
synfig-studio/src/gui/preview.cpp | 95 +
1 files changed, 44 insertions(+), 51 deletions(-)
diff --git a/synfig-studio/src/gui/preview.cpp
b/synfig-studio/src/gui/preview.cpp
index 0268713..5005a4e 100644
--- a/synfig-studio/src/gui/preview.cpp
+++ b/synfig-studio/src/gui/preview.cpp
@@ -297,16 +297,16 @@ void studio::Preview::frame_finish(const Preview_Target
*targ)
icon->set_padding(0,0); \
icon->show();
-Widget_Preview::Widget_Preview()
-:Gtk::Table(5,4,false),
-adj_time_scrub(0,0,1000,0,10,0),
-scr_time_scrub(adj_time_scrub),
-b_loop(/*_("Loop")*/),
-currentindex(0),
-audiotime(0),
-adj_sound(0,0,4),
-l_lasttime("0s"),
-playing(false)
+Widget_Preview::Widget_Preview():
+ Gtk::Table(5, 4, false),
+ adj_time_scrub(0,0,1000,0,10,0),
+ scr_time_scrub(adj_time_scrub),
+ b_loop(/*_("Loop")*/),
+ currentindex(0),
+ audiotime(0),
+ adj_sound(0,0,4),
+ l_lasttime("0s"),
+ playing(false)
{
//connect to expose events
//signal_expose_event().connect(sigc::mem_fun(*this,
&studio::Widget_Preview::redraw));
@@ -341,21 +341,14 @@ playing(false)
|sound |
*/
- Gtk::HBox *hbox = 0;
Gtk::Button *button = 0;
Gtk::Image *icon = 0;
- //should set up the dialog using attach etc.
- attach(draw_area, 0, 1, 0, 1);
- attach(scr_time_scrub, 0, 1, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK);
-
#if 1
- //2nd row
- hbox = manage(new Gtk::HBox);
+ //2nd row: prevframe play/pause nextframe loop | halt-render re-preview
erase-all
+ Gtk::HBox *controller = manage(new Gtk::HBox);
- //prevframe play/pause nextframe buttons
-
//prev rendered frame
Gtk::Button *prev_framebutton;
Gtk::Image *icon0 = manage(new
Gtk::Image(Gtk::StockID("synfig-animate_seek_prev_frame"),
Gtk::ICON_SIZE_BUTTON));
@@ -368,7 +361,7 @@ playing(false)
prev_framebutton->show();
prev_framebutton->signal_clicked().connect(sigc::bind(sigc::mem_fun(*this,&Widget_Preview::seek_frame),
-1));
- hbox->pack_start(*prev_framebutton, Gtk::PACK_SHRINK, 0);
+ controller->pack_start(*prev_framebutton, Gtk::PACK_SHRINK, 0);
//play pause
Gtk::Image *icon1 = manage(new
Gtk::Image(Gtk::StockID("synfig-animate_play"), Gtk::ICON_SIZE_BUTTON));
@@ -380,7 +373,8 @@ playing(false)
play_pausebutton->set_relief(Gtk::RELIEF_NONE);
play_pausebutton->show();
play_pausebutton->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::on_play_pause_pressed));
- hbox->pack_start(*play_pausebutton, Gtk::PACK_SHRINK, 0);
+
+ controller->pack_start(*play_pausebutton, Gtk::PACK_SHRINK, 0);
//next rendered frame
Gtk::Button *next_framebutton;
@@ -394,60 +388,59 @@ playing(false)
next_framebutton->show();
next_framebutton->signal_clicked().connect(sigc::bind(sigc::mem_fun(*this,&Widget_Preview::seek_frame),1));
- hbox->pack_start(*next_framebutton, Gtk::PACK_SHRINK, 0);
+ controller->pack_start(*next_framebutton, Gtk::PACK_SHRINK, 0);
- //space between next frame button and loop button
+ //todo: add a space between next frame button and loop button
button = &b_loop;
IMAGIFY_BUTTON(button,"synfig-animate_loop",_("Loop"));
- hbox->pack_start(b_loop,Gtk::PACK_SHRINK,0);
- //attach(b_loop,0,1,2,3,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK);
+ controller->pack_start(b_loop,Gtk::PACK_SHRINK,0);
- //attack the stop render and erase all buttons to same line...
-
+ // separator
Gtk::VSeparator *vsep = manage(new Gtk::VSeparator);
- hbox->pack_start(*vsep,Gtk::PACK_SHRINK,0);
+ controller->pack_start(*vsep,Gtk::PACK_SHRINK,0);
+ //halt render
button = manage(new Gtk::Button(/*_("Halt Render")*/));
button->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::stoprender));
IMAGIFY_BUTTON(button,Gtk::Stock::STOP,_("Halt Render"));
- hbox->pack_start(*button,Gtk::PACK_SHRINK,0);
- //attach(*button,2,3,3,4,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK);
+ controller->pack_start(*button,Gtk::PACK_SHRINK,0);
+
+ //re-preview
button = manage(new Gtk::Button(/*_("Re-Preview")*/));
button->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::repreview));
IMAGIFY_BUTTON(button,Gtk::Stock::EDIT,_("Re-Preview"));
- hbox->pack_start(*button,Gtk::PACK_SHRINK,0);
- //attach(*button,0,2,4,5,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK);
+ controller->pack_start(*button,Gtk::PACK_SHRINK,0);
+
+ //erase all
button = manage(new Gtk::Button(/*_("Erase All")*/));
button->signal_clicked().connect(sigc:
[Synfig-devl] Yu Chen : Add (back) the pause palying when seek frame pressed
Author: Yu Chen
Date: Sun Dec 11 19:18:19 2011 +0800
Add (back) the pause palying when seek frame pressed
---
synfig-studio/src/gui/preview.cpp |3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/synfig-studio/src/gui/preview.cpp
b/synfig-studio/src/gui/preview.cpp
index 10bc916..0268713 100644
--- a/synfig-studio/src/gui/preview.cpp
+++ b/synfig-studio/src/gui/preview.cpp
@@ -879,6 +879,9 @@ void studio::Widget_Preview::on_play_pause_pressed()
void studio::Widget_Preview::seek_frame(int frames)
{
// if(!frames) return;
+
+ if(playing) pause();//pause playing when seek frame called
+
float fps = preview->get_fps();
float currenttime = adj_time_scrub.get_value();
Time newtime(currenttime+(float)frames/fps);
--
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
___
Synfig-devl mailing list
Synfig-devl@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Use one function for previous/next rendered frame
Author: Yu Chen
Date: Sat Dec 10 20:00:30 2011 +0800
Use one function for previous/next rendered frame
---
synfig-studio/src/gui/preview.cpp | 25 -
synfig-studio/src/gui/preview.h |3 +--
2 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/synfig-studio/src/gui/preview.cpp
b/synfig-studio/src/gui/preview.cpp
index 33e054e..10bc916 100644
--- a/synfig-studio/src/gui/preview.cpp
+++ b/synfig-studio/src/gui/preview.cpp
@@ -366,7 +366,8 @@ playing(false)
prev_framebutton->add(*icon0);
prev_framebutton->set_relief(Gtk::RELIEF_NONE);
prev_framebutton->show();
-
prev_framebutton->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::prev_frame));
+
prev_framebutton->signal_clicked().connect(sigc::bind(sigc::mem_fun(*this,&Widget_Preview::seek_frame),
-1));
+
hbox->pack_start(*prev_framebutton, Gtk::PACK_SHRINK, 0);
//play pause
@@ -391,7 +392,8 @@ playing(false)
next_framebutton->add(*icon2);
next_framebutton->set_relief(Gtk::RELIEF_NONE);
next_framebutton->show();
-
next_framebutton->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::next_frame));
+
next_framebutton->signal_clicked().connect(sigc::bind(sigc::mem_fun(*this,&Widget_Preview::seek_frame),1));
+
hbox->pack_start(*next_framebutton, Gtk::PACK_SHRINK, 0);
//space between next frame button and loop button
@@ -874,18 +876,15 @@ void studio::Widget_Preview::on_play_pause_pressed()
if(play_flag) play(); else pause();
}
-void studio::Widget_Preview::next_frame()
-{
- if(playing) pause();
- float rate = preview->get_fps();
-
adj_time_scrub.set_value((adj_time_scrub.get_value()*rate+1.01)/rate);
-}
-
-void studio::Widget_Preview::prev_frame()
+void studio::Widget_Preview::seek_frame(int frames)
{
- if(playing) pause();
- float rate = preview->get_fps();
-
adj_time_scrub.set_value((adj_time_scrub.get_value()*rate-0.9)/rate);
+// if(!frames) return;
+ float fps = preview->get_fps();
+ float currenttime = adj_time_scrub.get_value();
+ Time newtime(currenttime+(float)frames/fps);
+ newtime = newtime.round(fps);
+
+ adj_time_scrub.set_value(newtime);
}
bool studio::Widget_Preview::scroll_move_event(GdkEvent *event)
diff --git a/synfig-studio/src/gui/preview.h b/synfig-studio/src/gui/preview.h
index a194c33..a8c7767 100644
--- a/synfig-studio/src/gui/preview.h
+++ b/synfig-studio/src/gui/preview.h
@@ -245,8 +245,7 @@ public:
void on_play_pause_pressed();
- void prev_frame();
- void next_frame();
+ void seek_frame(int frames);
void stoprender();
--
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
___
Synfig-devl mailing list
Synfig-devl@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Merge github.com:jcome/synfig_jcome into jcome_preview_window
Author: Yu Chen Date: Wed Dec 7 22:44:24 2011 +0800 Merge github.com:jcome/synfig_jcome into jcome_preview_window --- -- Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 ___ Synfig-devl mailing list Synfig-devl@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Merge github.com:jcome/synfig_jcome
Author: Yu Chen Date: Wed Dec 7 22:36:50 2011 +0800 Merge github.com:jcome/synfig_jcome --- -- Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 ___ Synfig-devl mailing list Synfig-devl@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Merge github.com:jcome/synfig_jcome into jcome_preview_window
Author: Yu Chen Date: Wed Dec 7 22:00:27 2011 +0800 Merge github.com:jcome/synfig_jcome into jcome_preview_window --- -- Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 ___ Synfig-devl mailing list Synfig-devl@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Merge branch 'master' of git://synfig.git.sourceforge.net/gitroot /synfig/synfig
Author: Yu Chen Date: Wed Dec 7 21:18:04 2011 +0800 Merge branch 'master' of git://synfig.git.sourceforge.net/gitroot/synfig/synfig --- -- Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 ___ Synfig-devl mailing list Synfig-devl@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Fix po file head issues caused by transifex.
Author: Yu Chen Date: Sat Dec 3 18:11:36 2011 +0800 Fix po file head issues caused by transifex. --- synfig-core/po/de.po | 422 +++-- synfig-core/po/en_GB.po | 418 +++-- synfig-core/po/es.po | 424 +++-- synfig-core/po/fa_IR.po | 411 ++-- synfig-core/po/fr.po | 487 --- synfig-core/po/it.po | 483 --- synfig-core/po/lt.po | 948 +++-- synfig-core/po/nl.po | 413 +++-- synfig-core/po/no_NO.po | 411 ++-- synfig-core/po/pl_PL.po | 415 +++-- synfig-core/po/pt_BR.po | 421 +++-- synfig-core/po/ro.po | 413 +++-- synfig-core/po/ru.po | 417 +++-- synfig-core/po/sk_SK.po | 413 +++-- synfig-core/po/zh_CN.po | 419 +++-- synfig-studio/po/ca.po| 596 +++- synfig-studio/po/de.po| 614 - synfig-studio/po/en_GB.po | 621 -- synfig-studio/po/es.po| 621 -- synfig-studio/po/fa_IR.po | 590 +++- synfig-studio/po/fr.po| 621 -- synfig-studio/po/it.po| 616 -- synfig-studio/po/lt.po| 538 +++--- synfig-studio/po/pt_BR.po | 609 - synfig-studio/po/ru.po| 539 +++--- synfig-studio/po/sk_SK.po | 597 - synfig-studio/po/zh_CN.po | 615 - 27 files changed, 7548 insertions(+), 6544 deletions(-) Diff: http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig/synfig;a=commitdiff;h=40ffc6a4716da5cc5e92820927fe8e87b288bd87 -- Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 ___ Synfig-devl mailing list Synfig-devl@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Add a new tanslation el_GR for Synfig Core
Author: Yu Chen Date: Sat Dec 3 18:10:35 2011 +0800 Add a new tanslation el_GR for Synfig Core --- synfig-core/configure.ac |2 +- synfig-core/po/el_GR.po | 4442 ++ 2 files changed, 4443 insertions(+), 1 deletions(-) Diff: http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig/synfig;a=commitdiff;h=a11b582e0dade47d71823ebbd5a3f753a549d4f9 -- Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 ___ Synfig-devl mailing list Synfig-devl@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Pause the playing when prev/next rendered frame button pressed.
Author: Yu Chen
Date: Mon Nov 28 21:21:42 2011 +0800
Pause the playing when prev/next rendered frame button pressed.
---
synfig-studio/src/gui/preview.cpp |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/synfig-studio/src/gui/preview.cpp
b/synfig-studio/src/gui/preview.cpp
index a3fe461..33e054e 100644
--- a/synfig-studio/src/gui/preview.cpp
+++ b/synfig-studio/src/gui/preview.cpp
@@ -876,12 +876,14 @@ void studio::Widget_Preview::on_play_pause_pressed()
void studio::Widget_Preview::next_frame()
{
+ if(playing) pause();
float rate = preview->get_fps();
adj_time_scrub.set_value((adj_time_scrub.get_value()*rate+1.01)/rate);
}
void studio::Widget_Preview::prev_frame()
{
+ if(playing) pause();
float rate = preview->get_fps();
adj_time_scrub.set_value((adj_time_scrub.get_value()*rate-0.9)/rate);
}
--
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
___
Synfig-devl mailing list
Synfig-devl@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Remove blank line.
Author: Yu Chen
Date: Mon Nov 28 21:13:36 2011 +0800
Remove blank line.
---
synfig-studio/src/gui/preview.cpp |1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/synfig-studio/src/gui/preview.cpp
b/synfig-studio/src/gui/preview.cpp
index 773a2d4..a3fe461 100644
--- a/synfig-studio/src/gui/preview.cpp
+++ b/synfig-studio/src/gui/preview.cpp
@@ -878,7 +878,6 @@ void studio::Widget_Preview::next_frame()
{
float rate = preview->get_fps();
adj_time_scrub.set_value((adj_time_scrub.get_value()*rate+1.01)/rate);
-
}
void studio::Widget_Preview::prev_frame()
--
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
___
Synfig-devl mailing list
Synfig-devl@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Merge branch 'master' of git://synfig.git.sourceforge.net/gitroot /synfig/synfig
Author: Yu Chen Date: Mon Nov 28 09:08:40 2011 +0800 Merge branch 'master' of git://synfig.git.sourceforge.net/gitroot/synfig/synfig --- -- Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 ___ Synfig-devl mailing list Synfig-devl@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Add seek to previous and next rendered frame buttons since scrollbar is replaced with scale widget
Author: Yu Chen
Date: Mon Nov 28 09:04:29 2011 +0800
Add seek to previous and next rendered frame buttons since scrollbar is
replaced with scale widget
---
synfig-studio/src/gui/preview.cpp | 45 -
synfig-studio/src/gui/preview.h |3 ++
2 files changed, 47 insertions(+), 1 deletions(-)
diff --git a/synfig-studio/src/gui/preview.cpp
b/synfig-studio/src/gui/preview.cpp
index ff5655d..773a2d4 100644
--- a/synfig-studio/src/gui/preview.cpp
+++ b/synfig-studio/src/gui/preview.cpp
@@ -354,7 +354,22 @@ playing(false)
//2nd row
hbox = manage(new Gtk::HBox);
- //play pause button
+ //prevframe play/pause nextframe buttons
+
+ //prev rendered frame
+ Gtk::Button *prev_framebutton;
+ Gtk::Image *icon0 = manage(new
Gtk::Image(Gtk::StockID("synfig-animate_seek_prev_frame"),
Gtk::ICON_SIZE_BUTTON));
+ prev_framebutton = manage(new class Gtk::Button());
+ prev_framebutton->set_tooltip_text(_("Prev frame"));
+ icon0->set_padding(0,0);
+ icon0->show();
+ prev_framebutton->add(*icon0);
+ prev_framebutton->set_relief(Gtk::RELIEF_NONE);
+ prev_framebutton->show();
+
prev_framebutton->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::prev_frame));
+ hbox->pack_start(*prev_framebutton, Gtk::PACK_SHRINK, 0);
+
+ //play pause
Gtk::Image *icon1 = manage(new
Gtk::Image(Gtk::StockID("synfig-animate_play"), Gtk::ICON_SIZE_BUTTON));
play_pausebutton = manage(new class Gtk::Button());
play_pausebutton->set_tooltip_text(_("Play"));
@@ -366,6 +381,21 @@ playing(false)
play_pausebutton->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::on_play_pause_pressed));
hbox->pack_start(*play_pausebutton, Gtk::PACK_SHRINK, 0);
+ //next rendered frame
+ Gtk::Button *next_framebutton;
+ Gtk::Image *icon2 = manage(new
Gtk::Image(Gtk::StockID("synfig-animate_seek_next_frame"),
Gtk::ICON_SIZE_BUTTON));
+ next_framebutton = manage(new class Gtk::Button());
+ next_framebutton->set_tooltip_text(_("Next frame"));
+ icon2->set_padding(0,0);
+ icon2->show();
+ next_framebutton->add(*icon2);
+ next_framebutton->set_relief(Gtk::RELIEF_NONE);
+ next_framebutton->show();
+
next_framebutton->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::next_frame));
+ hbox->pack_start(*next_framebutton, Gtk::PACK_SHRINK, 0);
+
+ //space between next frame button and loop button
+
button = &b_loop;
IMAGIFY_BUTTON(button,"synfig-animate_loop",_("Loop"));
hbox->pack_start(b_loop,Gtk::PACK_SHRINK,0);
@@ -844,6 +874,19 @@ void studio::Widget_Preview::on_play_pause_pressed()
if(play_flag) play(); else pause();
}
+void studio::Widget_Preview::next_frame()
+{
+ float rate = preview->get_fps();
+
adj_time_scrub.set_value((adj_time_scrub.get_value()*rate+1.01)/rate);
+
+}
+
+void studio::Widget_Preview::prev_frame()
+{
+ float rate = preview->get_fps();
+
adj_time_scrub.set_value((adj_time_scrub.get_value()*rate-0.9)/rate);
+}
+
bool studio::Widget_Preview::scroll_move_event(GdkEvent *event)
{
switch(event->type)
diff --git a/synfig-studio/src/gui/preview.h b/synfig-studio/src/gui/preview.h
index f79e990..a194c33 100644
--- a/synfig-studio/src/gui/preview.h
+++ b/synfig-studio/src/gui/preview.h
@@ -245,6 +245,9 @@ public:
void on_play_pause_pressed();
+ void prev_frame();
+ void next_frame();
+
void stoprender();
sigc::signal&signal_play() {return signal_play_;}
--
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
___
Synfig-devl mailing list
Synfig-devl@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Replace scrollbar with scale widget for time slider.
Author: Yu Chen
Date: Sat Nov 26 20:52:27 2011 +0800
Replace scrollbar with scale widget for time slider.
---
synfig-studio/src/gui/preview.cpp |4 +++-
synfig-studio/src/gui/preview.h |3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/synfig-studio/src/gui/preview.cpp
b/synfig-studio/src/gui/preview.cpp
index c98ead8..ff5655d 100644
--- a/synfig-studio/src/gui/preview.cpp
+++ b/synfig-studio/src/gui/preview.cpp
@@ -299,7 +299,7 @@ void studio::Preview::frame_finish(const Preview_Target
*targ)
Widget_Preview::Widget_Preview()
:Gtk::Table(5,4,false),
-adj_time_scrub(0,0,1000,1,10,0),
+adj_time_scrub(0,0,1000,0,10,0),
scr_time_scrub(adj_time_scrub),
b_loop(/*_("Loop")*/),
currentindex(0),
@@ -315,6 +315,8 @@ playing(false)
adj_time_scrub.signal_value_changed().connect(sigc::mem_fun(*this,&Widget_Preview::slider_move));
scr_time_scrub.signal_event().connect(sigc::mem_fun(*this,&Widget_Preview::scroll_move_event));
draw_area.signal_expose_event().connect(sigc::mem_fun(*this,&Widget_Preview::redraw));
+
+ scr_time_scrub.set_draw_value(0);
disp_sound.set_time_adjustment(&adj_sound);
timedisp = -1;
diff --git a/synfig-studio/src/gui/preview.h b/synfig-studio/src/gui/preview.h
index 664492d..f79e990 100644
--- a/synfig-studio/src/gui/preview.h
+++ b/synfig-studio/src/gui/preview.h
@@ -167,7 +167,8 @@ class Widget_Preview : public Gtk::Table
{
Gtk::DrawingAreadraw_area;
Gtk::Adjustment adj_time_scrub; //the adjustment for the
managed scrollbar
- Gtk::HScrollbar scr_time_scrub;
+// Gtk::HScrollbar scr_time_scrub;
+ Gtk::HScale scr_time_scrub;
Gtk::ToggleButton b_loop;
//Glib::RefPtr gc_area;
--
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
___
Synfig-devl mailing list
Synfig-devl@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Modify tooltip of loop button according to GHIG
Author: Yu Chen
Date: Thu Nov 24 10:59:06 2011 +0800
Modify tooltip of loop button according to GHIG
---
synfig-studio/src/gui/preview.cpp |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/synfig-studio/src/gui/preview.cpp
b/synfig-studio/src/gui/preview.cpp
index 458f6f4..c98ead8 100644
--- a/synfig-studio/src/gui/preview.cpp
+++ b/synfig-studio/src/gui/preview.cpp
@@ -365,7 +365,7 @@ playing(false)
hbox->pack_start(*play_pausebutton, Gtk::PACK_SHRINK, 0);
button = &b_loop;
- IMAGIFY_BUTTON(button,"synfig-animate_loop",_("Toggle Looping"));
+ IMAGIFY_BUTTON(button,"synfig-animate_loop",_("Loop"));
hbox->pack_start(b_loop,Gtk::PACK_SHRINK,0);
//attach(b_loop,0,1,2,3,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK);
--
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
___
Synfig-devl mailing list
Synfig-devl@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Switch button position for play/ pause and loop following common sequence in most media players
Author: Yu Chen
Date: Thu Nov 24 10:53:08 2011 +0800
Switch button position for play/pause and loop following common sequence in
most media players
---
synfig-studio/src/gui/preview.cpp | 10 +-
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/synfig-studio/src/gui/preview.cpp
b/synfig-studio/src/gui/preview.cpp
index 6492ea5..458f6f4 100644
--- a/synfig-studio/src/gui/preview.cpp
+++ b/synfig-studio/src/gui/preview.cpp
@@ -352,11 +352,6 @@ playing(false)
//2nd row
hbox = manage(new Gtk::HBox);
- button = &b_loop;
- IMAGIFY_BUTTON(button,"synfig-animate_loop",_("Toggle Looping"));
- hbox->pack_start(b_loop,Gtk::PACK_SHRINK,0);
- //attach(b_loop,0,1,2,3,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK);
-
//play pause button
Gtk::Image *icon1 = manage(new
Gtk::Image(Gtk::StockID("synfig-animate_play"), Gtk::ICON_SIZE_BUTTON));
play_pausebutton = manage(new class Gtk::Button());
@@ -369,6 +364,11 @@ playing(false)
play_pausebutton->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::on_play_pause_pressed));
hbox->pack_start(*play_pausebutton, Gtk::PACK_SHRINK, 0);
+ button = &b_loop;
+ IMAGIFY_BUTTON(button,"synfig-animate_loop",_("Toggle Looping"));
+ hbox->pack_start(b_loop,Gtk::PACK_SHRINK,0);
+ //attach(b_loop,0,1,2,3,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK);
+
//attack the stop render and erase all buttons to same line...
Gtk::VSeparator *vsep = manage(new Gtk::VSeparator);
--
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
___
Synfig-devl mailing list
Synfig-devl@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Eanble preview starts from beginning again if the timeslider is on last frame and play is pressed .
Author: Yu Chen
Date: Thu Nov 24 10:30:31 2011 +0800
Eanble preview starts from beginning again if the timeslider is on last frame
and play is pressed.
Cleanup the paly/pause button icons code.
---
synfig-studio/src/gui/preview.cpp | 33 +++--
synfig-studio/src/gui/preview.h |2 +-
2 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/synfig-studio/src/gui/preview.cpp
b/synfig-studio/src/gui/preview.cpp
index 0bc5dd3..6492ea5 100644
--- a/synfig-studio/src/gui/preview.cpp
+++ b/synfig-studio/src/gui/preview.cpp
@@ -765,7 +765,7 @@ void studio::Widget_Preview::clear()
void studio::Widget_Preview::play()
{
- if(preview && !playing)
+ if(preview)
{
//synfig::info("Playing at %lf",adj_time_scrub.get_value());
//audiotime = adj_time_scrub.get_value();
@@ -789,7 +789,6 @@ void studio::Widget_Preview::play()
timecon =
Glib::signal_timeout().connect(sigc::mem_fun(*this,&Widget_Preview::play_update),timeout);
timer.reset();
}
-
}
void studio::Widget_Preview::play_pause()
@@ -798,6 +797,15 @@ void studio::Widget_Preview::play_pause()
signal_pause()();
if(audio) audio->stop(); //!< stop the audio
//synfig::info("Stopping...");
+
+ Gtk::Image *icon;
+ icon = manage(new Gtk::Image(Gtk::StockID("synfig-animate_play"),
Gtk::ICON_SIZE_BUTTON));
+ play_pausebutton->remove();
+ play_pausebutton->add(*icon);
+ play_pausebutton->set_tooltip_text(_("Play"));
+ icon->set_padding(0,0);
+ icon->show();
+
}
void studio::Widget_Preview::pause()
@@ -810,28 +818,25 @@ void studio::Widget_Preview::pause()
void studio::Widget_Preview::on_play_pause_pressed()
{
bool play_flag;
- Gtk::Image *icon1;
+ float begin = preview->get_begintime();
+ float end = preview->get_endtime();
+ float current = adj_time_scrub.get_value();
+ Gtk::Image *icon;
if(!playing)
{
- icon1 = manage(new
Gtk::Image(Gtk::StockID("synfig-animate_pause"), Gtk::ICON_SIZE_BUTTON));
play_pausebutton->remove();
- play_pausebutton->add(*icon1);
+ if(current == end) adj_time_scrub.set_value(begin);
+ icon = manage(new
Gtk::Image(Gtk::StockID("synfig-animate_pause"), Gtk::ICON_SIZE_BUTTON));
play_pausebutton->set_tooltip_text(_("Pause"));
- icon1->set_padding(0,0);
- icon1->show();
+ play_pausebutton->add(*icon);
+ icon->set_padding(0,0);
+ icon->show();
play_flag=true;
}
else
{
- icon1 = manage(new
Gtk::Image(Gtk::StockID("synfig-animate_play"), Gtk::ICON_SIZE_BUTTON));
- play_pausebutton->remove();
- play_pausebutton->add(*icon1);
- play_pausebutton->set_tooltip_text(_("Play"));
- icon1->set_padding(0,0);
- icon1->show();
-
play_flag=false;
}
if(play_flag) play(); else pause();
diff --git a/synfig-studio/src/gui/preview.h b/synfig-studio/src/gui/preview.h
index 39e2352..664492d 100644
--- a/synfig-studio/src/gui/preview.h
+++ b/synfig-studio/src/gui/preview.h
@@ -223,7 +223,7 @@ class Widget_Preview : public Gtk::Table
void preview_draw();
sigc::signalsignal_play_;
- sigc::signal signal_pause_;
+ sigc::signal signal_pause_;
sigc::signalsignal_seek_;
public:
--
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
___
Synfig-devl mailing list
Synfig-devl@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Make play pause button icon update according to playback status
Author: Yu Chen
Date: Wed Nov 23 19:17:18 2011 +0800
Make play pause button icon update according to playback status
---
synfig-studio/src/gui/preview.cpp | 31 +++
synfig-studio/src/gui/preview.h |4
2 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/synfig-studio/src/gui/preview.cpp
b/synfig-studio/src/gui/preview.cpp
index e290a56..0bc5dd3 100644
--- a/synfig-studio/src/gui/preview.cpp
+++ b/synfig-studio/src/gui/preview.cpp
@@ -357,10 +357,17 @@ playing(false)
hbox->pack_start(b_loop,Gtk::PACK_SHRINK,0);
//attach(b_loop,0,1,2,3,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK);
- button = manage(new Gtk::Button());
-
button->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::on_play_pause_pressed));
- IMAGIFY_BUTTON(button, "synfig-animate_play", _("Play"));
- hbox->pack_start(*button, Gtk::PACK_SHRINK, 0);
+ //play pause button
+ Gtk::Image *icon1 = manage(new
Gtk::Image(Gtk::StockID("synfig-animate_play"), Gtk::ICON_SIZE_BUTTON));
+ play_pausebutton = manage(new class Gtk::Button());
+ play_pausebutton->set_tooltip_text(_("Play"));
+ icon1->set_padding(0,0);
+ icon1->show();
+ play_pausebutton->add(*icon1);
+ play_pausebutton->set_relief(Gtk::RELIEF_NONE);
+ play_pausebutton->show();
+
play_pausebutton->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::on_play_pause_pressed));
+ hbox->pack_start(*play_pausebutton, Gtk::PACK_SHRINK, 0);
//attack the stop render and erase all buttons to same line...
@@ -803,12 +810,28 @@ void studio::Widget_Preview::pause()
void studio::Widget_Preview::on_play_pause_pressed()
{
bool play_flag;
+ Gtk::Image *icon1;
+
if(!playing)
{
+ icon1 = manage(new
Gtk::Image(Gtk::StockID("synfig-animate_pause"), Gtk::ICON_SIZE_BUTTON));
+ play_pausebutton->remove();
+ play_pausebutton->add(*icon1);
+ play_pausebutton->set_tooltip_text(_("Pause"));
+ icon1->set_padding(0,0);
+ icon1->show();
+
play_flag=true;
}
else
{
+ icon1 = manage(new
Gtk::Image(Gtk::StockID("synfig-animate_play"), Gtk::ICON_SIZE_BUTTON));
+ play_pausebutton->remove();
+ play_pausebutton->add(*icon1);
+ play_pausebutton->set_tooltip_text(_("Play"));
+ icon1->set_padding(0,0);
+ icon1->show();
+
play_flag=false;
}
if(play_flag) play(); else pause();
diff --git a/synfig-studio/src/gui/preview.h b/synfig-studio/src/gui/preview.h
index a24500a..39e2352 100644
--- a/synfig-studio/src/gui/preview.h
+++ b/synfig-studio/src/gui/preview.h
@@ -252,6 +252,10 @@ public:
bool get_loop_flag() const {return b_loop.get_active();}
void set_loop_flag(bool b) {return b_loop.set_active(b);}
+
+private:
+
+ Gtk::Button *play_pausebutton;
};
}; // END of namespace studio
--
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
___
Synfig-devl mailing list
Synfig-devl@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Cleanup unused code
Author: Yu Chen
Date: Wed Nov 23 00:23:45 2011 +0800
Cleanup unused code
---
synfig-studio/src/gui/preview.cpp | 12
1 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/synfig-studio/src/gui/preview.cpp
b/synfig-studio/src/gui/preview.cpp
index 2b148fd..e290a56 100644
--- a/synfig-studio/src/gui/preview.cpp
+++ b/synfig-studio/src/gui/preview.cpp
@@ -362,18 +362,6 @@ playing(false)
IMAGIFY_BUTTON(button, "synfig-animate_play", _("Play"));
hbox->pack_start(*button, Gtk::PACK_SHRINK, 0);
-// button = manage(new Gtk::Button(/*_("Play")*/));
-//
button->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::play));
-// IMAGIFY_BUTTON(button,"synfig-animate_play",_("Play"));
-// hbox->pack_start(*button,Gtk::PACK_SHRINK,0);
-// //attach(*button,1,2,2,3,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK);
-
-// button = manage(new Gtk::Button(/*_("Stop")*/));
-//
button->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::pause));
-// IMAGIFY_BUTTON(button,"synfig-animate_pause",_("Pause"));
-// hbox->pack_start(*button,Gtk::PACK_SHRINK,0);
-// //attach(*button,2,3,2,3,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK);
-
//attack the stop render and erase all buttons to same line...
Gtk::VSeparator *vsep = manage(new Gtk::VSeparator);
--
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
___
Synfig-devl mailing list
Synfig-devl@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Merge play and pause functions into one button as play/ pause button on canvas window does
Author: Yu Chen
Date: Tue Nov 22 23:47:29 2011 +0800
Merge play and pause functions into one button as play/pause button on canvas
window does
---
synfig-studio/src/gui/preview.cpp | 49 +---
synfig-studio/src/gui/preview.h |2 +
2 files changed, 36 insertions(+), 15 deletions(-)
diff --git a/synfig-studio/src/gui/preview.cpp
b/synfig-studio/src/gui/preview.cpp
index d760957..2b148fd 100644
--- a/synfig-studio/src/gui/preview.cpp
+++ b/synfig-studio/src/gui/preview.cpp
@@ -357,23 +357,28 @@ playing(false)
hbox->pack_start(b_loop,Gtk::PACK_SHRINK,0);
//attach(b_loop,0,1,2,3,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK);
- button = manage(new Gtk::Button(/*_("Play")*/));
-
button->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::play));
- IMAGIFY_BUTTON(button,"synfig-animate_play",_("Play"));
- hbox->pack_start(*button,Gtk::PACK_SHRINK,0);
- //attach(*button,1,2,2,3,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK);
-
- button = manage(new Gtk::Button(/*_("Stop")*/));
-
button->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::pause));
- IMAGIFY_BUTTON(button,"synfig-animate_pause",_("Pause"));
- hbox->pack_start(*button,Gtk::PACK_SHRINK,0);
- //attach(*button,2,3,2,3,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK);
+ button = manage(new Gtk::Button());
+
button->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::on_play_pause_pressed));
+ IMAGIFY_BUTTON(button, "synfig-animate_play", _("Play"));
+ hbox->pack_start(*button, Gtk::PACK_SHRINK, 0);
+
+// button = manage(new Gtk::Button(/*_("Play")*/));
+//
button->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::play));
+// IMAGIFY_BUTTON(button,"synfig-animate_play",_("Play"));
+// hbox->pack_start(*button,Gtk::PACK_SHRINK,0);
+// //attach(*button,1,2,2,3,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK);
+
+// button = manage(new Gtk::Button(/*_("Stop")*/));
+//
button->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::pause));
+// IMAGIFY_BUTTON(button,"synfig-animate_pause",_("Pause"));
+// hbox->pack_start(*button,Gtk::PACK_SHRINK,0);
+// //attach(*button,2,3,2,3,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK);
//attack the stop render and erase all buttons to same line...
- {
- Gtk::VSeparator *vsep = manage(new Gtk::VSeparator);
- hbox->pack_start(*vsep,Gtk::PACK_SHRINK,0);
- }
+
+ Gtk::VSeparator *vsep = manage(new Gtk::VSeparator);
+ hbox->pack_start(*vsep,Gtk::PACK_SHRINK,0);
+
button = manage(new Gtk::Button(/*_("Halt Render")*/));
button->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::stoprender));
@@ -807,6 +812,20 @@ void studio::Widget_Preview::pause()
timecon.disconnect();
}
+void studio::Widget_Preview::on_play_pause_pressed()
+{
+ bool play_flag;
+ if(!playing)
+ {
+ play_flag=true;
+ }
+ else
+ {
+ play_flag=false;
+ }
+ if(play_flag) play(); else pause();
+}
+
bool studio::Widget_Preview::scroll_move_event(GdkEvent *event)
{
switch(event->type)
diff --git a/synfig-studio/src/gui/preview.h b/synfig-studio/src/gui/preview.h
index 0779f3e..a24500a 100644
--- a/synfig-studio/src/gui/preview.h
+++ b/synfig-studio/src/gui/preview.h
@@ -242,6 +242,8 @@ public:
void pause();
void seek(float t);
+ void on_play_pause_pressed();
+
void stoprender();
sigc::signal&signal_play() {return signal_play_;}
--
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
___
Synfig-devl mailing list
Synfig-devl@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Rename preview (window) stop to pause
Author: Yu Chen
Date: Tue Nov 22 18:18:23 2011 +0800
Rename preview (window) stop to pause
---
synfig-studio/src/gui/dialogs/dialog_preview.cpp |2 +-
synfig-studio/src/gui/preview.cpp| 26 +++---
synfig-studio/src/gui/preview.h |8 +++---
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/synfig-studio/src/gui/dialogs/dialog_preview.cpp
b/synfig-studio/src/gui/dialogs/dialog_preview.cpp
index 0d5d776..e9e4cc3 100644
--- a/synfig-studio/src/gui/dialogs/dialog_preview.cpp
+++ b/synfig-studio/src/gui/dialogs/dialog_preview.cpp
@@ -79,7 +79,7 @@ void Dialog_Preview::set_preview(etl::handle prev)
void Dialog_Preview::on_hide()
{
Dialog::on_hide();
- preview.stop();
+ preview.pause();
preview.stoprender();
}
diff --git a/synfig-studio/src/gui/preview.cpp
b/synfig-studio/src/gui/preview.cpp
index 3b3d7f6..d760957 100644
--- a/synfig-studio/src/gui/preview.cpp
+++ b/synfig-studio/src/gui/preview.cpp
@@ -364,7 +364,7 @@ playing(false)
//attach(*button,1,2,2,3,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK);
button = manage(new Gtk::Button(/*_("Stop")*/));
-
button->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::stop));
+
button->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::pause));
IMAGIFY_BUTTON(button,"synfig-animate_pause",_("Pause"));
hbox->pack_start(*button,Gtk::PACK_SHRINK,0);
//attach(*button,2,3,2,3,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK);
@@ -640,7 +640,7 @@ bool studio::Widget_Preview::play_update()
{
time = adj_time_scrub.get_upper();
adj_time_scrub.set_value(time);
- play_stop();
+ play_pause();
update();
//synfig::info("Play Stopped: time set to
%f",adj_time_scrub.get_value());
@@ -671,7 +671,7 @@ void studio::Widget_Preview::slider_move()
//for other things updating the value changed signal...
void studio::Widget_Preview::scrub_updated(double t)
{
- stop();
+ pause();
//Attempt at being more accurate... the time is adjusted to be exactly
where the sound says it is
//double oldt = t;
@@ -708,7 +708,7 @@ void
studio::Widget_Preview::set_preview(etl::handle prev)
synfig::info("Setting preview");
//stop playing the mini animation...
- stop();
+ pause();
if(preview)
{
@@ -792,18 +792,18 @@ void studio::Widget_Preview::play()
}
-void studio::Widget_Preview::play_stop()
+void studio::Widget_Preview::play_pause()
{
playing = false;
- signal_stop()();
+ signal_pause()();
if(audio) audio->stop(); //!< stop the audio
//synfig::info("Stopping...");
}
-void studio::Widget_Preview::stop()
+void studio::Widget_Preview::pause()
{
//synfig::warning("stopping");
- play_stop();
+ play_pause();
timecon.disconnect();
}
@@ -815,7 +815,7 @@ bool studio::Widget_Preview::scroll_move_event(GdkEvent
*event)
{
if(event->button.button == 1 || event->button.button ==
3)
{
- stop();
+ pause();
}
}
@@ -845,7 +845,7 @@ void
studio::Widget_Preview::set_audio(etl::handle a)
void studio::Widget_Preview::seek(float t)
{
- stop();
+ pause();
adj_time_scrub.set_value(t);
}
@@ -854,7 +854,7 @@ void studio::Widget_Preview::repreview()
if(preview)
{
stoprender();
- stop();
+ pause();
preview->get_canvasview()->preview_option();
}
}
@@ -869,7 +869,7 @@ void studio::Widget_Preview::stoprender()
#ifdef SINGLE_THREADED
if (preview->renderer->updating)
- preview->renderer->stop();
+ preview->renderer->pause();
else
#endif
preview->renderer.detach();
@@ -878,7 +878,7 @@ void studio::Widget_Preview::stoprender()
void studio::Widget_Preview::eraseall()
{
- stop();
+ pause();
stoprender();
currentbuf.clear();
diff --git a/synfig-studio/src/gui/preview.h b/synfig-studio/src/gui/preview.h
index fdfc61b..0779f3e 100644
--- a/synfig-studio/src/gui/preview.h
+++ b/synfig-studio/src/gui/preview.h
@@ -204,7 +204,7 @@ class Widget_Preview : public Gtk::Table
void slider_move(); //later to be a time_slider that's cooler
bool play_update();
- void play_stop();
+ void play_pause();
//bool play_frameupdate();
void update();
@@ -223,7 +223,7 @@ class Widget_Preview : public Gtk::Table
void preview_draw();
sigc::signalsignal
[Synfig-devl] Yu Chen : Hide the soundtrack widget in preview window since we don' t support sound currently
Author: Yu Chen
Date: Tue Nov 22 13:46:30 2011 +0800
Hide the soundtrack widget in preview window since we don't support sound
currently
---
synfig-studio/src/gui/preview.cpp |8
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/synfig-studio/src/gui/preview.cpp
b/synfig-studio/src/gui/preview.cpp
index a79cb01..3b3d7f6 100644
--- a/synfig-studio/src/gui/preview.cpp
+++ b/synfig-studio/src/gui/preview.cpp
@@ -298,7 +298,7 @@ void studio::Preview::frame_finish(const Preview_Target
*targ)
icon->show();
Widget_Preview::Widget_Preview()
-:Gtk::Table(5,5,false),
+:Gtk::Table(5,4,false),
adj_time_scrub(0,0,1000,1,10,0),
scr_time_scrub(adj_time_scrub),
b_loop(/*_("Loop")*/),
@@ -408,11 +408,11 @@ playing(false)
hbox->pack_start(l_lasttime,Gtk::PACK_SHRINK,0);
hbox->show_all();
attach(*hbox,0,1,3,4,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK);
- //attach(l_lasttime,0,1,3,4,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK);
+ attach(l_lasttime,0,1,3,4,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK);
//5th row
- disp_sound.set_size_request(-1,32);
- attach(disp_sound,0,1,4,5,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK);
+ //disp_sound.set_size_request(-1,32);
+ //attach(disp_sound,0,1,4,5,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK);
show_all();
--
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
___
Synfig-devl mailing list
Synfig-devl@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Rename stop to pause for framedials of canvas window
Author: Yu Chen
Date: Tue Nov 22 13:18:41 2011 +0800
Rename stop to pause for framedials of canvas window
---
synfig-studio/src/gui/canvasview.cpp | 20 ++--
synfig-studio/src/gui/canvasview.h|2 +-
synfig-studio/src/gui/dials/framedial.cpp |4 ++--
synfig-studio/src/gui/dials/framedial.h |6 +++---
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/synfig-studio/src/gui/canvasview.cpp
b/synfig-studio/src/gui/canvasview.cpp
index f1b17d7..6f53cce 100644
--- a/synfig-studio/src/gui/canvasview.cpp
+++ b/synfig-studio/src/gui/canvasview.cpp
@@ -1024,7 +1024,7 @@ CanvasView::create_time_bar()
);
framedial->signal_seek_prev_keyframe().connect(sigc::mem_fun(*canvas_interface().get(),
&synfigapp::CanvasInterface::jump_to_prev_keyframe));
framedial->signal_seek_prev_frame().connect(sigc::bind(sigc::mem_fun(*canvas_interface().get(),
&synfigapp::CanvasInterface::seek_frame), -1));
- framedial->signal_play_stop().connect(sigc::mem_fun(*this,
&studio::CanvasView::on_play_stop_pressed));
+ framedial->signal_play_pause().connect(sigc::mem_fun(*this,
&studio::CanvasView::on_play_pause_pressed));
framedial->signal_seek_next_frame().connect(sigc::bind(sigc::mem_fun(*canvas_interface().get(),
&synfigapp::CanvasInterface::seek_frame), 1));
framedial->signal_seek_next_keyframe().connect(sigc::mem_fun(*canvas_interface().get(),
&synfigapp::CanvasInterface::jump_to_next_keyframe));
framedial->signal_seek_end().connect(sigc::bind(sigc::mem_fun(*canvas_interface().get(),
&synfigapp::CanvasInterface::seek_time), Time::end()));
@@ -3240,7 +3240,7 @@ CanvasView::play()
return;
}
}
- on_play_stop_pressed();
+ on_play_pause_pressed();
is_playing_=false;
time_adjustment().set_value(endtime);
time_adjustment().value_changed();
@@ -4037,27 +4037,27 @@ CanvasView::on_delete_event(GdkEventAny* event
__attribute__ ((unused)))
//! Modify the play stop button apearence and play stop the animation
void
-CanvasView::on_play_stop_pressed()
+CanvasView::on_play_pause_pressed()
{
Gtk::IconSize
iconsize=Gtk::IconSize::from_name("synfig-small_icon_16x16");
Gtk::Image *icon;
- Gtk::Button *stop_button;
- stop_button=framedial->get_play_button();
+ Gtk::Button *pause_button;
+ pause_button=framedial->get_play_button();
bool play_flag;
if(!is_playing())
{
- icon = manage(new
Gtk::Image(Gtk::StockID("synfig-animate_stop"),iconsize));
- stop_button->set_relief(Gtk::RELIEF_NORMAL);
+ icon = manage(new
Gtk::Image(Gtk::StockID("synfig-animate_pause"),iconsize));
+ pause_button->set_relief(Gtk::RELIEF_NORMAL);
play_flag=true;
}
else
{
icon = manage(new
Gtk::Image(Gtk::StockID("synfig-animate_play"),iconsize));
- stop_button->set_relief(Gtk::RELIEF_NONE);
+ pause_button->set_relief(Gtk::RELIEF_NONE);
play_flag=false;
}
- stop_button->remove();
- stop_button->add(*icon);
+ pause_button->remove();
+ pause_button->add(*icon);
icon->set_padding(0, 0);
icon->show();
if(play_flag) play(); else stop();
diff --git a/synfig-studio/src/gui/canvasview.h
b/synfig-studio/src/gui/canvasview.h
index 7e4ef97..8bb04d7 100644
--- a/synfig-studio/src/gui/canvasview.h
+++ b/synfig-studio/src/gui/canvasview.h
@@ -710,7 +710,7 @@ private:
//void on_audio_play();
bool on_audio_scrub();
- void on_play_stop_pressed();
+ void on_play_pause_pressed();
protected:
bool close_instance_when_safe();
diff --git a/synfig-studio/src/gui/dials/framedial.cpp
b/synfig-studio/src/gui/dials/framedial.cpp
index c8457cf..e6dde9d 100644
--- a/synfig-studio/src/gui/dials/framedial.cpp
+++ b/synfig-studio/src/gui/dials/framedial.cpp
@@ -56,7 +56,7 @@ FrameDial::FrameDial(): Gtk::Table(7, 1, false)
seek_begin = create_icon(Gtk::ICON_SIZE_BUTTON,
"synfig-animate_seek_begin",_("Seek to begin"));
seek_prev_keyframe = create_icon(Gtk::ICON_SIZE_BUTTON,
"synfig-animate_seek_prev_keyframe",_("Seek to previous keyframe"));
seek_prev_frame = create_icon(Gtk::ICON_SIZE_BUTTON,
"synfig-animate_seek_prev_frame",_("Seek to previous frame"));
- play_stop = create_icon(Gtk::ICON_SIZE_BUTTON,
"synfig-animate_play",_("Play"));
+ play_pause = create_icon(Gtk::ICON_SIZE_BUTTON,
"synfig-animate_play",_("Play"));
seek_next_frame = create_icon(Gtk::ICON_SIZE_BUTTON,
"synfig-animate_seek_next_frame",_("Seek to next frame"));
seek_next_keyframe = create_icon(Gtk::ICON_SIZE_BUTTON,
"synfig-animate_seek_next_keyframe",_("Seek to next keyframe"));
seek_end = create_icon(Gtk::ICON_SIZE_BUTTON,
"synfig-animate_seek
[Synfig-devl] Yu Chen : Replace stop icon with pause icon and change its tooltip accordingly
Author: Yu Chen
Date: Tue Nov 22 12:48:49 2011 +0800
Replace stop icon with pause icon and change its tooltip accordingly
---
synfig-studio/src/gui/preview.cpp |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/synfig-studio/src/gui/preview.cpp
b/synfig-studio/src/gui/preview.cpp
index e3ecc8d..a79cb01 100644
--- a/synfig-studio/src/gui/preview.cpp
+++ b/synfig-studio/src/gui/preview.cpp
@@ -365,7 +365,7 @@ playing(false)
button = manage(new Gtk::Button(/*_("Stop")*/));
button->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::stop));
- IMAGIFY_BUTTON(button,"synfig-animate_stop",_("Stop"));
+ IMAGIFY_BUTTON(button,"synfig-animate_pause",_("Pause"));
hbox->pack_start(*button,Gtk::PACK_SHRINK,0);
//attach(*button,2,3,2,3,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK);
--
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
___
Synfig-devl mailing list
Synfig-devl@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Add loop and pause icons
Author: Yu Chen
Date: Tue Nov 22 12:46:58 2011 +0800
Add loop and pause icons
---
synfig-studio/images/Makefile.am | 13 +
synfig-studio/src/gui/iconcontroller.cpp |1 +
2 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/synfig-studio/images/Makefile.am b/synfig-studio/images/Makefile.am
index 5f66f3f..5e55d45 100644
--- a/synfig-studio/images/Makefile.am
+++ b/synfig-studio/images/Makefile.am
@@ -194,6 +194,8 @@ IMAGES = \
animate_seek_end_icon.$(EXT) \
animate_play_icon.$(EXT) \
animate_stop_icon.$(EXT) \
+ animate_pause_icon.$(EXT) \
+ animate_loop_icon.$(EXT) \
animate_mode_off_icon.$(EXT) \
animate_mode_on_icon.$(EXT) \
\
@@ -440,6 +442,17 @@ animate_stop_icon.$(EXT): $(srcdir)/framedial_icons.sif
echo " File \"images\\$@\"" >>./images.nsh
echo " Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh
+animate_pause_icon.$(EXT): $(srcdir)/framedial_icons.sif
+ $(SYNFIG) -q $< -o $@ --time 8
+ echo " File \"images\\$@\"" >>./images.nsh
+ echo " Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh
+
+animate_loop_icon.$(EXT): $(srcdir)/framedial_icons.sif
+ $(SYNFIG) -q $< -o $@ --time 9
+ echo " File \"images\\$@\"" >>./images.nsh
+ echo " Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh
+
+
animate_mode_off_icon.$(EXT): $(srcdir)/animate_mode_icons.sif
$(SYNFIG) -q $< -o $@ --time 0
echo " File \"images\\$@\"" >>./images.nsh
diff --git a/synfig-studio/src/gui/iconcontroller.cpp
b/synfig-studio/src/gui/iconcontroller.cpp
index de12a70..d13c0dc 100644
--- a/synfig-studio/src/gui/iconcontroller.cpp
+++ b/synfig-studio/src/gui/iconcontroller.cpp
@@ -279,6 +279,7 @@ IconController::IconController(const synfig::String&
/*basepath*/)
INIT_STOCK_ICON(animate_seek_prev_frame,"animate_seek_prev_frame_icon."IMAGE_EXT,_("Previous
frame"));
INIT_STOCK_ICON(animate_play,"animate_play_icon."IMAGE_EXT,_("Play"));
INIT_STOCK_ICON(animate_stop,"animate_stop_icon."IMAGE_EXT,_("Stop"));
+
INIT_STOCK_ICON(animate_pause,"animate_pause_icon."IMAGE_EXT,_("Pause"));
INIT_STOCK_ICON(animate_seek_next_frame,"animate_seek_next_frame_icon."IMAGE_EXT,_("Next
frame"));
INIT_STOCK_ICON(animate_seek_next_keyframe,"animate_seek_next_keyframe_icon."IMAGE_EXT,_("Next
keyframe"));
INIT_STOCK_ICON(animate_seek_end,"animate_seek_end_icon."IMAGE_EXT,_("Seek to
end"));
--
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
___
Synfig-devl mailing list
Synfig-devl@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/synfig-devl
[Synfig-devl] Yu Chen : Reflash preview window by new icons and set the buttons to none relief
Author: Yu Chen
Date: Tue Nov 22 11:58:03 2011 +0800
Reflash preview window by new icons and set the buttons to none relief
- replace loop, play and stop icons with the same style as framedial icons
- replace re-preview icon with Gtk-Edit icon
- replace Erase All icon with Gtk-Clear icon
---
synfig-studio/src/gui/iconcontroller.cpp |2 +-
synfig-studio/src/gui/preview.cpp| 22 --
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/synfig-studio/src/gui/iconcontroller.cpp
b/synfig-studio/src/gui/iconcontroller.cpp
index a5fb4b7..de12a70 100644
--- a/synfig-studio/src/gui/iconcontroller.cpp
+++ b/synfig-studio/src/gui/iconcontroller.cpp
@@ -282,7 +282,7 @@ IconController::IconController(const synfig::String&
/*basepath*/)
INIT_STOCK_ICON(animate_seek_next_frame,"animate_seek_next_frame_icon."IMAGE_EXT,_("Next
frame"));
INIT_STOCK_ICON(animate_seek_next_keyframe,"animate_seek_next_keyframe_icon."IMAGE_EXT,_("Next
keyframe"));
INIT_STOCK_ICON(animate_seek_end,"animate_seek_end_icon."IMAGE_EXT,_("Seek to
end"));
-
+ INIT_STOCK_ICON(animate_loop,"animate_loop_icon."IMAGE_EXT,_("Aniamte
Loop"));
INIT_STOCK_ICON(add_to_group,"action_add_to_group_icon."IMAGE_EXT,_("Add Layer
to Group"));
INIT_STOCK_ICON(remove_from_group,"action_remove_from_group_icon."IMAGE_EXT,_("Remove
Layer from Group"));
diff --git a/synfig-studio/src/gui/preview.cpp
b/synfig-studio/src/gui/preview.cpp
index f49fd99..e3ecc8d 100644
--- a/synfig-studio/src/gui/preview.cpp
+++ b/synfig-studio/src/gui/preview.cpp
@@ -288,11 +288,13 @@ void studio::Preview::frame_finish(const Preview_Target
*targ)
signal_changed()();
}
-#define IMAGIFY_BUTTON(button,stockid,tooltip)
\
- icon=manage(new
Gtk::Image(Gtk::StockID(stockid),Gtk::ICON_SIZE_BUTTON)); \
- button->add(*icon); \
- button->set_tooltip_text(tooltip); \
- icon->set_padding(0,0);\
+#define IMAGIFY_BUTTON(button,stockid,tooltip) \
+icon = manage(new Gtk::Image(Gtk::StockID(stockid),
Gtk::ICON_SIZE_BUTTON)); \
+ button->set_tooltip_text(tooltip); \
+button->add(*icon); \
+button->set_relief(Gtk::RELIEF_NONE); \
+button->show(); \
+ icon->set_padding(0,0); \
icon->show();
Widget_Preview::Widget_Preview()
@@ -351,19 +353,19 @@ playing(false)
hbox = manage(new Gtk::HBox);
button = &b_loop;
- IMAGIFY_BUTTON(button,Gtk::Stock::REFRESH,_("Toggle Looping"));
+ IMAGIFY_BUTTON(button,"synfig-animate_loop",_("Toggle Looping"));
hbox->pack_start(b_loop,Gtk::PACK_SHRINK,0);
//attach(b_loop,0,1,2,3,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK);
button = manage(new Gtk::Button(/*_("Play")*/));
button->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::play));
- IMAGIFY_BUTTON(button,Gtk::Stock::GO_FORWARD,_("Play"));
+ IMAGIFY_BUTTON(button,"synfig-animate_play",_("Play"));
hbox->pack_start(*button,Gtk::PACK_SHRINK,0);
//attach(*button,1,2,2,3,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK);
button = manage(new Gtk::Button(/*_("Stop")*/));
button->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::stop));
- IMAGIFY_BUTTON(button,Gtk::Stock::NO,_("Stop"));
+ IMAGIFY_BUTTON(button,"synfig-animate_stop",_("Stop"));
hbox->pack_start(*button,Gtk::PACK_SHRINK,0);
//attach(*button,2,3,2,3,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK);
@@ -381,13 +383,13 @@ playing(false)
button = manage(new Gtk::Button(/*_("Re-Preview")*/));
button->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::repreview));
- IMAGIFY_BUTTON(button,Gtk::Stock::CONVERT,_("Re-Preview"));
+ IMAGIFY_BUTTON(button,Gtk::Stock::EDIT,_("Re-Preview"));
hbox->pack_start(*button,Gtk::PACK_SHRINK,0);
//attach(*button,0,2,4,5,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK);
button = manage(new Gtk::Button(/*_("Erase All")*/));
button->signal_clicked().connect(sigc::mem_fun(*this,&Widget_Preview::eraseall));
- IMAGIFY_BUTTON(button,Gtk::Stock::DELETE,_("Erase All"));
+ IMAGIFY_BUTTON(button,Gtk::Stock::CLEAR,_("Erase All"));
hbox->pack_start(*button,Gtk::PACK_SHRINK,0);
//attach(*button,2,3,4,5,Gtk::EXPAND|Gtk::FILL,Gtk::SHRINK);
--
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
___
Synfig-devl mailing list
Synfig-devl@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/synfig-devl
