diff options
| author | Doug McLain <doug@nostar.net> | 2006-05-12 00:30:13 +0000 |
|---|---|---|
| committer | Doug McLain <doug@nostar.net> | 2006-05-12 00:30:13 +0000 |
| commit | a0fd9fa7a0940f08bde646ac338d5900c0bebde1 (patch) | |
| tree | 23b4b3c539b7772ac61dbf05206ceef08639a42f /gtk2_ardour | |
| parent | f0c0ecf3b1ebc21eaba768954613c15cefb9ff23 (diff) | |
Convert NSD from glade to gtkmm object
git-svn-id: svn://localhost/trunk/ardour2@499 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/SConscript | 13 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui.h | 2 |
2 files changed, 3 insertions, 12 deletions
diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript index 32b94f2e4c..ad1d9f4655 100644 --- a/gtk2_ardour/SConscript +++ b/gtk2_ardour/SConscript @@ -45,9 +45,7 @@ gtkardour.Merge ([ libraries['xslt'], libraries['soundtouch'], libraries['samplerate'], - libraries['jack'], - libraries['glade2'], - libraries['libglademm'] + libraries['jack'] ]) if gtkardour['DMALLOC']: @@ -127,8 +125,6 @@ export_range_markers_dialog.cc gain_automation_time_axis.cc gain_meter.cc ghostregion.cc -glade_path.cc -glade_factory.cc grouped_buttons.cc gtk-custom-hruler.c gtk-custom-ruler.c @@ -192,10 +188,9 @@ fft_graph.cc fft_result.cc """) -glade_files=glob.glob('glade/*.glade') pixmap_files=glob.glob('pixmaps/*.xpm') -intl_files = gtkardour_files + glade_files + glob.glob('*.h') +intl_files = gtkardour_files + glob.glob('*.h') mtest_files=Split(""" mtest.cc @@ -219,7 +214,6 @@ intl_files += extra_sources gtkardour.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE") gtkardour.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"") -gtkardour.Append(CXXFLAGS="-DGLADEPATH=\\\""+final_prefix+"/share/ardour/glade\\\"") versionflag = '-DVERSIONSTRING=\\\"' + env['VERSION'] + '\\\"' @@ -262,7 +256,6 @@ env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour # data files env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2'), 'splash.ppm')) env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2/pixmaps'), pixmap_files)) -env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2/glade'), glade_files)) #dist env.Alias ('tarball', env.Distribute (env['DISTTREE'], @@ -272,7 +265,7 @@ env.Alias ('tarball', env.Distribute (env['DISTTREE'], 'ardour.menus', 'ardour.bindings', 'ardour.colors', 'editor_xpms' ] + - gtkardour_files + vst_files + glade_files + pixmap_files + + gtkardour_files + vst_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_ui.h b/gtk2_ardour/ardour_ui.h index 89ae4df7da..95121bc283 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -61,7 +61,6 @@ #include "audio_clock.h" #include "ardour_dialog.h" #include "editing.h" -#include "glade_factory.h" class AudioClock; class PublicEditor; @@ -529,7 +528,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI bool _will_create_new_session_automatically; - GladeRef m_new_session_dialog_ref; NewSessionDialog* m_new_session_dialog; void open_session (); |