From c8140f5abe4965208548d8c0fbb09fb5d76ec63b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Carlos=20Cuevas=20Albadalejo?= Date: Mon, 14 Jul 2014 10:37:32 +0200 Subject: [PATCH] Updated to GTK3. --- src/jsoninspector.glade | 285 ++++++++++++++++++++++++++-------------- src/jsoninspector.py | 123 ++++++++--------- 2 files changed, 241 insertions(+), 167 deletions(-) diff --git a/src/jsoninspector.glade b/src/jsoninspector.glade index 949469e..69a574f 100644 --- a/src/jsoninspector.glade +++ b/src/jsoninspector.glade @@ -1,7 +1,117 @@ - + + - - + + + False + Introducir texto JSON + True + center + 200 + 180 + + + + + True + False + vertical + + + True + True + in + + + 200 + 140 + True + True + char + + + + + True + True + 0 + + + + + True + False + + + gtk-cancel + True + True + True + True + + + + False + True + 5 + end + 0 + + + + + gtk-ok + True + True + True + True + + + + False + True + 5 + end + 1 + + + + + + + + + + + + + + False + True + 1 + + + + + + + 100 + 1 + 10 + 10 + + + 100 + 1 + 10 + 10 + + + True + False + gtk-copy + + @@ -15,53 +125,64 @@ 400 400 + False JSON Inspector center - + - + True + False + vertical True + False True - _Archivo + False + _File True True + False gtk-open True + False True True - + - Copiar JSON + Cop_y JSON True + False + True image1 False - + True + False gtk-quit True + False True True - + @@ -71,17 +192,21 @@ True - Ay_uda + False + _Help True True + False gtk-about True + False True True + @@ -91,6 +216,7 @@ False + True 0 @@ -100,22 +226,23 @@ True adjustment1 adjustment2 - automatic - automatic 300 300 True True - treestore1 adjustment1 adjustment2 + treestore1 False treeviewcolumn1 0 1 both + + + True @@ -143,125 +270,87 @@ + True + True 1 True + False 2 True + False No hay JSON cargado + False + True 0 False + True 2 - - 100 - 1 - 10 - 10 - - - - 100 - 1 - 10 - 10 - - - Introducir texto JSON - True - center - 200 - 180 - - + + True + True + adjustment1 + adjustment2 - + + 300 + 300 True - - - 200 - 140 - True - True - char - - - 5 - 0 - + True + adjustment1 + adjustment2 + treestore1 + False + treeviewcolumn1 + 0 + 1 + both + + - - True - - - - - - gtk-ok - True - True - True - True - - - - False - 5 - 1 - - - - - - - - gtk-cancel - True - True - True - True - - - - False - 5 - 3 - - - - - + + True + Nodo + True + True + 0 + + + + + True + Valor + True + + + + + True + Tipo + True - - False - 5 - 1 - - - True - gtk-copy - diff --git a/src/jsoninspector.py b/src/jsoninspector.py index 31ccbdd..fd027a4 100644 --- a/src/jsoninspector.py +++ b/src/jsoninspector.py @@ -4,78 +4,73 @@ from pkg_resources import resource_filename import json -import sys -import pygtk -try: - pygtk.require("2.0") -except: - print "Versión de PyGTK incorrecta!\n" - sys.exit(1) +from gi.repository import Gtk, Gdk, Gio -import gtk - -class MainWindowMethods(object): +class MainWindowMethods(Gtk.Application): """ - Clase que contiene los métodos de la ventana principal + Main Application object with the main window signals """ def __init__(self, logic): + Gtk.Application.__init__(self, application_id = "apps.gnome.stevedore", + flags = Gio.ApplicationFlags.FLAGS_NONE) + + # We store the reference to the app logic + self.logicObj = logic + + self.connect("activate", self.on_app_start) + + def on_app_start(self, data = None): """ - Carga y conecta el XML de gtkBuilder, además de mostrar la ventana - principal + Loads the MainWindow widgets, shows it up and starts the main loop """ - self.builder = gtk.Builder() + self.builder = Gtk.Builder() self.builder.add_from_file(resource_filename(__name__,'jsoninspector.glade')) self.builder.connect_signals(self) - # Prepara los renderizados de columna y las asigna a los valores - cell = gtk.CellRendererText() + # Prepares the renders of columns and assigns the values + cell = Gtk.CellRendererText() columns = self.builder.get_object("treeviewcolumn1") - columns.pack_start(cell) + columns.pack_start(cell, True) columns.add_attribute(cell, 'text', 0) treeview = self.builder.get_object("treeview1") - # Esta columna es la que tiene los nodos de apertura y cierre + # This column has the open and collapse nodes treeview.set_expander_column(columns) - cell = gtk.CellRendererText() + cell = Gtk.CellRendererText() columns = self.builder.get_object("treeviewcolumn2") - columns.pack_start(cell) + columns.pack_start(cell, True) columns.add_attribute(cell, 'text', 1) - cell = gtk.CellRendererText() + cell = Gtk.CellRendererText() columns = self.builder.get_object("treeviewcolumn3") - columns.pack_start(cell) + columns.pack_start(cell, True) columns.add_attribute(cell, 'text', 2) - # Obtenemos la ventana y la mostramos completamente + # We get the window and show it self.window = self.builder.get_object("MainWindow") + self.add_window(self.window) self.window.show_all() - # Obtenemos un enlace al objeto de lógica de aplicación - self.logicObj = logic - def onOpenMenuClicked(self, event): """ - El usuario ha presionado Abrir en el menu + User has pressed Open in the menu """ - # Creamos el dialogo de abrir fichero - chooser = gtk.FileChooserDialog(title=None, - action=gtk.FILE_CHOOSER_ACTION_OPEN, - buttons=(gtk.STOCK_CANCEL, - gtk.RESPONSE_CANCEL, - gtk.STOCK_OPEN, - gtk.RESPONSE_OK)) - chooser.set_default_response(gtk.RESPONSE_OK) + # Create the FileChooser Dialog + chooser = Gtk.FileChooserDialog("Open JSON text file", self.window, + Gtk.FileChooserAction.OPEN, + (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, + Gtk.STOCK_OPEN, Gtk.ResponseType.OK)) - # Lo lanzamos + # Launch it response = chooser.run() - # Si hemos seleccionado un fichero, lo cargamos - if response == gtk.RESPONSE_OK: + # If we choose a file, we load it + if response == Gtk.ResponseType.OK: filename = chooser.get_filename() label = self.builder.get_object("StatusLabel") - # Según todo haya ido, actualizamos la barra de estado + # We update the statusbar accordingly to what has happened if self.logicObj.loadjson(filename): label.set_text(filename) @@ -87,20 +82,20 @@ class MainWindowMethods(object): label.set_text("No hay JSON cargado") - # Nos deshacemos del dialogo + # We finish the dialog chooser.destroy() def onCopyJSONClicked(self, widget): """ - Se ha pulsado Copiar JSON + User asked to paste a JSON code """ - # Mostrar la ventana de texto + # Show up the TextWindow textWindow = self.builder.get_object("TextWindow") textWindow.show_all() def onCopyJSONDelete(self, widget, event): """ - Se ha dado a cerrar la ventana de copiar texto + We've been told to close the CopyJSON Window """ textWindow = self.builder.get_object("TextWindow") textWindow.hide() @@ -109,7 +104,7 @@ class MainWindowMethods(object): def onCopyJSONDestroy(self, widget): """ - Se ha cerrado la ventana + We've been tasked with removing the CopyJSON window """ textWindow = self.builder.get_object("TextWindow") textWindow.hide() @@ -118,12 +113,12 @@ class MainWindowMethods(object): def onCopyJSONAcceptClicked(self, widget): """ - Se ha aceptado el código + The input is finished and accepted. """ textView = self.builder.get_object("textview1") jsonBuffer = textView.get_buffer() jsonText = jsonBuffer.get_text(jsonBuffer.get_start_iter(), - jsonBuffer.get_end_iter()) + jsonBuffer.get_end_iter(), True) textWindow = self.builder.get_object("TextWindow") textWindow.hide() @@ -138,24 +133,25 @@ class MainWindowMethods(object): def onCopyJSONCancelClicked(self, widget): """ - Se ha cancelado + The user changed its minds and pressed cancel """ textWindow = self.builder.get_object("TextWindow") textWindow.hide() def onExitMenuClicked(self, widget): """ - Se ha pulsado salir + Menu option Exit has been clicked """ - gtk.main_quit() - sys.exit(0) + self.quit() + + def onAboutMenuActivate(self, widget): + pass def onMainWindowDelete(self, widget, event): """ - Se ha destruido o mandado cerrar la ventana principal + Our MainWindow has been deleted or closed """ - gtk.main_quit() - sys.exit(0) + pass class LogicObject(object): @@ -246,21 +242,10 @@ class LogicObject(object): str(type(elems[key_val]))]) -class MainApp(object): - """ - Clase principal - """ - @staticmethod - def start(): - logicObject = LogicObject() - mainWindow = MainWindowMethods(logicObject) - - gtk.main() - - -# Ejecucion del programa principal - +# Main procedure if __name__ == "__main__": - app = MainApp() - app.start() + logicObject = LogicObject() + + mainWindow = MainWindowMethods(logicObject) + mainWindow.run(None)