projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 1824437: studio occasionally renders the tiles in the wrong places. This was...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
canvasview.h
diff --git
a/synfig-studio/trunk/src/gtkmm/canvasview.h
b/synfig-studio/trunk/src/gtkmm/canvasview.h
index
21f7216
..
7448377
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/canvasview.h
+++ b/
synfig-studio/trunk/src/gtkmm/canvasview.h
@@
-2,10
+2,11
@@
/*! \file canvasview.h
** \brief Template Header
**
/*! \file canvasview.h
** \brief Template Header
**
-** $Id
: canvasview.h,v 1.2 2005/01/13 18:37:30 darco Exp
$
+** $Id$
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** Copyright (c) 2007 Chris Moore
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-154,7
+155,7
@@
public:
typedef ChildrenTreeStore::Model ChildrenTreeModel;
//! Create an instance of this class whenever doing a longer task.
typedef ChildrenTreeStore::Model ChildrenTreeModel;
//! Create an instance of this class whenever doing a longer task.
- /*! Make sure that you check the bool value of this class occasionaly
+ /*! Make sure that you check the bool value of this class occasional
l
y
** to make sure the action has not been canceled. */
class IsWorking
{
** to make sure the action has not been canceled. */
class IsWorking
{
@@
-200,12
+201,12
@@
private:
etl::handle<AudioContainer> audio;
studio::Widget_Sound *disp_audio; //should this be put into thing too?
etl::handle<AudioContainer> audio;
studio::Widget_Sound *disp_audio; //should this be put into thing too?
-
SigC::C
onnection playcon;
-
SigC::C
onnection stopcon;
+
sigc::c
onnection playcon;
+
sigc::c
onnection stopcon;
std::auto_ptr<UniversalScrubber> universal_scrubber;
std::auto_ptr<UniversalScrubber> universal_scrubber;
- //! Tooltip controler
+ //! Tooltip control
l
er
Gtk::Tooltips tooltips;
DEBUGPOINT_CLASS(4);
Gtk::Tooltips tooltips;
DEBUGPOINT_CLASS(4);
@@
-504,8
+505,11
@@
public:
//! Updates the title of the window
void update_title();
//! Updates the title of the window
void update_title();
+ //! Closes this document
+ bool close_instance();
+
//! Closes this canvas view
//! Closes this canvas view
- bool close();
+ bool close
_view
();
//! Stops the currently executing action
/*! \see get_cancel_status(), reset_cancel_status(), IsWorking */
//! Stops the currently executing action
/*! \see get_cancel_status(), reset_cancel_status(), IsWorking */
@@
-569,15
+573,7
@@
public:
void hide_timebar();
//t Enables or disables interaction with the timebar
void hide_timebar();
//t Enables or disables interaction with the timebar
- void timebar_set_sensitive(bool sensitive);
-
- void do_rotoscope_bline();
-
- void do_rotoscope();
-
- void do_rotoscope_poly();
-
- void do_eyedrop();
+ void set_sensitive_timebar(bool sensitive);
void time_zoom_in();
void time_zoom_out();
void time_zoom_in();
void time_zoom_out();
@@
-597,6
+593,8
@@
public:
void present();
void present();
+ bool is_playing() { return is_playing_; }
+
/*
-- ** -- S I G N A L T E R M I N A L S -------------------------------------
*/
/*
-- ** -- S I G N A L T E R M I N A L S -------------------------------------
*/
@@
-670,6
+668,7
@@
private:
void on_audio_offset_notify();
bool on_duck_changed(const synfig::Point &value,const synfigapp::ValueDesc& value_desc);
void on_audio_offset_notify();
bool on_duck_changed(const synfig::Point &value,const synfigapp::ValueDesc& value_desc);
+ bool on_duck_angle_changed(const synfig::Angle &rotation,const synfigapp::ValueDesc& value_desc);
void on_layer_toggle(synfig::Layer::Handle);
void on_layer_toggle(synfig::Layer::Handle);
@@
-683,6
+682,7
@@
private:
bool on_audio_scrub();
protected:
bool on_audio_scrub();
protected:
+ bool close_instance_when_safe();
bool on_delete_event(GdkEventAny* event);
/*
bool on_delete_event(GdkEventAny* event);
/*