subject:"\[Synfig\-devl\] Carlos Lopez \: A little smaller, and better look. I don' t like it so much though. Have to think other solution."

[Synfig-devl] Carlos Lopez : A little smaller, and better look. I don' t like it so much though. Have to think other solution.

2009-08-18 Thread Konstantin Dmitriev

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

Author: Carlos Lopez 
Date:   Sat Jul 18 22:00:13 2009 +0200

A little smaller, and better look. I don't like it so much though. Have to 
think other solution.

---

 synfig-studio/trunk/src/gtkmm/canvasview.cpp   |   22 +--
 synfig-studio/trunk/src/gtkmm/canvasview.h |4 +++
 synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp   |4 +-
 .../trunk/src/gtkmm/widget_keyframe_list.cpp   |   13 +--
 .../trunk/src/gtkmm/widget_timeslider.cpp  |2 +-
 5 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp 
b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index a76b1a0..9675f03 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -690,6 +690,7 @@ CanvasView::CanvasView(etl::loose_handle 
instance,etl::handleset_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"));
@@ -1033,16 +1040,17 @@ CanvasView::create_time_bar()
keyframedial->show();
keyframebutton=keyframedial->get_lock_button();
 
-   timebar = manage(new class Gtk::Table(5, 4, false));
+   timebar = Gtk::manage(new class Gtk::Table(5, 4, false));
 
//Attach widgets to the timebar
-   timebar->attach(*manage(disp_audio), 1, 5, 0, 1, Gtk::EXPAND|Gtk::FILL, 
Gtk::SHRINK);
-   timebar->attach(*framedial, 0, 1, 2, 3,Gtk::SHRINK, Gtk::SHRINK);
-   timebar->attach(*current_time_widget, 0, 1, 1, 2, 
Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
-   timebar->attach(*timeslider, 1, 3, 1, 2, Gtk::EXPAND|Gtk::FILL, 
Gtk::SHRINK);
+   //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::SHRINK);
+   timebar->attach(*widget_kf_list, 1, 3, 1, 2, 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, 1, 2, Gtk::SHRINK, Gtk::SHRINK);
-   timebar->attach(*animatebutton, 4, 5, 1, 2, Gtk::SHRINK, Gtk::SHRINK);
+   timebar->attach(*keyframedial, 3, 4, 0, 2, Gtk::SHRINK, Gtk::SHRINK);
+   timebar->attach(*animatebutton, 4, 5, 0, 2, Gtk::SHRINK, Gtk::SHRINK);
//timebar->attach(*keyframebutton, 1, 2, 3, 4, Gtk::SHRINK, 
Gtk::SHRINK);
 
timebar->show();
diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.h 
b/synfig-studio/trunk/src/gtkmm/canvasview.h
index a33fb26..cddcbe2 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.h
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.h
@@ -70,6 +70,7 @@
 #include "framedial.h"
 #include "toggleducksdial.h"
 #include "resolutiondial.h"
+#include "widget_keyframe_list.h"
 
 #include "duckmatic.h"
 #include 
@@ -294,6 +295,9 @@ private:
//! Time slider class. Same than the Time track panel
std::auto_ptr timeslider;
 
+   //!Keyframe list slider
+   std::auto_ptr widget_kf_list;
+
std::list duck_changed_connections;
 
 /* DEBUGPOINT_CLASS(8);
diff --git a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp 
b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
index c13bb71..ac36340 100644
--- a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
@@ -414,8 +414,8 @@ Dock_Timetrack::Dock_Timetrack():
if (header_height < 3)
header_height = 22;
 
-   widget_timeslider_->set_size_request(-1,header_height);
-   widget_kf_list_->set_size_request(-1,header_height);
+   widget_timeslider_->set_size_request(-1,header_height-8);
+   widget_kf_list_->set_size_request(-1,8);
 
hscrollbar_=new Gtk::HScrollbar();
vscrollbar_=new Gtk::VScrollbar();
diff --git a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp 
b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
index 1e597ce..d31810a 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.c

[Synfig-devl] Carlos Lopez : A little smaller, and better look. I don' t like it so much though. Have to think other solution.

2009-08-01 Thread Genete

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

Author: Carlos Lopez 
Date:   Sat Jul 18 22:00:13 2009 +0200

A little smaller, and better look. I don't like it so much though. Have to 
think other solution.

---

 synfig-studio/trunk/src/gtkmm/canvasview.cpp   |   22 +--
 synfig-studio/trunk/src/gtkmm/canvasview.h |4 +++
 synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp   |4 +-
 .../trunk/src/gtkmm/widget_keyframe_list.cpp   |   13 +--
 .../trunk/src/gtkmm/widget_timeslider.cpp  |2 +-
 5 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp 
b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index a76b1a0..9675f03 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -690,6 +690,7 @@ CanvasView::CanvasView(etl::loose_handle 
instance,etl::handleset_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"));
@@ -1033,16 +1040,17 @@ CanvasView::create_time_bar()
keyframedial->show();
keyframebutton=keyframedial->get_lock_button();
 
-   timebar = manage(new class Gtk::Table(5, 4, false));
+   timebar = Gtk::manage(new class Gtk::Table(5, 4, false));
 
//Attach widgets to the timebar
-   timebar->attach(*manage(disp_audio), 1, 5, 0, 1, Gtk::EXPAND|Gtk::FILL, 
Gtk::SHRINK);
-   timebar->attach(*framedial, 0, 1, 2, 3,Gtk::SHRINK, Gtk::SHRINK);
-   timebar->attach(*current_time_widget, 0, 1, 1, 2, 
Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
-   timebar->attach(*timeslider, 1, 3, 1, 2, Gtk::EXPAND|Gtk::FILL, 
Gtk::SHRINK);
+   //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::SHRINK);
+   timebar->attach(*widget_kf_list, 1, 3, 1, 2, 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, 1, 2, Gtk::SHRINK, Gtk::SHRINK);
-   timebar->attach(*animatebutton, 4, 5, 1, 2, Gtk::SHRINK, Gtk::SHRINK);
+   timebar->attach(*keyframedial, 3, 4, 0, 2, Gtk::SHRINK, Gtk::SHRINK);
+   timebar->attach(*animatebutton, 4, 5, 0, 2, Gtk::SHRINK, Gtk::SHRINK);
//timebar->attach(*keyframebutton, 1, 2, 3, 4, Gtk::SHRINK, 
Gtk::SHRINK);
 
timebar->show();
diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.h 
b/synfig-studio/trunk/src/gtkmm/canvasview.h
index a33fb26..cddcbe2 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.h
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.h
@@ -70,6 +70,7 @@
 #include "framedial.h"
 #include "toggleducksdial.h"
 #include "resolutiondial.h"
+#include "widget_keyframe_list.h"
 
 #include "duckmatic.h"
 #include 
@@ -294,6 +295,9 @@ private:
//! Time slider class. Same than the Time track panel
std::auto_ptr timeslider;
 
+   //!Keyframe list slider
+   std::auto_ptr widget_kf_list;
+
std::list duck_changed_connections;
 
 /* DEBUGPOINT_CLASS(8);
diff --git a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp 
b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
index c13bb71..ac36340 100644
--- a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
@@ -414,8 +414,8 @@ Dock_Timetrack::Dock_Timetrack():
if (header_height < 3)
header_height = 22;
 
-   widget_timeslider_->set_size_request(-1,header_height);
-   widget_kf_list_->set_size_request(-1,header_height);
+   widget_timeslider_->set_size_request(-1,header_height-8);
+   widget_kf_list_->set_size_request(-1,8);
 
hscrollbar_=new Gtk::HScrollbar();
vscrollbar_=new Gtk::VScrollbar();
diff --git a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp 
b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
index 1e597ce..d31810a 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
+++ b/

[Synfig-devl] Carlos Lopez : A little smaller, and better look. I don' t like it so much though. Have to think other solution.

2009-07-27 Thread Genete

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

Author: Carlos Lopez 
Date:   Sat Jul 18 22:00:13 2009 +0200

A little smaller, and better look. I don't like it so much though. Have to 
think other solution.

---

 synfig-studio/trunk/src/gtkmm/canvasview.cpp   |   22 +--
 synfig-studio/trunk/src/gtkmm/canvasview.h |4 +++
 synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp   |4 +-
 .../trunk/src/gtkmm/widget_keyframe_list.cpp   |   13 +--
 .../trunk/src/gtkmm/widget_timeslider.cpp  |2 +-
 5 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp 
b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index a76b1a0..9675f03 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -690,6 +690,7 @@ CanvasView::CanvasView(etl::loose_handle 
instance,etl::handleset_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"));
@@ -1033,16 +1040,17 @@ CanvasView::create_time_bar()
keyframedial->show();
keyframebutton=keyframedial->get_lock_button();
 
-   timebar = manage(new class Gtk::Table(5, 4, false));
+   timebar = Gtk::manage(new class Gtk::Table(5, 4, false));
 
//Attach widgets to the timebar
-   timebar->attach(*manage(disp_audio), 1, 5, 0, 1, Gtk::EXPAND|Gtk::FILL, 
Gtk::SHRINK);
-   timebar->attach(*framedial, 0, 1, 2, 3,Gtk::SHRINK, Gtk::SHRINK);
-   timebar->attach(*current_time_widget, 0, 1, 1, 2, 
Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
-   timebar->attach(*timeslider, 1, 3, 1, 2, Gtk::EXPAND|Gtk::FILL, 
Gtk::SHRINK);
+   //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::SHRINK);
+   timebar->attach(*widget_kf_list, 1, 3, 1, 2, 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, 1, 2, Gtk::SHRINK, Gtk::SHRINK);
-   timebar->attach(*animatebutton, 4, 5, 1, 2, Gtk::SHRINK, Gtk::SHRINK);
+   timebar->attach(*keyframedial, 3, 4, 0, 2, Gtk::SHRINK, Gtk::SHRINK);
+   timebar->attach(*animatebutton, 4, 5, 0, 2, Gtk::SHRINK, Gtk::SHRINK);
//timebar->attach(*keyframebutton, 1, 2, 3, 4, Gtk::SHRINK, 
Gtk::SHRINK);
 
timebar->show();
diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.h 
b/synfig-studio/trunk/src/gtkmm/canvasview.h
index a33fb26..cddcbe2 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.h
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.h
@@ -70,6 +70,7 @@
 #include "framedial.h"
 #include "toggleducksdial.h"
 #include "resolutiondial.h"
+#include "widget_keyframe_list.h"
 
 #include "duckmatic.h"
 #include 
@@ -294,6 +295,9 @@ private:
//! Time slider class. Same than the Time track panel
std::auto_ptr timeslider;
 
+   //!Keyframe list slider
+   std::auto_ptr widget_kf_list;
+
std::list duck_changed_connections;
 
 /* DEBUGPOINT_CLASS(8);
diff --git a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp 
b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
index c13bb71..ac36340 100644
--- a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
@@ -414,8 +414,8 @@ Dock_Timetrack::Dock_Timetrack():
if (header_height < 3)
header_height = 22;
 
-   widget_timeslider_->set_size_request(-1,header_height);
-   widget_kf_list_->set_size_request(-1,header_height);
+   widget_timeslider_->set_size_request(-1,header_height-8);
+   widget_kf_list_->set_size_request(-1,8);
 
hscrollbar_=new Gtk::HScrollbar();
vscrollbar_=new Gtk::VScrollbar();
diff --git a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp 
b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
index 1e597ce..d31810a 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp

[Synfig-devl] Carlos Lopez : A little smaller, and better look. I don' t like it so much though. Have to think other solution.

2009-07-19 Thread Konstantin Dmitriev

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

Author: Carlos Lopez 
Date:   Sat Jul 18 22:00:13 2009 +0200

A little smaller, and better look. I don't like it so much though. Have to 
think other solution.

---

 synfig-studio/trunk/src/gtkmm/canvasview.cpp   |   22 +--
 synfig-studio/trunk/src/gtkmm/canvasview.h |4 +++
 synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp   |4 +-
 .../trunk/src/gtkmm/widget_keyframe_list.cpp   |   13 +--
 .../trunk/src/gtkmm/widget_timeslider.cpp  |2 +-
 5 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp 
b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index a76b1a0..9675f03 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -690,6 +690,7 @@ CanvasView::CanvasView(etl::loose_handle 
instance,etl::handleset_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"));
@@ -1033,16 +1040,17 @@ CanvasView::create_time_bar()
keyframedial->show();
keyframebutton=keyframedial->get_lock_button();
 
-   timebar = manage(new class Gtk::Table(5, 4, false));
+   timebar = Gtk::manage(new class Gtk::Table(5, 4, false));
 
//Attach widgets to the timebar
-   timebar->attach(*manage(disp_audio), 1, 5, 0, 1, Gtk::EXPAND|Gtk::FILL, 
Gtk::SHRINK);
-   timebar->attach(*framedial, 0, 1, 2, 3,Gtk::SHRINK, Gtk::SHRINK);
-   timebar->attach(*current_time_widget, 0, 1, 1, 2, 
Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
-   timebar->attach(*timeslider, 1, 3, 1, 2, Gtk::EXPAND|Gtk::FILL, 
Gtk::SHRINK);
+   //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::SHRINK);
+   timebar->attach(*widget_kf_list, 1, 3, 1, 2, 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, 1, 2, Gtk::SHRINK, Gtk::SHRINK);
-   timebar->attach(*animatebutton, 4, 5, 1, 2, Gtk::SHRINK, Gtk::SHRINK);
+   timebar->attach(*keyframedial, 3, 4, 0, 2, Gtk::SHRINK, Gtk::SHRINK);
+   timebar->attach(*animatebutton, 4, 5, 0, 2, Gtk::SHRINK, Gtk::SHRINK);
//timebar->attach(*keyframebutton, 1, 2, 3, 4, Gtk::SHRINK, 
Gtk::SHRINK);
 
timebar->show();
diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.h 
b/synfig-studio/trunk/src/gtkmm/canvasview.h
index a33fb26..cddcbe2 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.h
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.h
@@ -70,6 +70,7 @@
 #include "framedial.h"
 #include "toggleducksdial.h"
 #include "resolutiondial.h"
+#include "widget_keyframe_list.h"
 
 #include "duckmatic.h"
 #include 
@@ -294,6 +295,9 @@ private:
//! Time slider class. Same than the Time track panel
std::auto_ptr timeslider;
 
+   //!Keyframe list slider
+   std::auto_ptr widget_kf_list;
+
std::list duck_changed_connections;
 
 /* DEBUGPOINT_CLASS(8);
diff --git a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp 
b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
index c13bb71..ac36340 100644
--- a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
@@ -414,8 +414,8 @@ Dock_Timetrack::Dock_Timetrack():
if (header_height < 3)
header_height = 22;
 
-   widget_timeslider_->set_size_request(-1,header_height);
-   widget_kf_list_->set_size_request(-1,header_height);
+   widget_timeslider_->set_size_request(-1,header_height-8);
+   widget_kf_list_->set_size_request(-1,8);
 
hscrollbar_=new Gtk::HScrollbar();
vscrollbar_=new Gtk::VScrollbar();
diff --git a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp 
b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
index 1e597ce..d31810a 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
+++ b

[Synfig-devl] Carlos Lopez : A little smaller, and better look. I don' t like it so much though. Have to think other solution.

2009-07-18 Thread Genete

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

Author: Carlos Lopez 
Date:   Sat Jul 18 22:00:13 2009 +0200

A little smaller, and better look. I don't like it so much though. Have to 
think other solution.

---

 synfig-studio/trunk/src/gtkmm/canvasview.cpp   |   22 +--
 synfig-studio/trunk/src/gtkmm/canvasview.h |4 +++
 synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp   |4 +-
 .../trunk/src/gtkmm/widget_keyframe_list.cpp   |   13 +--
 .../trunk/src/gtkmm/widget_timeslider.cpp  |2 +-
 5 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp 
b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index a76b1a0..9675f03 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -690,6 +690,7 @@ CanvasView::CanvasView(etl::loose_handle 
instance,etl::handleset_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"));
@@ -1033,16 +1040,17 @@ CanvasView::create_time_bar()
keyframedial->show();
keyframebutton=keyframedial->get_lock_button();
 
-   timebar = manage(new class Gtk::Table(5, 4, false));
+   timebar = Gtk::manage(new class Gtk::Table(5, 4, false));
 
//Attach widgets to the timebar
-   timebar->attach(*manage(disp_audio), 1, 5, 0, 1, Gtk::EXPAND|Gtk::FILL, 
Gtk::SHRINK);
-   timebar->attach(*framedial, 0, 1, 2, 3,Gtk::SHRINK, Gtk::SHRINK);
-   timebar->attach(*current_time_widget, 0, 1, 1, 2, 
Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0);
-   timebar->attach(*timeslider, 1, 3, 1, 2, Gtk::EXPAND|Gtk::FILL, 
Gtk::SHRINK);
+   //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::SHRINK);
+   timebar->attach(*widget_kf_list, 1, 3, 1, 2, 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, 1, 2, Gtk::SHRINK, Gtk::SHRINK);
-   timebar->attach(*animatebutton, 4, 5, 1, 2, Gtk::SHRINK, Gtk::SHRINK);
+   timebar->attach(*keyframedial, 3, 4, 0, 2, Gtk::SHRINK, Gtk::SHRINK);
+   timebar->attach(*animatebutton, 4, 5, 0, 2, Gtk::SHRINK, Gtk::SHRINK);
//timebar->attach(*keyframebutton, 1, 2, 3, 4, Gtk::SHRINK, 
Gtk::SHRINK);
 
timebar->show();
diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.h 
b/synfig-studio/trunk/src/gtkmm/canvasview.h
index a33fb26..cddcbe2 100644
--- a/synfig-studio/trunk/src/gtkmm/canvasview.h
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.h
@@ -70,6 +70,7 @@
 #include "framedial.h"
 #include "toggleducksdial.h"
 #include "resolutiondial.h"
+#include "widget_keyframe_list.h"
 
 #include "duckmatic.h"
 #include 
@@ -294,6 +295,9 @@ private:
//! Time slider class. Same than the Time track panel
std::auto_ptr timeslider;
 
+   //!Keyframe list slider
+   std::auto_ptr widget_kf_list;
+
std::list duck_changed_connections;
 
 /* DEBUGPOINT_CLASS(8);
diff --git a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp 
b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
index c13bb71..ac36340 100644
--- a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
@@ -414,8 +414,8 @@ Dock_Timetrack::Dock_Timetrack():
if (header_height < 3)
header_height = 22;
 
-   widget_timeslider_->set_size_request(-1,header_height);
-   widget_kf_list_->set_size_request(-1,header_height);
+   widget_timeslider_->set_size_request(-1,header_height-8);
+   widget_kf_list_->set_size_request(-1,8);
 
hscrollbar_=new Gtk::HScrollbar();
vscrollbar_=new Gtk::VScrollbar();
diff --git a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp 
b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
index 1e597ce..d31810a 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_keyframe_l

[Synfig-devl] Carlos Lopez : A little smaller, and better look. I don' t like it so much though. Have to think other solution.

[Synfig-devl] Carlos Lopez : A little smaller, and better look. I don' t like it so much though. Have to think other solution.

[Synfig-devl] Carlos Lopez : A little smaller, and better look. I don' t like it so much though. Have to think other solution.

[Synfig-devl] Carlos Lopez : A little smaller, and better look. I don' t like it so much though. Have to think other solution.

[Synfig-devl] Carlos Lopez : A little smaller, and better look. I don' t like it so much though. Have to think other solution.

5 matches

Site Navigation

Mail list logo

Footer information