Author: kitone
Date: Sun Apr 12 12:21:24 2015
New Revision: 900
URL: http://svn.gna.org/viewcvs/subtitleeditor?rev=900&view=rev
Log:
Refactoring, using the set_filename_from_another_uri introduce in the previous
commit.
Modified:
trunk/ChangeLog
trunk/plugins/actions/wavefrommanagement/waveformmanagement.cc
Modified: trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/ChangeLog?rev=900&r1=899&r2=900&view=diff
==============================================================================
--- trunk/ChangeLog (original)
+++ trunk/ChangeLog Sun Apr 12 12:21:24 2015
@@ -1,3 +1,8 @@
+2015-04-12 kitone <[email protected]>
+
+ * plugins/actions/wavefrommanagement/waveformmanagement.cc:
+ Refactoring, using the set_filename_from_another_uri introduce in the
previous commit.
+
2015-04-12 kitone <[email protected]>
* src/gui/dialogfilechooser.cc:
Modified: trunk/plugins/actions/wavefrommanagement/waveformmanagement.cc
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/plugins/actions/wavefrommanagement/waveformmanagement.cc?rev=900&r1=899&r2=900&view=diff
==============================================================================
--- trunk/plugins/actions/wavefrommanagement/waveformmanagement.cc
(original)
+++ trunk/plugins/actions/wavefrommanagement/waveformmanagement.cc Sun Apr
12 12:21:24 2015
@@ -377,12 +377,11 @@
Glib::RefPtr<Waveform> wf =
get_waveform_manager()->get_waveform();
if(wf)
{
- Gtk::FileChooserDialog ui(_("Save Waveform"),
Gtk::FILE_CHOOSER_ACTION_SAVE);
+ DialogFileChooser ui(_("Save Waveform"),
Gtk::FILE_CHOOSER_ACTION_SAVE, "dialog-save-waveform");
ui.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
ui.add_button(Gtk::Stock::OK, Gtk::RESPONSE_OK);
ui.set_default_response(Gtk::RESPONSE_OK);
-
- set_default_filename_from_video(&ui,
wf->get_video_uri(), "wf");
+ ui.set_filename_from_another_uri(wf->get_video_uri(),
"wf");
if(ui.run() == Gtk::RESPONSE_OK)
{
@@ -403,31 +402,6 @@
Glib::RefPtr<Waveform> wf(NULL);
get_waveform_manager()->set_waveform(wf);
- }
-
- /*
- */
- void set_default_filename_from_video(Gtk::FileChooser *fc, const
Glib::ustring &video_uri, const Glib::ustring &ext)
- {
- try
- {
- Glib::ustring videofn =
Glib::filename_from_uri(video_uri);
- Glib::ustring pathname =
Glib::path_get_dirname(videofn);
- Glib::ustring basename =
Glib::path_get_basename(videofn);
-
- Glib::RefPtr<Glib::Regex> re =
Glib::Regex::create("^(.*)(\\.)(.*)$");
- if(re->match(basename))
- basename = re->replace(basename, 0, "\\1." +
ext, Glib::RegexMatchFlags(0));
- else
- basename = Glib::ustring::compose("%1.%2",
basename, ext);
-
- fc->set_current_folder(pathname); //
set_current_folder_uri ?
- fc->set_current_name(basename);
- }
- catch(const Glib::Exception &ex)
- {
- std::cerr << "set_default_filename_from_video failed :
" << ex.what() << std::endl;
- }
}
/*
_______________________________________________
Subtitleeditor-commits mailing list
[email protected]
https://mail.gna.org/listinfo/subtitleeditor-commits
