marko10_000
/
apostrophe
forked from Mirrors/apostrophe
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix merge issues

master
Manuel Genovés 2020-03-12 03:39:59 +01:00
parent e38520c35d
commit 30af9b2b20
2 changed files with 21 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
data/ui/Export.ui
View File

@ -597,40 +597,27 @@
<object class="GtkDialog" id="Export"> <object class="GtkDialog" id="Export">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="type_hint">dialog</property> <property name="type_hint">dialog</property>
<property name="use-header-bar">1</property>
<action-widgets> <action-widgets>
<action-widget response="cancel">cancel_btn</action-widget> <action-widget response="cancel">cancel_btn</action-widget>
<action-widget response="accept" default="true">export_btn</action-widget> <action-widget response="accept" default="true">export_btn</action-widget>
</action-widgets> </action-widgets>
<child type="titlebar"> <child type="action">
<object class="GtkHeaderBar" id="Export_hb"> <object class="GtkButton" id="cancel_btn">
<property name="label">gtk-cancel</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">True</property>
<property name="has_subtitle">False</property> <property name="receives_default">True</property>
<child> <property name="use_stock">True</property>
<object class="GtkButton" id="cancel_btn"> </object>
<property name="label">gtk-cancel</property> </child>
<property name="visible">True</property> <child type="action">
<property name="can_focus">True</property> <object class="GtkButton" id="export_btn">
<property name="receives_default">True</property> <property name="label" translatable="yes">Export</property>
<property name="use_stock">True</property> <property name="visible">True</property>
</object> <property name="can_focus">True</property>
<packing> <property name="can_default">True</property>
<property name="position">1</property> <property name="receives_default">True</property>
</packing>
</child>
<child>
<object class="GtkButton" id="export_btn">
<property name="label" translatable="yes">Export</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
</object>
<packing>
<property name="pack_type">end</property>
<property name="position">2</property>
</packing>
</child>
</object> </object>
</child> </child>
<child internal-child="vbox"> <child internal-child="vbox">
@ -664,43 +651,5 @@
</child> </child>
</object> </object>
</child> </child>
<child type="titlebar">
<object class="GtkHeaderBar" id="Export_hb">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child type="title">
<object class="GtkStackSwitcher" id="format_switcher">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stack">export_stack</property>
</object>
</child>
<child>
<object class="GtkButton" id="cancel_btn">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="export_btn">
<property name="label" translatable="yes">Export</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
</object>
<packing>
<property name="pack_type">end</property>
<property name="position">2</property>
</packing>
</child>
</object>
</child>
</object> </object>
</interface> </interface>

7
uberwriter/export_dialog.py
View File

@ -191,7 +191,7 @@ class Export:
if response == Gtk.ResponseType.ACCEPT: if response == Gtk.ResponseType.ACCEPT:
try: try:
self.export(export_format, text) self.export(export_format, text)
except (NotADirectoryError, Exception) as e: except (NotADirectoryError, RuntimeError) as e:
dialog = Gtk.MessageDialog(None, dialog = Gtk.MessageDialog(None,
Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT, Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,
Gtk.MessageType.ERROR, Gtk.MessageType.ERROR,
@ -201,8 +201,9 @@ class Export:
) )
dialog.run() dialog.run()
dialog.destroy() dialog.destroy()
self.dialog.destroy()
def regular_export_dialog(self): def regular_export_dialog(self):
texlive_installed = helpers.exist_executable("pdftex") texlive_installed = helpers.exist_executable("pdftex")
@ -260,6 +261,7 @@ class Export:
self.adv_export_name = self.builder.get_object("advanced_export_name") self.adv_export_name = self.builder.get_object("advanced_export_name")
self.adv_export_name.set_text(os.path.basename(self.filename)[:-3]) self.adv_export_name.set_text(os.path.basename(self.filename)[:-3])
self.paper_size = self.builder.get_object("combobox_paper_size")
return self.builder.get_object("Export") return self.builder.get_object("Export")
@ -298,6 +300,7 @@ class Export:
args = [ args = [
"--variable=papersize:a4" "--variable=papersize:a4"
] ]
filename = self.dialog.get_filename()
if filename.endswith("." + export_type): if filename.endswith("." + export_type):
filename = filename[:-len(export_type)-1] filename = filename[:-len(export_type)-1]
output_dir = os.path.abspath(os.path.join(filename, os.path.pardir)) output_dir = os.path.abspath(os.path.join(filename, os.path.pardir))