New sae icons, fix ghostregion layering problem (automation-specific revert of track...

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4137 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour2_ui_dark_sae.rc.in b/gtk2_ardour/ardour2_ui_dark_sae.rc.in
index 0c12a970cc2712478fb72727970d361ca980ca37..c9ff511e3115a7df0ad2f24a5057efc5f449b5b2 100644 (file)
--- a/gtk2_ardour/ardour2_ui_dark_sae.rc.in
+++ b/gtk2_ardour/ardour2_ui_dark_sae.rc.in
@@ -117,7 +117,7 @@ style "default_base" = "medium_text"
   base[INSENSITIVE]  = "#4c5159"
   base[SELECTED]     = { 0.25, 0.25, 0.25 }
 
-  engine "default" 
+  engine "clearlooks" 
   {
     menubarstyle      = 0       # 0 = flat, 1 = sunken, 2 = flat gradient
   }

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 1af90e1232a536997e3f688b8eb9f17ebc2a1e1b..29ea031c4d19fe732aa04b28afcb0c1254fefeed 100644 (file)
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -338,11 +338,12 @@ ARDOUR_UI::post_engine ()
        /* set default clock modes */
 
        if (Profile->get_sae()) {
-               primary_clock.set_mode (AudioClock::MinSec);
+               primary_clock.set_mode (AudioClock::BBT);
+               secondary_clock.set_mode (AudioClock::MinSec);
        }  else {
                primary_clock.set_mode (AudioClock::SMPTE);
+               secondary_clock.set_mode (AudioClock::BBT);
        }
-       secondary_clock.set_mode (AudioClock::BBT);
 
        /* start the time-of-day-clock */
        
@@ -2542,6 +2543,9 @@ ARDOUR_UI::build_session (const Glib::ustring& path, const Glib::ustring& snap_n
        connect_to_session (new_session);
 
        session_loaded = true;
+
+       new_session->save_state(new_session->name());
+
        return 0;
 }
 

diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index 0128ccbba26d8b3b8e49ece9902f80eb081ce5d4..cc54e9993a34059a38b0c5c315a784448a09712a 100644 (file)
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -70,10 +70,10 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
        ignore_state_request = false;
        first_call_to_set_height = true;
 
-       base_rect = new SimpleRect(*canvas_background);
+       base_rect = new SimpleRect(*canvas_display);
        base_rect->property_x1() = 0.0;
        base_rect->property_y1() = 0.0;
-       base_rect->property_x2() = editor.get_physical_screen_width();
+       base_rect->property_x2() = LONG_MAX / 2;
        base_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_AutomationTrackOutline.get();
        /* outline ends and bottom */
        base_rect->property_outline_what() = (guint32) (0x1|0x2|0x8);

diff --git a/instant.xml.sae b/instant.xml.sae
index 450abfbc84250a27c9f374eb0ad4169251368d55..20b4f928fa1c9d5ab59dc1ba346689fdad900d3b 100644 (file)
--- a/instant.xml.sae
+++ b/instant.xml.sae
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <instant>
-  <Editor id="12" mixer-width="Wide" zoom-focus="3" zoom="512.000000" snap-to="12" snap-mode="1" edit-point="EditAtPlayhead" playhead="0" show-waveforms="yes" show-waveforms-recording="yes" show-measures="yes" follow-playhead="yes" xfades-visible="yes" region-list-sort-type="ByEndInFile" mouse-mode="MouseObject" show-editor-mixer="yes">
+  <Editor id="12" mixer-width="Wide" zoom-focus="3" zoom="512.000000" snap-to="12" snap-mode="2" edit-point="EditAtPlayhead" playhead="0" show-waveforms="yes" show-waveforms-recording="yes" show-measures="no" follow-playhead="yes" xfades-visible="yes" region-list-sort-type="ByEndInFile" mouse-mode="MouseObject" show-editor-mixer="yes">
     <geometry x_size="1242" y_size="768" x_pos="0" y_pos="0" x_off="0" y_off="0" edit_pane_pos="1024"/>
   </Editor>
   <Mixer narrow-strips="no" show-mixer="no"/>

diff --git a/tools/osx_packaging/Ardour2-SAE.icns b/tools/osx_packaging/Ardour2-SAE.icns
index d6f51279364a2cd3e8953918edbacd045686e64b..14afad1f2b1155d2870064da20d6e94c80763b0d 100644 (file)
Binary files a/tools/osx_packaging/Ardour2-SAE.icns and b/tools/osx_packaging/Ardour2-SAE.icns differ