date:20090722

[Synfig-devl] Carlos Lopez : Forgot to commit those two files

2009-07-22 Thread Konstantin Dmitriev

Module: synfig
Branch: morevna
Commit: 723347b927dd88f5e127484d6ec33149206042ea
URL:
http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commit;h=723347b927dd88f5e127484d6ec33149206042ea

Author: Carlos Lopez car...@pcnuevo.(none)
Date:   Tue Jul 21 01:43:49 2009 +0200

Forgot to commit those two files

---

 synfig-studio/trunk/src/gtkmm/canvasview.cpp |4 ++--
 synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp 
b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index da2e672..6e40ea1 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -1046,8 +1046,8 @@ CanvasView::create_time_bar()
//timebar-attach(*manage(disp_audio), 1, 5, 0, 1, 
Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK);
timebar-attach(*current_time_widget, 0, 1, 0, 2, 
Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
timebar-attach(*framedial, 0, 1, 2, 3, Gtk::SHRINK, Gtk::SHRINK);
-   timebar-attach(*timeslider, 1, 3, 0, 1, Gtk::EXPAND|Gtk::FILL, 
Gtk::EXPAND|Gtk::FILL);
-   timebar-attach(*widget_kf_list, 1, 3, 1, 2, 
Gtk::EXPAND|Gtk::FILL,Gtk::EXPAND|Gtk::FILL);
+   timebar-attach(*timeslider, 1, 3, 1, 2, Gtk::EXPAND|Gtk::FILL, 
Gtk::EXPAND|Gtk::FILL);
+   timebar-attach(*widget_kf_list, 1, 3, 0, 1, 
Gtk::EXPAND|Gtk::FILL,Gtk::EXPAND|Gtk::FILL);
timebar-attach(*time_window_scroll, 1, 3, 2, 3, Gtk::EXPAND|Gtk::FILL, 
Gtk::SHRINK);
timebar-attach(*keyframedial, 3, 4, 0, 2, Gtk::SHRINK, Gtk::SHRINK);
timebar-attach(*animatebutton, 4, 5, 0, 2, Gtk::SHRINK, Gtk::SHRINK);
diff --git a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp 
b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
index c070e8b..1255cd2 100644
--- a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
@@ -509,8 +509,8 @@ 
Dock_Timetrack::changed_canvas_view_vfunc(etl::loose_handleCanvasView canvas_v
vscrollbar_-set_adjustment(*tree_view-get_vadjustment());

hscrollbar_-set_adjustment(canvas_view-time_window_adjustment());
table_=new Gtk::Table(2,3);
-   table_-attach(*widget_timeslider_, 0, 1, 0, 1, 
Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::SHRINK);
-   table_-attach(*widget_kf_list_, 0, 1, 1, 2, 
Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::SHRINK);
+   table_-attach(*widget_timeslider_, 0, 1, 1, 2, 
Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::SHRINK);
+   table_-attach(*widget_kf_list_, 0, 1, 0, 1, 
Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::SHRINK);
table_-attach(*tree_view, 0, 1, 2, 3, Gtk::FILL|Gtk::EXPAND, 
Gtk::FILL|Gtk::EXPAND);
table_-attach(*hscrollbar_, 0, 1, 3, 4, Gtk::FILL|Gtk::EXPAND, 
Gtk::FILL|Gtk::SHRINK);
table_-attach(*vscrollbar_, 1, 2, 0, 3, Gtk::FILL|Gtk::SHRINK, 
Gtk::FILL|Gtk::EXPAND);


--
___
Synfig-devl mailing list
Synfig-devl@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/synfig-devl

[Synfig-devl] Konstantin Dmitriev : Merge commit 'origin/genete_keyframe_list' into morevna

2009-07-22 Thread Konstantin Dmitriev

Module: synfig
Branch: morevna
Commit: 61b0e0dd88d8a84b826e434e51d572998c59c0d9
URL:
http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commit;h=61b0e0dd88d8a84b826e434e51d572998c59c0d9

Author: Konstantin Dmitriev ksee.zelga...@gmail.com
Date:   Wed Jul 22 17:03:43 2009 +0700

Merge commit 'origin/genete_keyframe_list' into morevna

---




--
___
Synfig-devl mailing list
Synfig-devl@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/synfig-devl

[Synfig-devl] Carlos Lopez : Fix bug for the modification of the keyframe length.

2009-07-22 Thread Genete

Module: synfig
Branch: genete_keyframe_list
Commit: ccdb7642df27ee84d641dc7c8a63f5fffbce2665
URL:
http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commit;h=ccdb7642df27ee84d641dc7c8a63f5fffbce2665

Author: Carlos Lopez car...@pcnuevo.(none)
Date:   Wed Jul 22 17:47:39 2009 +0200

Fix bug for the modification of the keyframe length.
Now, modify the keyframe length column, shifts the rest
of keyframes form the modified keyframe to the end of time.

---

 .../src/synfigapp/actions/keyframesetdelta.cpp |5 -
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframesetdelta.cpp 
b/synfig-studio/trunk/src/synfigapp/actions/keyframesetdelta.cpp
index 97898c3..6cd262a 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/keyframesetdelta.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/keyframesetdelta.cpp
@@ -178,7 +178,10 @@ Action::KeyframeSetDelta::perform()
 
 // Time location(keyframe.get_time());
Time location(get_canvas()-keyframe_list().find(keyframe)-get_time());
-   Time delta(delta);
+// This line sets delta to 0s regardless to any previous value of delta.
+// I think it was here for symmetry to the undo() operation.
+// It was causing that the Set delta operation was faulty. Now works!
+// Time delta(delta);
 
get_canvas()-keyframe_list().insert_time(location,delta);
 


--
___
Synfig-devl mailing list
Synfig-devl@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/synfig-devl

[Synfig-devl] Konstantin Dmitriev : Invoke bash directly to detect revision ( allows to avoid using some minimal shell alternatives). Minor improvements on branch detection.

2009-07-22 Thread Konstantin Dmitriev

Module: synfig
Branch: zelgadis_master
Commit: 2e16825821373ef132e3601f9fcc8da63eb61848
URL:
http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commit;h=2e16825821373ef132e3601f9fcc8da63eb61848

Author: Konstantin Dmitriev ksee.zelga...@gmail.com
Date:   Thu Jul 23 04:37:29 2009 +0700

Invoke bash directly to detect revision (allows to avoid using some minimal 
shell alternatives). Minor improvements on branch detection.

---

 synfig-core/trunk/build_tools/Makefile.am   |2 +-
 synfig-core/trunk/build_tools/autorevision.sh   |2 +-
 synfig-studio/trunk/build_tools/Makefile.am |2 +-
 synfig-studio/trunk/build_tools/autorevision.sh |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/synfig-core/trunk/build_tools/Makefile.am 
b/synfig-core/trunk/build_tools/Makefile.am
index 29b053f..27edb64 100644
--- a/synfig-core/trunk/build_tools/Makefile.am
+++ b/synfig-core/trunk/build_tools/Makefile.am
@@ -1,7 +1,7 @@
 dist_noinst_SCRIPTS = autorevision.sh
 
 all-local:
-   sh $(srcdir)/autorevision.sh $(top_srcdir) $(top_builddir)
+   bash $(srcdir)/autorevision.sh $(top_srcdir) $(top_builddir)
 
 clean-local:
-rm -f $(top_builddir)/autorevision.h
diff --git a/synfig-core/trunk/build_tools/autorevision.sh 
b/synfig-core/trunk/build_tools/autorevision.sh
index f898b10..3b14c59 100644
--- a/synfig-core/trunk/build_tools/autorevision.sh
+++ b/synfig-core/trunk/build_tools/autorevision.sh
@@ -16,7 +16,7 @@
 get_git_id(){
export SCM=git
export REVISION_ID=`cd $1; git log --no-color -1 | head -n 1 | cut -f 
2 -d ' '`
-   export BRANCH=`cd $1; git branch -a --no-color --contains HEAD | sed 
-e s/\*\ // | sed -e s/\(no\ branch\)//`
+   export BRANCH=`cd $1; git branch -a --no-color --contains HEAD | sed 
-e s/\*\ // | sed -e s/\(no\ branch\)// | tr '\n' ' ' | tr -s ' ' | sed s/^' 
'//`
if ( echo $BRANCH | egrep origin/master  /dev/null ); then
#give a priority to master branch
BRANCH='master'
diff --git a/synfig-studio/trunk/build_tools/Makefile.am 
b/synfig-studio/trunk/build_tools/Makefile.am
index 29b053f..27edb64 100644
--- a/synfig-studio/trunk/build_tools/Makefile.am
+++ b/synfig-studio/trunk/build_tools/Makefile.am
@@ -1,7 +1,7 @@
 dist_noinst_SCRIPTS = autorevision.sh
 
 all-local:
-   sh $(srcdir)/autorevision.sh $(top_srcdir) $(top_builddir)
+   bash $(srcdir)/autorevision.sh $(top_srcdir) $(top_builddir)
 
 clean-local:
-rm -f $(top_builddir)/autorevision.h
diff --git a/synfig-studio/trunk/build_tools/autorevision.sh 
b/synfig-studio/trunk/build_tools/autorevision.sh
index e6516b1..f60f4ef 100644
--- a/synfig-studio/trunk/build_tools/autorevision.sh
+++ b/synfig-studio/trunk/build_tools/autorevision.sh
@@ -16,7 +16,7 @@
 get_git_id(){
export SCM=git
export REVISION_ID=`cd $1; git log --no-color -1 | head -n 1 | cut -f 
2 -d ' '`
-   export BRANCH=`cd $1; git branch -a --no-color --contains HEAD | sed 
-e s/\*\ // | sed -e s/\(no\ branch\)//`
+   export BRANCH=`cd $1; git branch -a --no-color --contains HEAD | sed 
-e s/\*\ // | sed -e s/\(no\ branch\)// | tr '\n' ' ' | tr -s ' ' | sed s/^' 
'//`
if ( echo $BRANCH | egrep origin/master  /dev/null ); then
#give a priority to master branch
BRANCH='master'


--
___
Synfig-devl mailing list
Synfig-devl@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/synfig-devl

[Synfig-devl] Carlos Lopez : Alter the font size of the timeslider

2009-07-22 Thread Konstantin Dmitriev

Module: synfig
Branch: morevna
Commit: acc6eb743b440a2363d21c5e060425ee45b0f9fa
URL:
http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commit;h=acc6eb743b440a2363d21c5e060425ee45b0f9fa

Author: Carlos Lopez car...@pcnuevo.(none)
Date:   Wed Jul 22 22:53:43 2009 +0200

Alter the font size of the timeslider

---

 synfig-studio/trunk/src/gtkmm/canvasview.cpp   |   15 +++
 synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp   |2 +-
 .../trunk/src/gtkmm/widget_timeslider.cpp  |   10 ++
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp 
b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index 6e40ea1..53a6ccc 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -966,13 +966,11 @@ CanvasView::create_time_bar()
//Widget_Timeslider *time_scroll = manage(new Widget_Timeslider);
timeslider-set_time_adjustment(time_adjustment());
timeslider-set_bounds_adjustment(time_window_adjustment());
-   //timeslider-set_size_request(-1,12);
//layout_table-attach(*timeslider, 0, 1, 2, 3, Gtk::EXPAND|Gtk::FILL, 
Gtk::SHRINK|Gtk::FILL);
//Setup the keyframe list widget
widget_kf_list-set_time_adjustment(time_adjustment());
widget_kf_list-set_canvas_interface(canvas_interface());
widget_kf_list-show();
-   widget_kf_list-set_size_request(-1,8);
 
tooltips.set_tip(*time_window_scroll,_(Moves the time window));
tooltips.set_tip(*timeslider,_(Changes the current time));
@@ -1042,12 +1040,21 @@ CanvasView::create_time_bar()
 
timebar = Gtk::manage(new class Gtk::Table(5, 4, false));
 
+   //Adjust both widgets to be the same as the
+   int header_height = 0;
+   if(getenv(SYNFIG_TIMETRACK_HEADER_HEIGHT))
+   header_height = atoi(getenv(SYNFIG_TIMETRACK_HEADER_HEIGHT));
+   if (header_height  3)
+   header_height = 24;
+   timeslider-set_size_request(-1,header_height-header_height/3+1);
+   widget_kf_list-set_size_request(-1,header_height/3+1);
+
//Attach widgets to the timebar
//timebar-attach(*manage(disp_audio), 1, 5, 0, 1, 
Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK);
timebar-attach(*current_time_widget, 0, 1, 0, 2, 
Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
timebar-attach(*framedial, 0, 1, 2, 3, Gtk::SHRINK, Gtk::SHRINK);
-   timebar-attach(*timeslider, 1, 3, 1, 2, Gtk::EXPAND|Gtk::FILL, 
Gtk::EXPAND|Gtk::FILL);
-   timebar-attach(*widget_kf_list, 1, 3, 0, 1, 
Gtk::EXPAND|Gtk::FILL,Gtk::EXPAND|Gtk::FILL);
+   timebar-attach(*timeslider, 1, 3, 1, 2, Gtk::FILL|Gtk::SHRINK, 
Gtk::FILL|Gtk::SHRINK);
+   timebar-attach(*widget_kf_list, 1, 3, 0, 1, Gtk::FILL|Gtk::EXPAND, 
Gtk::FILL|Gtk::SHRINK);
timebar-attach(*time_window_scroll, 1, 3, 2, 3, Gtk::EXPAND|Gtk::FILL, 
Gtk::SHRINK);
timebar-attach(*keyframedial, 3, 4, 0, 2, Gtk::SHRINK, Gtk::SHRINK);
timebar-attach(*animatebutton, 4, 5, 0, 2, Gtk::SHRINK, Gtk::SHRINK);
diff --git a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp 
b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
index 1255cd2..7a6139a 100644
--- a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
@@ -509,7 +509,7 @@ 
Dock_Timetrack::changed_canvas_view_vfunc(etl::loose_handleCanvasView canvas_v
vscrollbar_-set_adjustment(*tree_view-get_vadjustment());

hscrollbar_-set_adjustment(canvas_view-time_window_adjustment());
table_=new Gtk::Table(2,3);
-   table_-attach(*widget_timeslider_, 0, 1, 1, 2, 
Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::SHRINK);
+   table_-attach(*widget_timeslider_, 0, 1, 1, 2, 
Gtk::FILL|Gtk::SHRINK, Gtk::FILL|Gtk::SHRINK);
table_-attach(*widget_kf_list_, 0, 1, 0, 1, 
Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::SHRINK);
table_-attach(*tree_view, 0, 1, 2, 3, Gtk::FILL|Gtk::EXPAND, 
Gtk::FILL|Gtk::EXPAND);
table_-attach(*hscrollbar_, 0, 1, 3, 4, Gtk::FILL|Gtk::EXPAND, 
Gtk::FILL|Gtk::SHRINK);
diff --git a/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp 
b/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp
index 1687371..ed5d63c 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp
@@ -576,6 +576,16 @@ bool Widget_Timeslider::redraw(bool /*doublebuffer*/)
 
//gc-set_rgb_fg_color(Gdk::Color(#00));
layout-set_text(timecode);
+   Pango::AttrList attr_list;
+   // Aproximately a font size of 8 pixels.
+   // Pango::SCALE = 1024
+   // create_attr_size waits a number in 1000th of pixels.
+   // Should be user customizable in the future. Now it is 
fixed

[Synfig-devl] Konstantin Dmitriev : Invoke bash directly to detect revision ( allows to avoid using some minimal shell alternatives). Minor improvements on branch detection.

2009-07-22 Thread Konstantin Dmitriev

Module: synfig
Branch: morevna
Commit: 2e16825821373ef132e3601f9fcc8da63eb61848
URL:
http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig;a=commit;h=2e16825821373ef132e3601f9fcc8da63eb61848

Author: Konstantin Dmitriev ksee.zelga...@gmail.com
Date:   Thu Jul 23 04:37:29 2009 +0700

Invoke bash directly to detect revision (allows to avoid using some minimal 
shell alternatives). Minor improvements on branch detection.

---

 synfig-core/trunk/build_tools/Makefile.am   |2 +-
 synfig-core/trunk/build_tools/autorevision.sh   |2 +-
 synfig-studio/trunk/build_tools/Makefile.am |2 +-
 synfig-studio/trunk/build_tools/autorevision.sh |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/synfig-core/trunk/build_tools/Makefile.am 
b/synfig-core/trunk/build_tools/Makefile.am
index 29b053f..27edb64 100644
--- a/synfig-core/trunk/build_tools/Makefile.am
+++ b/synfig-core/trunk/build_tools/Makefile.am
@@ -1,7 +1,7 @@
 dist_noinst_SCRIPTS = autorevision.sh
 
 all-local:
-   sh $(srcdir)/autorevision.sh $(top_srcdir) $(top_builddir)
+   bash $(srcdir)/autorevision.sh $(top_srcdir) $(top_builddir)
 
 clean-local:
-rm -f $(top_builddir)/autorevision.h
diff --git a/synfig-core/trunk/build_tools/autorevision.sh 
b/synfig-core/trunk/build_tools/autorevision.sh
index f898b10..3b14c59 100644
--- a/synfig-core/trunk/build_tools/autorevision.sh
+++ b/synfig-core/trunk/build_tools/autorevision.sh
@@ -16,7 +16,7 @@
 get_git_id(){
export SCM=git
export REVISION_ID=`cd $1; git log --no-color -1 | head -n 1 | cut -f 
2 -d ' '`
-   export BRANCH=`cd $1; git branch -a --no-color --contains HEAD | sed 
-e s/\*\ // | sed -e s/\(no\ branch\)//`
+   export BRANCH=`cd $1; git branch -a --no-color --contains HEAD | sed 
-e s/\*\ // | sed -e s/\(no\ branch\)// | tr '\n' ' ' | tr -s ' ' | sed s/^' 
'//`
if ( echo $BRANCH | egrep origin/master  /dev/null ); then
#give a priority to master branch
BRANCH='master'
diff --git a/synfig-studio/trunk/build_tools/Makefile.am 
b/synfig-studio/trunk/build_tools/Makefile.am
index 29b053f..27edb64 100644
--- a/synfig-studio/trunk/build_tools/Makefile.am
+++ b/synfig-studio/trunk/build_tools/Makefile.am
@@ -1,7 +1,7 @@
 dist_noinst_SCRIPTS = autorevision.sh
 
 all-local:
-   sh $(srcdir)/autorevision.sh $(top_srcdir) $(top_builddir)
+   bash $(srcdir)/autorevision.sh $(top_srcdir) $(top_builddir)
 
 clean-local:
-rm -f $(top_builddir)/autorevision.h
diff --git a/synfig-studio/trunk/build_tools/autorevision.sh 
b/synfig-studio/trunk/build_tools/autorevision.sh
index e6516b1..f60f4ef 100644
--- a/synfig-studio/trunk/build_tools/autorevision.sh
+++ b/synfig-studio/trunk/build_tools/autorevision.sh
@@ -16,7 +16,7 @@
 get_git_id(){
export SCM=git
export REVISION_ID=`cd $1; git log --no-color -1 | head -n 1 | cut -f 
2 -d ' '`
-   export BRANCH=`cd $1; git branch -a --no-color --contains HEAD | sed 
-e s/\*\ // | sed -e s/\(no\ branch\)//`
+   export BRANCH=`cd $1; git branch -a --no-color --contains HEAD | sed 
-e s/\*\ // | sed -e s/\(no\ branch\)// | tr '\n' ' ' | tr -s ' ' | sed s/^' 
'//`
if ( echo $BRANCH | egrep origin/master  /dev/null ); then
#give a priority to master branch
BRANCH='master'


--
___
Synfig-devl mailing list
Synfig-devl@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/synfig-devl

[Synfig-devl] Carlos Lopez : Forgot to commit those two files

[Synfig-devl] Konstantin Dmitriev : Merge commit 'origin/genete_keyframe_list' into morevna

[Synfig-devl] Carlos Lopez : Fix bug for the modification of the keyframe length.

[Synfig-devl] Konstantin Dmitriev : Invoke bash directly to detect revision ( allows to avoid using some minimal shell alternatives). Minor improvements on branch detection.

[Synfig-devl] Carlos Lopez : Alter the font size of the timeslider

[Synfig-devl] Konstantin Dmitriev : Invoke bash directly to detect revision ( allows to avoid using some minimal shell alternatives). Minor improvements on branch detection.

6 matches

Site Navigation

Mail list logo

Footer information