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

Fixes to get Family Lines plugin dialog working. Family colours and people of interest boxes not sizing correctly yet. Other plugins may work

Browse Source 
svn: r20117
This commit is contained in:
Gary Burton
2012-07-27 20:08:07 +00:00
parent 8247c24e3e
commit 103184ceb6
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/plug/_guioptions.py
View File

@@ -43,6 +43,7 @@ import sys
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from gi.repository import Gtk from gi.repository import Gtk
from gi.repository import Gdk
from gi.repository import GObject from gi.repository import GObject
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@@ -227,7 +228,8 @@ class GuiColorOption(Gtk.ColorButton):
def __init__(self, option, dbstate, uistate, track, override): def __init__(self, option, dbstate, uistate, track, override):
self.__option = option self.__option = option
value = self.__option.get_value() value = self.__option.get_value()
GObject.GObject.__init__( self, Gdk.color_parse(value) ) GObject.GObject.__init__(self)
self.set_color(Gdk.color_parse(self.__option.get_value()))
# Set up signal handlers when the widget value is changed # Set up signal handlers when the widget value is changed
# from user interaction or programmatically. When handling # from user interaction or programmatically. When handling
@@ -434,7 +436,8 @@ class GuiBooleanOption(Gtk.CheckButton):
""" """
def __init__(self, option, dbstate, uistate, track, override): def __init__(self, option, dbstate, uistate, track, override):
self.__option = option self.__option = option
GObject.GObject.__init__(self, self.__option.get_label()) GObject.GObject.__init__(self)
self.set_label(self.__option.get_label())
self.set_active(self.__option.get_value()) self.set_active(self.__option.get_value())
# Set up signal handlers when the widget value is changed # Set up signal handlers when the widget value is changed
@@ -1129,7 +1132,7 @@ class GuiPersonListOption(Gtk.HBox):
Gtk.PolicyType.AUTOMATIC) Gtk.PolicyType.AUTOMATIC)
self.__scrolled_window.set_shadow_type(Gtk.ShadowType.OUT) self.__scrolled_window.set_shadow_type(Gtk.ShadowType.OUT)
self.pack_start(self.__scrolled_window, expand=True, fill=True) self.pack_start(self.__scrolled_window, True, True, 0)
self.__value_changed() self.__value_changed()
@@ -1143,7 +1146,7 @@ class GuiPersonListOption(Gtk.HBox):
self.__vbbox.add(self.__add_person) self.__vbbox.add(self.__add_person)
self.__vbbox.add(self.__del_person) self.__vbbox.add(self.__del_person)
self.__vbbox.set_layout(Gtk.ButtonBoxStyle.SPREAD) self.__vbbox.set_layout(Gtk.ButtonBoxStyle.SPREAD)
self.pack_end(self.__vbbox, expand=False) self.pack_end(self.__vbbox, False, False, 0)
self.valuekey = self.__option.connect('value-changed', self.__value_changed) self.valuekey = self.__option.connect('value-changed', self.__value_changed)
@@ -1453,7 +1456,7 @@ class GuiSurnameColorOption(Gtk.HBox):
self.scrolled_window.set_policy(Gtk.PolicyType.AUTOMATIC, self.scrolled_window.set_policy(Gtk.PolicyType.AUTOMATIC,
Gtk.PolicyType.AUTOMATIC) Gtk.PolicyType.AUTOMATIC)
self.scrolled_window.set_shadow_type(Gtk.ShadowType.OUT) self.scrolled_window.set_shadow_type(Gtk.ShadowType.OUT)
self.pack_start(self.scrolled_window, expand=True, fill=True) self.pack_start(self.scrolled_window, True, True, 0)
self.add_surname = widgets.SimpleButton(Gtk.STOCK_ADD, self.add_surname = widgets.SimpleButton(Gtk.STOCK_ADD,
self.__add_clicked) self.__add_clicked)
@@ -1463,7 +1466,7 @@ class GuiSurnameColorOption(Gtk.HBox):
self.vbbox.add(self.add_surname) self.vbbox.add(self.add_surname)
self.vbbox.add(self.del_surname) self.vbbox.add(self.del_surname)
self.vbbox.set_layout(Gtk.ButtonBoxStyle.SPREAD) self.vbbox.set_layout(Gtk.ButtonBoxStyle.SPREAD)
self.pack_end(self.vbbox, expand=False) self.pack_end(self.vbbox, False, False, 0)
self.__value_changed() self.__value_changed()

3
src/gui/plug/report/_fileentry.py
View File

@@ -24,6 +24,7 @@
import os import os
from gi.repository import Gtk from gi.repository import Gtk
from gi.repository import GObject
from gen.utils.file import get_unicode_path_from_file_chooser from gen.utils.file import get_unicode_path_from_file_chooser
class FileEntry(Gtk.HBox): class FileEntry(Gtk.HBox):
@@ -46,7 +47,7 @@ class FileEntry(Gtk.HBox):
self.button.add(image) self.button.add(image)
self.button.connect('clicked', self.__select_file) self.button.connect('clicked', self.__select_file)
self.pack_start(self.entry, True, True, 0) self.pack_start(self.entry, True, True, 0)
self.pack_end(self.button, False, False) self.pack_end(self.button, False, False, 0)
def __select_file(self, obj): def __select_file(self, obj):
""" Call back function to handle the open button press """ """ Call back function to handle the open button press """