Remove Video Export Infobox (1/2)
This commit is contained in:
parent
9c087492c7
commit
c593ac75a5
|
@ -164,7 +164,6 @@
|
|||
#include "debug.h"
|
||||
#include "engine_dialog.h"
|
||||
#include "export_video_dialog.h"
|
||||
#include "export_video_infobox.h"
|
||||
#include "gain_meter.h"
|
||||
#include "global_port_matrix.h"
|
||||
#include "gui_object.h"
|
||||
|
|
|
@ -48,7 +48,6 @@
|
|||
|
||||
#include "add_video_dialog.h"
|
||||
#include "ardour_ui.h"
|
||||
#include "export_video_infobox.h"
|
||||
#include "export_video_dialog.h"
|
||||
#include "public_editor.h"
|
||||
#include "utils_videotl.h"
|
||||
|
@ -412,20 +411,6 @@ ARDOUR_UI::flush_videotimeline_cache (bool localcacheonly)
|
|||
void
|
||||
ARDOUR_UI::export_video (bool range)
|
||||
{
|
||||
if (ARDOUR::Config->get_show_video_export_info()) {
|
||||
ExportVideoInfobox infobox (_session);
|
||||
Gtk::ResponseType rv = (Gtk::ResponseType) infobox.run();
|
||||
if (infobox.show_again()) {
|
||||
ARDOUR::Config->set_show_video_export_info(false);
|
||||
}
|
||||
switch (rv) {
|
||||
case RESPONSE_YES:
|
||||
PBD::open_uri (ARDOUR::Config->get_reference_manual_url() + "/video-timeline/operations/#export");
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
export_video_dialog->set_session (_session);
|
||||
export_video_dialog->apply_state(editor->get_selection().time, range);
|
||||
export_video_dialog->run ();
|
||||
|
|
|
@ -1,78 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2013-2016 Paul Davis <paul@linuxaudiosystems.com>
|
||||
* Copyright (C) 2013-2017 Robin Gareus <robin@gareus.org>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
#ifdef interface
|
||||
#undef interface
|
||||
#endif
|
||||
|
||||
#include <gtkmm/box.h>
|
||||
#include <gtkmm/label.h>
|
||||
#include <gtkmm/separator.h>
|
||||
#include <gtkmm/stock.h>
|
||||
|
||||
#include "ardour/session.h"
|
||||
|
||||
#include "export_video_infobox.h"
|
||||
#include "pbd/i18n.h"
|
||||
|
||||
using namespace Gtk;
|
||||
using namespace std;
|
||||
using namespace PBD;
|
||||
using namespace ARDOUR;
|
||||
|
||||
ExportVideoInfobox::ExportVideoInfobox (Session* s)
|
||||
: ArdourDialog (_("Video Export Info"))
|
||||
, showagain_checkbox (_("Do Not Show This Dialog Again (Reset in Edit > Preferences > Video)."))
|
||||
{
|
||||
set_session (s);
|
||||
|
||||
set_name ("ExportVideoInfobox");
|
||||
set_modal (true);
|
||||
set_skip_taskbar_hint (true);
|
||||
set_resizable (false);
|
||||
|
||||
Gtk::Label* l;
|
||||
VBox* vbox = manage (new VBox);
|
||||
|
||||
l = manage (new Label (_("<b>Video Export Info</b>"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
|
||||
l->set_use_markup ();
|
||||
vbox->pack_start (*l, false, true);
|
||||
l = manage (new Label (
|
||||
string_compose(
|
||||
_("%1 does not include commercial licenses for encoding audio/video. Visit mpegla.com for information about licensing various audio/video codecs.\n\nVideo encoding is a non-trivial task with many details.\n\nPlease see the manual at %2/video-timeline/operations/#export.\n\nOpen Manual in Browser? "),
|
||||
PROGRAM_NAME, Config->get_reference_manual_url()
|
||||
), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
|
||||
l->set_size_request(700,-1);
|
||||
l->set_line_wrap();
|
||||
vbox->pack_start (*l, false, true,4);
|
||||
|
||||
vbox->pack_start (*(manage (new HSeparator())), true, true, 2);
|
||||
vbox->pack_start (showagain_checkbox, false, true, 2);
|
||||
|
||||
get_vbox()->set_spacing (4);
|
||||
get_vbox()->pack_start (*vbox, false, false);
|
||||
|
||||
showagain_checkbox.set_active(false);
|
||||
show_all_children ();
|
||||
add_button (Stock::YES, RESPONSE_YES);
|
||||
add_button (Stock::NO, RESPONSE_NO);
|
||||
}
|
||||
|
||||
ExportVideoInfobox::~ExportVideoInfobox ()
|
||||
{
|
||||
}
|
|
@ -1,42 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2013-2017 Robin Gareus <robin@gareus.org>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
#ifndef __gtk_ardour_export_video_infobox_h__
|
||||
#define __gtk_ardour_export_video_infobox_h__
|
||||
|
||||
#include <gtkmm/checkbutton.h>
|
||||
#include "ardour_dialog.h"
|
||||
|
||||
/** @class ExportVideoInfobox
|
||||
* @brief optional info box regarding video-export
|
||||
*
|
||||
* This dialog is optional and can be en/disabled in the
|
||||
* Preferences.
|
||||
*/
|
||||
class ExportVideoInfobox : public ArdourDialog
|
||||
{
|
||||
public:
|
||||
ExportVideoInfobox (ARDOUR::Session*);
|
||||
~ExportVideoInfobox ();
|
||||
|
||||
bool show_again () { return showagain_checkbox.get_active(); }
|
||||
|
||||
private:
|
||||
Gtk::CheckButton showagain_checkbox;
|
||||
};
|
||||
|
||||
#endif /* __gtk_ardour_export_video_infobox_h__ */
|
|
@ -1773,7 +1773,6 @@ class VideoTimelineOptions : public OptionEditorMiniPage
|
|||
public:
|
||||
VideoTimelineOptions (RCConfiguration* c)
|
||||
: _rc_config (c)
|
||||
, _show_video_export_info_button (_("Show Video Export Info before export"))
|
||||
, _show_video_server_dialog_button (_("Show Video Server Startup Dialog"))
|
||||
, _video_advanced_setup_button (_("Advanced Setup (remote video server)"))
|
||||
, _xjadeo_browse_button (_("Browse..."))
|
||||
|
@ -1781,12 +1780,6 @@ class VideoTimelineOptions : public OptionEditorMiniPage
|
|||
Table* t = &table;
|
||||
int n = table.property_n_rows();
|
||||
|
||||
t->attach (_show_video_export_info_button, 1, 4, n, n + 1);
|
||||
_show_video_export_info_button.signal_toggled().connect (sigc::mem_fun (*this, &VideoTimelineOptions::show_video_export_info_toggled));
|
||||
Gtkmm2ext::UI::instance()->set_tip (_show_video_export_info_button,
|
||||
_("<b>When enabled</b> an information window with details is displayed before the video-export dialog."));
|
||||
++n;
|
||||
|
||||
t->attach (_show_video_server_dialog_button, 1, 4, n, n + 1);
|
||||
_show_video_server_dialog_button.signal_toggled().connect (sigc::mem_fun (*this, &VideoTimelineOptions::show_video_server_dialog_toggled));
|
||||
Gtkmm2ext::UI::instance()->set_tip (_show_video_server_dialog_button,
|
||||
|
@ -1860,12 +1853,6 @@ class VideoTimelineOptions : public OptionEditorMiniPage
|
|||
_rc_config->set_video_server_docroot (_video_server_docroot_entry.get_text());
|
||||
}
|
||||
|
||||
void show_video_export_info_toggled ()
|
||||
{
|
||||
bool const x = _show_video_export_info_button.get_active ();
|
||||
_rc_config->set_show_video_export_info (x);
|
||||
}
|
||||
|
||||
void show_video_server_dialog_toggled ()
|
||||
{
|
||||
bool const x = _show_video_server_dialog_button.get_active ();
|
||||
|
@ -1908,9 +1895,6 @@ class VideoTimelineOptions : public OptionEditorMiniPage
|
|||
_video_server_url_entry.set_text (_rc_config->get_video_server_url());
|
||||
} else if (p == "video-server-docroot") {
|
||||
_video_server_docroot_entry.set_text (_rc_config->get_video_server_docroot());
|
||||
} else if (p == "show-video-export-info") {
|
||||
bool const x = _rc_config->get_show_video_export_info();
|
||||
_show_video_export_info_button.set_active (x);
|
||||
} else if (p == "show-video-server-dialog") {
|
||||
bool const x = _rc_config->get_show_video_server_dialog();
|
||||
_show_video_server_dialog_button.set_active (x);
|
||||
|
@ -1929,7 +1913,6 @@ class VideoTimelineOptions : public OptionEditorMiniPage
|
|||
parameter_changed ("video-server-url");
|
||||
parameter_changed ("video-server-docroot");
|
||||
parameter_changed ("video-monitor-setup-dialog");
|
||||
parameter_changed ("show-video-export-info");
|
||||
parameter_changed ("show-video-server-dialog");
|
||||
parameter_changed ("video-advanced-setup");
|
||||
parameter_changed ("xjadeo-binary");
|
||||
|
@ -1940,7 +1923,6 @@ class VideoTimelineOptions : public OptionEditorMiniPage
|
|||
Entry _video_server_url_entry;
|
||||
Entry _video_server_docroot_entry;
|
||||
Entry _custom_xjadeo_path;
|
||||
CheckButton _show_video_export_info_button;
|
||||
CheckButton _show_video_server_dialog_button;
|
||||
CheckButton _video_advanced_setup_button;
|
||||
Button _xjadeo_browse_button;
|
||||
|
|
|
@ -342,8 +342,7 @@ gtk2_ardour_sources = [
|
|||
'transcode_video_dialog.cc',
|
||||
'video_server_dialog.cc',
|
||||
'utils_videotl.cc',
|
||||
'export_video_dialog.cc',
|
||||
'export_video_infobox.cc'
|
||||
'export_video_dialog.cc'
|
||||
]
|
||||
|
||||
def enoify (major, minor):
|
||||
|
|
Loading…
Reference in New Issue
Block a user