smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-20 13:46:30 +01:00
Code Issues Projects Releases Wiki Activity

alter a previous change re: transport menu shortening; fix splash screen crash in some window managers; some code to get me a .png of a cursor

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3039 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2008-02-12 14:12:58 +00:00
parent a1955a82e8
commit 8bfbf5bda1
5 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/ardour.menus
View file

@ -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'/>

1
gtk2_ardour/ardour_ui_ed.cc
View file

@ -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"));

14
gtk2_ardour/editor.cc
View file

@ -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);

1
gtk2_ardour/editor.h
View file

@ -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;

10
gtk2_ardour/splash.cc
View file

@ -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();