Revert "adjust horizontal-offset for snap/grid dropdown." Wrong fix for the problem.

[ardour.git] / gtk2_ardour / wscript

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index c9d6fc8c494fc39aced0bc4eb6a56687e4e06446..41e67e023e895577187dc53fc1b9da986c81751d 100644 (file)
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -101,8 +101,6 @@ gtk2_ardour_sources = [
         'ghostregion.cc',
         'global_port_matrix.cc',
         'group_tabs.cc',
-        'gtk-custom-hruler.c',
-        'gtk-custom-ruler.c',
         'gtk_pianokeyboard.c',
         'gui_object.cc',
         'insert_time_dialog.cc',
@@ -195,6 +193,7 @@ gtk2_ardour_sources = [
         'route_processor_selection.cc',
         'route_time_axis.cc',
         'route_ui.cc',
+        'ruler_dialog.cc',
         'search_path_option.cc',
         'selection.cc',
         'send_ui.cc',
@@ -483,7 +482,7 @@ def build(bld):
             'INSTALL_PREFIX' : bld.env['PREFIX'],
             'LIBDIR'         : os.path.normpath(bld.env['DLLDIR']),
             'DATADIR'        : os.path.normpath(bld.env['DATADIR']),
-            'SYSCONFDIR'     : os.path.normpath(bld.env['CONFDIR']),
+            'CONFDIR'        : os.path.normpath(bld.env['CONFDIR']),
             'LIBS'           : 'build/libs',
             'VERSION'        : bld.env['VERSION'],
             'EXECUTABLE'     : 'build/gtk2_ardour/ardour-' + bld.env['VERSION']
@@ -521,6 +520,7 @@ def build(bld):
 
     dark_rc_subst_dict = {}
     light_rc_subst_dict = {}
+    ui_conf_dict = {}
     font_sizes      = {}
     base_font       = ""
 
@@ -581,18 +581,21 @@ def build(bld):
 
             dark_rc_subst_dict[key] = fontstyle
             light_rc_subst_dict[key] = fontstyle
-
+            ui_conf_dict[key] = points
+            
     # @FONT_SIZE_XXXX@
     for sizename,points in iter(font_sizes.items()):
             key = "_".join (['FONT_SIZE',sizename])
             dark_rc_subst_dict[key] = points
             light_rc_subst_dict[key] = points
+            ui_conf_dict[key] = points
 
     # various font names, eg @BOLD_MONOSPACE@
     for font_sym,text in iter(font_names.items()):
         key = font_sym
         dark_rc_subst_dict[key] = text
         light_rc_subst_dict[key] = text
+        ui_conf_dict[key] = text
 
     # RC files
     dark_rc_subst_dict['COLOR_SCHEME'] = build_color_scheme(
@@ -657,6 +660,12 @@ def build(bld):
     obj.target = 'ardour3_ui_light.rc'
     obj.install_path = bld.env['CONFDIR']
 
+    obj              = bld(features = 'subst')
+    obj.source       = [ 'ardour3_ui_default.conf.in' ]
+    obj.target       = 'ardour3_ui_default.conf'
+    obj.install_path = None
+    set_subst_dict(obj, ui_conf_dict)
+
     # Menus
     menus_argv = []
     if bld.is_defined('GTKOSX'):