smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 15:54:57 +01:00
Code Issues Projects Releases Wiki Activity

cleanup leftover problems from my commit yesterday; return of the windows

Browse source 
git-svn-id: svn://localhost/trunk/ardour2@149 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2005-11-29 17:27:58 +00:00
parent 7886d3232c
commit 4a19b4732f
7 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gtk2_ardour/ardour_ui_dependents.cc
View file

@ -52,6 +52,7 @@ ARDOUR_UI::shutdown ()
void void
ARDOUR_UI::we_have_dependents () ARDOUR_UI::we_have_dependents ()
{ {
cerr << "have dependents\n";
setup_keybindings (); setup_keybindings ();
} }

2
gtk2_ardour/ardour_ui_ed.cc
View file

@ -69,8 +69,6 @@ ARDOUR_UI::install_actions ()
act = ActionManager::register_action (main_actions, X_("New"), _("New"), bind (mem_fun(*this, &ARDOUR_UI::new_session), false, string ())); act = ActionManager::register_action (main_actions, X_("New"), _("New"), bind (mem_fun(*this, &ARDOUR_UI::new_session), false, string ()));
cerr << "\n\n\n NEW has accel path " << act->get_accel_path() << endl;
ActionManager::register_action (main_actions, X_("Open"), _("Open"), mem_fun(*this, &ARDOUR_UI::open_session)); ActionManager::register_action (main_actions, X_("Open"), _("Open"), mem_fun(*this, &ARDOUR_UI::open_session));
ActionManager::register_action (main_actions, X_("Recent"), _("Recent"), mem_fun(*this, &ARDOUR_UI::open_recent_session)); ActionManager::register_action (main_actions, X_("Recent"), _("Recent"), mem_fun(*this, &ARDOUR_UI::open_recent_session));
act = ActionManager::register_action (main_actions, X_("Close"), _("Close"), mem_fun(*this, &ARDOUR_UI::close_session)); act = ActionManager::register_action (main_actions, X_("Close"), _("Close"), mem_fun(*this, &ARDOUR_UI::close_session));

9
gtk2_ardour/editor.cc
View file

@ -796,7 +796,8 @@ void
Editor::show_window () Editor::show_window ()
{ {
show_all (); show_all ();
present ();
/* now reset all audio_time_axis heights, because widgets might need /* now reset all audio_time_axis heights, because widgets might need
to be re-hidden to be re-hidden
*/ */
@ -4097,9 +4098,3 @@ Editor::transport_punch_location()
return 0; return 0;
} }
} }
void
Editor::on_map ()
{
// XXX remove me
}

1
gtk2_ardour/editor.h
View file

@ -307,7 +307,6 @@ class Editor : public PublicEditor
void map_position_change (jack_nframes_t); void map_position_change (jack_nframes_t);
void on_realize(); void on_realize();
void on_map ();
private: private:

7
gtk2_ardour/main.cc
View file

@ -27,6 +27,7 @@
#include <unistd.h> #include <unistd.h>
#include <sigc++/bind.h> #include <sigc++/bind.h>
#include <gtkmm/settings.h>
#include <pbd/error.h> #include <pbd/error.h>
#include <pbd/textreceiver.h> #include <pbd/textreceiver.h>
@ -185,6 +186,8 @@ catch_signals (void)
pthread_t signal_thread_id; pthread_t signal_thread_id;
sigset_t signals; sigset_t signals;
return 0;
// if (setpgid (0,0)) { // if (setpgid (0,0)) {
if (setsid ()) { if (setsid ()) {
warning << string_compose (_("cannot become new process group leader (%1)"), warning << string_compose (_("cannot become new process group leader (%1)"),
@ -358,6 +361,10 @@ main (int argc, char *argv[])
gtk_rc_set_default_files (null_file_list); gtk_rc_set_default_files (null_file_list);
// allow run-time rebinding of accels
Settings::get_default()->property_gtk_can_change_accels() = true;
cout << _("Ardour/GTK ") cout << _("Ardour/GTK ")
<< VERSIONSTRING << VERSIONSTRING
<< _("\n (built using ") << _("\n (built using ")

8
gtk2_ardour/option_editor.cc
View file

@ -71,7 +71,7 @@ static vector<string> layer_mode_strings;
static vector<string> xfade_model_strings; static vector<string> xfade_model_strings;
OptionEditor::OptionEditor (ARDOUR_UI& uip, PublicEditor& ed, Mixer_UI& mixui) OptionEditor::OptionEditor (ARDOUR_UI& uip, PublicEditor& ed, Mixer_UI& mixui)
: ArdourDialog ("option editor"), : Dialog ("option editor"),
ui (uip), ui (uip),
editor (ed), editor (ed),
mixer (mixui), mixer (mixui),
@ -159,8 +159,7 @@ OptionEditor::OptionEditor (ARDOUR_UI& uip, PublicEditor& ed, Mixer_UI& mixui)
layer_mode_label.set_name ("OptionsLabel"); layer_mode_label.set_name ("OptionsLabel");
xfade_model_label.set_name ("OptionsLabel"); xfade_model_label.set_name ("OptionsLabel");
VBox *vbox = manage(new VBox); VBox *vbox = get_vbox();
add (*vbox);
set_border_width (3); set_border_width (3);
vbox->set_spacing (4); vbox->set_spacing (4);
@ -197,6 +196,7 @@ OptionEditor::OptionEditor (ARDOUR_UI& uip, PublicEditor& ed, Mixer_UI& mixui)
} }
set_session (0); set_session (0);
show_all_children();
} }
void void
@ -1398,7 +1398,7 @@ OptionEditor::strip_width_clicked ()
void void
OptionEditor::just_close_win() OptionEditor::just_close_win()
{ {
hide_all(); hide();
} }
void void

2
gtk2_ardour/option_editor.h
View file

@ -46,7 +46,7 @@ class IOSelector;
class GainMeter; class GainMeter;
class PannerUI; class PannerUI;
class OptionEditor : public ArdourDialog class OptionEditor : public Gtk::Dialog
{ {
public: public:
OptionEditor (ARDOUR_UI&, PublicEditor&, Mixer_UI&); OptionEditor (ARDOUR_UI&, PublicEditor&, Mixer_UI&);