2006-05-12  Alex Roitman  <shura@gramps-project.org>
	* src/UndoHistory.py (gtk_color_to_str): Better color to str.
	* src/QuestionDialog.py (QuestionDialog2.__init__): Use the
	underline for labels.
	* src/plugins/ChangeNames.py: Fix WM.
	* src/plugins/PatchNames.py: Fix WM.

In po:
	* gramps.pot: Update.


svn: r6630
This commit is contained in:
Alex Roitman 2006-05-12 18:46:26 +00:00
parent 75d6553294
commit 9e68a4b550
7 changed files with 661 additions and 438 deletions

View File

@ -1,3 +1,10 @@
2006-05-12 Alex Roitman <shura@gramps-project.org>
* src/UndoHistory.py (gtk_color_to_str): Better color to str.
* src/QuestionDialog.py (QuestionDialog2.__init__): Use the
underline for labels.
* src/plugins/ChangeNames.py: Fix WM.
* src/plugins/PatchNames.py: Fix WM.
2006-05-12 Don Allingham <don@gramps-project.org> 2006-05-12 Don Allingham <don@gramps-project.org>
* src/GrampsWidgets.py: fix MonitoredDataType initialization * src/GrampsWidgets.py: fix MonitoredDataType initialization
* plugins/BookReport.py: append "file://" properly * plugins/BookReport.py: append "file://" properly

View File

@ -1,4 +1,5 @@
2006-05-12 Alex Roitman <shura@gramps-project.org> 2006-05-12 Alex Roitman <shura@gramps-project.org>
* gramps.pot: Update.
* POTFILES.in: Add missing files. * POTFILES.in: Add missing files.
2006-05-10 Alex Roitman <shura@gramps-project.org> 2006-05-10 Alex Roitman <shura@gramps-project.org>

File diff suppressed because it is too large Load Diff

View File

@ -118,7 +118,9 @@ class QuestionDialog2:
label2.set_use_markup(True) label2.set_use_markup(True)
self.xml.get_widget('okbutton').set_label(label_msg1) self.xml.get_widget('okbutton').set_label(label_msg1)
self.xml.get_widget('okbutton').set_use_underline(True)
self.xml.get_widget('no').set_label(label_msg2) self.xml.get_widget('no').set_label(label_msg2)
self.xml.get_widget('no').set_use_underline(True)
self.top.show() self.top.show()
if parent: if parent:
self.top.set_transient_for(parent) self.top.set_transient_for(parent)

View File

@ -235,10 +235,9 @@ class UndoHistory(ManagedWindow.ManagedWindow):
self._update_ui() self._update_ui()
def gtk_color_to_str(color): def gtk_color_to_str(color):
r = hex(255*color.red/65535).replace('0x','') color_str = u"#%02x%02x%02x" % (color.red/256,
g = hex(255*color.green/65535).replace('0x','') color.green/256,
b = hex(255*color.blue/65535).replace('0x','') color.blue/256)
color_str =u'#%s%s%s' % (r,g,b)
return color_str return color_str
def get_colors(obj,state): def get_colors(obj,state):

View File

@ -61,13 +61,14 @@ class ChangeNames(Tool.BatchTool, ManagedWindow.ManagedWindow):
def __init__(self, dbstate, uistate, options_class, name, callback=None): def __init__(self, dbstate, uistate, options_class, name, callback=None):
self.label = _('Capitalization changes') self.label = _('Capitalization changes')
self.cb = callback
ManagedWindow.ManagedWindow.__init__(self,uistate,[],self.__class__)
self.set_window(gtk.Window(),gtk.Label(),'')
Tool.BatchTool.__init__(self, dbstate, options_class, name) Tool.BatchTool.__init__(self, dbstate, options_class, name)
if self.fail: if self.fail:
return return
ManagedWindow.ManagedWindow.__init__(self, uistate, [], self.__class__)
self.cb = callback
self.progress = Utils.ProgressMeter(_('Checking family names'),'') self.progress = Utils.ProgressMeter(_('Checking family names'),'')
self.progress.set_pass(_('Searching family names'), self.progress.set_pass(_('Searching family names'),
@ -84,6 +85,7 @@ class ChangeNames(Tool.BatchTool, ManagedWindow.ManagedWindow):
self.display() self.display()
else: else:
self.progress.close() self.progress.close()
self.close()
OkDialog(_('No modifications made'), OkDialog(_('No modifications made'),
_("No capitalization changes were detected.")) _("No capitalization changes were detected."))

View File

@ -90,11 +90,12 @@ class PatchNames(Tool.BatchTool, ManagedWindow.ManagedWindow):
def __init__(self, dbstate, uistate, options_class, name, callback=None): def __init__(self, dbstate, uistate, options_class, name, callback=None):
self.label = _('Name and title extraction tool') self.label = _('Name and title extraction tool')
ManagedWindow.ManagedWindow.__init__(self,uistate,[],self.__class__)
self.set_window(gtk.Window(),gtk.Label(),'')
Tool.BatchTool.__init__(self, dbstate, options_class, name) Tool.BatchTool.__init__(self, dbstate, options_class, name)
if self.fail: if self.fail:
return return
ManagedWindow.ManagedWindow.__init__(self,uistate,[],self.__class__)
self.cb = callback self.cb = callback
self.title_list = [] self.title_list = []
@ -161,6 +162,7 @@ class PatchNames(Tool.BatchTool, ManagedWindow.ManagedWindow):
self.display() self.display()
else: else:
self.progress.close() self.progress.close()
self.close()
OkDialog(_('No modifications made'), OkDialog(_('No modifications made'),
_("No titles or nicknames were found")) _("No titles or nicknames were found"))