Allow markers to be glued to bar/beat time. Fixes #1815.

[ardour.git] / gtk2_ardour / theme_manager.cc

diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc
index 6b574588b63655f31eea056b0f3b90331880a46c..923e61fa4cf531ea631ece2ac146e135977c2fac 100644 (file)
--- a/gtk2_ardour/theme_manager.cc
+++ b/gtk2_ardour/theme_manager.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    Copyright (C) 2000-2007 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -24,7 +24,6 @@
 
 #include <gtkmm/stock.h>
 #include <gtkmm2ext/gtk_ui.h>
-#include <gtkmm2ext/window_title.h>
 #include <gtkmm/settings.h>
 
 #include "pbd/file_utils.h"
@@ -49,21 +48,19 @@ sigc::signal<void> ColorsChanged;
 sigc::signal<void,uint32_t> ColorChanged;
 
 ThemeManager::ThemeManager()
-       : ArdourDialog ("ThemeManager"),
-       dark_button ("Dark theme"),
-       light_button ("Light theme"),
-       reset_button ("Restore Defaults")
+       : ArdourDialog (_("Theme Manager")),
+         dark_button (_("Dark Theme")),
+         light_button (_("Light Theme")),
+         reset_button (_("Restore Defaults"))
 {
-       Gtkmm2ext::WindowTitle title (Glib::get_application_name ());
-       title += _("Theme Manager");
-       set_title (title.get_string ());
-  
+       set_title (_("Theme Manager"));
+
        color_list = ListStore::create (columns);
        color_display.set_model (color_list);
        color_display.append_column (_("Object"), columns.name);
        color_display.append_column (_("Color"), columns.color);
-       color_display.get_column (0)->set_data (X_("colnum"), GUINT_TO_POINTER(0));     
-       color_display.get_column (1)->set_data (X_("colnum"), GUINT_TO_POINTER(1));     
+       color_display.get_column (0)->set_data (X_("colnum"), GUINT_TO_POINTER(0));
+       color_display.get_column (1)->set_data (X_("colnum"), GUINT_TO_POINTER(1));
        color_display.set_reorderable (false);
        color_display.get_selection()->set_mode (SELECTION_NONE);
        color_display.set_headers_visible (true);
@@ -71,10 +68,10 @@ ThemeManager::ThemeManager()
        CellRenderer* color_cell = color_display.get_column_cell_renderer (1);
        TreeViewColumn* color_column = color_display.get_column (1);
        color_column->add_attribute (color_cell->property_cell_background_gdk(), columns.gdkcolor);
-       
+
        scroller.add (color_display);
        scroller.set_policy (POLICY_NEVER, POLICY_AUTOMATIC);
-       
+
        RadioButton::Group group = dark_button.get_group();
        light_button.set_group(group);
        theme_selection_hbox.set_homogeneous(false);
@@ -86,16 +83,16 @@ ThemeManager::ThemeManager()
        get_vbox()->pack_start (reset_button, PACK_SHRINK);
        get_vbox()->pack_start (scroller);
 
-       color_display.signal_button_press_event().connect (mem_fun (*this, &ThemeManager::button_press_event), false);
+       color_display.signal_button_press_event().connect (sigc::mem_fun (*this, &ThemeManager::button_press_event), false);
 
        color_dialog.get_colorsel()->set_has_opacity_control (true);
        color_dialog.get_colorsel()->set_has_palette (true);
 
-       color_dialog.get_ok_button()->signal_clicked().connect (bind (mem_fun (color_dialog, &Gtk::Dialog::response), RESPONSE_ACCEPT));
-       color_dialog.get_cancel_button()->signal_clicked().connect (bind (mem_fun (color_dialog, &Gtk::Dialog::response), RESPONSE_CANCEL));
-       dark_button.signal_toggled().connect (mem_fun (*this, &ThemeManager::on_dark_theme_button_toggled));
-       light_button.signal_toggled().connect (mem_fun (*this, &ThemeManager::on_light_theme_button_toggled));
-       reset_button.signal_clicked().connect (mem_fun (*this, &ThemeManager::reset_canvas_colors));
+       color_dialog.get_ok_button()->signal_clicked().connect (sigc::bind (sigc::mem_fun (color_dialog, &Gtk::Dialog::response), RESPONSE_ACCEPT));
+       color_dialog.get_cancel_button()->signal_clicked().connect (sigc::bind (sigc::mem_fun (color_dialog, &Gtk::Dialog::response), RESPONSE_CANCEL));
+       dark_button.signal_toggled().connect (sigc::mem_fun (*this, &ThemeManager::on_dark_theme_button_toggled));
+       light_button.signal_toggled().connect (sigc::mem_fun (*this, &ThemeManager::on_light_theme_button_toggled));
+       reset_button.signal_clicked().connect (sigc::mem_fun (*this, &ThemeManager::reset_canvas_colors));
 
        set_size_request (-1, 400);
        setup_theme ();
@@ -121,7 +118,7 @@ ThemeManager::button_press_event (GdkEventButton* ev)
        int celly;
 
        UIConfigVariable<uint32_t> *ccvar;
-       
+
        if (!color_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) {
                return false;
        }
@@ -151,7 +148,7 @@ ThemeManager::button_press_event (GdkEventButton* ev)
                        case RESPONSE_CANCEL:
                                break;
                        case RESPONSE_ACCEPT:
-                               color = color_dialog.get_colorsel()->get_current_color(); 
+                               color = color_dialog.get_colorsel()->get_current_color();
                                a = color_dialog.get_colorsel()->get_current_alpha();
                                r = (int) floor (color.get_red_p() * 255.0);
                                g = (int) floor (color.get_green_p() * 255.0);
@@ -196,14 +193,13 @@ load_rc_file (const string& filename, bool themechange)
        spath += system_config_search_path();
 
        if (!find_file_in_search_path (spath, filename, rc_file_path)) {
-               warning << string_compose(
-                               _("Unable to find UI style file %1 in search path %2. Ardour will look strange"),
-                               filename, spath.to_string()) 
+               warning << string_compose (_("Unable to find UI style file %1 in search path %2. %3 will look strange"),
+                                           filename, spath.to_string(), PROGRAM_NAME)
                                << endmsg;
                return;
        }
 
-       cerr << "Loading ui configuration file " << rc_file_path.to_string() << endmsg;
+       info << "Loading ui configuration file " << rc_file_path.to_string() << endmsg;
 
        Gtkmm2ext::UI::instance()->load_rcfile (rc_file_path.to_string(), themechange);
 }
@@ -211,7 +207,7 @@ load_rc_file (const string& filename, bool themechange)
 /* hmm, this is a problem. the profile doesn't
    exist when the theme manager is constructed
    and toggles buttons during "normal" GTK setup.
-   
+
    a better solution will be to make all Profile
    methods static or something.
 
@@ -255,7 +251,7 @@ ThemeManager::setup_theme ()
        color_list->clear();
 
        for (std::vector<UIConfigVariable<uint32_t> *>::iterator i = ARDOUR_UI::config()->canvas_colors.begin(); i != ARDOUR_UI::config()->canvas_colors.end(); i++) {
-               
+
                TreeModel::Row row = *(color_list->append());
 
                Gdk::Color col;