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

* src/EditPlace.py: WATCH cursor and temp label for References tab.

Browse Source 
* src/EditSource.py: Improve manipulating notebook tab labels.
* src/Utils.py (temp_label): Add function;
(bold_label,unbold_label): Properly set cursor to default.
* src/gramps.glade (event editor, source editor, place editor):
Add icons to notebook tabs.


svn: r4683
This commit is contained in:
Alex Roitman 2005-05-26 05:04:36 +00:00
parent 06913ac261
commit d9c8ebef56
5 changed files with 570 additions and 2493 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gramps2/ChangeLog
View File

@ -1,3 +1,11 @@
2005-05-25 Alex Roitman <shura@gramps-project.org>
* src/EditPlace.py: WATCH cursor and temp label for References tab.
* src/EditSource.py: Improve manipulating notebook tab labels.
* src/Utils.py (temp_label): Add function;
(bold_label,unbold_label): Properly set cursor to default.
* src/gramps.glade (event editor, source editor, place editor):
Add icons to notebook tabs.
2005-05-25 Richard Taylor <rjt-gramps@thegrindstone.me.uk> 2005-05-25 Richard Taylor <rjt-gramps@thegrindstone.me.uk>
* src/plugins/ScratchPad.py: disabled search because it does not do * src/plugins/ScratchPad.py: disabled search because it does not do
what the user expects. what the user expects.

14
gramps2/src/EditPlace.py
View File

@ -182,12 +182,16 @@ class EditPlace:
self.preform.set_active(1) self.preform.set_active(1)
else: else:
self.flowed.set_active(1) self.flowed.set_active(1)
else:
Utils.unbold_label(self.notes_label)
self.flowed.set_sensitive(mode) self.flowed.set_sensitive(mode)
self.preform.set_sensitive(mode) self.preform.set_sensitive(mode)
if self.place.get_media_list(): if self.place.get_media_list():
Utils.bold_label(self.gallery_label) Utils.bold_label(self.gallery_label)
else:
Utils.unbold_label(self.gallery_label)
self.top_window.signal_autoconnect({ self.top_window.signal_autoconnect({
"on_switch_page" : self.on_switch_page, "on_switch_page" : self.on_switch_page,
@ -237,12 +241,13 @@ class EditPlace:
self.redraw_url_list() self.redraw_url_list()
self.redraw_location_list() self.redraw_location_list()
self.display_references()
if parent_window: if parent_window:
self.top.set_transient_for(parent_window) self.top.set_transient_for(parent_window)
self.add_itself_to_menu() self.add_itself_to_menu()
self.top_window.get_widget('ok').set_sensitive(not self.db.readonly) self.top_window.get_widget('ok').set_sensitive(not self.db.readonly)
Utils.temp_label(self.refs_label,self.top)
self.top.show() self.top.show()
gobject.idle_add(self.display_references)
def on_delete_event(self,obj,b): def on_delete_event(self,obj,b):
self.glry.close() self.glry.close()
@ -407,7 +412,8 @@ class EditPlace:
self.glry.load_images() self.glry.load_images()
elif page == 6 and self.ref_not_loaded: elif page == 6 and self.ref_not_loaded:
self.ref_not_loaded = 0 self.ref_not_loaded = 0
self.display_references() Utils.temp_label(self.refs_label,self.top)
gobject.idle_add(self.display_references)
text = unicode(self.note_buffer.get_text(self.note_buffer.get_start_iter(), text = unicode(self.note_buffer.get_text(self.note_buffer.get_start_iter(),
self.note_buffer.get_end_iter(),False)) self.note_buffer.get_end_iter(),False))
if text: if text:
@ -544,7 +550,9 @@ class EditPlace:
self.refinfo.get_buffer().set_text(msg) self.refinfo.get_buffer().set_text(msg)
if any: if any:
Utils.bold_label(self.refs_label) Utils.bold_label(self.refs_label,self.top)
else:
Utils.unbold_label(self.refs_label,self.top)
self.ref_not_loaded = 0 self.ref_not_loaded = 0

32
gramps2/src/EditSource.py
View File

@ -34,7 +34,6 @@ from gettext import gettext as _
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import gobject import gobject
import gtk.glade import gtk.glade
import gtk.gdk
import gnome import gnome
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -96,9 +95,10 @@ class EditSource:
self.note = self.top_window.get_widget("source_note") self.note = self.top_window.get_widget("source_note")
self.note.set_editable(mode) self.note.set_editable(mode)
self.notes_buffer = self.note.get_buffer() self.notes_buffer = self.note.get_buffer()
self.gallery_label = self.top_window.get_widget("gallerySourceEditor") self.gallery_label = self.top_window.get_widget("source_edit_gallery")
self.refs_label = self.top_window.get_widget("refsSourceEditor") self.refs_label = self.top_window.get_widget("source_edit_refs")
self.notes_label = self.top_window.get_widget("notesSourceEditor") self.notes_label = self.top_window.get_widget("source_edit_notes")
self.data_label = self.top_window.get_widget("source_edit_data")
self.flowed = self.top_window.get_widget("source_flowed") self.flowed = self.top_window.get_widget("source_flowed")
self.flowed.set_sensitive(mode) self.flowed.set_sensitive(mode)
self.preform = self.top_window.get_widget("source_preform") self.preform = self.top_window.get_widget("source_preform")
@ -129,9 +129,13 @@ class EditSource:
self.preform.set_active(1) self.preform.set_active(1)
else: else:
self.flowed.set_active(1) self.flowed.set_active(1)
else:
Utils.unbold_label(self.notes_label)
if self.source.get_media_list(): if self.source.get_media_list():
Utils.bold_label(self.gallery_label) Utils.bold_label(self.gallery_label)
else:
Utils.unbold_label(self.gallery_label)
self.top_window.signal_autoconnect({ self.top_window.signal_autoconnect({
"on_switch_page" : self.on_switch_page, "on_switch_page" : self.on_switch_page,
@ -177,6 +181,11 @@ class EditSource:
for item in dmap.keys(): for item in dmap.keys():
self.data_model.append(row=[item,dmap[item]]) self.data_model.append(row=[item,dmap[item]])
if dmap:
Utils.bold_label(self.data_label)
else:
Utils.unbold_label(self.data_label)
if parent_window: if parent_window:
self.top.set_transient_for(parent_window) self.top.set_transient_for(parent_window)
@ -186,7 +195,7 @@ class EditSource:
self.top.set_transient_for(parent_window) self.top.set_transient_for(parent_window)
self.add_itself_to_menu() self.add_itself_to_menu()
self.top.show() self.top.show()
self.refs_label.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH)) Utils.temp_label(self.refs_label,self.top)
gobject.idle_add(self.display_references) gobject.idle_add(self.display_references)
self.data_sel = self.datalist.get_selection() self.data_sel = self.datalist.get_selection()
@ -346,12 +355,11 @@ class EditSource:
self.model.add([_("Media"),gramps_id,name],(5,handle)) self.model.add([_("Media"),gramps_id,name],(5,handle))
if any: if any:
Utils.bold_label(self.refs_label) Utils.bold_label(self.refs_label,self.top)
else: else:
Utils.unbold_label(self.refs_label) Utils.unbold_label(self.refs_label,self.top)
self.ref_not_loaded = 0 self.ref_not_loaded = 0
self.refs_label.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.LEFT_PTR))
def on_source_apply_clicked(self,obj): def on_source_apply_clicked(self,obj):
@ -407,14 +415,14 @@ class EditSource:
self.gallery.load_images() self.gallery.load_images()
elif page == 3 and self.ref_not_loaded: elif page == 3 and self.ref_not_loaded:
self.ref_not_loaded = 0 self.ref_not_loaded = 0
self.refs_label.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH)) Utils.temp_label(self.refs_label,self.top)
gobject.idle_add(self.display_references) gobject.idle_add(display_references)
text = unicode(self.notes_buffer.get_text(self.notes_buffer.get_start_iter(), text = unicode(self.notes_buffer.get_text(self.notes_buffer.get_start_iter(),
self.notes_buffer.get_end_iter(),False)) self.notes_buffer.get_end_iter(),False))
if text: if text:
Utils.bold_label(self.notes_label) Utils.bold_label(self.notes_label,self.top)
else: else:
Utils.unbold_label(self.notes_label) Utils.unbold_label(self.notes_label,self.top)
class DelSrcQuery: class DelSrcQuery:

60
gramps2/src/Utils.py
View File

@ -34,6 +34,7 @@ import locale
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import gtk import gtk
import gtk.gdk
import gnome import gnome
try: try:
@ -402,33 +403,40 @@ def search_for(name):
# Change label apperance # Change label apperance
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
def bold_label(label): def bold_label(label,widget=None):
try: clist = label.get_children()
clist = label.get_children() text = unicode(clist[1].get_text())
text = unicode(clist[1].get_text()) text = text.replace('<i>','')
clist[0].show() text = text.replace('</i>','')
clist[1].set_text("<b>%s</b>" % text ) clist[0].show()
clist[1].set_use_markup(True) clist[1].set_text("<b>%s</b>" % text )
except AttributeError: clist[1].set_use_markup(True)
text = unicode(label.get_text()) if widget:
label.set_text("<b>%s</b>" % text ) widget.window.set_cursor(None)
label.set_use_markup(1)
def unbold_label(label): def unbold_label(label,widget=None):
try: clist = label.get_children()
clist = label.get_children() text = unicode(clist[1].get_text())
text = unicode(clist[1].get_text()) text = text.replace('<b>','')
text = text.replace('<b>','') text = text.replace('</b>','')
text = text.replace('</b>','') text = text.replace('<i>','')
clist[0].hide() text = text.replace('</i>','')
clist[1].set_text(text) clist[0].hide()
clist[1].set_use_markup(False) clist[1].set_text(text)
except AttributeError: clist[1].set_use_markup(False)
text = unicode(label.get_text()) if widget:
text = text.replace('<b>','') widget.window.set_cursor(None)
text = text.replace('</b>','')
label.set_text(text) def temp_label(label,widget=None):
label.set_use_markup(0) clist = label.get_children()
text = unicode(clist[1].get_text())
text = text.replace('<b>','')
text = text.replace('</b>','')
clist[0].hide()
clist[1].set_text("<i>%s</i>" % text )
clist[1].set_use_markup(True)
if widget:
widget.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH))
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

2949
gramps2/src/gramps.glade
View File

File diff suppressed because it is too large Load Diff