Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 2888: gramps.glade: convert from liglade to gtkbuilder -- part 1

Browse Source 
svn: r12508
This commit is contained in:
Gerald Britton
2009-05-06 14:44:22 +00:00
parent 6ebd0b0a77
commit 0440ca1c2a
30 changed files with 11959 additions and 17058 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/Editors/AddMedia.py
View File

@@ -44,7 +44,6 @@ from gettext import gettext as _
#
#-------------------------------------------------------------------------
import gtk
from gtk import glade
#-------------------------------------------------------------------------
#
@@ -64,7 +63,7 @@ from QuestionDialog import ErrorDialog, WarningDialog
# global variables
#
#-------------------------------------------------------------------------
_GLADE_FILE = 'addmedia.glade'
#-------------------------------------------------------------------------
@@ -94,17 +93,19 @@ class AddMediaObject(ManagedWindow.ManagedWindow):
self.last_directory = Config.get(Config.ADDMEDIA_IMGDIR)
self.relative_path = Config.get(Config.ADDMEDIA_RELPATH)
self.glade = glade.XML(const.GLADE_FILE, "imageSelect", "gramps")
glade_file = os.path.join(const.GLADE_DIR, _GLADE_FILE)
self.glade = gtk.Builder()
self.glade.add_from_file(glade_file)
self.set_window(
self.glade.get_widget("imageSelect"),
self.glade.get_widget('title'),
self.glade.get_object("imageSelect"),
self.glade.get_object('title'),
_('Select a media object'))
self.description = self.glade.get_widget("photoDescription")
self.image = self.glade.get_widget("image")
self.file_text = self.glade.get_widget("fname")
self.description = self.glade.get_object("photoDescription")
self.image = self.glade.get_object("image")
self.file_text = self.glade.get_object("fname")
if not(self.last_directory and os.path.isdir(self.last_directory)):
self.last_directory = const.USER_HOME
#if existing path, use dir of path
@@ -121,16 +122,16 @@ class AddMediaObject(ManagedWindow.ManagedWindow):
if not self.obj.get_description() == "":
self.description.set_text(self.obj.get_description())
self.relpath = self.glade.get_widget('relpath')
self.relpath = self.glade.get_object('relpath')
self.relpath.set_active(self.relative_path)
self.temp_name = ""
self.object = None
self.glade.get_widget('fname').connect('update_preview',
self.glade.get_object('fname').connect('update_preview',
self.on_name_changed)
self.ok_button = self.glade.get_widget('button79')
self.help_button = self.glade.get_widget('button103')
self.cancel_button = self.glade.get_widget('button81')
self.ok_button = self.glade.get_object('button79')
self.help_button = self.glade.get_object('button103')
self.cancel_button = self.glade.get_object('button81')
self.ok_button.connect('clicked',self.save)
self.ok_button.set_sensitive(not self.dbase.readonly)
self.help_button.connect('clicked', lambda x: GrampsDisplay.help())
@@ -171,8 +172,7 @@ class AddMediaObject(ManagedWindow.ManagedWindow):
return
mtype = Mime.get_type(full_file)
if description == "":
description = os.path.basename(filename)
description = description or os.path.basename(filename)
self.obj.set_description(description)
self.obj.set_mime_type(mtype)

32
src/Editors/_EditSource.py
View File

@@ -27,7 +27,7 @@
#
#-------------------------------------------------------------------------
from gettext import gettext as _
import os
import logging
log = logging.getLogger(".")
@@ -37,7 +37,6 @@ log = logging.getLogger(".")
#
#-------------------------------------------------------------------------
import gtk
from gtk import glade
#-------------------------------------------------------------------------
#
@@ -59,6 +58,8 @@ from QuestionDialog import ErrorDialog
# Constants
#
#-------------------------------------------------------------------------
_GLADE_FILE = "editsource.glade"
class EditSource(EditPrimary):
def __init__(self, dbstate, uistate, track, source):
@@ -82,39 +83,42 @@ class EditSource(EditPrimary):
self.width_key = Config.SOURCE_WIDTH
self.height_key = Config.SOURCE_HEIGHT
assert(self.obj)
self.glade = glade.XML(const.GLADE_FILE, "source_editor","gramps")
glade_file = os.path.join(const.GLADE_DIR, _GLADE_FILE)
self.glade = gtk.Builder()
self.glade.add_from_file(glade_file)
self.set_window(self.glade.get_widget("source_editor"), None,
self.set_window(self.glade.get_object("source_editor"), None,
self.get_menu_title())
def _connect_signals(self):
self.define_ok_button(self.glade.get_widget('ok'),self.save)
self.define_cancel_button(self.glade.get_widget('cancel'))
self.define_help_button(self.glade.get_widget('help'))
self.define_ok_button(self.glade.get_object('ok'),self.save)
self.define_cancel_button(self.glade.get_object('cancel'))
self.define_help_button(self.glade.get_object('help'))
def _setup_fields(self):
self.author = MonitoredEntry(self.glade.get_widget("author"),
self.author = MonitoredEntry(self.glade.get_object("author"),
self.obj.set_author, self.obj.get_author,
self.db.readonly)
self.pubinfo = MonitoredEntry(self.glade.get_widget("pubinfo"),
self.pubinfo = MonitoredEntry(self.glade.get_object("pubinfo"),
self.obj.set_publication_info,
self.obj.get_publication_info,
self.db.readonly)
self.gid = MonitoredEntry(self.glade.get_widget("gid"),
self.gid = MonitoredEntry(self.glade.get_object("gid"),
self.obj.set_gramps_id,
self.obj.get_gramps_id, self.db.readonly)
self.priv = PrivacyButton(self.glade.get_widget("private"), self.obj,
self.priv = PrivacyButton(self.glade.get_object("private"), self.obj,
self.db.readonly)
self.abbrev = MonitoredEntry(self.glade.get_widget("abbrev"),
self.abbrev = MonitoredEntry(self.glade.get_object("abbrev"),
self.obj.set_abbreviation,
self.obj.get_abbreviation,
self.db.readonly)
self.title = MonitoredEntry(self.glade.get_widget("source_title"),
self.title = MonitoredEntry(self.glade.get_object("source_title"),
self.obj.set_title, self.obj.get_title,
self.db.readonly)
@@ -161,7 +165,7 @@ class EditSource(EditPrimary):
self._setup_notebook_tabs(notebook)
notebook.show_all()
self.glade.get_widget('vbox').pack_start(notebook, True)
self.glade.get_object('vbox').pack_start(notebook, True)
def build_menu_names(self, source):
return (_('Edit Source'), self.get_menu_title())