diff --git a/SConstruct b/SConstruct index 605c4f1642..77b1e9cbdf 100644 --- a/SConstruct +++ b/SConstruct @@ -612,7 +612,8 @@ if env['SYSLIBS']: gtk_subdirs = [ # 'libs/flowcanvas', 'libs/gtkmm2ext', - 'gtk2_ardour' + 'gtk2_ardour', + 'libs/clearlooks' ] else: @@ -681,8 +682,9 @@ else: 'libs/gtkmm2/gtk', 'libs/libgnomecanvasmm', # 'libs/flowcanvas', - 'libs/gtkmm2ext', - 'gtk2_ardour' + 'libs/gtkmm2ext', + 'gtk2_ardour', + 'libs/clearlooks' ] # @@ -974,6 +976,7 @@ rcbuild = env.SubstInFile ('ardour.rc','ardour.rc.in', SUBST_DICT = subst_dict) the_revision = env.Command ('svn_revision.h', [], create_stored_revision) +env.Alias('revision', the_revision) env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour_system.rc')) env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.rc')) diff --git a/gtk2_ardour/ardev_common.sh b/gtk2_ardour/ardev_common.sh index ac18e750bd..d4109de8bb 100755 --- a/gtk2_ardour/ardev_common.sh +++ b/gtk2_ardour/ardev_common.sh @@ -3,6 +3,8 @@ cd `dirname "$0"`/.. #export G_DEBUG=fatal_criticals export ARDOUR_PATH=gtk2_ardour/icons:gtk2_ardour/pixmaps:gtk2_ardour +export GTK_PATH=libs/clearlooks + export LD_LIBRARY_PATH=libs/surfaces/control_protocol:libs/ardour:libs/midi++2:libs/pbd:libs/soundtouch:libs/gtkmm2ext:libs/sigc++2:libs/glibmm2:libs/gtkmm2/atk:libs/gtkmm2/pango:libs/gtkmm2/gdk:libs/gtkmm2/gtk:libs/libgnomecanvasmm:libs/libsndfile:libs/appleutility:$LD_LIBRARY_PATH diff --git a/gtk2_ardour/ardour.sh.in b/gtk2_ardour/ardour.sh.in index b748c96954..107321024b 100644 --- a/gtk2_ardour/ardour.sh.in +++ b/gtk2_ardour/ardour.sh.in @@ -1,5 +1,7 @@ #!/bin/sh +export GTK_PATH=%INSTALL_PREFIX%/lib/ardour2:$GTK_PATH + export LD_LIBRARY_PATH=%INSTALL_PREFIX%/lib/ardour2:$LD_LIBRARY_PATH # DYLD_LIBRARY_PATH is for Darwin export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH diff --git a/gtk2_ardour/ardour2_ui.rc b/gtk2_ardour/ardour2_ui.rc index b7f26b1c7c..4f97a42cb7 100644 --- a/gtk2_ardour/ardour2_ui.rc +++ b/gtk2_ardour/ardour2_ui.rc @@ -205,6 +205,15 @@ style "solo_button" = "small_button" fg[ACTIVE] = { 0, 0, 0 } } +style "safe_solo_button" = "small_button" +{ + bg[PRELIGHT] = { 0, 1.0, 0 } + bg[ACTIVE] = { 0.19, 0.97, 0.69 } + + fg[PRELIGHT] = { 0, 0, 0 } + fg[ACTIVE] = { 0, 0, 0 } +} + style "mixer_solo_button" = "solo_button" { font_name = "sans 7" @@ -213,6 +222,14 @@ style "mixer_solo_button" = "solo_button" } +style "mixer_safe_solo_button" = "safe_solo_button" +{ + font_name = "sans 7" + xthickness = 0 + ythickness = 0 + +} + style "mute_button" = "small_button" { @@ -1002,8 +1019,8 @@ widget "*EditorTimeButton*" style "time_button" widget "*EditorMixerButton*" style "default_buttons_menus" widget "*SoloButton*" style "solo_button" widget "*SoloButton.*" style "solo_button" -widget "*SafeSoloButton*" style "solo_button" -widget "*SafeSoloButton.*" style "solo_button" +widget "*SafeSoloButton*" style "safe_solo_button" +widget "*SafeSoloButton.*" style "safe_solo_button" widget "*MixerPhaseInvertButton*" style "very_small_button" widget "*MixerPhaseInvertButton.*" style "very_small_button" widget "*MixerAutomationRecordingButton*" style "very_small_button" diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 7e5922b618..34756ec1ed 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -551,7 +551,6 @@ Editor::Editor (AudioEngine& eng) region_list_display.set_model (region_list_model); region_list_display.append_column (_("Regions"), region_list_columns.name); region_list_display.set_headers_visible (false); - region_list_display.set_hover_expand (true); region_list_display.get_selection()->set_select_function (mem_fun (*this, &Editor::region_list_selection_filter)); diff --git a/gtk2_ardour/new_session_dialog.cc b/gtk2_ardour/new_session_dialog.cc index 9a8bcecc42..4c486eaaf8 100644 --- a/gtk2_ardour/new_session_dialog.cc +++ b/gtk2_ardour/new_session_dialog.cc @@ -313,7 +313,6 @@ NewSessionDialog::NewSessionDialog() m_treeview->set_enable_search(true); m_treeview->set_fixed_height_mode(false); m_treeview->set_hover_selection(false); - m_treeview->set_hover_expand(true); m_treeview->set_size_request(-1, 150); recent_scrolledwindow->set_flags(Gtk::CAN_FOCUS); recent_scrolledwindow->set_border_width(6); diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 7769a185c7..a616941fe9 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -124,10 +124,10 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh visual_button.signal_clicked().connect (mem_fun(*this, &RouteTimeAxisView::visual_click)); hide_button.signal_clicked().connect (mem_fun(*this, &RouteTimeAxisView::hide_click)); - solo_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::solo_press), false); - solo_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::solo_release), false); - mute_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::mute_press), false); - mute_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::mute_release), false); + solo_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::solo_press)); + solo_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::solo_release)); + mute_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::mute_press)); + mute_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::mute_release)); if (is_track()) { diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index ed42be2901..f1349b5b04 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -75,8 +75,8 @@ RouteUI::RouteUI (boost::shared_ptr rt, ARDOUR::Session& sess, co mute_button = manage (new BindableToggleButton (_route->mute_control(), m_name )); solo_button = manage (new BindableToggleButton (_route->solo_control(), s_name )); - mute_button->unset_flags (Gtk::CAN_FOCUS); - solo_button->unset_flags (Gtk::CAN_FOCUS); + // mute_button->unset_flags (Gtk::CAN_FOCUS); + // solo_button->unset_flags (Gtk::CAN_FOCUS); _route->mute_changed.connect (mem_fun(*this, &RouteUI::mute_changed)); _route->solo_changed.connect (mem_fun(*this, &RouteUI::solo_changed)); @@ -130,6 +130,8 @@ RouteUI::mute_press(GdkEventButton* ev) if (!Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::Control))) { wait_for_release = true; + } else { + return false; } } @@ -206,6 +208,8 @@ RouteUI::solo_press(GdkEventButton* ev) if (!Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::Control))) { wait_for_release = true; + } else { + return false; } } diff --git a/libs/clearlooks/SConscript b/libs/clearlooks/SConscript new file mode 100644 index 0000000000..0df20efe56 --- /dev/null +++ b/libs/clearlooks/SConscript @@ -0,0 +1,23 @@ +import os.path + +Import ('env install_prefix') + +clearlooks = env.Copy() + +clearlooks.Replace(CCFLAGS = ' `pkg-config --cflags gtk+-2.0` ', + LINKFLAGS = ' `pkg-config --libs gtk+-2.0` ') + +libclearlooks = clearlooks.SharedLibrary('clearlooks', [ + 'clearlooks_draw.c', + 'clearlooks_rc_style.c', + 'clearlooks_style.c', + 'clearlooks_theme_main.c', + 'support.c' +]) + +usable_libclearlooks = clearlooks.Install ('engines', libclearlooks) +Default (usable_libclearlooks) + +env.Alias('install', + env.Install(os.path.join(install_prefix,'lib/ardour2/engines'), + libclearlooks)) diff --git a/libs/clearlooks/SConstruct b/libs/clearlooks/SConstruct deleted file mode 100644 index a190a11a6a..0000000000 --- a/libs/clearlooks/SConstruct +++ /dev/null @@ -1,5 +0,0 @@ -CCFLAGS = ' `pkg-config --cflags gtk+-2.0` ' -LINKFLAGS = ' `pkg-config --libs gtk+-2.0` ' - -env = Environment(CCFLAGS=CCFLAGS, LINKFLAGS=LINKFLAGS) -env.SharedLibrary('clearlooks', ['clearlooks_draw.c', 'clearlooks_rc_style.c', 'clearlooks_style.c', 'clearlooks_theme_main.c', 'support.c'])