@@ -46,9 +46,9 @@ Shortcuts:

         'inputfile', metavar='file', nargs='?',

         help='input file to be viewed')

     parser.add_argument(

-        '-f', '--filter', choices=['dot', 'neato', 'twopi', 'circo', 'fdp'],

+        '-f', '--filter', action='store',

         dest='filter', default='dot', metavar='FILTER',

-        help='graphviz filter: dot, neato, twopi, circo, or fdp [default: %(default)s]')

+        help='graphviz filter, e.g. dot, neato, twopi, circo, or fdp [default: %(default)s]')

     parser.add_argument(

         '-n', '--no-filter',

         action='store_const', const=None, dest='filter',

@@ -36,6 +36,7 @@ Shortcuts:

   F                         find

   Q                         quit

   P                         print

+  T                         toggle show/hide toolbar

   Escape                    halt animation

   Ctrl-drag                 zoom in/out

   Shift-drag                zooms an area

@@ -56,6 +56,10 @@ Shortcuts:

         '-g', '--geometry',

         action='store', dest='geometry',

         help='default window size in form WxH')

+    parser.add_argument(

+        '--hide-toolbar',

+        action='store_true', dest='hide_toolbar',

+        help='Hides the toolbar on start.')

     options = parser.parse_args()

     inputfile = options.inputfile

@@ -76,6 +80,9 @@ Shortcuts:

         else:

             win.open_file(inputfile)

+    if options.hide_toolbar:

+        win.uimanager.get_widget('/ToolBar').set_visible(False)

+

     if sys.platform != 'win32':

         # Reset KeyboardInterrupt SIGINT handler, so that glib loop can be stopped by it

         import signal

@@ -60,7 +60,7 @@ Shortcuts:

     options = parser.parse_args()

     inputfile = options.inputfile

-    width = height = 512

+    width, height = 610, 610

     if options.geometry:

         try:

             width, height = (int(i) for i in options.geometry.split('x'))

@@ -72,7 +72,7 @@ Shortcuts:

     win.set_filter(options.filter)

     if inputfile and len(inputfile) >= 1:

         if inputfile == '-':

-            win.set_dotcode(sys.stdin.read())

+            win.set_dotcode(sys.stdin.buffer.read())

         else:

             win.open_file(inputfile)

@@ -1,6 +1,6 @@

 #!/usr/bin/env python3

 #

-# Copyright 2008-2015 Jose Fonseca

+# Copyright 2008-2017 Jose Fonseca

 #

 # This program is free software: you can redistribute it and/or modify it

 # under the terms of the GNU Lesser General Public License as published

@@ -15,6 +15,7 @@

 # You should have received a copy of the GNU Lesser General Public License

 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #

+

 import argparse

 import sys

@@ -74,6 +74,12 @@ Shortcuts:

             win.set_dotcode(sys.stdin.read())

         else:

             win.open_file(inputfile)

+

+    if sys.platform != 'win32':

+        # Reset KeyboardInterrupt SIGINT handler, so that glib loop can be stopped by it

+        import signal

+        signal.signal(signal.SIGINT, signal.SIG_DFL)

+

     Gtk.main()

 if __name__ == '__main__':

@@ -15,24 +15,17 @@

 # You should have received a copy of the GNU Lesser General Public License

 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #

-import optparse

+import argparse

 import sys

 from .ui.window import DotWindow, Gtk

-class OptionParser(optparse.OptionParser):

-

-    def format_epilog(self, formatter):

-        # Prevent stripping the newlines in epilog message

-        # http://stackoverflow.com/questions/1857346/python-optparse-how-to-include-additional-info-in-usage-output

-        return self.epilog

-

-

 def main():

-    parser = OptionParser(

-        usage='\n\t%prog [file]',

+    parser = argparse.ArgumentParser(

+        description="xdot.py is an interactive viewer for graphs written in Graphviz's dot language.",

+        formatter_class=argparse.RawDescriptionHelpFormatter,

         epilog='''

 Shortcuts:

   Up, Down, Left, Right     scroll

@@ -47,23 +40,24 @@ Shortcuts:

   Shift-drag                zooms an area

 '''

     )

-    parser.add_option(

-        '-f', '--filter',

-        type='choice', choices=('dot', 'neato', 'twopi', 'circo', 'fdp'),

-        dest='filter', default='dot',

-        help='graphviz filter: dot, neato, twopi, circo, or fdp [default: %default]')

-    parser.add_option(

+    parser.add_argument(

+        'inputfile', metavar='file', nargs='?',

+        help='input file to be viewed')

+    parser.add_argument(

+        '-f', '--filter', choices=['dot', 'neato', 'twopi', 'circo', 'fdp'],

+        dest='filter', default='dot', metavar='FILTER',

+        help='graphviz filter: dot, neato, twopi, circo, or fdp [default: %(default)s]')

+    parser.add_argument(

         '-n', '--no-filter',

         action='store_const', const=None, dest='filter',

         help='assume input is already filtered into xdot format (use e.g. dot -Txdot)')

-    parser.add_option(

-        '-g', None,

+    parser.add_argument(

+        '-g', '--geometry',

         action='store', dest='geometry',

         help='default window size in form WxH')

-    (options, args) = parser.parse_args(sys.argv[1:])

-    if len(args) > 1:

-        parser.error('incorrect number of arguments')

+    options = parser.parse_args()

+    inputfile = options.inputfile

     width = height = 512

     if options.geometry:

@@ -75,11 +69,11 @@ Shortcuts:

     win = DotWindow(width=width, height=height)

     win.connect('delete-event', Gtk.main_quit)

     win.set_filter(options.filter)

-    if len(args) >= 1:

-        if args[0] == '-':

+    if inputfile and len(inputfile) >= 1:

+        if inputfile == '-':

             win.set_dotcode(sys.stdin.read())

         else:

-            win.open_file(args[0])

+            win.open_file(inputfile)

     Gtk.main()

 if __name__ == '__main__':

@@ -68,7 +68,7 @@ Shortcuts:

     width = height = 512

     if options.geometry:

         try:

-            width,height = (int(i) for i in options.geometry.split('x'))

+            width, height = (int(i) for i in options.geometry.split('x'))

         except ValueError:

             parser.error('invalid window geometry')

new file mode 100755

@@ -0,0 +1,86 @@

+#!/usr/bin/env python3

+#

+# Copyright 2008-2015 Jose Fonseca

+#

+# This program is free software: you can redistribute it and/or modify it

+# under the terms of the GNU Lesser General Public License as published

+# by the Free Software Foundation, either version 3 of the License, or

+# (at your option) any later version.

+#

+# This program is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU Lesser General Public License for more details.

+#

+# You should have received a copy of the GNU Lesser General Public License

+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

+#

+import optparse

+import sys

+

+from .ui.window import DotWindow, Gtk

+

+

+class OptionParser(optparse.OptionParser):

+

+    def format_epilog(self, formatter):

+        # Prevent stripping the newlines in epilog message

+        # http://stackoverflow.com/questions/1857346/python-optparse-how-to-include-additional-info-in-usage-output

+        return self.epilog

+

+

+def main():

+

+    parser = OptionParser(

+        usage='\n\t%prog [file]',

+        epilog='''

+Shortcuts:

+  Up, Down, Left, Right     scroll

+  PageUp, +, =              zoom in

+  PageDown, -               zoom out

+  R                         reload dot file

+  F                         find

+  Q                         quit

+  P                         print

+  Escape                    halt animation

+  Ctrl-drag                 zoom in/out

+  Shift-drag                zooms an area

+'''

+    )

+    parser.add_option(

+        '-f', '--filter',

+        type='choice', choices=('dot', 'neato', 'twopi', 'circo', 'fdp'),

+        dest='filter', default='dot',

+        help='graphviz filter: dot, neato, twopi, circo, or fdp [default: %default]')

+    parser.add_option(

+        '-n', '--no-filter',

+        action='store_const', const=None, dest='filter',

+        help='assume input is already filtered into xdot format (use e.g. dot -Txdot)')

+    parser.add_option(

+        '-g', None,

+        action='store', dest='geometry',

+        help='default window size in form WxH')

+

+    (options, args) = parser.parse_args(sys.argv[1:])

+    if len(args) > 1:

+        parser.error('incorrect number of arguments')

+

+    width = height = 512

+    if options.geometry:

+        try:

+            width,height = (int(i) for i in options.geometry.split('x'))

+        except ValueError:

+            parser.error('invalid window geometry')

+

+    win = DotWindow(width=width, height=height)

+    win.connect('delete-event', Gtk.main_quit)

+    win.set_filter(options.filter)

+    if len(args) >= 1:

+        if args[0] == '-':

+            win.set_dotcode(sys.stdin.read())

+        else:

+            win.open_file(args[0])

+    Gtk.main()

+

+if __name__ == '__main__':

+    main()