projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow markers to be glued to bar/beat time. Fixes #1815.
[ardour.git]
/
gtk2_ardour
/
splash.cc
diff --git
a/gtk2_ardour/splash.cc
b/gtk2_ardour/splash.cc
index 3fa96704e321407445ca772fea8c936429c62ca8..01f0db9f9fcea747b53d2b9de463848acfce3efd 100644
(file)
--- a/
gtk2_ardour/splash.cc
+++ b/
gtk2_ardour/splash.cc
@@
-33,7
+33,7
@@
Splash::Splash ()
catch (...) {
throw failed_constructor();
}
catch (...) {
throw failed_constructor();
}
-
+
darea.set_size_request (pixbuf->get_width(), pixbuf->get_height());
set_keep_above (true);
set_position (WIN_POS_CENTER);
darea.set_size_request (pixbuf->get_width(), pixbuf->get_height());
set_keep_above (true);
set_position (WIN_POS_CENTER);
@@
-42,21
+42,21
@@
Splash::Splash ()
layout = create_pango_layout ("");
string str = "<b>";
layout = create_pango_layout ("");
string str = "<b>";
- string i18n =
_("Ardour loading ..."
);
+ string i18n =
string_compose (_("%1 loading ..."), PROGRAM_NAME
);
str += i18n;
str += "</b>";
layout->set_markup (str);
darea.show ();
str += i18n;
str += "</b>";
layout->set_markup (str);
darea.show ();
- darea.signal_expose_event().connect (mem_fun (*this, &Splash::expose));
+ darea.signal_expose_event().connect (
sigc::
mem_fun (*this, &Splash::expose));
add (darea);
set_default_size (pixbuf->get_width(), pixbuf->get_height());
the_splash = this;
add (darea);
set_default_size (pixbuf->get_width(), pixbuf->get_height());
the_splash = this;
- ARDOUR::BootMessage.connect (m
em_fun (*this, &Splash::boot_message
));
+ ARDOUR::BootMessage.connect (m
sg_connection, invalidator (*this), ui_bind (&Splash::boot_message, this, _1), gui_context(
));
}
void
}
void
@@
-93,10
+93,10
@@
Splash::expose (GdkEventExpose* ev)
window->draw_pixbuf (get_style()->get_bg_gc (STATE_NORMAL), pixbuf,
ev->area.x, ev->area.y,
ev->area.x, ev->area.y,
window->draw_pixbuf (get_style()->get_bg_gc (STATE_NORMAL), pixbuf,
ev->area.x, ev->area.y,
ev->area.x, ev->area.y,
- min ((pixbuf->get_width() - ev->area.x), ev->area.width),
+ 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);
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();
Glib::RefPtr<Gtk::Style> style = darea.get_style();
Glib::RefPtr<Gdk::GC> white = style->get_white_gc();