Author: kitone
Date: Sun Apr 12 12:41:50 2015
New Revision: 902
URL: http://svn.gna.org/viewcvs/subtitleeditor?rev=902&view=rev
Log:
Fix bug #23148 : Default to video file name when saving new subtitles.
Modified:
trunk/ChangeLog
trunk/plugins/actions/documentmanagement/documentmanagement.cc
Modified: trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/ChangeLog?rev=902&r1=901&r2=902&view=diff
==============================================================================
--- trunk/ChangeLog (original)
+++ trunk/ChangeLog Sun Apr 12 12:41:50 2015
@@ -1,3 +1,8 @@
+2015-04-12 kitone <[email protected]>
+
+ * plugins/actions/documentmanagement/documentmanagement.cc:
+ Fix bug #23148 : Default to video file name when saving new subtitles.
+
2015-04-12 kitone <[email protected]>
* src/subtitleformatsystem.cc:
Modified: trunk/plugins/actions/documentmanagement/documentmanagement.cc
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/plugins/actions/documentmanagement/documentmanagement.cc?rev=902&r1=901&r2=902&view=diff
==============================================================================
--- trunk/plugins/actions/documentmanagement/documentmanagement.cc
(original)
+++ trunk/plugins/actions/documentmanagement/documentmanagement.cc Sun Apr
12 12:41:50 2015
@@ -25,6 +25,7 @@
#include <utility.h>
#include <gui/dialogfilechooser.h>
#include <vector>
+#include <subtitleformatsystem.h>
/*
*
@@ -366,15 +367,22 @@
g_return_val_if_fail(doc, false);
+ Glib::ustring format = default_format.empty() ?
doc->getFormat() : default_format;
+
DialogSaveDocument::auto_ptr dialog =
DialogSaveDocument::create();
if(Glib::file_test(doc->getFilename(), Glib::FILE_TEST_EXISTS))
dialog->set_filename(doc->getFilename());
+ else
if(SubtitleEditorWindow::get_instance()->get_player()->get_state() !=
Player::NONE)
+ {
+ dialog->set_filename_from_another_uri(
+
SubtitleEditorWindow::get_instance()->get_player()->get_uri(),
+
SubtitleFormatSystem::instance().get_extension_of_format(format));
+ }
else
dialog->set_current_name(doc->getName());
- dialog->set_format(
- default_format.empty() ? doc->getFormat() :
default_format);
+ dialog->set_format(format);
dialog->set_encoding(doc->getCharset());
dialog->set_newline(doc->getNewLine());
dialog->set_do_overwrite_confirmation(true);
@@ -388,7 +396,7 @@
Glib::ustring filename = dialog->get_filename();
Glib::ustring uri = dialog->get_uri();
- Glib::ustring format = dialog->get_format();
+ format = dialog->get_format();
Glib::ustring encoding = dialog->get_encoding();
Glib::ustring newline = dialog->get_newline();
_______________________________________________
Subtitleeditor-commits mailing list
[email protected]
https://mail.gna.org/listinfo/subtitleeditor-commits
