Removed last usage of checkmark XPMs.

[ardour.git] / gtk2_ardour / editor.cc

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 0310dbbf4c591a5e941b1f379e2e055203dbf7a0..cde3e0cf45a3f909f0f86e1431fa05cee25a6c81 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -48,7 +48,6 @@
 #include <ardour/utils.h>
 
 #include "ardour_ui.h"
-#include "check_mark.h"
 #include "editor.h"
 #include "grouped_buttons.h"
 #include "keyboard.h"
@@ -145,15 +144,9 @@ Gdk::Cursor* Editor::zoom_cursor = 0;
 Gdk::Cursor* Editor::time_fx_cursor = 0;
 Gdk::Cursor* Editor::fader_cursor = 0;
 Gdk::Cursor* Editor::speaker_cursor = 0;
-Gdk::Cursor* Editor::null_cursor = 0;
 Gdk::Cursor* Editor::wait_cursor = 0;
 Gdk::Cursor* Editor::timebar_cursor = 0;
 
-GdkPixmap *Editor::check_pixmap = 0;
-GdkBitmap *Editor::check_mask = 0;
-GdkPixmap *Editor::empty_pixmap = 0;
-GdkBitmap *Editor::empty_mask = 0;
-
 Editor::Editor (AudioEngine& eng) 
        : engine (eng),
 
@@ -219,13 +212,6 @@ Editor::Editor (AudioEngine& eng)
 
        init_colormap ();
 
-       check_pixmap = gdk_pixmap_colormap_create_from_xpm_d (NULL, 
-                                                             gtk_widget_get_colormap (GTK_WIDGET(edit_group_list.gobj())),
-                                                             &check_mask, NULL, (gchar **) check_xpm);
-       empty_pixmap = gdk_pixmap_colormap_create_from_xpm_d (NULL, 
-                                                             gtk_widget_get_colormap (GTK_WIDGET(edit_group_list.gobj())),
-                                                             &empty_mask, NULL, (gchar **) empty_xpm);
-
        session = 0;
 
        selection = new Selection;
@@ -462,9 +448,9 @@ Editor::Editor (AudioEngine& eng)
        zoom_out_full_button.set_name ("EditorTimeButton");
        ARDOUR_UI::instance()->tooltips().set_tip (zoom_out_full_button, _("Zoom to session"));
 
-       zoom_in_button.add (*(manage (new Gtk::Image (Gdk::Pixbuf::create_from_xpm_data(zoom_in_button_xpm)))));
-       zoom_out_button.add (*(manage (new Gtk::Image (Gdk::Pixbuf::create_from_xpm_data(zoom_out_button_xpm)))));
-       zoom_out_full_button.add (*(manage (new Gtk::Image (Gdk::Pixbuf::create_from_xpm_data(zoom_out_full_button_xpm)))));
+       zoom_in_button.add (*(manage (new Gtk::Image (Stock::ZOOM_IN, ICON_SIZE_BUTTON))));
+       zoom_out_button.add (*(manage (new Gtk::Image (Stock::ZOOM_OUT, ICON_SIZE_BUTTON))));
+       zoom_out_full_button.add (*(manage (new Gtk::Image (Stock::ZOOM_FIT, ICON_SIZE_BUTTON))));
        
        zoom_in_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::temporal_zoom_step), false));
        zoom_out_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::temporal_zoom_step), true));
@@ -532,11 +518,13 @@ Editor::Editor (AudioEngine& eng)
 
        edit_group_list.set_name ("MixerGroupList");
        //edit_group_list.set_shadow_type (Gtk::SHADOW_IN);
-       route_list.set_headers_visible (false);
-       edit_group_list.set_reorderable (false);
-       edit_group_list.set_size_request (75, -1);
+
        edit_group_list.columns_autosize ();
        edit_group_list.get_selection()->set_mode (Gtk::SELECTION_MULTIPLE);
+       edit_group_list.set_reorderable (false);
+
+       edit_group_list.set_size_request (75, -1);
+       edit_group_list.set_headers_visible (true);
 
        edit_group_list_scroller.add (edit_group_list);
        edit_group_list_scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
@@ -616,11 +604,14 @@ Editor::Editor (AudioEngine& eng)
 
        named_selection_model = TreeStore::create (named_selection_columns);
        named_selection_display.set_model (named_selection_model);
+       named_selection_display.append_column (_("Chunks"), named_selection_columns.text);
+       named_selection_display.set_size_request (100, -1);
        named_selection_display.set_name ("RegionListDisplay");
+       
+       named_selection_display.get_selection()->set_mode (Gtk::SELECTION_SINGLE);
        named_selection_display.set_size_request (100, -1);
        named_selection_display.set_headers_visible (true);
        named_selection_display.set_headers_clickable (true);
-       named_selection_display.get_selection()->set_mode (Gtk::SELECTION_SINGLE);
        named_selection_display.signal_button_press_event().connect (mem_fun(*this, &Editor::named_selection_display_button_press));
        named_selection_display.get_selection()->signal_changed().connect (mem_fun (*this, &Editor::named_selection_display_selection_changed));
 
@@ -989,12 +980,6 @@ Editor::on_realize ()
 
        track_context_menu.accelerate (*this->get_toplevel());
        track_region_context_menu.accelerate (*this->get_toplevel());
-       
-        Glib::RefPtr<Gdk::Pixmap> empty_pixmap = Gdk::Pixmap::create(get_window(), 1, 1, 1);
-       Glib::RefPtr<Gdk::Pixmap> empty_bitmap = Gdk::Pixmap::create(get_window(), 1, 1, 1);
-       Gdk::Color white ("#ffffff" );
-
-       null_cursor = new Gdk::Cursor(empty_pixmap, empty_bitmap, white, white, 0, 0);
 }