From 8cc5830a79c66c4d937bc329bfca8d6a235258b1 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Mon, 8 Nov 2004 04:40:18 +0000 Subject: [PATCH] * src/ImageSelect.py: load global note in a read only buffer * src/gramps.glade: change buttons to icons, add global note on image properties editor svn: r3712 --- gramps2/ChangeLog | 5 + gramps2/src/ImageSelect.py | 5 + gramps2/src/edit_sm.png | Bin 1029 -> 1022 bytes gramps2/src/gramps.glade | 796 +++++++++++++++++++++++++++++-------- 4 files changed, 645 insertions(+), 161 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 7f13cee72..cbcf87edf 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,8 @@ +2004-11-07 Don Allingham + * src/ImageSelect.py: load global note in a read only buffer + * src/gramps.glade: change buttons to icons, add global note + on image properties editor + 2004-11-06 Don Allingham * src/DateHandler.py: handle en_GB, en_AU and en_CA locales diff --git a/gramps2/src/ImageSelect.py b/gramps2/src/ImageSelect.py index 0f4c8d9ef..eeadeb40f 100644 --- a/gramps2/src/ImageSelect.py +++ b/gramps2/src/ImageSelect.py @@ -734,6 +734,11 @@ class LocalMediaProperties: "on_cancel_clicked" : self.close, "on_local_delete_event" : self.on_delete_event, }) + + media_obj = self.db.get_object_from_handle(self.photo.get_reference_handle()) + global_note = self.change_dialog.get_widget('global_notes').get_buffer() + global_note.insert_at_cursor(media_obj.get_note()) + self.redraw_attr_list() if parent_window: self.window.set_transient_for(parent_window) diff --git a/gramps2/src/edit_sm.png b/gramps2/src/edit_sm.png index 1cc0a2313d74a2685f87c9466999c3166d050e8a..05b6f2c6882fc7b587d3d8e51f6564e285167657 100644 GIT binary patch delta 968 zcmV;(12_DI2>u6<7YY;z1^@s6jfou%ks&dE3kMeo9COyM!T*UFk!Q9+` z+{X(G3zr?ovH$IWZQD{Vm)BQUSHHh;v+&vVJL zY*ZU##Fd|8|8({0)sK!HJ2nAWqlQIMScfY~k}w<&iK2)oiiqQwG))mX5FjEL zV^B&tv$L}o7Zw)2ICJLA+kpE5=pNF4Eyr;vih{vlfH4NkvdFTGq9{;GQ7)J9eGg*< z-}lj4d-Zz#d=Lch0?U8~#C_4(wrwoS8l^FYQmKUR`#6pRKv5JJBh1XqP_0goWy)V# zTB-p)U<1WSs)!&WIF5r-DX!~c+cuR-&(QIoH$;8&6>Sm?wii< zKL8y-9nSFJ<eQb+;*oF}qPrd-*1vwH21vEuN~^2pi|Qbonjj=jRB+5a0JvO5wV$ z9QC?;Fu#JW&L%g%{f51N=bKDd3`oZM?mVx)evZp$&vNS2DQ0G-DV0h%j*T%g_9u)1 zwbn#~2+Iv9yh(bN$8`7#pL}?lMx(*h)D%GwVB7YX2}D4|j02-6Dq5}ey)c~VdwyU~ zy&N98V1iz6k2p?_fEcL~5!&tc{`U6s_^4E?R;!g7jm8^c7`~}9R9X=c%d%{2+a7`b qDWWJ!+U@p(ZnwJvM1bLcAAbXrQ!m?|hMRu?0000eQ(Tz#0`)N?F5`BuPlqlqiabqKG(-$+8S%jszHE&{`veaAs#` zuPiJqe0kx*g|`9s80Ze^mg6`mr5Fr<257CZEQ>tPQA#0%pjDBA? z%Rvyl3#+qSVRYm{1RN~IFM@8dWQ07@yeHq6Y-P_0go=fYoJUakQ?U;}C- z)fj^@2FGy_BExlEY}=+%sSH~-BcL%F-}k9hDpWnE_Vs7iuZ9#m_nVu)yC-LVG%71o`*38Ap}}WFcM2=_|^e>(8Nu;PHX3>bLY<8e0`(2{abG^c|xH=Yn!4d zh~oiqJRnI@N~Hi*B*-+yvtnF-`HcAR3AUG1w6%BmeZNpUBcM_m zV{(!tA`<>t_SuPI}!vnxA5) zv(4@AzUAP>Hq#XiCTDYhf1X!gzr?kR7ddzC95XZ1lu9KW$3|;2_9u)1rIbX22+Ivn z-XuNCV>*0=Pd+?PqtRe$YKkBTux)$H1jc|ddK?%R3L!34eD z0dbt105MW!jG^6bAMWnHh)+tjYPDLa(P+F8hT)q+WEEqKWmz^lwr!6<{}xdcCGB?m xVYk~|10q0MLsOT4>d@pC|34Iv0`c*d{{f-nG~C@h(69gi002ovPDHLkV1j(v*&qM_ diff --git a/gramps2/src/gramps.glade b/gramps2/src/gramps.glade index 997364980..99082a51c 100644 --- a/gramps2/src/gramps.glade +++ b/gramps2/src/gramps.glade @@ -8832,6 +8832,7 @@ Other True + Edit the preferred name True GTK_RELIEF_NORMAL True @@ -9600,18 +9601,27 @@ Other True Create an alternate name for this person - True True - _Add... - True GTK_RELIEF_NORMAL True + + + + True + gtk-add + 4 + 0.5 + 0.5 + 0 + 0 + + 0 False - False + True @@ -9621,16 +9631,25 @@ Other False Edit the selected name True - _Edit... - True GTK_RELIEF_NORMAL True + + + + True + edit_sm.png + 0.5 + 0.5 + 0 + 0 + + 0 False - False + True @@ -9638,19 +9657,28 @@ Other True False - Delete selected name - True + Delete the selected name True - _Delete - True GTK_RELIEF_NORMAL True + + + + True + gtk-remove + 4 + 0.5 + 0.5 + 0 + 0 + + 0 False - False + True @@ -10152,18 +10180,27 @@ Other True Create a new event - True True - _Add... - True GTK_RELIEF_NORMAL True + + + + True + gtk-add + 4 + 0.5 + 0.5 + 0 + 0 + + 0 False - False + True @@ -10173,16 +10210,25 @@ Other False Edit the selected event True - _Edit... - True GTK_RELIEF_NORMAL True + + + + True + edit_sm.png + 0.5 + 0.5 + 0 + 0 + + 0 False - False + True @@ -10191,18 +10237,27 @@ Other True False Delete the selected event - True True - _Delete - True GTK_RELIEF_NORMAL True + + + + True + gtk-remove + 4 + 0.5 + 0.5 + 0 + 0 + + 0 False - False + True @@ -10211,7 +10266,7 @@ Other - 6 + 3 False True @@ -10567,18 +10622,27 @@ Other True Create a new attribute - True True - _Add... - True GTK_RELIEF_NORMAL True + + + + True + gtk-add + 4 + 0.5 + 0.5 + 0 + 0 + + 0 False - False + True @@ -10588,16 +10652,25 @@ Other False Edit the selected attribute True - _Edit... - True GTK_RELIEF_NORMAL True + + + + True + edit_sm.png + 0.5 + 0.5 + 0 + 0 + + 0 False - False + True @@ -10606,18 +10679,27 @@ Other True False Delete the selected attribute - True True - _Delete - True GTK_RELIEF_NORMAL True + + + + True + gtk-remove + 4 + 0.5 + 0.5 + 0 + 0 + + 0 False - False + True @@ -11248,18 +11330,27 @@ Other True Create a new address - True True - _Add... - True GTK_RELIEF_NORMAL True + + + + True + gtk-add + 4 + 0.5 + 0.5 + 0 + 0 + + 0 False - False + True @@ -11269,16 +11360,25 @@ Other False Edit the selected address True - _Edit... - True GTK_RELIEF_NORMAL True + + + + True + edit_sm.png + 0.5 + 0.5 + 0 + 0 + + 0 False - False + True @@ -11287,18 +11387,27 @@ Other True False Delete the selected address - True True - _Delete - True GTK_RELIEF_NORMAL True + + + + True + gtk-remove + 4 + 0.5 + 0.5 + 0 + 0 + + 0 False - False + True @@ -11551,49 +11660,80 @@ Other True - True + Add a source True - _Add... - True GTK_RELIEF_NORMAL True + + + + True + gtk-add + 4 + 0.5 + 0.5 + 0 + 0 + + 0 False - False + True True + Edit the selected source True - _Edit... - True GTK_RELIEF_NORMAL True + + + + True + edit_sm.png + 0.5 + 0.5 + 0 + 0 + + 0 False - False + True True + Remove the selected source True - _Delete... - True GTK_RELIEF_NORMAL True + + + + True + gtk-remove + 4 + 0.5 + 0.5 + 0 + 0 + + 0 False - False + True @@ -11685,18 +11825,27 @@ Other True Add a new media object to the database and place it in this gallery - True True - _Add from file... - True GTK_RELIEF_NORMAL True + + + + True + gtk-add + 4 + 0.5 + 0.5 + 0 + 0 + + 0 False - False + True @@ -11704,18 +11853,27 @@ Other True Select an existing media object from the database and place it in this gallery - True True - Add from _database... - True GTK_RELIEF_NORMAL True + + + + True + gtk-index + 4 + 0.5 + 0.5 + 0 + 0 + + 0 False - False + True @@ -11724,35 +11882,53 @@ Other True Edit the properties of the selected object True - _Edit... - True GTK_RELIEF_NORMAL True + + + + True + edit_sm.png + 0.5 + 0.5 + 0 + 0 + + 0 False - False + True True - Remove selected object from this gallery only - True + Remove the selected object from this gallery only True - _Remove - True GTK_RELIEF_NORMAL True + + + + True + gtk-remove + 4 + 0.5 + 0.5 + 0 + 0 + + 0 False - False + True @@ -11981,18 +12157,27 @@ Other True Add an internet reference about this person - True True - _Add... - True GTK_RELIEF_NORMAL True + + + + True + gtk-add + 4 + 0.5 + 0.5 + 0 + 0 + + 0 False - False + True @@ -12000,17 +12185,27 @@ Other True False + Edit the selected internet address True - _Edit... - True GTK_RELIEF_NORMAL True + + + + True + edit_sm.png + 0.5 + 0.5 + 0 + 0 + + 0 False - False + True @@ -12024,69 +12219,21 @@ Other - + True + gtk-jump-to + 4 0.5 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-jump-to - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - _Go - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - + 0 + 0 0 False - False + True @@ -12095,18 +12242,27 @@ Other True False Delete selected reference - True True - _Delete - True GTK_RELIEF_NORMAL True + + + + True + gtk-remove + 4 + 0.5 + 0.5 + 0 + 0 + + 0 False - False + True @@ -22353,10 +22509,10 @@ Other 12 True - 5 + 4 2 False - 3 + 6 12 @@ -22431,28 +22587,6 @@ Other - - - True - True - _Private record - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 1 - 2 - 4 - 5 - fill - - - - True @@ -22599,6 +22733,291 @@ Other False + + + 12 + True + 5 + 5 + False + 6 + 6 + + + + True + Lower X: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 1 + 2 + 4 + 5 + fill + + + + + + + True + Upper X: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 1 + 2 + 3 + 4 + fill + + + + + + + True + Upper Y: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 3 + 4 + 3 + 4 + fill + + + + + + + True + Lower Y: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 3 + 4 + 4 + 5 + fill + + + + + + + True + True + True + True + 0 + + True + * + False + + + 2 + 3 + 3 + 4 + + + + + + + True + True + True + True + 0 + + True + * + False + + + 2 + 3 + 4 + 5 + + + + + + + True + True + True + True + 0 + + True + * + False + + + 4 + 5 + 3 + 4 + + + + + + + True + True + True + True + 0 + + True + * + False + + + 4 + 5 + 4 + 5 + + + + + + + True + <b>Subsection</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 5 + 2 + 3 + fill + + + + + + + True + True + _Private record + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 1 + 5 + 1 + 2 + fill + + + + + + + True + <b>Privacy</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 5 + 0 + 1 + fill + + + + + + False + True + + + + + + True + General + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + True @@ -22753,6 +23172,61 @@ Other + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT + + + + 6 + True + True + False + False + True + GTK_JUSTIFY_LEFT + GTK_WRAP_NONE + False + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + False + True + + + + + + True + Global Notes + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + True