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

2008-01-13 Raphael Ackermann <raphael.ackermann@gmail.com>

Browse Source 
* src/gramps_main.py: Add dots to list of things in Betawarning
	to make it consistent
	* src/GrampsLogger/_ErrorReportAssistant.py: Disable sending emails to the 
	bug list and add button to file bug report on gramps issue tracker

svn: r9794
This commit is contained in:
Raphael Ackermann 2008-01-13 15:05:41 +00:00
parent 0b1f8f408c
commit bedafa494a
3 changed files with 64 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-01-13 Raphael Ackermann <raphael.ackermann@gmail.com>
* src/gramps_main.py: Add dots to list of things in Betawarning
to make it consistent
* src/GrampsLogger/_ErrorReportAssistant.py: Disable sending emails to the
bug list and add button to file bug report on gramps issue tracker
2008-01-12 Brian Matherly <brian@gramps-project.org> 2008-01-12 Brian Matherly <brian@gramps-project.org>
* src/gramps_main.py: Enable the beta warning on startup. * src/gramps_main.py: Enable the beta warning on startup.

79
src/GrampsLogger/_ErrorReportAssistant.py
View File

@ -1,10 +1,10 @@
from gettext import gettext as _ from gettext import gettext as _
import sys,os,bsddb
import const
import gtk
import Assistant import Assistant
import const
import gtk
import sys,os,bsddb
class ErrorReportAssistant: class ErrorReportAssistant:
@ -28,10 +28,10 @@ class ErrorReportAssistant:
"gather some information about the error that has "\ "gather some information about the error that has "\
"occured and the operating environment. "\ "occured and the operating environment. "\
"At the end of the assistant you will be asked to "\ "At the end of the assistant you will be asked to "\
"send an email to the Gramps bug reporting mailing list. "\ "file a bug report on the Gramps bug tracking system. "\
"The assistant will place the bug report on the clip board so "\ "The assistant will place the bug report on the clip board so "\
"that you can paste it into your email programme and review "\ "that you can paste it into the form on the bug tracking "\
"exactly what information is being sent.")) "website and review exactly what information you want to include."))
self.w.add_page(_("Report a bug: Step 1 of 5"), self.build_page1()) self.w.add_page(_("Report a bug: Step 1 of 5"), self.build_page1())
@ -80,6 +80,10 @@ class ErrorReportAssistant:
self._final_report_text_buffer.get_start_iter(), self._final_report_text_buffer.get_start_iter(),
self._final_report_text_buffer.get_end_iter())) self._final_report_text_buffer.get_end_iter()))
def _start_gramps_bts_in_browser(self,obj=None):
import GrampsDisplay
GrampsDisplay.url('http://bugs.gramps-project.org/bug_report_page.php')
def _get_sys_information(self): def _get_sys_information(self):
if hasattr(os, "uname"): if hasattr(os, "uname"):
operatingsystem = os.uname()[0] operatingsystem = os.uname()[0]
@ -365,9 +369,13 @@ class ErrorReportAssistant:
summary_frame.add(summary_align) summary_frame.add(summary_align)
# side_label = gtk.Label(_("This is the completed bug report. The next page "\
# "of the assistant will help you to send the report "\
# "to the bug report mailing list."))
side_label = gtk.Label(_("This is the completed bug report. The next page "\ side_label = gtk.Label(_("This is the completed bug report. The next page "\
"of the assistant will help you to send the report "\ "of the assistant will help you to file a bug "\
"to the bug report mailing list.")) " on the Gramps bug tracking system website."))
side_label.set_line_wrap(True) side_label.set_line_wrap(True)
side_label.set_size_request(124, -1) side_label.set_size_request(124, -1)
@ -382,27 +390,37 @@ class ErrorReportAssistant:
return box return box
def build_page5(self): def build_page5(self):
# label = gtk.Label(
# "%s <i>%s</i>" %
# (_("Use one of the two methods below to send the "\
# "bug report to the GRAMPS bug reporting mailing "\
# "list at "),
# "gramps-bugs@lists.sourceforge.net."))
label = gtk.Label( label = gtk.Label(
"%s <i>%s</i>" % "%s <i>%s</i>" %
(_("Use one of the two methods below to send the "\ (_("Use the two buttons below to first copy the bug report to the "
"bug report to the GRAMPS bug reporting mailing "\ "clipboard and then open a webbrowser to file a bug report at "),
"list at "), "http://bugs.gramps-project.org/bug_report_page.php."))
"gramps-bugs@lists.sourceforge.net."))
label.set_alignment(0.01,0.5) label.set_alignment(0.01,0.5)
label.set_padding(0, 4) label.set_padding(0, 4)
label.set_line_wrap(True) label.set_line_wrap(True)
label.set_use_markup(True) label.set_use_markup(True)
url_label = gtk.Label(_("If your email client is configured correctly you may be able "\ # url_label = gtk.Label(_("If your email client is configured correctly you may be able "\
"to use this button to start it with the bug report ready to send. "\ # "to use this button to start it with the bug report ready to send. "\
"(This will probably only work if you are running Gnome)")) # "(This will probably only work if you are running Gnome)"))
url_label = gtk.Label(_("Use this button to start a web browser and "
"file a bug report on the Gramps bug tracking "
"system."))
url_label.set_alignment(0.01,0.5) url_label.set_alignment(0.01,0.5)
url_label.set_padding(0, 4) url_label.set_padding(0, 4)
url_label.set_line_wrap(True) url_label.set_line_wrap(True)
url_button = gtk.Button("Start email client") url_button = gtk.Button("File bug report")
url_button.connect('clicked', self._start_email_client) # url_button = gtk.Button("Start email client")
# url_button.connect('clicked', self._start_email_client)
url_button.connect('clicked', self._start_gramps_bts_in_browser)
url_button_vbox = gtk.VBox() url_button_vbox = gtk.VBox()
url_button_vbox.pack_start(url_button,True,False) url_button_vbox.pack_start(url_button,True,False)
@ -418,10 +436,15 @@ class ErrorReportAssistant:
url_frame = gtk.Frame() url_frame = gtk.Frame()
url_frame.add(url_align) url_frame.add(url_align)
clip_label = gtk.Label(_("If your email program fails to start you can use this button " # clip_label = gtk.Label(_("If your email program fails to start you can use this button "
"to copy the bug report onto the clipboard. Then start your " # "to copy the bug report onto the clipboard. Then start your "
"email client, paste the report and send it to the address " # "email client, paste the report and send it to the address "
"above.")) # "above."))
clip_label = gtk.Label(_("Use this button "
"to copy the bug report onto the clipboard. "
"Then go to the bug tracking website by using "
"the button below, paste the report and click "
"submit report"))
clip_label.set_alignment(0.01,0.5) clip_label.set_alignment(0.01,0.5)
clip_label.set_padding(0, 4) clip_label.set_padding(0, 4)
clip_label.set_line_wrap(True) clip_label.set_line_wrap(True)
@ -446,8 +469,10 @@ class ErrorReportAssistant:
inner_box = gtk.VBox() inner_box = gtk.VBox()
inner_box.pack_start(label,False,False) inner_box.pack_start(label,False,False)
inner_box.pack_start(url_frame,False,False) # inner_box.pack_start(url_frame,False,False)
# inner_box.pack_start(clip_frame,False,False)
inner_box.pack_start(clip_frame,False,False) inner_box.pack_start(clip_frame,False,False)
inner_box.pack_start(url_frame,False,False)
inner_align = gtk.Alignment(0,0,1,1) inner_align = gtk.Alignment(0,0,1,1)
inner_align.set_padding(0,0,11,0) inner_align.set_padding(0,0,11,0)
@ -460,8 +485,12 @@ class ErrorReportAssistant:
outer_frame.add(inner_align) outer_frame.add(inner_align)
# side_label = gtk.Label(_("This is the final step. Use the buttons on this "
# "page to transfer the bug report to your email client."))
side_label = gtk.Label(_("This is the final step. Use the buttons on this " side_label = gtk.Label(_("This is the final step. Use the buttons on this "
"page to transfer the bug report to your email client.")) "page to start a web browser and file a bug "
"report on the Gramps bug tracking system."))
side_label.set_line_wrap(True) side_label.set_line_wrap(True)
side_label.set_size_request(124, -1) side_label.set_size_request(124, -1)

6
src/gramps_main.py
View File

@ -203,9 +203,9 @@ def _display_welcome_message():
"not meant for normal usage. Use at your own risk.\n\n" "not meant for normal usage. Use at your own risk.\n\n"
"This version may:\n" "This version may:\n"
"1) Work differently than you expect.\n" "1) Work differently than you expect.\n"
"2) Fail to run at all\n" "2) Fail to run at all.\n"
"3) Crash often\n" "3) Crash often.\n"
"4) Corrupt your data\n" "4) Corrupt your data.\n"
"5) Save data in a format that is incompatible with the " "5) Save data in a format that is incompatible with the "
"official release.\n" "official release.\n"
"\n<b>BACKUP</b> your existing databases " "\n<b>BACKUP</b> your existing databases "