kolan
/
LAview.Desktop
1
0
Fork 0
Code Issues 2 Releases Activity

Merge branch '#114_latexmk' into develop

This commit is contained in:
Kolan Sh 2016-05-07 15:41:12 +03:00
parent 6e5a97586c 0da0c7ca5c
commit 83d488a444
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
po/de/laview-desktop.po
View File

@ -151,7 +151,7 @@ msgid "LyX path on Windows"
msgstr "" msgstr ""
#: ui/glade/laview-desktop.glade.h:10 #: ui/glade/laview-desktop.glade.h:10
msgid "pdfLaTeX path on Windows" msgid "LaTeXmk path on Windows"
msgstr "" msgstr ""
#: ui/glade/laview-desktop.glade.h:11 #: ui/glade/laview-desktop.glade.h:11

2
po/laview-desktop.pot
View File

@ -151,7 +151,7 @@ msgid "LyX path on Windows"
msgstr "" msgstr ""
#: ui/glade/laview-desktop.glade.h:10 #: ui/glade/laview-desktop.glade.h:10
msgid "pdfLaTeX path on Windows" msgid "LaTeXmk path on Windows"
msgstr "" msgstr ""
#: ui/glade/laview-desktop.glade.h:11 #: ui/glade/laview-desktop.glade.h:11

4
po/ru/laview-desktop.po
View File

@ -152,8 +152,8 @@ msgid "LyX path on Windows"
msgstr "Путь к LyX под Windows" msgstr "Путь к LyX под Windows"
#: ui/glade/laview-desktop.glade.h:10 #: ui/glade/laview-desktop.glade.h:10
msgid "pdfLaTeX path on Windows" msgid "LaTeXmk path on Windows"
msgstr "Путь к pdfLaTeX под Windows" msgstr "Путь к LaTeXmk под Windows"
#: ui/glade/laview-desktop.glade.h:11 #: ui/glade/laview-desktop.glade.h:11
msgid "Common" msgid "Common"

10
src/PreferencesWindow.vala
View File

@ -10,7 +10,7 @@ namespace LAview.Desktop {
Gtk.ListStore liststore_data; Gtk.ListStore liststore_data;
Gtk.ListStore liststore_objects; Gtk.ListStore liststore_objects;
FileChooserButton filechooserbutton_lyx; FileChooserButton filechooserbutton_lyx;
FileChooserButton filechooserbutton_pdflatex; FileChooserButton filechooserbutton_latexmk;
public PreferencesDialog (Gtk.Application application, Window parent) throws Error { public PreferencesDialog (Gtk.Application application, Window parent) throws Error {
var builder = new Builder (); var builder = new Builder ();
@ -25,13 +25,13 @@ namespace LAview.Desktop {
liststore_data = builder.get_object ("liststore_data") as Gtk.ListStore; liststore_data = builder.get_object ("liststore_data") as Gtk.ListStore;
liststore_objects = builder.get_object ("liststore_protocol_objects") as Gtk.ListStore; liststore_objects = builder.get_object ("liststore_protocol_objects") as Gtk.ListStore;
filechooserbutton_lyx = builder.get_object ("filechooserbutton_lyx") as FileChooserButton; filechooserbutton_lyx = builder.get_object ("filechooserbutton_lyx") as FileChooserButton;
filechooserbutton_pdflatex = builder.get_object ("filechooserbutton_pdflatex") as FileChooserButton; filechooserbutton_latexmk = builder.get_object ("filechooserbutton_latexmk") as FileChooserButton;
fill_liststore_data (); fill_liststore_data ();
fill_liststore_objects (); fill_liststore_objects ();
filechooserbutton_lyx.set_filename (AppCore.core.lyx_path); filechooserbutton_lyx.set_filename (AppCore.core.lyx_path);
filechooserbutton_pdflatex.set_filename (AppCore.core.pdflatex_path); filechooserbutton_latexmk.set_filename (AppCore.core.latexmk_path);
} }
void fill_liststore_data () { void fill_liststore_data () {
@ -67,8 +67,8 @@ namespace LAview.Desktop {
} }
[CCode (instance_pos = -1)] [CCode (instance_pos = -1)]
public void pdflatex_file_set (FileChooserButton chooser) { public void latexmk_file_set (FileChooserButton chooser) {
AppCore.core.pdflatex_path = chooser.get_filename (); AppCore.core.latexmk_path = chooser.get_filename ();
} }
} }
} }

6
ui/glade/laview-desktop.glade
View File

@ -231,7 +231,7 @@
<object class="GtkLabel" id="label6"> <object class="GtkLabel" id="label6">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes">pdfLaTeX path on Windows</property> <property name="label" translatable="yes">LaTeXmk path on Windows</property>
<property name="xalign">0</property> <property name="xalign">0</property>
</object> </object>
<packing> <packing>
@ -252,11 +252,11 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkFileChooserButton" id="filechooserbutton_pdflatex"> <object class="GtkFileChooserButton" id="filechooserbutton_latexmk">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<signal name="file-set" handler="laview_desktop_preferences_dialog_pdflatex_file_set" swapped="no"/> <signal name="file-set" handler="laview_desktop_preferences_dialog_latexmk_file_set" swapped="no"/>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>