Some cleanups to drawing of automation line control points. Drag all selected automa...

[ardour.git] / gtk2_ardour / wscript

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index d594d364d89b71e16d5bdc5c48a9a97ad3acc4f0..6a3caef427bb75aea0a2a57d0bff9e98b207136f 100644 (file)
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -52,6 +52,7 @@ gtk2_ardour_sources = [
        'bundle_manager.cc',
        'cairo_widget.cc',
        'canvas-flag.cc',
+       'canvas-hit.cc',
        'canvas-note-event.cc',
        'canvas-note.cc',
        'canvas-program-change.cc',
@@ -78,10 +79,9 @@ gtk2_ardour_sources = [
        'editor_route_groups.cc',
        'editor_export_audio.cc',
        'editor_group_tabs.cc',
-       'editor_hscroller.cc',
-       'editor_imageframe.cc',
        'editor_keyboard.cc',
        'editor_keys.cc',
+       'editor_locations.cc',
        'editor_markers.cc',
        'editor_mixer.cc',
        'editor_mouse.cc',
@@ -92,7 +92,6 @@ gtk2_ardour_sources = [
        'editor_rulers.cc',
        'editor_scrub.cc',
        'editor_selection.cc',
-       'editor_selection_list.cc',
        'editor_snapshots.cc',
        'editor_summary.cc',
        'editor_tempodisplay.cc',
@@ -193,6 +192,7 @@ gtk2_ardour_sources = [
        'time_fx_dialog.cc',
        'time_selection.cc',
        'track_selection.cc',
+       'track_view_list.cc',
        'ui_config.cc',
        'utils.cc',
        'version.cc',
@@ -246,11 +246,11 @@ def build(bld):
        obj.cflags       = ['-DPACKAGE="gtk2_ardour"']
        obj.cxxflags     = ['-DPACKAGE="gtk2_ardour"']
        obj.cxxflags     += ['-DVERSIONSTRING="' + GTK2_ARDOUR_VERSION + '"']
-       obj.cxxflags     += ['-DDATA_DIR="' + os.path.normpath(bld.env['DATADIRNAME']) + '"']
-       obj.cxxflags     += ['-DCONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIRNAME']) + '"']
-       obj.cxxflags     += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIRNAME']) + '"']
+       obj.cxxflags     += ['-DDATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"']
+       obj.cxxflags     += ['-DCONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIR']) + '"']
+       obj.cxxflags     += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"']
        obj.cxxflags     += ['-DLOCALEDIR="' + os.path.join(
-                       os.path.normpath(bld.env['DATADIRNAME']), 'locale') + '"']
+                       os.path.normpath(bld.env['DATADIR']), 'locale') + '"']
 
        if bld.env['HAVE_SLV2']:
                obj.source += [ 'lv2_plugin_ui.cc' ]
@@ -303,18 +303,6 @@ def build(bld):
        font_sizes      = {}
        base_font       = ""
 
-       # Set up font substitution dictionary
-       for style in ['', 'BOLD', 'ITALIC']:
-               for sizename,points in font_sizes.iteritems():
-                       if (len (style)):
-                               key = "_".join (['FONT',style,sizename])
-                               fontstyle = " ".join ([basefont,style.lower(),points])
-                       else:
-                               key = "_".join (['FONT',sizename])
-                               fontstyle = " ".join ([basefont,points])
-                       key = '%' + key + '%'
-                       font_subst_dict[key] = fontstyle
-
        # Set up font sizes
        if bld.env['IS_OSX']: # OS X fonts
                basefont = "Lucida Grande"
@@ -345,8 +333,18 @@ def build(bld):
                        'MASSIVE' : '60'
                }
 
-       # RC files
+       # Set up font substitution dictionary
+       for style in ['', 'BOLD', 'ITALIC']:
+               for sizename,points in font_sizes.iteritems():
+                       if (len (style)):
+                               key = "_".join (['FONT',style,sizename])
+                               fontstyle = " ".join ([basefont,style.lower(),points])
+                       else:
+                               key = "_".join (['FONT',sizename])
+                               fontstyle = " ".join ([basefont,points])
+                       font_subst_dict[key] = fontstyle
 
+       # RC files
        obj              = bld.new_task_gen('subst')
        obj.source       = 'ardour3_ui_dark.rc.in'
        obj.target       = 'ardour3_ui_dark.rc'
@@ -374,7 +372,7 @@ def build(bld):
        # Menus
        menus_argv = []
        if bld.env['GTKOSX']:
-               menus_argv = [ '-E', '-P', '-DGTKOSX', '-DTOP_MENUBAR' ]
+               menus_argv = [ '-E', '-P', '-DGTKOSX' ]
        else:
                menus_argv = [ '-E', '-P' ]
        obj = bld.new_task_gen('command-output')
@@ -403,6 +401,9 @@ def build(bld):
        bld.install_files('${DATADIR}/ardour3/pixmaps', 'pixmaps/*.xpm')
        bld.install_files('${DATADIR}/ardour3', 'splash.png')
 
+       # Default UI configuration
+       bld.install_files('${CONFIGDIR}/ardour3', 'ardour3_ui_default.conf')
+
        # i18n
        if bld.env['ENABLE_NLS']:
                mo_files = glob.glob (os.path.join (bld.get_curdir(), 'po/*.mo'))