smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-24 07:27:44 +01:00
Code Issues Projects Releases Wiki Activity

fixes to theme font issues, tweaks etc. still needs verification on the linux end.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2230 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Jesse Chappell 2007-08-03 03:54:08 +00:00
parent deb231f6cc
commit 69fe6ac3fd
6 changed files with 49 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

14
gtk2_ardour/SConscript
View file

@ -281,12 +281,13 @@ if gtkardour['DIST_TARGET'] == 'panther' or gtkardour['DIST_TARGET'] == 'tiger':
# OS X font rendering is different even with X11
#
my_font_dict['%FONT_TINY%'] = 'sans 7'
my_font_dict['%FONT_SMALLERER%'] = 'sans 8'
my_font_dict['%FONT_SMALLER%'] = 'sans 9'
my_font_dict['%FONT_SMALL%'] = 'sans 10'
my_font_dict['%FONT_NORMAL%'] = 'sans 11'
my_font_dict['%FONT_BIG%'] = 'sans 15'
my_font_dict['%FONT_BIGGER%'] = 'sans 16'
my_font_dict['%FONT_LARGE%'] = 'sans 20'
my_font_dict['%FONT_BIG%'] = 'sans 12'
my_font_dict['%FONT_BIGGER%'] = 'sans 14'
my_font_dict['%FONT_LARGE%'] = 'sans 18'
my_font_dict['%FONT_LARGER%'] = 'sans 28'
my_font_dict['%FONT_HUGER%'] = 'sans 36'
my_font_dict['%FONT_MASSIVE%'] = 'sans 60'
@ -294,10 +295,10 @@ if gtkardour['DIST_TARGET'] == 'panther' or gtkardour['DIST_TARGET'] == 'tiger':
my_font_dict['%FONT_BOLD_SMALLER%'] = 'sans bold 9'
my_font_dict['%FONT_BOLD_SMALL%'] = 'sans bold 10'
my_font_dict['%FONT_BOLD_NORMAL%'] = 'sans bold 11'
my_font_dict['%FONT_BOLD_BIG%'] = 'sans bold 15'
my_font_dict['%FONT_BOLD_BIGGER%'] = 'sans bold 16'
my_font_dict['%FONT_BOLD_BIG%'] = 'sans bold 13'
my_font_dict['%FONT_BOLD_BIGGER%'] = 'sans bold 14'
my_font_dict['%FONT_BOLD_LARGE%'] = 'sans bold 20'
my_font_dict['%FONT_BOLD_LARGER%'] = 'sans bold 28'
my_font_dict['%FONT_BOLD_LARGER%'] = 'sans bold 25'
my_font_dict['%FONT_BOLD_HUGER%'] = 'sans bold 36'
my_font_dict['%FONT_BOLD_MASSIVE%'] = 'sans bold 60'
my_font_dict['%FONT_ITALIC_TINY%'] = 'sans italic 7'
@ -315,6 +316,7 @@ else:
# Linux/X11 font rendering
#
my_font_dict['%FONT_TINY%'] = 'sans 4'
my_font_dict['%FONT_SMALLERER%'] = 'sans 6'
my_font_dict['%FONT_SMALLER%'] = 'sans 6'
my_font_dict['%FONT_SMALL%'] = 'sans 7'
my_font_dict['%FONT_NORMAL%'] = 'sans 8'

36
gtk2_ardour/ardour2_ui_dark.rc.in
View file

@ -4,17 +4,17 @@
style "very_small_text"
{
font_name = "%FONT_SMALL%"
font_name = "%FONT_SMALLER%"
}
style "small_text"
{
font_name = "%FONT_NORMAL%"
font_name = "%FONT_SMALL%"
}
style "small_bold_text"
{
font_name = "%FONT_BOLD_NORMAL%"
font_name = "%FONT_BOLD_SMALL%"
}
style "medium_bold_text"
@ -73,7 +73,7 @@ style "verbose_canvas_cursor"
style "marker_text"
{
font_name = "%FONT_NORMAL%"
font_name = "%FONT_SMALL%"
}
style "time_axis_view_item_name"
@ -159,7 +159,7 @@ style "default_buttons_menus"
style "very_small_button" = "default_buttons_menus"
{
font_name = "%FONT_SMALL%"
font_name = "%FONT_SMALLER%"
ythickness = 0
xthickness = 0
}
@ -220,21 +220,21 @@ style "track_rec_enable_button_alternate" = "small_button"
style "mixer_track_rec_enable_button" = "track_rec_enable_button"
{
font_name = "%FONT_SMALL%"
font_name = "%FONT_SMALLER%"
xthickness = 0
ythickness = 0
}
style "mixer_track_rec_enable_button_alternate" = "track_rec_enable_button_alternate"
{
font_name = "%FONT_SMALL%"
font_name = "%FONT_SMALLER%"
xthickness = 0
ythickness = 0
}
style "mixer_track_rec_enable_button_active" = "track_rec_enable_button_active"
{
font_name = "%FONT_SMALL%"
font_name = "%FONT_SMALLER%"
xthickness = 0
ythickness = 0
}
@ -272,20 +272,20 @@ style "solo_button_active" = "small_button"
style "mixer_solo_button" = "solo_button"
{
font_name = "%FONT_SMALL%"
font_name = "%FONT_SMALLERER%"
xthickness = 0
ythickness = 0
}
style "mixer_solo_button_alternate" = "solo_button_alternate"
{
font_name = "%FONT_SMALL%"
font_name = "%FONT_SMALLERER%"
xthickness = 0
ythickness = 0
}
style "mixer_solo_button_active" = "solo_button_active"
{
font_name = "%FONT_SMALL%"
font_name = "%FONT_SMALLERER%"
xthickness = 0
ythickness = 0
}
@ -323,21 +323,21 @@ style "mute_button_active" = "small_button"
style "mixer_mute_button" = "mute_button"
{
font_name = "%FONT_SMALL%"
font_name = "%FONT_SMALLERER%"
xthickness = 0
ythickness = 0
}
style "mixer_mute_button_alternate" = "mute_button_alternate"
{
font_name = "%FONT_SMALL%"
font_name = "%FONT_SMALLERER%"
xthickness = 0
ythickness = 0
}
style "mixer_mute_button_active" = "mute_button_active"
{
font_name = "%FONT_SMALL%"
font_name = "%FONT_SMALLERER%"
xthickness = 0
ythickness = 0
}
@ -351,7 +351,7 @@ style "multiline_combo" = "small_button"
style "mixer_mute_button" = "mute_button"
{
font_name = "%FONT_SMALL%"
font_name = "%FONT_SMALLER%"
xthickness = 0
ythickness = 0
}
@ -667,7 +667,7 @@ style "transport_clock_display_delta" = "transport_clock_display"
style "tempo_meter_clock_display"
{
font_name = "%FONT_SMALL%"
font_name = "%FONT_SMALLER%"
fg[NORMAL] = { 1.0, 1.0, 1.0 }
fg[ACTIVE] = { 1.0, 1.0, 0.0 }
fg[SELECTED] = { 1.0, 0, 0 }
@ -1098,10 +1098,10 @@ style "tearoff_arrow" = "medium_bold_entry"
bg[PRELIGHT] = { 0.80, 0.80, 0.80 }
}
style "meter_metrics_strip" = "default_base"
style "meter_metrics_strip" = "audio_track_base"
{
font_name = "%FONT_TINY%"
fg[NORMAL] = { 1.0, 0.8, 0.2 }
fg[NORMAL] = { 1.0, 0.8, 0.6 }
}
style "location_row_button" = "default_buttons_menus"

36
gtk2_ardour/ardour2_ui_light.rc.in
View file

@ -4,17 +4,17 @@
style "very_small_text"
{
font_name = "%FONT_SMALL%"
font_name = "%FONT_SMALLER%"
}
style "small_text"
{
font_name = "%FONT_NORMAL%"
font_name = "%FONT_SMALL%"
}
style "small_bold_text"
{
font_name = "%FONT_BOLD_NORMAL%"
font_name = "%FONT_BOLD_SMALL%"
}
style "medium_bold_text"
@ -162,7 +162,7 @@ style "default_buttons_menus"
style "very_small_button" = "default_buttons_menus"
{
font_name = "%FONT_SMALL%"
font_name = "%FONT_SMALLER%"
ythickness = 0
xthickness = 0
}
@ -223,21 +223,21 @@ style "track_rec_enable_button_alternate" = "small_button"
style "mixer_track_rec_enable_button" = "track_rec_enable_button"
{
font_name = "%FONT_SMALL%"
font_name = "%FONT_SMALLER%"
xthickness = 0
ythickness = 0
}
style "mixer_track_rec_enable_button_alternate" = "track_rec_enable_button_alternate"
{
font_name = "%FONT_SMALL%"
font_name = "%FONT_SMALLER%"
xthickness = 0
ythickness = 0
}
style "mixer_track_rec_enable_button_active" = "track_rec_enable_button_active"
{
font_name = "%FONT_SMALL%"
font_name = "%FONT_SMALLER%"
xthickness = 0
ythickness = 0
}
@ -275,20 +275,20 @@ style "solo_button_active" = "small_button"
style "mixer_solo_button" = "solo_button"
{
font_name = "%FONT_SMALL%"
font_name = "%FONT_SMALLERER%"
xthickness = 0
ythickness = 0
}
style "mixer_solo_button_alternate" = "solo_button_alternate"
{
font_name = "%FONT_SMALL%"
font_name = "%FONT_SMALLERER%"
xthickness = 0
ythickness = 0
}
style "mixer_solo_button_active" = "solo_button_active"
{
font_name = "%FONT_SMALL%"
font_name = "%FONT_SMALLERER%"
xthickness = 0
ythickness = 0
}
@ -326,21 +326,21 @@ style "mute_button_active" = "small_button"
style "mixer_mute_button" = "mute_button"
{
font_name = "%FONT_SMALL%"
font_name = "%FONT_SMALLERER%"
xthickness = 0
ythickness = 0
}
style "mixer_mute_button_alternate" = "mute_button_alternate"
{
font_name = "%FONT_SMALL%"
font_name = "%FONT_SMALLERER%"
xthickness = 0
ythickness = 0
}
style "mixer_mute_button_active" = "mute_button_active"
{
font_name = "%FONT_SMALL%"
font_name = "%FONT_SMALLERER%"
xthickness = 0
ythickness = 0
}
@ -354,7 +354,7 @@ style "multiline_combo" = "small_button"
style "mixer_mute_button" = "mute_button"
{
font_name = "%FONT_SMALL%"
font_name = "%FONT_SMALLERER%"
xthickness = 0
ythickness = 0
}
@ -672,7 +672,7 @@ style "transport_clock_display_delta" = "transport_clock_display"
style "tempo_meter_clock_display"
{
font_name = "%FONT_SMALL%"
font_name = "%FONT_SMALLER%"
fg[NORMAL] = { 1.0, 1.0, 1.0 }
fg[ACTIVE] = { 1.0, 1.0, 0.0 }
fg[SELECTED] = { 1.0, 0, 0 }
@ -1102,15 +1102,15 @@ style "tearoff_arrow" = "medium_bold_entry"
bg[PRELIGHT] = { 0.80, 0.80, 0.80 }
}
style "meter_metrics_strip" = "default_base"
style "meter_metrics_strip" = "audio_track_base"
{
font_name = "%FONT_TINY%"
fg[NORMAL] = { 1.0, 0.8, 0.2 }
fg[NORMAL] = { 1.0, 0.8, 0.6 }
}
style "location_row_button" = "default_buttons_menus"
{
font_name = "%FONT_BIG%"
font_name = "%FONT_SMALL%"
}
style "location_rows_clock" = "default_clock_display"

3
gtk2_ardour/gain_meter.cc
View file

@ -228,6 +228,7 @@ GainMeter::render_metrics (Gtk::Widget& w)
{
Glib::RefPtr<Gdk::Window> win (w.get_window());
Glib::RefPtr<Gdk::GC> fg_gc (w.get_style()->get_fg_gc (Gtk::STATE_NORMAL));
Glib::RefPtr<Gdk::GC> text_gc (w.get_style()->get_text_gc (Gtk::STATE_NORMAL));
Glib::RefPtr<Gdk::GC> bg_gc (w.get_style()->get_bg_gc (Gtk::STATE_NORMAL));
gint width, height;
int db_points[] = { -50, -40, -20, -30, -10, -3, 0, 4 };
@ -640,7 +641,7 @@ GainMeter::gain_changed (void *src)
void
GainMeter::set_meter_strip_name (const char * name)
{
meter_metric_area.set_name (name);
// meter_metric_area.set_name (name);
}
void

4
tools/osx_packaging/app_build.rb
View file

@ -197,8 +197,8 @@ if File.exist?(ppc_libdir) and File.exist?(i386_libdir) then
if not File.exist?("Ardour2.app/Contents/Resources/etc/ardour2") then
Dir.mkdir "Ardour2.app/Contents/Resources/etc/ardour2"
end
`cp ../../gtk2_ardour/ardour.bindings ../../gtk2_ardour/ardour.colors ../../gtk2_ardour/ardour.menus Ardour2.app/Contents/Resources/etc/ardour2/`
`cp ../../ardour.rc ../../ardour_system.rc Ardour2.app/Contents/Resources/etc/ardour2/`
`cp ../../gtk2_ardour/ardour.bindings ../../gtk2_ardour/ardour.menus Ardour2.app/Contents/Resources/etc/ardour2/`
`cp ../../ardour_system.rc Ardour2.app/Contents/Resources/etc/ardour2/`
`cp ../../gtk2_ardour/ardour2_ui_default.conf Ardour2.app/Contents/Resources/etc/ardour2/`
`cp ../../gtk2_ardour/ardour2_ui_light.rc Ardour2.app/Contents/Resources/etc/ardour2/`
`cp ../../gtk2_ardour/ardour2_ui_dark.rc Ardour2.app/Contents/Resources/etc/ardour2/`

1
tools/osx_packaging/ardour2_mac_ui.rc
View file

@ -1,3 +1,4 @@
#
# This is the GTK style file for Ardour
#