X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Futils.h;h=fe8a0f5cb50ad28e883b8de12669109b94d5180b;hb=2558e52e22e3fc604e68a469e9a41608f9166148;hp=30ccd9c43d53d1dd0711ed57f5991f6f55b98424;hpb=6acdfc69b785841ac10a324484ddd0208612a213;p=ardour.git

diff --git a/gtk2_ardour/utils.h b/gtk2_ardour/utils.h
index 30ccd9c43d..fe8a0f5cb5 100644
--- a/gtk2_ardour/utils.h
+++ b/gtk2_ardour/utils.h
@@ -47,6 +47,8 @@ namespace ArdourCanvas {
 	class Item;
 }
 
+namespace ARDOUR_UI_UTILS {
+
 extern sigc::signal<void>  DPIReset;
 
 gint   just_hide_it (GdkEventAny*, Gtk::Window*);
@@ -57,15 +59,15 @@ unsigned char* xpm2rgba (const char** xpm, uint32_t& w, uint32_t& h);
 
 ArdourCanvas::Points* get_canvas_points (std::string who, uint32_t npoints);
 
+Pango::FontDescription sanitized_font (std::string const&);
 Pango::FontDescription get_font_for_style (std::string widgetname);
 
-uint32_t rgba_from_style (std::string, uint32_t, uint32_t, uint32_t, uint32_t, std::string = "fg", int = Gtk::STATE_NORMAL, bool = true);
-
-bool rgba_p_from_style (std::string, float*, float*, float*, std::string = "fg", int = Gtk::STATE_NORMAL);
-
 void decorate (Gtk::Window& w, Gdk::WMDecoration d);
 
-void set_color (Gdk::Color&, int);
+void set_color_from_rgb (Gdk::Color&, uint32_t);
+void set_color_from_rgba (Gdk::Color&, uint32_t);
+uint32_t gdk_color_to_rgba (Gdk::Color const&);
+uint32_t contrasting_text_color (uint32_t c);
 
 bool relay_key_press (GdkEventKey* ev, Gtk::Window* win);
 bool forward_key_press (GdkEventKey* ev);
@@ -73,8 +75,9 @@ bool key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev);
 bool emulate_key_event (Gtk::Widget*, unsigned int);
 
 Glib::RefPtr<Gdk::Pixbuf> get_xpm (std::string);
-std::string get_icon_path (const char*);
-Glib::RefPtr<Gdk::Pixbuf> get_icon (const char*);
+std::vector<std::string> get_icon_sets ();
+std::string get_icon_path (const char*, std::string icon_set = std::string(), bool is_image = true);
+Glib::RefPtr<Gdk::Pixbuf> get_icon (const char*, std::string icon_set = std::string());
 static std::map<std::string, Glib::RefPtr<Gdk::Pixbuf> > xpm_map;
 const char* const *get_xpm_data (std::string path);
 std::string longest (std::vector<std::string>&);
@@ -91,4 +94,5 @@ Gdk::Color unique_random_color (std::list<Gdk::Color> &);
 
 std::string rate_as_string (float r);
 
+} // namespace
 #endif /* __ardour_gtk_utils_h__ */