GEPS008: Removed Reorder module (now in relationship view)

svn: r19794

po/POTFILES.in

@@ -9,7 +9,6 @@ src/ExportOptions.py
 src/gramps.py
 src/LdsUtils.py
 src/PlaceUtils.py
-src/Reorder.py
 src/Spell.py
 src/ToolTips.py
 src/TransUtils.py

src/Makefile.am

@@ -24,7 +24,6 @@ gdir_PYTHON = \
 	ImgManip.py\
 	LdsUtils.py \
 	MacTransUtils.py\
-	Reorder.py\
 	Sort.py\
 	soundex.py\
 	Spell.py\

src/Reorder.py

@@ -1,191 +0,0 @@
-# Gramps - a GTK+/GNOME based genealogy program
-#
-# Copyright (C) 2001-2007  Donald N. Allingham
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, 
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-# $Id$
-#
-
-#-------------------------------------------------------------------------
-#
-# Standard python modules
-#
-#-------------------------------------------------------------------------
-from gen.ggettext import gettext as _
-
-#-------------------------------------------------------------------------
-#
-# gramps modules
-#
-#-------------------------------------------------------------------------
-from gen.db import DbTxn
-from gen.display.name import displayer as name_displayer
-from gui.listmodel import ListModel
-from gui.managedwindow import ManagedWindow
-from gui.glade import Glade
-
-PARENT_TITLES = [(_('Father'), -1, 200), (_('Mother'), -1, 200), ('', -1, 0)]
-FAMILY_TITLES = [(_('Spouse'), -1, 200), (_('Relationship'), -1, 200), ('', -1, 0)]
-
-class Reorder(ManagedWindow):
-    
-    def __init__(self, state, uistate, track, handle):
-        xml = Glade()
-        top = xml.toplevel
-
-        self.dbstate = state
-        ManagedWindow.__init__(self, uistate, track, self)
-
-        self.person = self.dbstate.db.get_person_from_handle(handle)
-        self.parent_list = self.person.get_parent_family_handle_list()
-        self.family_list = self.person.get_family_handle_list()
-
-        penable = len(self.parent_list) > 1
-        fenable = len(self.family_list) > 1
-
-        self.set_window(top, None, _("Reorder Relationships"))
-
-        self.ptree = xml.get_object('ptree')
-        self.pmodel = ListModel(self.ptree, PARENT_TITLES)
-
-        self.ftree = xml.get_object('ftree')
-        self.fmodel = ListModel(self.ftree, FAMILY_TITLES)
-
-        xml.get_object('ok').connect('clicked', self.ok_clicked)
-        xml.get_object('cancel').connect('clicked', self.cancel_clicked)
-
-        fup = xml.get_object('fup')
-        fup.connect('clicked', self.fup_clicked)
-        fup.set_sensitive(fenable)
-
-        fdown = xml.get_object('fdown')
-        fdown.connect('clicked', self.fdown_clicked)
-        fdown.set_sensitive(fenable)
-
-        pup = xml.get_object('pup')
-        pup.connect('clicked', self.pup_clicked)
-        pup.set_sensitive(penable)
-
-        pdown = xml.get_object('pdown')
-        pdown.connect('clicked', self.pdown_clicked)
-        pdown.set_sensitive(penable)
-
-        self.fill_data()
-
-        self.show()
-
-    def fill_data(self):
-        self.fill_parents()
-        self.fill_family()
-
-    def fill_parents(self):
-        for handle in self.parent_list:
-            family = self.dbstate.db.get_family_from_handle(handle)
-            fhandle = family.get_father_handle()
-            mhandle = family.get_mother_handle()
-
-            fname = ""
-            if fhandle:
-                father = self.dbstate.db.get_person_from_handle(fhandle)
-                if father:
-                    fname = name_displayer.display(father)
-
-            mname = ""
-            if mhandle:
-                mother = self.dbstate.db.get_person_from_handle(mhandle)
-                if mother:
-                    mname = name_displayer.display(mother)
-
-            self.pmodel.add([fname, mname, handle])
-
-    def fill_family(self):
-        for handle in self.family_list:
-
-            family = self.dbstate.db.get_family_from_handle(handle)
-            fhandle = family.get_father_handle()
-            mhandle = family.get_mother_handle()
-
-            name = ""
-
-            if fhandle and fhandle != self.person.handle:
-                spouse = self.dbstate.db.get_person_from_handle(fhandle)
-                if spouse:
-                    name = name_displayer.display(spouse)
-            elif mhandle:
-                spouse = self.dbstate.db.get_person_from_handle(mhandle)
-                if spouse:
-                    name = name_displayer.display(spouse)
-
-            reltype = str(family.get_relationship())
-
-            self.fmodel.add([name, reltype, handle])
-
-    def cancel_clicked(self, obj):
-        self.close()
-
-    def ok_clicked(self, obj):
-        name = name_displayer.display(self.person)
-        msg = _("Reorder Relationships: %s") % name
-        with DbTxn(msg, self.dbstate.db) as trans:
-            self.dbstate.db.commit_person(self.person, trans)
-
-        self.close()
-
-    def pup_clicked(self, obj):
-        """Moves the current selection up one row"""
-        row = self.pmodel.get_selected_row()
-        if not row or row == -1:
-            return
-        store, the_iter = self.pmodel.get_selected()
-        data = self.pmodel.get_data(the_iter, xrange(3))
-        self.pmodel.remove(the_iter)
-        self.pmodel.insert(row-1, data, None, 1)
-        handle = self.parent_list.pop(row)
-        self.parent_list.insert(row-1, handle)
-
-    def pdown_clicked(self, obj):
-        row = self.pmodel.get_selected_row()
-        if row + 1 >= self.pmodel.count or row == -1:
-            return
-        store, the_iter = self.pmodel.get_selected()
-        data = self.pmodel.get_data(the_iter, xrange(3))
-        self.pmodel.remove(the_iter)
-        self.pmodel.insert(row+1, data, None, 1)
-        handle = self.parent_list.pop(row)
-        self.parent_list.insert(row+1, handle)
-
-    def fup_clicked(self, obj):
-        row = self.fmodel.get_selected_row()
-        if not row or row == -1:
-            return
-        store, the_iter = self.fmodel.get_selected()
-        data = self.fmodel.get_data(the_iter, xrange(3))
-        self.fmodel.remove(the_iter)
-        self.fmodel.insert(row-1, data, None, 1)
-        handle = self.family_list.pop(row)
-        self.family_list.insert(row-1, handle)
-
-
-    def fdown_clicked(self, obj):
-        row = self.fmodel.get_selected_row()
-        if row + 1 >= self.fmodel.count or row == -1:
-            return
-        store, the_iter = self.fmodel.get_selected()
-        data = self.fmodel.get_data(the_iter, xrange(3))
-        self.fmodel.remove(the_iter)
-        self.fmodel.insert(row+1, data, None, 1)
-        handle = self.family_list.pop(row)
-        self.family_list.insert(row+1, handle)

src/plugins/view/relview.py

@@ -64,6 +64,9 @@ from gui.views.bookmarks import PersonBookmarks
 import const
 from Utils import preset_name
 from gen.utils import get_birth_or_fallback, get_death_or_fallback
+from gui.listmodel import ListModel
+from gui.managedwindow import ManagedWindow
+from gui.glade import Glade
 
 _GenderCode = {
     gen.lib.Person.MALE    : u'\u2642', 
@@ -1603,9 +1606,7 @@ class RelationshipView(NavigationView):
     def reorder(self, obj, dumm1=None, dummy2=None):
         if self.get_active():
             try:
-                import Reorder
+                Reorder(self.dbstate, self.uistate, [], self.get_active())
-                Reorder.Reorder(self.dbstate, self.uistate, [],
-                                self.get_active())
             except WindowActiveError:
                 pass
 
@@ -1690,6 +1691,167 @@ class RelationshipView(NavigationView):
         """
         return [self.content_panel, self.config_panel]
 
+#-------------------------------------------------------------------------
+#
+# Reorder class
+#
+#-------------------------------------------------------------------------
+class Reorder(ManagedWindow):
+    
+    def __init__(self, state, uistate, track, handle):
+        xml = Glade('reorder.glade')
+        top = xml.toplevel
+
+        self.dbstate = state
+        ManagedWindow.__init__(self, uistate, track, self)
+
+        self.person = self.dbstate.db.get_person_from_handle(handle)
+        self.parent_list = self.person.get_parent_family_handle_list()
+        self.family_list = self.person.get_family_handle_list()
+
+        penable = len(self.parent_list) > 1
+        fenable = len(self.family_list) > 1
+
+        self.set_window(top, None, _("Reorder Relationships"))
+
+        self.ptree = xml.get_object('ptree')
+        self.pmodel = ListModel(self.ptree, 
+                               [(_('Father'), -1, 200), 
+                                (_('Mother'), -1, 200), 
+                                ('', -1, 0)])
+
+        self.ftree = xml.get_object('ftree')
+        self.fmodel = ListModel(self.ftree, 
+                               [(_('Spouse'), -1, 200), 
+                                (_('Relationship'), -1, 200), 
+                                ('', -1, 0)])
+
+        xml.get_object('ok').connect('clicked', self.ok_clicked)
+        xml.get_object('cancel').connect('clicked', self.cancel_clicked)
+
+        fup = xml.get_object('fup')
+        fup.connect('clicked', self.fup_clicked)
+        fup.set_sensitive(fenable)
+
+        fdown = xml.get_object('fdown')
+        fdown.connect('clicked', self.fdown_clicked)
+        fdown.set_sensitive(fenable)
+
+        pup = xml.get_object('pup')
+        pup.connect('clicked', self.pup_clicked)
+        pup.set_sensitive(penable)
+
+        pdown = xml.get_object('pdown')
+        pdown.connect('clicked', self.pdown_clicked)
+        pdown.set_sensitive(penable)
+
+        self.fill_data()
+
+        self.show()
+
+    def fill_data(self):
+        self.fill_parents()
+        self.fill_family()
+
+    def fill_parents(self):
+        for handle in self.parent_list:
+            family = self.dbstate.db.get_family_from_handle(handle)
+            fhandle = family.get_father_handle()
+            mhandle = family.get_mother_handle()
+
+            fname = ""
+            if fhandle:
+                father = self.dbstate.db.get_person_from_handle(fhandle)
+                if father:
+                    fname = name_displayer.display(father)
+
+            mname = ""
+            if mhandle:
+                mother = self.dbstate.db.get_person_from_handle(mhandle)
+                if mother:
+                    mname = name_displayer.display(mother)
+
+            self.pmodel.add([fname, mname, handle])
+
+    def fill_family(self):
+        for handle in self.family_list:
+
+            family = self.dbstate.db.get_family_from_handle(handle)
+            fhandle = family.get_father_handle()
+            mhandle = family.get_mother_handle()
+
+            name = ""
+
+            if fhandle and fhandle != self.person.handle:
+                spouse = self.dbstate.db.get_person_from_handle(fhandle)
+                if spouse:
+                    name = name_displayer.display(spouse)
+            elif mhandle:
+                spouse = self.dbstate.db.get_person_from_handle(mhandle)
+                if spouse:
+                    name = name_displayer.display(spouse)
+
+            reltype = str(family.get_relationship())
+
+            self.fmodel.add([name, reltype, handle])
+
+    def cancel_clicked(self, obj):
+        self.close()
+
+    def ok_clicked(self, obj):
+        name = name_displayer.display(self.person)
+        msg = _("Reorder Relationships: %s") % name
+        with DbTxn(msg, self.dbstate.db) as trans:
+            self.dbstate.db.commit_person(self.person, trans)
+
+        self.close()
+
+    def pup_clicked(self, obj):
+        """Moves the current selection up one row"""
+        row = self.pmodel.get_selected_row()
+        if not row or row == -1:
+            return
+        store, the_iter = self.pmodel.get_selected()
+        data = self.pmodel.get_data(the_iter, xrange(3))
+        self.pmodel.remove(the_iter)
+        self.pmodel.insert(row-1, data, None, 1)
+        handle = self.parent_list.pop(row)
+        self.parent_list.insert(row-1, handle)
+
+    def pdown_clicked(self, obj):
+        row = self.pmodel.get_selected_row()
+        if row + 1 >= self.pmodel.count or row == -1:
+            return
+        store, the_iter = self.pmodel.get_selected()
+        data = self.pmodel.get_data(the_iter, xrange(3))
+        self.pmodel.remove(the_iter)
+        self.pmodel.insert(row+1, data, None, 1)
+        handle = self.parent_list.pop(row)
+        self.parent_list.insert(row+1, handle)
+
+    def fup_clicked(self, obj):
+        row = self.fmodel.get_selected_row()
+        if not row or row == -1:
+            return
+        store, the_iter = self.fmodel.get_selected()
+        data = self.fmodel.get_data(the_iter, xrange(3))
+        self.fmodel.remove(the_iter)
+        self.fmodel.insert(row-1, data, None, 1)
+        handle = self.family_list.pop(row)
+        self.family_list.insert(row-1, handle)
+
+
+    def fdown_clicked(self, obj):
+        row = self.fmodel.get_selected_row()
+        if row + 1 >= self.fmodel.count or row == -1:
+            return
+        store, the_iter = self.fmodel.get_selected()
+        data = self.fmodel.get_data(the_iter, xrange(3))
+        self.fmodel.remove(the_iter)
+        self.fmodel.insert(row+1, data, None, 1)
+        handle = self.family_list.pop(row)
+        self.family_list.insert(row+1, handle)
+
 #-------------------------------------------------------------------------
 #
 # Function to return if person has children