smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-08 14:45:43 +01:00
Code Issues Projects Releases Wiki Activity

adding system lock dialog

Browse source 
[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 453235]
This commit is contained in:
Valeriy Kamyshniy 2014-04-16 12:30:29 -05:00
parent db5eaaf3ce
commit 2f46766a9a
8 changed files with 187 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gtk2_ardour/ardour_ui.cc
View file

@ -202,8 +202,8 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
, about (X_("about"), _("About"))
, location_ui (X_("locations"), _("Locations"))
, route_params (X_("inspector"), _("Tracks and Busses"))
//VKPRefs:, audio_midi_setup (X_("audio-midi-setup"), _("Audio/MIDI Setup"))
, tracks_control_panel (X_("tracks-control-panel"), _("PREFERENCES"))
, session_lock_dialog (X_("session-lock-dialog"), _("SESSION LOCK"))
, session_option_editor (X_("session-options-editor"), _("Properties"), boost::bind (&ARDOUR_UI::create_session_option_editor, this))
, add_video_dialog (X_("add-video"), _("Add Tracks/Busses"), boost::bind (&ARDOUR_UI::create_add_video_dialog, this))
, bundle_manager (X_("bundle-manager"), _("Bundle Manager"), boost::bind (&ARDOUR_UI::create_bundle_manager, this))
@ -370,8 +370,8 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
WM::Manager::instance().register_window (&add_route_dialog);
WM::Manager::instance().register_window (&add_video_dialog);
WM::Manager::instance().register_window (&route_params);
//VKPRefs:WM::Manager::instance().register_window (&audio_midi_setup);
WM::Manager::instance().register_window (&tracks_control_panel);
WM::Manager::instance().register_window (&session_lock_dialog);
WM::Manager::instance().register_window (&bundle_manager);
WM::Manager::instance().register_window (&location_ui);
WM::Manager::instance().register_window (&big_clock_window);
@ -4399,3 +4399,10 @@ ARDOUR_UI::do_tracks_control_panel (uint32_t desired_sample_rate)
return -1;
}
int
ARDOUR_UI::do_session_lock_dialog ()
{
session_lock_dialog->run();
return 0;
}

12
gtk2_ardour/ardour_ui.h
View file

@ -72,7 +72,7 @@
#include "ardour_dialog.h"
#include "ardour_window.h"
#include "editing.h"
//VKPRefs:#include "engine_dialog.h"
#include "session_lock_dialog.h"
#include "tracks_control_panel.h"
#include "meterbridge.h"
#include "ui_config.h"
@ -606,8 +606,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
WM::Proxy<About> about;
WM::Proxy<LocationUIWindow> location_ui;
WM::Proxy<RouteParams_UI> route_params;
//VKPRefs:WM::Proxy<EngineControl> audio_midi_setup;
WM::Proxy<TracksControlPanel> tracks_control_panel;
WM::Proxy<SessionLockDialog> session_lock_dialog;
/* Windows/Dialogs that require a creator method */
@ -754,11 +754,11 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
void resize_text_widgets ();
std::string _announce_string;
void check_announcements ();
std::string _announce_string;
void check_announcements ();
//VKPRefs:int do_audio_midi_setup (uint32_t);
int do_tracks_control_panel(uint32_t);
int do_tracks_control_panel(uint32_t);
int do_session_lock_dialog();
};
#endif /* __ardour_gui_h__ */

BIN
gtk2_ardour/icons/session_lock.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 124 KiB

85
gtk2_ardour/session_lock_dialog.cc Normal file
View file

@ -0,0 +1,85 @@
/*
Copyright (C) 2014 Valeriy Kamyshniy
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., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifdef WAF_BUILD
#include "gtk2ardour-config.h"
#endif
#include <fstream>
#include <algorithm>
#include "waves_button.h"
#include <gtkmm/filechooser.h>
//#include "pbd/failed_constructor.h"
//#include "pbd/file_utils.h"
//#include "pbd/replace_all.h"
//#include "pbd/whitespace.h"
//#include "pbd/stacktrace.h"
//#include "pbd/openuri.h"
//
//#include "ardour/audioengine.h"
//#include "ardour/filesystem_paths.h"
//#include "ardour/recent_sessions.h"
//#include "ardour/session.h"
//#include "ardour/session_state_utils.h"
//#include "ardour/template_utils.h"
//#include "ardour/filename_extensions.h"
//
//#include "ardour_ui.h"
#include "session_lock_dialog.h"
//#include "opts.h"
//VKPRefs:#include "engine_dialog.h"
#include "i18n.h"
//#include "utils.h"
using namespace std;
using namespace Gtk;
using namespace Gdk;
using namespace Glib;
using namespace PBD;
using namespace ARDOUR;
#define dbg_msg(a) MessageDialog (a, PROGRAM_NAME).run();
SessionLockDialog::SessionLockDialog ()
: WavesDialog (_("session_lock_dialog.xml"), true, false)
, ok_button (get_waves_button ("ok_button"))
{
set_keep_above (true);
set_position (WIN_POS_CENTER);
ok_button.signal_clicked.connect (sigc::mem_fun (*this, &SessionLockDialog::on_ok));
}
SessionLockDialog::~SessionLockDialog()
{
}
//app logic
void
SessionLockDialog::on_ok (WavesButton*)
{
hide();
response (Gtk::RESPONSE_OK);
}

58
gtk2_ardour/session_lock_dialog.h Normal file
View file

@ -0,0 +1,58 @@
/*
Copyright (C) 2014 Valeriy Kamyshniy
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., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef __gtk2_session_lock_dialog_h__
#define __gtk2_session_lock_dialog_h__
#include <string>
#include "waves_dialog.h"
//#include <gdkmm/pixbuf.h>
//#include <gtkmm/label.h>
//#include <gtkmm/drawingarea.h>
//#include <gtkmm/expander.h>
//#include <gtkmm/box.h>
//#include <gtkmm/radiobutton.h>
//#include <gtkmm/filechooserbutton.h>
//#include <gtkmm/scrolledwindow.h>
//#include <gtkmm/treeview.h>
//#include <gtkmm/treestore.h>
//#include <gtkmm/checkbutton.h>
//#include <gtkmm/table.h>
//#include <gtkmm/frame.h>
//#include <gtkmm/spinbutton.h>
//#include <gtkmm/liststore.h>
//#include <gtkmm/combobox.h>
//#include "ardour/utils.h"
class EngineControl;
#define MAX_RECENT_SESSION_COUNTS 10
class SessionLockDialog : public WavesDialog {
public:
SessionLockDialog ();
~SessionLockDialog ();
private:
WavesButton& ok_button;
void on_ok(WavesButton*);
};
#endif /* __gtk2_session_lock_dialog_h__ */

4
gtk2_ardour/tracks.menus.in
View file

@ -44,11 +44,13 @@
<menuitem action='CleanupUnused'/>
<menuitem action='FlushWastebasket'/>
</menu>
#ifdef GTKOSX
#ifdef GTKOSX
<menuitem action='toggle-about'/>
<menuitem action='toggle-rc-options-editor'/>
#endif
#ifndef GTKOSX
<separator/>
<menuitem action='toggle-session-lock-dialog'/>
<separator/>
<menuitem action='Quit'/>
#endif

22
gtk2_ardour/ui/session_lock_dilaog.xml Normal file
View file

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<Dialog title="Session Lock" resizeable="false">
<style name="generic_control" font ="Arial 10"/>
<style name="generic_button"
style="generic_control"
fgnormal="#BFBFBF"
bgnormal="#6C6C6C"
fgactive="#BFBFBF"
bgactive="#454545"
fghover="#CCCCCC"
bghover="#898989"
fgdisabled ="#959595"
bordercolor="#7E7E7E"
borderwidth="1 1 0 0" />
<Layout bgnormal="#FF0000" width="447" height="500">
<Button style="generic_button"
id="ok_button"
text="UNLOCK"
x="0" y="0" width="71" height="28"/>
</Layout>
</Layout>
</Dialog>

7
gtk2_ardour/wscript
View file

@ -210,6 +210,7 @@ gtk2_ardour_sources = [
'selection.cc',
'send_ui.cc',
'session_dialog.cc',
'session_lock_dialog.cc',
'session_import_dialog.cc',
'session_metadata_dialog.cc',
'session_option_editor.cc',
@ -234,6 +235,8 @@ gtk2_ardour_sources = [
'time_fx_dialog.cc',
'time_info_box.cc',
'time_selection.cc',
'tracks_control_panel.cc',
'tracks_control_panel.logic.cc',
'track_selection.cc',
'track_view_list.cc',
'transpose_dialog.cc',
@ -255,9 +258,7 @@ gtk2_ardour_sources = [
'video_server_dialog.cc',
'utils_videotl.cc',
'export_video_dialog.cc',
'export_video_infobox.cc',
'tracks_control_panel.cc',
'tracks_control_panel.logic.cc'
'export_video_infobox.cc'
]
def options(opt):