Reloaded3 - UI : curve panel, save space and adjust buttons

* Place in one line top widgets
* Place in one line bottom buttons (curve type + clear / save ...)
* Move "Toggle rendering" near "Reset"
* Rewrite some ttips texts
This commit is contained in:
Jerome Blanchi aka d.j.a.y
2019-05-23 01:04:42 +02:00
parent edaccd7737
commit 04798b56e5

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 --> <!-- Generated with glade 3.20.0 -->
<interface> <interface>
<requires lib="gtk+" version="3.16"/> <requires lib="gtk+" version="3.16"/>
<!-- interface-css-provider-path gveejay.reloaded.css --> <!-- interface-css-provider-path gveejay.reloaded.css -->
@@ -8,18 +8,12 @@
<child> <child>
<placeholder/> <placeholder/>
</child> </child>
<child>
<placeholder/>
</child>
</object> </object>
<object class="GtkApplicationWindow"> <object class="GtkApplicationWindow">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<child> <child>
<placeholder/> <placeholder/>
</child> </child>
<child>
<placeholder/>
</child>
</object> </object>
<object class="GtkAdjustment" id="calibration_duration"> <object class="GtkAdjustment" id="calibration_duration">
<property name="lower">2</property> <property name="lower">2</property>
@@ -149,9 +143,6 @@
<property name="default_height">400</property> <property name="default_height">400</property>
<property name="icon">icon_stream.png</property> <property name="icon">icon_stream.png</property>
<signal name="delete-event" handler="on_generator_window_delete_event" swapped="no"/> <signal name="delete-event" handler="on_generator_window_delete_event" swapped="no"/>
<child>
<placeholder/>
</child>
<child> <child>
<object class="GtkFrame" id="frame_generator"> <object class="GtkFrame" id="frame_generator">
<property name="visible">True</property> <property name="visible">True</property>
@@ -1423,6 +1414,18 @@
<child> <child>
<placeholder/> <placeholder/>
</child> </child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child> <child>
<object class="GtkButton" id="generators_close"> <object class="GtkButton" id="generators_close">
<property name="visible">True</property> <property name="visible">True</property>
@@ -1554,9 +1557,6 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="title" translatable="yes">Image Calibration</property> <property name="title" translatable="yes">Image Calibration</property>
<signal name="delete-event" handler="on_calibration_window_delete_event" swapped="no"/> <signal name="delete-event" handler="on_calibration_window_delete_event" swapped="no"/>
<child>
<placeholder/>
</child>
<child> <child>
<object class="GtkBox" id="vbox637"> <object class="GtkBox" id="vbox637">
<property name="visible">True</property> <property name="visible">True</property>
@@ -2397,9 +2397,6 @@
<property name="default_height">400</property> <property name="default_height">400</property>
<property name="icon">icon_stream.png</property> <property name="icon">icon_stream.png</property>
<signal name="delete-event" handler="on_inputstream_window_delete_event" swapped="no"/> <signal name="delete-event" handler="on_inputstream_window_delete_event" swapped="no"/>
<child>
<placeholder/>
</child>
<child> <child>
<object class="GtkFrame" id="frame161"> <object class="GtkFrame" id="frame161">
<property name="width_request">340</property> <property name="width_request">340</property>
@@ -2772,9 +2769,6 @@
<property name="type_hint">dialog</property> <property name="type_hint">dialog</property>
<signal name="close" handler="on_veejay_connection_close" swapped="no"/> <signal name="close" handler="on_veejay_connection_close" swapped="no"/>
<signal name="delete-event" handler="on_veejay_connection_close" swapped="no"/> <signal name="delete-event" handler="on_veejay_connection_close" swapped="no"/>
<child>
<placeholder/>
</child>
<child internal-child="vbox"> <child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox3"> <object class="GtkBox" id="dialog-vbox3">
<property name="visible">True</property> <property name="visible">True</property>
@@ -3246,9 +3240,6 @@
<property name="type_hint">dialog</property> <property name="type_hint">dialog</property>
<signal name="close" handler="on_video_options_close" swapped="no"/> <signal name="close" handler="on_video_options_close" swapped="no"/>
<signal name="delete-event" handler="on_video_options_close" swapped="no"/> <signal name="delete-event" handler="on_video_options_close" swapped="no"/>
<child>
<placeholder/>
</child>
<child internal-child="vbox"> <child internal-child="vbox">
<object class="GtkBox" id="vbox_video_options"> <object class="GtkBox" id="vbox_video_options">
<property name="visible">True</property> <property name="visible">True</property>
@@ -4114,9 +4105,6 @@
<property name="type_hint">dialog</property> <property name="type_hint">dialog</property>
<signal name="close" handler="on_vims_bundles_close" swapped="no"/> <signal name="close" handler="on_vims_bundles_close" swapped="no"/>
<signal name="delete-event" handler="on_vims_bundles_close" swapped="no"/> <signal name="delete-event" handler="on_vims_bundles_close" swapped="no"/>
<child>
<placeholder/>
</child>
<child internal-child="vbox"> <child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox5"> <object class="GtkBox" id="dialog-vbox5">
<property name="visible">True</property> <property name="visible">True</property>
@@ -4513,9 +4501,6 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="title" translatable="yes">Reloaded</property> <property name="title" translatable="yes">Reloaded</property>
<property name="icon">veejay-icon.png</property> <property name="icon">veejay-icon.png</property>
<child>
<placeholder/>
</child>
<child> <child>
<object class="GtkBox" id="veejay_box"> <object class="GtkBox" id="veejay_box">
<property name="visible">True</property> <property name="visible">True</property>
@@ -8175,22 +8160,6 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="curve_parameter">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="margin_top">4</property>
<property name="margin_bottom">4</property>
<property name="label" translatable="yes">None</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child> <child>
<object class="GtkGrid"> <object class="GtkGrid">
<property name="visible">True</property> <property name="visible">True</property>
@@ -8495,6 +8464,27 @@
<property name="top_attach">0</property> <property name="top_attach">0</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkLabel" id="curve_parameter">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="margin_left">4</property>
<property name="margin_right">4</property>
<property name="label" translatable="yes">None</property>
<property name="ellipsize">middle</property>
<property name="width_chars">15</property>
<property name="single_line_mode">True</property>
<property name="max_width_chars">15</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child> <child>
<placeholder/> <placeholder/>
</child> </child>
@@ -8502,7 +8492,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child> <child>
@@ -8632,6 +8622,129 @@
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child>
<placeholder/>
</child>
<child>
<object class="GtkBox" id="fxanimcontrols">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkToggleButton" id="curve_toggleentry_param">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Toggle parameter animation status</property>
<signal name="toggled" handler="on_curve_toggleentry_param_toggled" swapped="no"/>
<child>
<object class="GtkImage" id="image2146">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">icon_connect.png</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="curve_buttonstore">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Save this animation (Apply)</property>
<signal name="clicked" handler="on_curve_buttonstore_clicked" swapped="no"/>
<child>
<object class="GtkImage" id="image2521">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">icon_save.png</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="curve_clear_parameter">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Clear this animation</property>
<signal name="clicked" handler="on_curve_clear_parameter_clicked" swapped="no"/>
<child>
<object class="GtkImage" id="image17">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">icon_clear.png</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkBox" id="hbox850">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkToggleButton" id="curve_panel_toggleentry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Toggle rendering of this animation in FX chain</property>
<signal name="toggled" handler="curve_panel_toggleentry_toggled" swapped="no"/>
<child>
<object class="GtkImage" id="image58">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">icon_keyframe.png</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="curve_buttonclear">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Reset all animated parameters</property>
<signal name="clicked" handler="on_curve_buttonclear_clicked" swapped="no"/>
<child>
<object class="GtkImage" id="image532">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">icon_clearall.png</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">False</property>
<property name="position">4</property>
</packing>
</child>
<child> <child>
<object class="GtkBox" id="hbox657"> <object class="GtkBox" id="hbox657">
<property name="visible">True</property> <property name="visible">True</property>
@@ -8697,137 +8810,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">2</property> <property name="position">5</property>
</packing>
</child>
<child>
<object class="GtkBox" id="fxanimcontrols">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkToggleButton" id="curve_panel_toggleentry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Toggle rendering of this animation in FX chain</property>
<signal name="toggled" handler="curve_panel_toggleentry_toggled" swapped="no"/>
<child>
<object class="GtkImage" id="image58">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">icon_keyframe.png</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkToggleButton" id="curve_toggleentry_param">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Toggle status</property>
<signal name="toggled" handler="on_curve_toggleentry_param_toggled" swapped="no"/>
<child>
<object class="GtkImage" id="image2146">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">icon_connect.png</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="curve_buttonstore">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Save this animation (Apply)</property>
<signal name="clicked" handler="on_curve_buttonstore_clicked" swapped="no"/>
<child>
<object class="GtkImage" id="image2521">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">icon_save.png</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkButton" id="curve_clear_parameter">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Clear this animation</property>
<signal name="clicked" handler="on_curve_clear_parameter_clicked" swapped="no"/>
<child>
<object class="GtkImage" id="image17">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">icon_clear.png</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkBox" id="hbox850">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkButton" id="curve_buttonclear">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Reset</property>
<signal name="clicked" handler="on_curve_buttonclear_clicked" swapped="no"/>
<child>
<object class="GtkImage" id="image532">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">icon_clearall.png</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">4</property>
</packing> </packing>
</child> </child>
</object> </object>