projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Synchronise quality spin button and quality action radio buttons.
[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
6f1f87e
..
2f26d7b
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/canvasview.h
+++ b/
synfig-studio/trunk/src/gtkmm/canvasview.h
@@
-41,6
+41,7
@@
#include <gtkmm/scrolledwindow.h>
#include <gtkmm/notebook.h>
#include <gdkmm/device.h>
#include <gtkmm/scrolledwindow.h>
#include <gtkmm/notebook.h>
#include <gdkmm/device.h>
+#include <gtkmm/spinbutton.h>
#include <synfigapp/canvasinterface.h>
#include <synfigapp/selectionmanager.h>
#include <synfigapp/canvasinterface.h>
#include <synfigapp/selectionmanager.h>
@@
-65,6
+66,9
@@
#include "dialog_waypoint.h"
#include "dialog_keyframe.h"
#include "dialog_waypoint.h"
#include "dialog_keyframe.h"
+#include "framedial.h"
+#include "toggleducksdial.h"
+#include "resolutiondial.h"
#include "duckmatic.h"
#include <gtkmm/scale.h>
#include "duckmatic.h"
#include <gtkmm/scale.h>
@@
-260,11
+264,18
@@
private:
Gtk::Button *refreshbutton;
Gtk::Button *treetogglebutton; // not used
Gtk::Notebook *notebook; // not used
Gtk::Button *refreshbutton;
Gtk::Button *treetogglebutton; // not used
Gtk::Notebook *notebook; // not used
- Gtk::Widget *timebar;
+ Gtk::Table *timebar;
+ Gtk::Table *displaybar;
Gtk::Button *animatebutton;
Gtk::Button *keyframebutton;
Gtk::Button *animatebutton;
Gtk::Button *keyframebutton;
-
-
+ FrameDial *framedial;
+ ToggleDucksDial *toggleducksdial;
+ bool toggling_ducks_;
+ ResolutionDial *resolutiondial;
+ bool changing_resolution_;
+ Gtk::Adjustment quality_adjustment_;
+ Gtk::SpinButton *quality_spin;
+ bool updating_quality_;
//! Shows current time and allows edition
Widget_Time *current_time_widget;
void on_current_time_widget_changed();
//! Shows current time and allows edition
Widget_Time *current_time_widget;
void on_current_time_widget_changed();
@@
-403,6
+414,8
@@
private:
Gtk::Widget *create_time_bar();
Gtk::Widget *create_time_bar();
+ Gtk::Widget *create_display_bar();
+
//! Pop up menu for the bezier (bline, draw) tool (?)
void popup_param_menu_bezier(float location, synfigapp::ValueDesc value_desc)
{ popup_param_menu(value_desc,location,true); }
//! Pop up menu for the bezier (bline, draw) tool (?)
void popup_param_menu_bezier(float location, synfigapp::ValueDesc value_desc)
{ popup_param_menu(value_desc,location,true); }
@@
-423,6
+436,8
@@
private:
void decrease_low_res_pixel_size();
void increase_low_res_pixel_size();
void decrease_low_res_pixel_size();
void increase_low_res_pixel_size();
+ void toggle_low_res_pixel_flag();
+ void set_quality(int x);
/*
-- ** -- P U B L I C M E T H O D S -----------------------------------------
/*
-- ** -- P U B L I C M E T H O D S -----------------------------------------
@@
-594,6
+609,8
@@
public:
bool is_playing() { return is_playing_; }
bool is_playing() { return is_playing_; }
+ void update_quality();
+
/*
-- ** -- 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 -------------------------------------
*/
@@
-679,6
+696,8
@@
private:
//void on_audio_play();
bool on_audio_scrub();
//void on_audio_play();
bool on_audio_scrub();
+ void on_play_stop_pressed();
+
protected:
bool close_instance_when_safe();
bool on_delete_event(GdkEventAny* event);
protected:
bool close_instance_when_safe();
bool on_delete_event(GdkEventAny* event);