Merge GTK-prettify into default

ikanobori · ikanobori · commit bbbeefe318dc · 2009-12-29T21:47:43.000+01:00
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -3,7 +3,9 @@ include AUTHORS
 include CHANGELOG
 include LICENSE
 include data/bpython
+include data/bpython-gtk
 include data/bpython.desktop
 include doc/*.[0-9]
 include sample-config
 include *.theme
+include bpython/logo.png
diff --git a/bpython/gtk_.py b/bpython/gtk_.py
@@ -30,6 +30,7 @@
 from __future__ import with_statement
 import inspect
 import sys
+import os
 from locale import LC_ALL, getpreferredencoding, setlocale
 
 import gobject
@@ -42,7 +43,7 @@
 
 
 _COLORS = dict(b='blue', c='cyan', g='green', m='magenta', r='red',
-               w='white', y='yellow', k='black')
+               w='white', y='yellow', k='black', d='black')
 
 
 class ArgspecFormatter(object):
@@ -129,7 +130,7 @@ def __nonzero__(self):
 
 class SuggestionWindow(gtk.Window):
     """
-    The window where suggestiosn are displayed.
+    The window where suggestions are displayed.
     """
     __gsignals__ = dict(expose_event=None,
                         selection_changed=(gobject.SIGNAL_RUN_LAST, None,
@@ -263,6 +264,9 @@ def __init__(self, interpreter, config):
         self.list_win.connect('selection-changed',
                               self.on_suggestion_selection_changed)
         self.list_win.hide()
+
+        self.modify_base('normal', gtk.gdk.color_parse(_COLORS[self.config.color_scheme['background']]))
+
         self.text_buffer = self.get_buffer()
         tags = dict()
         for (name, value) in self.config.color_scheme.iteritems():
@@ -626,15 +630,24 @@ def main(args=None):
     interpreter = repl.Interpreter(None, getpreferredencoding())
     repl_widget = ReplWidget(interpreter, config)
 
-    sys.stderr = repl_widget
+    # sys.stderr = repl_widget
     sys.stdout = repl_widget
 
     gobject.idle_add(init_import_completion)
 
     window = gtk.Window()
 
     # branding
+
+    # fix icon to be distributed and loaded from the correct path
+    icon = gtk.gdk.pixbuf_new_from_file(os.path.join(os.path.dirname(__file__),
+                                                     'logo.png'))
+
     window.set_title('bpython')
+    window.set_icon(icon)
+    window.resize(600, 300)
+
+    # read from config
 
     sw = gtk.ScrolledWindow()
     sw.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
diff --git a/bpython/logo.png b/bpython/logo.png
diff --git a/data/bpython-gtk b/data/bpython-gtk
@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+
+import sys
+from bpython.gtk_ import main
+
+sys.exit(main())
diff --git a/setup.py b/setup.py
@@ -46,12 +46,15 @@
         (os.path.join(man_dir, 'man5'), ['doc/bpython-config.5']),
         ('share/applications', ['data/bpython.desktop'])
     ],
+    package_data = {'bpython': ['logo.png']},
     entry_points = {
         'console_scripts': [
             'bpython = bpython.cli:main',
+            'bpython-gtk = bpython.gtk_:main',
         ],
     },
-    scripts = ([] if using_setuptools else ['data/bpython']),
+    scripts = ([] if using_setuptools else ['data/bpython', 
+                                            'data/bpython-gtk']),
     cmdclass=dict(build_py=build_py)
 )
 
