Author: Yu Chen <[email protected]>
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_end",_("Seek to end"));
@@ -64,7 +64,7 @@ FrameDial::FrameDial(): Gtk::Table(7, 1, false)
attach(*seek_begin, 0, 1, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
attach(*seek_prev_keyframe, 1, 2, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
attach(*seek_prev_frame, 2, 3, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
- attach(*play_stop, 3, 4, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+ attach(*play_pause, 3, 4, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
attach(*seek_next_frame, 4, 5, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
attach(*seek_next_keyframe, 5, 6, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
attach(*seek_end, 6, 7, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
diff --git a/synfig-studio/src/gui/dials/framedial.h
b/synfig-studio/src/gui/dials/framedial.h
index 1e1bdc9..100c819 100644
--- a/synfig-studio/src/gui/dials/framedial.h
+++ b/synfig-studio/src/gui/dials/framedial.h
@@ -50,7 +50,7 @@ class FrameDial : public Gtk::Table
Gtk::Button *seek_begin;
Gtk::Button *seek_prev_keyframe;
Gtk::Button *seek_prev_frame;
- Gtk::Button *play_stop;
+ Gtk::Button *play_pause;
Gtk::Button *seek_next_frame;
Gtk::Button *seek_next_keyframe;
Gtk::Button *seek_end;
@@ -62,12 +62,12 @@ public:
Glib::SignalProxy0<void> signal_seek_begin() { return
seek_begin->signal_clicked(); }
Glib::SignalProxy0<void> signal_seek_prev_keyframe() { return
seek_prev_keyframe->signal_clicked(); }
Glib::SignalProxy0<void> signal_seek_prev_frame() { return
seek_prev_frame->signal_clicked(); }
- Glib::SignalProxy0<void> signal_play_stop() { return
play_stop->signal_clicked(); }
+ Glib::SignalProxy0<void> signal_play_pause() { return
play_pause->signal_clicked(); }
Glib::SignalProxy0<void> signal_seek_next_frame() { return
seek_next_frame->signal_clicked(); }
Glib::SignalProxy0<void> signal_seek_next_keyframe() { return
seek_next_keyframe->signal_clicked(); }
Glib::SignalProxy0<void> signal_seek_end() { return
seek_end->signal_clicked(); }
- Gtk::Button *get_play_button() { return play_stop; }
+ Gtk::Button *get_play_button() { return play_pause; }
}; // END of class FrameDial
------------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl
