alter a previous change re: transport menu shortening; fix splash screen crash in...

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

diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus
index 855c89463385a361fd5e8a49b0fe7a72a16824a3..a14b8845393486c0e2a28dafcc132058407ccb80 100644 (file)
--- a/gtk2_ardour/ardour.menus
+++ b/gtk2_ardour/ardour.menus
@@ -68,7 +68,7 @@
                <menuitem action='playhead-to-range-start'/>
                <menuitem action='playhead-to-range-end'/>
                <menuitem action='focus-on-clock'/>
-              <menu action='Markers'>
+              <menu action='LocateToMarker'>
                        <menuitem action='goto-mark-1'/>
                        <menuitem action='goto-mark-2'/>
                        <menuitem action='goto-mark-3'/>

diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index 98175c400957e52c8590ef232364a1ab0d81278f..4b375d06542d59140d8d2c4c898610ec5c722737 100644 (file)
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -91,7 +91,6 @@ ARDOUR_UI::install_actions ()
        ActionManager::register_action (main_actions, X_("Sync"), _("Sync"));
        ActionManager::register_action (main_actions, X_("Options"), _("Options"));
        ActionManager::register_action (main_actions, X_("TransportOptions"), _("Options"));
-       ActionManager::register_action (main_actions, X_("Markers"), _("Markers"));
        ActionManager::register_action (main_actions, X_("Help"), _("Help"));
        ActionManager::register_action (main_actions, X_("KeyMouse Actions"), _("KeyMouse Actions"));
        ActionManager::register_action (main_actions, X_("AudioFileFormat"), _("Audio File Format"));

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index aa385eb7ae9f0526279280a16132b2cf035a8002..dfd560f4677aba32cb0bd3762dfb97841e24143a 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -1304,8 +1304,22 @@ Editor::build_cursors ()
                Gdk::Color c;
                transparent_cursor = new Gdk::Cursor (bits, bits, c, c, 0, 0);
        }
+       
+       Glib::RefPtr<Gdk::Pixbuf> grabber_edit_point_pixbuf (::get_icon ("grabber_edit_point"));
 
        grabber_cursor = new Gdk::Cursor (HAND2);
+       
+#ifdef GTKOSX
+       {
+
+               Glib::RefPtr<Gdk::Pixbuf> hand2 (grabber_cursor->get_image());
+               hand2->save ("hand.png", "png");
+       }
+
+
+       grabber_edit_point_cursor = new Gdk::Cursor (Gdk::Display::get_default(), grabber_edit_point_pixbuf);
+#endif
+
        cross_hair_cursor = new Gdk::Cursor (CROSSHAIR);
        trimmer_cursor =  new Gdk::Cursor (SB_H_DOUBLE_ARROW);
        selector_cursor = new Gdk::Cursor (XTERM);

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 7313f40df445d73716d7cd445436bf4c94704b87..c29239b1c113c346720dbeab35546c0c9a89ed71 100644 (file)
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -894,6 +894,7 @@ class Editor : public PublicEditor
        static Gdk::Cursor* trimmer_cursor;
        static Gdk::Cursor* selector_cursor;
        static Gdk::Cursor* grabber_cursor;
+       static Gdk::Cursor* grabber_edit_point_cursor;
        static Gdk::Cursor* zoom_cursor;
        static Gdk::Cursor* time_fx_cursor;
        static Gdk::Cursor* fader_cursor;

diff --git a/gtk2_ardour/splash.cc b/gtk2_ardour/splash.cc
index 7f68f8521607071868912eeb806259c1fc93cbe3..1b0bca2e031066fb0bda00fbe79bdd6710ec13e7 100644 (file)
--- a/gtk2_ardour/splash.cc
+++ b/gtk2_ardour/splash.cc
@@ -48,6 +48,7 @@ Splash::Splash ()
 
        add (darea);
 
+       set_default_size (pixbuf->get_width(), pixbuf->get_height());
        the_splash = this;
 }
 
@@ -78,12 +79,17 @@ Splash::expose (GdkEventExpose* ev)
 {
        RefPtr<Gdk::Window> window = darea.get_window();
 
+       /* note: height & width need to be constrained to the pixbuf size
+          in case a WM provides us with a screwy allocation
+       */
+
        window->draw_pixbuf (get_style()->get_bg_gc (STATE_NORMAL), pixbuf,
                             ev->area.x, ev->area.y,
                             ev->area.x, ev->area.y,
-                            ev->area.width, ev->area.height,
+                            min ((pixbuf->get_width() - ev->area.x), ev->area.width), 
+                            min ((pixbuf->get_height() - ev->area.y), ev->area.height),
                             Gdk::RGB_DITHER_NONE, 0, 0);
-
+       
        Glib::RefPtr<Gtk::Style> style = darea.get_style();
        Glib::RefPtr<Gdk::GC> white = style->get_white_gc();