← Back to branch summary

~rosco2/ubuntu/wily/gramps/bug-1492304

« back to all changes in this revision

Viewing changes to gramps/gui/plug/report/_docreportdialog.py

  • Committer: Package Import Robot
  • Author(s): Ross Gammon
  • Date: 2015-08-11 23:03:11 UTC
  • mfrom: (1.4.3)
  • mto: This revision was merged to the branch mainline in revision 58.
  • Revision ID: package-import@ubuntu.com-20150811230311-acjr8gcfe8isx7ij
https://launchpad.net/bugs/1464845
https://launchpad.net/bugs/1451259
* New upstream release
* Drop patches applied upstream or cherry-picked from there
* Add version constraints for gtk and pygobject
* Add goocanvas dependency - available soon
* Drop webkit dpendency as HTML view has been removed
* Force removal of upstream packages when installing Debian one
  (LP: #1464845)
* Drop fixperm override as permissions fixed upstream
* Fix spelling error in changelog
* Switch to nose for unit tests
* Add build dependencies for the nose tests
* Update copyright file
* Add uversionmangle to watch file to deal with alpha/beta versions
* Add manual test cases
* Drop FAQ URL from upstream metadata - changes every release
* Add patch to fix transparent windows in Ubuntu.
  Thanks to Lance Orner (LP: #1451259)

Show diffs side-by-side

added added

removed removed

Lines of Context:
gramps/gui/plug/report/_docreportdialog.py
125
125
        if self.firstpage_added:
126
126
            self.notebook.remove_page(0)
127
127
        if docgen_plugin.get_paper_used():
128
 
            self.paper_label = Gtk.Label(label='<b>%s</b>'%_("Paper Options"))
 
128
            self.paper_label = Gtk.Label(label='<b>%s</b>' % _("Paper Options"))
129
129
            self.paper_label.set_use_markup(True)
130
130
            self.notebook.insert_page(self.paper_frame, self.paper_label, 0)
131
131
            self.paper_frame.show_all()
132
132
        else:
133
133
            self.html_label = Gtk.Label(label='<b>%s</b>' % _("HTML Options"))
134
134
            self.html_label.set_use_markup(True)
135
 
            self.notebook.insert_page(self.html_table, self.html_label, 0)
136
 
            self.html_table.show_all()
 
135
            self.notebook.insert_page(self.html_grid, self.html_label, 0)
 
136
            self.html_grid.show_all()
137
137
        if preserve_tab:
138
138
            self.notebook.set_current_page(old_page)
139
139
        self.firstpage_added = True
168
168
        self.make_doc_menu(self.options.handler.get_format_name())
169
169
        self.format_menu.connect('changed', self.doc_type_changed)
170
170
        label = Gtk.Label(label="%s:" % _("Output Format"))
171
 
        label.set_alignment(0.0, 0.5)
172
 
        self.tbl.attach(label, 1, 2, self.row, self.row+1, Gtk.AttachOptions.SHRINK|Gtk.AttachOptions.FILL)
173
 
        self.tbl.attach(self.format_menu, 2, 4, self.row, self.row+1,
174
 
                        yoptions=Gtk.AttachOptions.SHRINK)
 
171
        label.set_halign(Gtk.Align.START)
 
172
        self.grid.attach(label, 1, self.row, 1, 1)
 
173
        self.format_menu.set_hexpand(True)
 
174
        self.grid.attach(self.format_menu, 2, self.row, 2, 1)
175
175
        self.row += 1
176
176
 
177
177
        self.open_with_app = Gtk.CheckButton(label=_("Open with default viewer"))
178
178
        self.open_with_app.set_active(
179
179
            config.get('interface.open-with-default-viewer'))
180
 
        self.tbl.attach(self.open_with_app, 2, 4, self.row, self.row+1,
181
 
                        yoptions=Gtk.AttachOptions.SHRINK)
 
180
        self.grid.attach(self.open_with_app, 2, self.row, 2, 1)
182
181
        self.row += 1
183
182
 
184
183
        ext = self.format_menu.get_active_plugin().get_extension()
209
208
        this function is to grab a pointer for later use in the parse
210
209
        html frame function."""
211
210
 
212
 
        self.html_table = Gtk.Table(n_rows=3, n_columns=3)
213
 
        self.html_table.set_col_spacings(12)
214
 
        self.html_table.set_row_spacings(6)
215
 
        self.html_table.set_border_width(0)
 
211
        self.html_grid = Gtk.Grid()
 
212
        self.html_grid.set_column_spacing(12)
 
213
        self.html_grid.set_row_spacing(6)
 
214
        self.html_grid.set_border_width(6)
216
215
 
217
216
        label = Gtk.Label(label="%s:" % _("CSS file"))
218
 
        label.set_alignment(0.0,0.5)
219
 
        self.html_table.attach(label, 1, 2, 1, 2, Gtk.AttachOptions.SHRINK|Gtk.AttachOptions.FILL,
220
 
                               yoptions=Gtk.AttachOptions.SHRINK)
 
217
        label.set_halign(Gtk.Align.START)
 
218
        self.html_grid.attach(label, 1, 1, 1, 1)
221
219
 
222
220
        self.css_combo = Gtk.ComboBoxText()
 
221
        self.css_combo.set_hexpand(True)
223
222
 
224
223
        css_filename = self.options.handler.get_css_filename()
225
224
        active_index = 0
234
233
                    active_index = index
235
234
                index += 1
236
235
 
237
 
        self.html_table.attach(self.css_combo,2,3,1,2, yoptions=Gtk.AttachOptions.SHRINK)
 
236
        self.html_grid.attach(self.css_combo, 2, 1, 1, 1)
238
237
        self.css_combo.set_active(active_index)
239
238
 
240
239
    def parse_format_frame(self):