diff --git a/meld/meldwindow.py b/meld/meldwindow.py index 2108e14ea..b567a8607 100644 --- a/meld/meldwindow.py +++ b/meld/meldwindow.py @@ -275,7 +275,6 @@ def app_action(*args): def osx_menu_setup(self, widget, event, callback_data=None): if self.osx_ready == False: import gi - from gi.repository import Pango gi.require_version('GtkosxApplication', '1.0') from gi.repository import GtkosxApplication as gtkosx_application self.macapp = gtkosx_application.Application() @@ -295,7 +294,6 @@ def osx_menu_setup(self, widget, event, callback_data=None): self.macapp.insert_app_menu_item(Gtk.SeparatorMenuItem(), 3) #self.macapp.ready() NSApp.activateIgnoringOtherApps_(True) - self.widget.modify_font(Pango.FontDescription("Lucida Grande 10")) self.osx_ready = True def _on_recentmenu_map(self, recentmenu): diff --git a/meld/ui/filechooser.py b/meld/ui/filechooser.py index 6fcc1501b..7c5c93c4b 100644 --- a/meld/ui/filechooser.py +++ b/meld/ui/filechooser.py @@ -50,6 +50,14 @@ def __init__( # file comparisons, not in folder or version-control. self.props.local_only = action not in FILE_ACTIONS + try: + from AppKit import NSFont + from gi.repository import Pango + system_font = NSFont.systemFontOfSize_(10) + self.modify_font(Pango.FontDescription(system_font.displayName() + " 10")) + except: + pass + def make_encoding_combo(self): """Create the combo box for text encoding selection""" codecs = [] diff --git a/meld/ui/gnomeglade.py b/meld/ui/gnomeglade.py index e7d877f28..31d277117 100644 --- a/meld/ui/gnomeglade.py +++ b/meld/ui/gnomeglade.py @@ -43,6 +43,13 @@ def __init__(self, filename, root, extra=None): self.builder.connect_signals(self) self.widget = getattr(self, root) self.widget.pyobject = self + try: + from AppKit import NSFont + from gi.repository import Pango + system_font = NSFont.systemFontOfSize_(10) + self.widget.modify_font(Pango.FontDescription(system_font.displayName() + " 10")) + except: + pass def __getattr__(self, key): """Allow UI builder widgets to be accessed as self.widgetname""" diff --git a/meld/ui/statusbar.py b/meld/ui/statusbar.py index be4349847..c6eb116de 100644 --- a/meld/ui/statusbar.py +++ b/meld/ui/statusbar.py @@ -128,6 +128,14 @@ def __init__(self): self.props.margin = 0 self.props.spacing = 6 + try: + from AppKit import NSFont + from gi.repository import Pango + system_font = NSFont.systemFontOfSize_(10) + self.modify_font(Pango.FontDescription(system_font.displayName() + " 9")) + except: + pass + hbox = self.get_message_area() label = hbox.get_children()[0] hbox.props.spacing = 6