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

New citation editor

Browse Source 
svn: r17983
This commit is contained in:
Nick Hall 2011-08-01 22:49:19 +00:00
parent 570f5e53a3
commit e26c5325e0
2 changed files with 126 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

164
src/glade/editcitation.glade
View File

@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 2.12 -->
<!-- interface-requires grampswidgets 0.0 -->
@ -6,7 +6,6 @@
<object class="GtkDialog" id="editcitation">
<property name="default_width">600</property>
<property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox17">
<property name="visible">True</property>
@ -16,7 +15,7 @@
<property name="xalign">0</property>
<property name="xpad">6</property>
<property name="ypad">3</property>
<property name="label" translatable="yes">&lt;b&gt;Reference information&lt;/b&gt;</property>
<property name="label" translatable="yes">&lt;b&gt;Citation information&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="use_underline">True</property>
<property name="justify">center</property>
@ -36,7 +35,7 @@
<object class="GtkTable" id="table67">
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="n_rows">3</property>
<property name="n_rows">5</property>
<property name="n_columns">3</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
@ -81,13 +80,13 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">Specific location within the information referenced. For a published work, this could include the volume of a multi-volume work and the page number(s). For a periodical, it could include volume, issue, and page numbers. For a newspaper, it could include a column number and page number. For an unpublished source, this could be a sheet number, page number, frame number, etc. A census record might have a line number or dwelling and family numbers in addition to the page number. </property>
<property name="invisible_char">&#x25CF;</property>
<property name="invisible_char">●</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
@ -101,8 +100,8 @@
<property name="mnemonic_widget">volume</property>
</object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
@ -117,30 +116,8 @@
<property name="mnemonic_widget">confidence</property>
</object>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkToggleButton" id="privacy">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="relief">none</property>
<child>
<object class="GtkImage" id="image2677">
<property name="visible">True</property>
<property name="icon_name">gramps-unlock</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
@ -164,8 +141,8 @@ Very High =Direct and primary evidence used, or by dominance of the evidence </p
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
@ -175,7 +152,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence </p
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">The date of the entry in the source you are referencing, e.g. the date a house was visited during a census, or the date an entry was made in a birth log/registry. </property>
<property name="invisible_char">&#x25CF;</property>
<property name="invisible_char">●</property>
</object>
<packing>
<property name="left_attach">1</property>
@ -183,6 +160,111 @@ Very High =Direct and primary evidence used, or by dominance of the evidence </p
<property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkHBox" id="warn_box2">
<property name="visible">True</property>
<property name="spacing">12</property>
<child>
<object class="GtkImage" id="warn_icon2">
<property name="visible">True</property>
<property name="stock">gtk-dialog-warning</property>
<property name="icon-size">6</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="warn_text2">
<property name="width_request">500</property>
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="ypad">3</property>
<property name="label" translatable="yes">&lt;b&gt;Note:&lt;/b&gt; Any changes in the shared citation information will be reflected in the citation itself, for all items that reference the citation.</property>
<property name="use_markup">True</property>
<property name="use_underline">True</property>
<property name="wrap">True</property>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="right_attach">3</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<property name="spacing">12</property>
<child>
<object class="UndoableEntry" id="gid2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">A unique ID to identify the citation</property>
<property name="invisible_char">•</property>
</object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkToggleButton" id="privacy">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="relief">none</property>
<child>
<object class="GtkImage" id="image2677">
<property name="visible">True</property>
<property name="icon_name">gramps-unlock</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">ID:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">gid</property>
</object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
@ -291,7 +373,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence </p
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">Authors of the source.</property>
<property name="invisible_char">&#x25CF;</property>
<property name="invisible_char">●</property>
</object>
<packing>
<property name="left_attach">1</property>
@ -346,7 +428,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence </p
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">Provide a short title used for sorting, filing, and retrieving source records.</property>
<property name="invisible_char">&#x25CF;</property>
<property name="invisible_char">●</property>
</object>
<packing>
<property name="left_attach">1</property>
@ -361,7 +443,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence </p
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">Publication Information, such as city and year of publication, name of publisher, ...</property>
<property name="invisible_char">&#x25CF;</property>
<property name="invisible_char">●</property>
</object>
<packing>
<property name="left_attach">1</property>
@ -395,7 +477,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence </p
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">A unique ID to identify the source</property>
<property name="invisible_char">&#x25CF;</property>
<property name="invisible_char">●</property>
</object>
<packing>
<property name="position">0</property>
@ -435,7 +517,7 @@ Very High =Direct and primary evidence used, or by dominance of the evidence </p
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">Title of the source.</property>
<property name="invisible_char">&#x25CF;</property>
<property name="invisible_char">●</property>
</object>
<packing>
<property name="left_attach">1</property>

9
src/gui/editors/editcitation.py
View File

@ -190,12 +190,9 @@ class EditCitation(EditPrimary):
self.track,
self.db.readonly)
# FIXME: This needs to be changed to reflect the correct names
# and uncommented when src/glade/editcitation.glade
# has been amended to include an id in the Citation section.
# self.gid = MonitoredEntry(
# self.glade.get_object('gid'), self.obj.set_gramps_id,
# self.obj.get_gramps_id,self.db.readonly)
self.gid = MonitoredEntry(
self.glade.get_object('gid2'), self.obj.set_gramps_id,
self.obj.get_gramps_id,self.db.readonly)
self.volume = MonitoredEntry(
self.glade.get_object("volume"), self.obj.set_page,