lots of fidgety work to get track renaming to work correctly now that we have to rename audio files too; some GUI tweaks

git-svn-id: svn://localhost/trunk/ardour2@404 d708f5d6-7413-0410-9779-e7cbd77b26cf

6 files changed, 51 insertions, 33 deletions

diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index 53576302cf..09e5b7f7eb 100644
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -188,6 +188,7 @@ fft_result.cc
 """)
 
 glade_files=glob.glob('glade/*.glade')
+pixmap_files=glob.glob('pixmaps/*.xpm')
 
 intl_files = gtkardour_files + glade_files + glob.glob('*.h')
 
@@ -244,19 +245,20 @@ env.Alias('install', env.InstallAs(os.path.join(install_prefix, 'bin')+'/ardour'
 env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour'), 'ardour2_ui.rc'))
 env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour'), 'ardour.menus'))
 env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour'), 'ardour.bindings'))
+env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour'), 'ardour.colors'))
 env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour'), 'splash.ppm'))
+env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour/pixmaps'), pixmap_files))
 env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour/glade'), glade_files))
 
 #dist
 env.Alias ('tarball', env.Distribute (env['DISTTREE'],
                                       [ 'SConscript',
                                         'i18n.h', 'gettext.h',
-                                        'editor_xpms', 'misc_xpms',
-                                        'crossfade_xpms.h', 'meter_xpms.h',
                                         'ardour2_ui.rc', 'splash.ppm',
-                                        'ardour.menus', 'ardour.bindings'
+                                        'ardour.menus', 'ardour.bindings', 'ardour.colors',
+					'editor_xpms'
                                         ] +
-                                      gtkardour_files + vst_files + glade_files +
+                                      gtkardour_files + vst_files + glade_files + pixmap_files +
                                       glob.glob('po/*.po') + glob.glob('*.h')))
 
 # generate a prototype full-featured ardour_ui.rc file
diff --git a/gtk2_ardour/ardour.colors b/gtk2_ardour/ardour.colors
index db01ef384b..cc514890fc 100644
--- a/gtk2_ardour/ardour.colors
+++ b/gtk2_ardour/ardour.colors
@@ -1,8 +1,8 @@
-cWaveForm 0.50 1.0 1.0 0.90
+cWaveForm 0.0 0.0 0.0 0.80
 cMutedWaveForm 0.35 0.35 0.35 1.0
-cSelectedFrameBase 0.63 0.13 0.94 0.2
-cFrameBase 0.0 0.0 0.0 0.25
-cAudioTrackBase 0.30 0.30 0.30 0.25
+cSelectedFrameBase 0.71 0.57 0.66 1.0
+cFrameBase 0.75 0.75 0.76 1.0
+cAudioTrackBase 0.79 0.80 0.85 0.41
 cAudioTrackOutline 0.00 0.00 0.00 1.00
 cAudioBusBase 0.90 0.82 0.90 0.41
 cTempoBar 0.64 0.64 0.66 1.0
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 88f1d05f3b..b68c1d3f6a 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -427,20 +427,18 @@ Editor::Editor (AudioEngine& eng)
 	edit_packer.set_col_spacings (0);
 	edit_packer.set_row_spacings (0);
 	edit_packer.set_homogeneous (false);
+	edit_packer.set_border_width (0);
 	edit_packer.set_name ("EditorWindow");
+	
+	edit_packer.attach (edit_vscrollbar,         0, 1, 1, 3,    FILL,        FILL|EXPAND, 0, 0);
 
-	edit_packer.attach (edit_hscrollbar,         1, 2, 0, 1,    FILL|EXPAND,  FILL, 0, 0);
-
-	edit_packer.attach (time_button_event_box,   0, 1, 1, 2,    FILL,        FILL, 0, 0);
-	edit_packer.attach (time_canvas_event_box,   1, 2, 1, 2,    FILL|EXPAND, FILL, 0, 0);
+	edit_packer.attach (time_button_event_box,   1, 2, 0, 1,    FILL,        FILL, 0, 0);
+	edit_packer.attach (time_canvas_event_box,   2, 3, 0, 1,    FILL|EXPAND, FILL, 0, 0);
 
-	edit_packer.attach (controls_layout,         0, 1, 2, 3,    FILL,        FILL|EXPAND, 0, 0);
-	edit_packer.attach (track_canvas_event_box,  1, 2, 2, 3,    FILL|EXPAND, FILL|EXPAND, 0, 0);
-	edit_packer.attach (edit_vscrollbar,         2, 3, 2, 3,    FILL,        FILL|EXPAND, 0, 0);
+	edit_packer.attach (controls_layout,         1, 2, 1, 2,    FILL,        FILL|EXPAND, 0, 0);
+	edit_packer.attach (track_canvas_event_box,  2, 3, 1, 2,    FILL|EXPAND, FILL|EXPAND, 0, 0);
 
-	edit_frame.set_name ("BaseFrame");
-	edit_frame.set_shadow_type (SHADOW_IN);
-	edit_frame.add (edit_packer);
+	edit_packer.attach (edit_hscrollbar,         2, 3, 2, 3,    FILL|EXPAND,  FILL, 0, 0);
 
 	zoom_in_button.set_name ("EditorTimeButton");
 	zoom_out_button.set_name ("EditorTimeButton");
@@ -637,20 +635,31 @@ Editor::Editor (AudioEngine& eng)
 	snapshot_display.get_selection()->signal_changed().connect (mem_fun(*this, &Editor::snapshot_display_selection_changed));
 	snapshot_display.signal_button_press_event().connect (mem_fun (*this, &Editor::snapshot_display_button_press), false);
 
-       	the_notebook.append_page (region_list_scroller, _("Regions"));
-       	the_notebook.append_page (route_list_scroller, _("Tracks/Busses"));
-	the_notebook.append_page (snapshot_display_scroller, _("Snapshots"));
-	the_notebook.append_page (*edit_group_display_packer, _("Edit Groups"));
-	the_notebook.append_page (named_selection_scroller, _("Chunks"));
+	Gtk::Label* nlabel;
+
+	nlabel = manage (new Label (_("Regions")));
+	nlabel->set_angle (-90);
+       	the_notebook.append_page (region_list_scroller, *nlabel);
+	nlabel = manage (new Label (_("Tracks/Busses")));
+	nlabel->set_angle (-90);
+       	the_notebook.append_page (route_list_scroller, *nlabel);
+	nlabel = manage (new Label (_("Snapshots")));
+	nlabel->set_angle (-90);
+	the_notebook.append_page (snapshot_display_scroller, *nlabel);
+	nlabel = manage (new Label (_("Edit Groups")));
+	nlabel->set_angle (-90);
+	the_notebook.append_page (*edit_group_display_packer, *nlabel);
+	nlabel = manage (new Label (_("Chunks")));
+	nlabel->set_angle (-90);
+	the_notebook.append_page (named_selection_scroller, *nlabel);
+
 	the_notebook.set_show_tabs (true);
 	the_notebook.set_scrollable (true);
 	the_notebook.popup_enable ();
+	the_notebook.set_tab_pos (Gtk::POS_RIGHT);
 
-	TearOff *notebook_tearoff = manage (new TearOff (the_notebook, true));
-	notebook_tearoff->tearoff_window().set_size_request (200, 400);
-
-	edit_pane.pack1 (edit_frame, true, true);
-	edit_pane.pack2 (*notebook_tearoff, false, true);
+	edit_pane.pack1 (edit_packer, true, true);
+	edit_pane.pack2 (the_notebook, false, true);
 	
 	edit_pane.signal_size_allocate().connect_notify (bind (mem_fun(*this, &Editor::pane_allocation_handler), static_cast<Paned*> (&edit_pane)));
 
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index ecf9da747d..7312c5d596 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -672,7 +672,6 @@ class Editor : public PublicEditor
 	Gtk::HBox           bottom_hbox;
 	
 	Gtk::Table          edit_packer;
-	Gtk::Frame          edit_frame;
 	Gtk::VScrollbar     edit_vscrollbar;
 
 	Gtk::Adjustment     vertical_adjustment;
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 8db3ce7556..c18bf867cd 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -130,6 +130,7 @@ Editor::initialize_canvas ()
 	time_canvas.set_name ("EditorTimeCanvas");
 	time_canvas.add_events (Gdk::POINTER_MOTION_HINT_MASK);
 	time_canvas.set_flags (CAN_FOCUS);
+	time_canvas.set_center_scroll_region (false);
 	
 	meter_group = new ArdourCanvas::Group (*time_canvas.root(), 0.0, 0.0);
 	tempo_group = new ArdourCanvas::Group (*time_canvas.root(), 0.0, timebar_height);
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 14330e2009..028c38ac74 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -239,11 +239,18 @@ string
 which_ui_rcfile ()
 {
 	string rcfile;
+	char* env;
+
+	if ((env = getenv ("ARDOUR2_UI_RC")) != 0 && strlen (env)) {
+		rcfile = env;
+	} else {
+		rcfile = "ardour2_ui.rc";
+	}
+
+	rcfile = find_config_file (rcfile);
 	
-	rcfile = find_config_file ("ardour2_ui.rc");
-	
-	if (rcfile.length() == 0) {
-		warning << _("Without a UI style file, ardour will look strange.\n Please set ARDOUR_UI_RC to point to a valid UI style file") << endmsg;
+	if (rcfile.empty()) {
+		warning << _("Without a UI style file, ardour will look strange.\n Please set ARDOUR2_UI_RC to point to a valid UI style file") << endmsg;
 	}
 
 	return rcfile;