Start convertion to introspection. Flat models work, as does relationship view
svn: r19858
This commit is contained in:
@ -67,14 +67,14 @@ log = logging.getLogger('BuildApp')
|
||||
log.addHandler(console)
|
||||
|
||||
|
||||
class buildbase(gobject.GObject):
|
||||
class buildbase(GObject.GObject):
|
||||
__gsignals__={
|
||||
"build_progresstext" : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [gobject.TYPE_STRING]),
|
||||
"build_progressfraction" : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [gobject.TYPE_FLOAT]),
|
||||
"build_progresstext" : (GObject.SignalFlags.RUN_LAST, None, [GObject.TYPE_STRING]),
|
||||
"build_progressfraction" : (GObject.SignalFlags.RUN_LAST, None, [GObject.TYPE_FLOAT]),
|
||||
}
|
||||
|
||||
def __init(self):
|
||||
gobject.GObject.__init__(self)
|
||||
GObject.GObject.__init__(self)
|
||||
self.gramps_version = 'VERSION-UNKNOWN'
|
||||
self.bTarball = bTarball
|
||||
self.build_root = '.' # the directory were the build source is located
|
||||
@ -636,4 +636,4 @@ Options:
|
||||
#==========================
|
||||
sys.exit(buildGRAMPS(repository_path,out_dir, bTarball))
|
||||
|
||||
gobject.type_register(buildbase)
|
||||
GObject.type_register(buildbase)
|
@ -170,8 +170,8 @@ def CheckWithDependencyWalker():
|
||||
exe = os.path.join(scriptpath, 'depends.exe')
|
||||
fout = os.path.join(scriptpath, 'depres.txt')
|
||||
f2check = [
|
||||
os.path.join(sys.prefix, 'Lib/site-packages/gtk-2.0/gtk/_gtk.pyd' ),
|
||||
os.path.join(sys.prefix, 'Lib/site-packages/gtk-2.0/gobject/_gobject.pyd' ),
|
||||
os.path.join(sys.prefix, 'Lib/site-packages/gtk-2.0/gtk/_Gtk.pyd' ),
|
||||
os.path.join(sys.prefix, 'Lib/site-packages/gtk-2.0/gobject/_GObject.pyd' ),
|
||||
os.path.join(sys.prefix, 'Lib/site-packages/gtk-2.0/pangocairo.pyd' ),
|
||||
]
|
||||
if os.path.isfile( exe ):
|
||||
@ -268,10 +268,10 @@ def Import_pyGtkIntoPython():
|
||||
try:
|
||||
import gtk
|
||||
|
||||
PrintVersionResult(' GTK+ ', MIN_GTK_VER, gtk.gtk_version, UNTESTED_GTK_VER )
|
||||
PrintVersionResult(' GTK+ ', MIN_GTK_VER, Gtk.gtk_version, UNTESTED_GTK_VER )
|
||||
|
||||
#test the pyGTK version (which is in the gtk namespace)
|
||||
PrintVersionResult(' pyGTK ', MIN_PYGTK_VER, gtk.pygtk_version, UNTESTED_PYGTK_VER )
|
||||
PrintVersionResult(' pyGTK ', MIN_PYGTK_VER, Gtk.pygtk_version, UNTESTED_PYGTK_VER )
|
||||
|
||||
except ImportError:
|
||||
PrintFailedImport(' GTK+ ', MIN_GTK_VER, NOT_FOUND_STR)
|
||||
@ -281,7 +281,7 @@ def Import_pyGtkIntoPython():
|
||||
#test the gobject version
|
||||
try:
|
||||
import gobject
|
||||
PrintVersionResult(' gobject', MIN_GOBJECT_VER, gobject.pygobject_version, UNTESTED_GOBJECT_VER)
|
||||
PrintVersionResult(' gobject', MIN_GOBJECT_VER, GObject.pygobject_version, UNTESTED_GOBJECT_VER)
|
||||
|
||||
except ImportError:
|
||||
PrintFailedImport(' gobject', MIN_GOBJECT_VER, NOT_FOUND_STR)
|
||||
@ -299,7 +299,7 @@ def Import_pyGtkIntoPython():
|
||||
log.info( '\n==== See if libglade installed ====')
|
||||
|
||||
try:
|
||||
import gtk.glade
|
||||
import Gtk.glade
|
||||
log.info( ' Glade tesing import of libglade .......\tOK\n' )
|
||||
except ImportError, e:
|
||||
log.info( ' Glade importError: %s\n' % e )
|
||||
|
@ -26,11 +26,11 @@ py_str = 'found %d.%d.%d' % sys.version_info[:3]
|
||||
try:
|
||||
import gtk
|
||||
try:
|
||||
gtkver_str = 'found %d.%d.%d' % gtk.gtk_version
|
||||
gtkver_str = 'found %d.%d.%d' % Gtk.gtk_version
|
||||
except : # any failure to 'get' the version
|
||||
gtkver_str = 'unknown version'
|
||||
try:
|
||||
pygtkver_str = 'found %d.%d.%d' % gtk.pygtk_version
|
||||
pygtkver_str = 'found %d.%d.%d' % Gtk.pygtk_version
|
||||
except :# any failure to 'get' the version
|
||||
pygtkver_str = 'unknown version'
|
||||
except ImportError:
|
||||
@ -41,7 +41,7 @@ except ImportError:
|
||||
try:
|
||||
import gobject
|
||||
try:
|
||||
gobjectver_str = 'found %d.%d.%d' % gobject.pygobject_version
|
||||
gobjectver_str = 'found %d.%d.%d' % GObject.pygobject_version
|
||||
except :# any failure to 'get' the version
|
||||
gobjectver_str = 'unknown version'
|
||||
|
||||
|
@ -165,8 +165,8 @@ def CheckWithDependencyWalker():
|
||||
exe = os.path.join(scriptpath, 'depends.exe')
|
||||
fout = os.path.join(scriptpath, 'depres.txt')
|
||||
f2check = [
|
||||
os.path.join(sys.prefix, 'Lib/site-packages/gtk-2.0/gtk/_gtk.pyd' ),
|
||||
os.path.join(sys.prefix, 'Lib/site-packages/gtk-2.0/gobject/_gobject.pyd' ),
|
||||
os.path.join(sys.prefix, 'Lib/site-packages/gtk-2.0/gtk/_Gtk.pyd' ),
|
||||
os.path.join(sys.prefix, 'Lib/site-packages/gtk-2.0/gobject/_GObject.pyd' ),
|
||||
os.path.join(sys.prefix, 'Lib/site-packages/gtk-2.0/pangocairo.pyd' ),
|
||||
]
|
||||
if os.path.isfile( exe ):
|
||||
@ -265,10 +265,10 @@ def Import_pyGtkIntoPython():
|
||||
try:
|
||||
import gtk
|
||||
|
||||
PrintVersionResult(' GTK+ ', MIN_GTK_VER, gtk.gtk_version, UNTESTED_GTK_VER )
|
||||
PrintVersionResult(' GTK+ ', MIN_GTK_VER, Gtk.gtk_version, UNTESTED_GTK_VER )
|
||||
|
||||
#test the pyGTK version (which is in the gtk namespace)
|
||||
PrintVersionResult(' pyGTK ', MIN_PYGTK_VER, gtk.pygtk_version, UNTESTED_PYGTK_VER )
|
||||
PrintVersionResult(' pyGTK ', MIN_PYGTK_VER, Gtk.pygtk_version, UNTESTED_PYGTK_VER )
|
||||
|
||||
except ImportError:
|
||||
PrintFailedImport(' GTK+ ', MIN_GTK_VER, NOT_FOUND_STR)
|
||||
@ -278,7 +278,7 @@ def Import_pyGtkIntoPython():
|
||||
#test the gobject version
|
||||
try:
|
||||
import gobject
|
||||
PrintVersionResult(' gobject', MIN_GOBJECT_VER, gobject.pygobject_version, UNTESTED_GOBJECT_VER)
|
||||
PrintVersionResult(' gobject', MIN_GOBJECT_VER, GObject.pygobject_version, UNTESTED_GOBJECT_VER)
|
||||
|
||||
except ImportError:
|
||||
PrintFailedImport(' gobject', MIN_GOBJECT_VER, NOT_FOUND_STR)
|
||||
@ -296,7 +296,7 @@ def Import_pyGtkIntoPython():
|
||||
print '\n==== See if libglade installed ===='
|
||||
|
||||
try:
|
||||
import gtk.glade
|
||||
import Gtk.glade
|
||||
print ' Glade tesing import of libglade .......\tOK\n'
|
||||
except ImportError, e:
|
||||
print ' Glade importError: %s\n' % e
|
||||
|
@ -27,11 +27,11 @@ f = open(fn,"w")
|
||||
f.write('[tests]\n')
|
||||
|
||||
try:
|
||||
import gtk
|
||||
from gi.repository import Gtk
|
||||
f.write('gtk=yes\n')
|
||||
f.write('gtkver=%d.%d.%d\n' % gtk.gtk_version)
|
||||
f.write('gtkver=%d.%d.%d\n' % Gtk.gtk_version)
|
||||
f.write('pygtk=yes\n')
|
||||
f.write('pygtkver=%d.%d.%d\n' % gtk.pygtk_version)
|
||||
f.write('pygtkver=%d.%d.%d\n' % Gtk.pygtk_version)
|
||||
except ImportError:
|
||||
f.write('gtk=no\n')
|
||||
f.write('gtkver=no\n')
|
||||
|
Reference in New Issue
Block a user