Author: kitone
Date: Sun Feb 7 11:36:58 2016
New Revision: 965
URL: http://svn.gna.org/viewcvs/subtitleeditor?rev=965&view=rev
Log:
Fix bug #24066 : Trailing spaces count for cps calculation.
Modified:
trunk/ChangeLog
trunk/plugins/actions/preferences/dialog-preferences.ui
trunk/plugins/actions/preferences/timingpage.h
trunk/src/defaultcfg.cc
trunk/src/utility.cc
Modified: trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/ChangeLog?rev=965&r1=964&r2=965&view=diff
==============================================================================
--- trunk/ChangeLog (original)
+++ trunk/ChangeLog Sun Feb 7 11:36:58 2016
@@ -1,3 +1,11 @@
+2016-02-07 kitone <[email protected]>
+
+ * plugins/actions/preferences/dialog-preferences.ui:
+ * plugins/actions/preferences/timingpage.h:
+ * src/defaultcfg.cc:
+ * src/utility.cc:
+ Fix bug #24066 : Trailing spaces count for cps calculation.
+
2016-02-06 kitone <[email protected]>
* configure.ac:
Modified: trunk/plugins/actions/preferences/dialog-preferences.ui
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/plugins/actions/preferences/dialog-preferences.ui?rev=965&r1=964&r2=965&view=diff
==============================================================================
--- trunk/plugins/actions/preferences/dialog-preferences.ui (original)
+++ trunk/plugins/actions/preferences/dialog-preferences.ui Sun Feb 7
11:36:58 2016
@@ -18,7 +18,7 @@
<property name="lower">1</property>
<property name="upper">999</property>
<property name="value">1</property>
- <property name="step_increment">0.1</property>
+ <property name="step_increment">0.10000000000000001</property>
<property name="page_increment">1</property>
</object>
<object class="GtkAdjustment" id="adjustment-max-line-per-subtitle">
@@ -31,7 +31,7 @@
<property name="lower">1</property>
<property name="upper">999</property>
<property name="value">1</property>
- <property name="step_increment">0.1</property>
+ <property name="step_increment">0.10000000000000001</property>
<property name="page_increment">1</property>
</object>
<object class="GtkAdjustment" id="adjustment-min-display-sub">
@@ -1142,6 +1142,23 @@
<property name="top_attach">5</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton"
id="check-ignore-space">
+ <property name="label"
translatable="yes">_Ignore space in subtitle</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="tooltip_text"
translatable="yes">This setting takes effect only after Subtitle Editor is
restarted</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
</object>
</child>
</object>
Modified: trunk/plugins/actions/preferences/timingpage.h
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/plugins/actions/preferences/timingpage.h?rev=965&r1=964&r2=965&view=diff
==============================================================================
--- trunk/plugins/actions/preferences/timingpage.h (original)
+++ trunk/plugins/actions/preferences/timingpage.h Sun Feb 7 11:36:58 2016
@@ -41,6 +41,7 @@
init_widget(xml, "spin-min-display", "timing", "min-display");
init_widget(xml, "spin-max-characters-per-line", "timing",
"max-characters-per-line");
init_widget(xml, "spin-max-line-per-subtitle", "timing",
"max-line-per-subtitle");
+ init_widget(xml, "check-ignore-space", "timing",
"ignore-space");
init_widget(xml, "check-do-auto-timing-check", "timing",
"do-auto-timing-check");
}
};
Modified: trunk/src/defaultcfg.cc
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/src/defaultcfg.cc?rev=965&r1=964&r2=965&view=diff
==============================================================================
--- trunk/src/defaultcfg.cc (original)
+++ trunk/src/defaultcfg.cc Sun Feb 7 11:36:58 2016
@@ -108,6 +108,7 @@
config["timing"]["min-display"] = "1000";
config["timing"]["max-characters-per-line"] = "40";
config["timing"]["max-line-per-subtitle"] = "2";
+ config["timing"]["ignore-space"] = "false";
//[external-video-player]
config["external-video-player"]["command"] = "mplayer \"#video_file\"
-noautosub -sub \"#subtitle_file\" -ss #seconds -osdlevel 2";
Modified: trunk/src/utility.cc
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/src/utility.cc?rev=965&r1=964&r2=965&view=diff
==============================================================================
--- trunk/src/utility.cc (original)
+++ trunk/src/utility.cc Sun Feb 7 11:36:58 2016
@@ -377,7 +377,9 @@
Glib::ustring get_stripped_text(const Glib::ustring &text)
{
// pattern for tags like <i>, </i>, {\comment}, etc.
- static Glib::RefPtr<Glib::Regex> tag_pattern =
Glib::Regex::create("<.*?>|{.*?}");
+ // or space
+ static bool ignore_space =
Config::getInstance().get_value_bool("timing", "ignore-space");
+ static Glib::RefPtr<Glib::Regex> tag_pattern = ignore_space ?
Glib::Regex::create("<.*?>|{.*?}| ") : Glib::Regex::create("<.*?>|{.*?}");
return tag_pattern->replace(text, 0, "",
static_cast<Glib::RegexMatchFlags>(0));
}
_______________________________________________
Subtitleeditor-commits mailing list
[email protected]
https://mail.gna.org/listinfo/subtitleeditor-commits
