Commit Graph

5 Commits

Author SHA1 Message Date
Tim G L Lyons
3adb1b7ffa Merged trunk r17888 through r18397 into geps023.
Conflicts resolved in:
    /data/grampsxml.dtd
    /data/grampsxml.rng
    /src/Filters/Rules/Repository/_MatchesNameSubstringOf.py
    /src/plugins/import/ImportXml.py
(Various property conflicts also resolved)

svn: r18405
2011-11-05 19:07:58 +00:00
Paul Franklin
6a651d80e7 malformed SVN "Id" line
svn: r18392
2011-10-31 15:33:09 +00:00
Paul Franklin
bb0b9de18b malformed SVN "Id" line
svn: r18391
2011-10-31 15:27:48 +00:00
Brian Matherly
93ec059b3d Remove ErrorDialog and WarningDialog from reports. Replace with User.warn() and User.notify_error().
svn: r18388
2011-10-31 02:40:19 +00:00
Brian Matherly
0b8ea1202d Implement new "User()" class for reports to indicate progress and prompt the user. This allows the removal of from "gui.utils import ProgressMeter" from reports so that they don't depend on gui.
svn: r18378
2011-10-29 05:02:33 +00:00