Author: kitone
Date: Sat Apr 25 16:50:26 2015
New Revision: 928
URL: http://svn.gna.org/viewcvs/subtitleeditor?rev=928&view=rev
Log:
Fix bug #23502 : Allow display of subtitles elsewhere but at the bottom.
Modified:
trunk/ChangeLog
trunk/plugins/actions/preferences/dialog-preferences.ui
trunk/plugins/actions/preferences/videoplayerpage.h
trunk/src/vp/gstplayer.cc
trunk/src/vp/gstplayer.h
Modified: trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/ChangeLog?rev=928&r1=927&r2=928&view=diff
==============================================================================
--- trunk/ChangeLog (original)
+++ trunk/ChangeLog Sat Apr 25 16:50:26 2015
@@ -1,3 +1,11 @@
+2015-04-25 kitone <[email protected]>
+
+ * plugins/actions/preferences/dialog-preferences.ui:
+ * plugins/actions/preferences/videoplayerpage.h:
+ * src/vp/gstplayer.cc:
+ * src/vp/gstplayer.h:
+ Fix bug #23502 : Allow display of subtitles elsewhere but at the bottom.
+
2015-04-25 kitone <[email protected]>
* src/gui/treeviewextensionmanager.cc:
Modified: trunk/plugins/actions/preferences/dialog-preferences.ui
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/plugins/actions/preferences/dialog-preferences.ui?rev=928&r1=927&r2=928&view=diff
==============================================================================
--- trunk/plugins/actions/preferences/dialog-preferences.ui (original)
+++ trunk/plugins/actions/preferences/dialog-preferences.ui Sat Apr 25
16:50:26 2015
@@ -43,7 +43,6 @@
</object>
<object class="GtkDialog" id="dialog-preferences">
<property name="can_focus">False</property>
- <property name="default_width">800</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
@@ -753,6 +752,48 @@
<property name="position">2</property>
</packing>
</child>
+ <child>
+ <object class="GtkBox" id="box12">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label31">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Vertical Alignment:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText"
id="combo-text-valignment">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <items>
+ <item id="0"
translatable="yes">baseline</item>
+ <item id="1"
translatable="yes">bottom</item>
+ <item id="2"
translatable="yes">top</item>
+ <item id="3"
translatable="yes">position</item>
+ <item id="4"
translatable="yes">center</item>
+ </items>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
</object>
</child>
</object>
@@ -1653,6 +1694,7 @@
<object class="GtkScrolledWindow"
id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property
name="hscrollbar_policy">never</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView"
id="treeview-extension">
Modified: trunk/plugins/actions/preferences/videoplayerpage.h
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/plugins/actions/preferences/videoplayerpage.h?rev=928&r1=927&r2=928&view=diff
==============================================================================
--- trunk/plugins/actions/preferences/videoplayerpage.h (original)
+++ trunk/plugins/actions/preferences/videoplayerpage.h Sat Apr 25 16:50:26 2015
@@ -114,6 +114,8 @@
init_widget(xml, "check-force-aspect-ratio", "video-player",
"force-aspect-ratio");
init_widget(xml, "check-automatically-open-video",
"video-player", "automatically-open-video");
+ init_widget(xml, "combo-text-valignment", "video-player",
"text-valignment");
+
// outputs
xml->get_widget_derived("combo-audio-output",
m_comboAudioOutput);
xml->get_widget_derived("combo-video-output",
m_comboVideoOutput);
@@ -154,7 +156,7 @@
}
protected:
-
+
void on_audio_output_changed()
{
Glib::ustring name = m_comboAudioOutput->get_active_name();
Modified: trunk/src/vp/gstplayer.cc
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/src/vp/gstplayer.cc?rev=928&r1=927&r2=928&view=diff
==============================================================================
--- trunk/src/vp/gstplayer.cc (original)
+++ trunk/src/vp/gstplayer.cc Sat Apr 25 16:50:26 2015
@@ -437,6 +437,7 @@
Glib::ustring cfg_font_desc = cfg.get_value_string("video-player",
"font-desc");
bool cfg_shaded_background = cfg.get_value_bool("video-player",
"shaded-background");
bool cfg_force_aspect_ratio = cfg.get_value_bool("video-player",
"force-aspect-ratio");
+ guint cfg_text_valignment = get_text_valignment_based_on_config();
try
{
@@ -488,7 +489,7 @@
// configure text overlay
//m_textoverlay->set_property("halignment", 1); // "center"
- //m_textoverlay->set_property("valignment", 0); // "bottom"
+ m_textoverlay->set_property("valignment", cfg_text_valignment);
m_textoverlay->set_property("shaded_background",
cfg_shaded_background);
m_textoverlay->set_property("font_desc", cfg_font_desc);
@@ -992,3 +993,27 @@
return framerate;
}
+guint GstPlayer::get_text_valignment_based_on_config()
+{
+ guint alignment = 0;
+
+ Glib::ustring cfg_text_valignment;
+ if(Config::getInstance().get_value_string("video-player",
"text-valignment", cfg_text_valignment))
+ {
+ if(cfg_text_valignment == "baseline")
+ alignment = 0;
+ else if(cfg_text_valignment == "bottom")
+ alignment = 1;
+ else if(cfg_text_valignment == "top")
+ alignment = 2;
+ else if(cfg_text_valignment == "position")
+ alignment = 3;
+ else if(cfg_text_valignment == "center")
+ alignment = 4;
+ }
+ else
+ Config::getInstance().set_value_string("video-player",
"text-valignment", "baseline");
+
+ return alignment;
+}
+
Modified: trunk/src/vp/gstplayer.h
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/src/vp/gstplayer.h?rev=928&r1=927&r2=928&view=diff
==============================================================================
--- trunk/src/vp/gstplayer.h (original)
+++ trunk/src/vp/gstplayer.h Sat Apr 25 16:50:26 2015
@@ -270,6 +270,9 @@
*/
gint get_current_audio();
+ /*
+ */
+ guint get_text_valignment_based_on_config();
protected:
gulong m_xWindowId;
_______________________________________________
Subtitleeditor-commits mailing list
[email protected]
https://mail.gna.org/listinfo/subtitleeditor-commits
