summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorDoug McLain <doug@nostar.net>2005-12-05 04:43:00 +0000
committerDoug McLain <doug@nostar.net>2005-12-05 04:43:00 +0000
commit68c9ae93deb222406f29b4ed6ef87ec748c3c5b4 (patch)
treed0a115ddb00cbb09e1b5cb9f2744b27954831340 /gtk2_ardour
parent7d1f1eeb20edc21d704cc69529e4e94dd7eabd39 (diff)
Create and make default the new rc file ardour2_ui.rc, with new font definitions
git-svn-id: svn://localhost/trunk/ardour2@166 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/SConscript4
-rw-r--r--gtk2_ardour/main.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index 452d84480a..1e464c48ee 100644
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -222,7 +222,7 @@ if env['NLS']:
env.Alias('install', env.InstallAs(os.path.join(install_prefix, 'bin')+'/ardour', ardour))
-env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour'), 'ardour_ui.rc'))
+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.xml'))
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/glade'), glade_files))
@@ -232,7 +232,7 @@ env.Alias ('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript',
'i18n.h', 'gettext.h',
'editor_xpms', 'misc_xpms', 'transport_xpms',
- 'ardour_ui.rc', 'splash.ppm'
+ 'ardour2_ui.rc', 'splash.ppm'
] +
gtkardour_files + vst_files + glade_files +
glob.glob('po/*.po') + glob.glob('*.h')))
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index acd8188bcb..5890b60492 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -244,7 +244,7 @@ which_ui_rcfile ()
char* envvar;
if ((envvar = getenv("ARDOUR_UI_RC")) == 0) {
- rcfile = find_config_file ("ardour_ui.rc");
+ 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;