Browse Source

Merge branch 'release-1.1.5'

master v1.1.5
Kolan Sh 6 years ago
parent
commit
bb985a96e0
  1. 2
      CMakeLists.txt
  2. 90
      po/de/laview-desktop.po
  3. 90
      po/laview-desktop.pot
  4. 92
      po/ru/laview-desktop.po
  5. 38
      src/MainWindow.vala
  6. 16
      src/PreferencesWindow.vala
  7. 1
      src/main.vala
  8. 61
      ui/glade/laview-desktop.glade

2
CMakeLists.txt

@ -7,7 +7,7 @@ SET (PROJECT_DESCRIPTION "LAview Desktop Application.")
SET (MAJOR 1)
SET (MINOR 1)
SET (PATCH 4)
SET (PATCH 5)
LIST (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/backbone)

90
po/de/laview-desktop.po

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: laview-desktop\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-01-27 04:50+0300\n"
"POT-Creation-Date: 2016-02-14 15:22+0300\n"
"PO-Revision-Date: 2015-10-24 20:19+0300\n"
"Last-Translator: <backbone@backbone.ws>\n"
"Language-Team: German\n"
@ -25,77 +25,69 @@ msgstr ""
msgid "It is too lazy to select a directory each time..."
msgstr ""
#: src/MainWindow.vala:58
#: src/MainWindow.vala:64
msgid "We're ready, Commander! Select or create a template. :-)"
msgstr ""
#: src/MainWindow.vala:76 src/MainWindow.vala:120 src/MainWindow.vala:194
#: src/MainWindow.vala:212 src/MainWindow.vala:312
#: src/MainWindow.vala:82 src/MainWindow.vala:125 src/MainWindow.vala:199
#: src/MainWindow.vala:217 src/MainWindow.vala:255 src/MainWindow.vala:321
msgid "Error"
msgstr ""
#: src/MainWindow.vala:84
#: src/MainWindow.vala:90
msgid "Select templates"
msgstr ""
#: src/MainWindow.vala:86 src/MainWindow.vala:268
#: src/MainWindow.vala:92 src/MainWindow.vala:281
msgid "_Cancel"
msgstr ""
#: src/MainWindow.vala:87
#: src/MainWindow.vala:93
msgid "_Open"
msgstr ""
#: src/MainWindow.vala:166
#: src/MainWindow.vala:171
msgid "After composing all objects print the document."
msgstr ""
#: src/MainWindow.vala:248
#: src/MainWindow.vala:261
msgid "Document analized, select an object and set it's properties."
msgstr ""
#: src/MainWindow.vala:253
#: src/MainWindow.vala:266
msgid "Press 'Properties' button to compose the object."
msgstr ""
#: src/MainWindow.vala:262
#: src/MainWindow.vala:275
msgid "Prepare the document first! >;-]"
msgstr ""
#: src/MainWindow.vala:266
#: src/MainWindow.vala:279
msgid "Select destination"
msgstr ""
#: src/MainWindow.vala:269
#: src/MainWindow.vala:282
msgid "_Save"
msgstr ""
#: src/MainWindow.vala:305
#: src/MainWindow.vala:314
msgid "bytes of"
msgstr ""
#: src/MainWindow.vala:306
#: src/MainWindow.vala:315
msgid "bytes copied/saved"
msgstr ""
#: src/MainWindow.vala:309
#: src/MainWindow.vala:318
msgid "Save/Copy operation complete! :-)"
msgstr ""
#: src/main.vala:33
msgid "Show the application's version"
msgstr ""
#: src/main.vala:52
msgid "[FILE]"
msgstr ""
#: src/main.vala:64
#: src/main.vala:64 src/main.vala:83
#, c-format
msgid "Error: %s\n"
msgstr ""
#: src/main.vala:65
#: src/main.vala:84
#, c-format
msgid "Run '%s --help' to see a full list of available command line options.\n"
msgstr ""
@ -137,89 +129,81 @@ msgid "Common"
msgstr ""
#: ui/glade/laview-desktop.glade.h:10
msgid "Protocol Plugins"
msgid "Object plugins"
msgstr ""
#: ui/glade/laview-desktop.glade.h:11
msgid "Protocol plugins"
msgstr ""
#: ui/glade/laview-desktop.glade.h:12
msgid "Data Plugins"
msgstr ""
#: ui/glade/laview-desktop.glade.h:13
msgid "Data plugins"
msgstr ""
#: ui/glade/laview-desktop.glade.h:14
#: ui/glade/laview-desktop.glade.h:12
msgid "LAview Desktop"
msgstr ""
#: ui/glade/laview-desktop.glade.h:15
#: ui/glade/laview-desktop.glade.h:13
msgid "_Template"
msgstr ""
#: ui/glade/laview-desktop.glade.h:16
#: ui/glade/laview-desktop.glade.h:14
msgid "_Document"
msgstr ""
#: ui/glade/laview-desktop.glade.h:17
#: ui/glade/laview-desktop.glade.h:15
msgid "_Application"
msgstr ""
#: ui/glade/laview-desktop.glade.h:18
#: ui/glade/laview-desktop.glade.h:16
msgid "_Help"
msgstr ""
#: ui/glade/laview-desktop.glade.h:19
#: ui/glade/laview-desktop.glade.h:17
msgid "Create a new template"
msgstr ""
#: ui/glade/laview-desktop.glade.h:20
#: ui/glade/laview-desktop.glade.h:18
msgid "Open a template"
msgstr ""
#: ui/glade/laview-desktop.glade.h:21
#: ui/glade/laview-desktop.glade.h:19
msgid "Change selected template"
msgstr ""
#: ui/glade/laview-desktop.glade.h:22
#: ui/glade/laview-desktop.glade.h:20
msgid "Delete selected template"
msgstr ""
#: ui/glade/laview-desktop.glade.h:23
#: ui/glade/laview-desktop.glade.h:21
msgid "Document object preparing"
msgstr ""
#: ui/glade/laview-desktop.glade.h:24
#: ui/glade/laview-desktop.glade.h:22
msgid "View and print the document"
msgstr ""
#: ui/glade/laview-desktop.glade.h:25
#: ui/glade/laview-desktop.glade.h:23
msgid "Edit the result document"
msgstr ""
#: ui/glade/laview-desktop.glade.h:26
#: ui/glade/laview-desktop.glade.h:24
msgid "Save the document as..."
msgstr ""
#: ui/glade/laview-desktop.glade.h:27
#: ui/glade/laview-desktop.glade.h:25
msgid "Application preferences"
msgstr ""
#: ui/glade/laview-desktop.glade.h:28
#: ui/glade/laview-desktop.glade.h:26
msgid "Help and reference"
msgstr ""
#: ui/glade/laview-desktop.glade.h:29
#: ui/glade/laview-desktop.glade.h:27
msgid "Close the application"
msgstr ""
#: ui/glade/laview-desktop.glade.h:30
#: ui/glade/laview-desktop.glade.h:28
msgid "Templates"
msgstr ""
#: ui/glade/laview-desktop.glade.h:31
#: ui/glade/laview-desktop.glade.h:29
msgid "Document Objects"
msgstr ""

90
po/laview-desktop.pot

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: laview-desktop\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-01-27 04:50+0300\n"
"POT-Creation-Date: 2016-02-14 15:22+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -25,77 +25,69 @@ msgstr ""
msgid "It is too lazy to select a directory each time..."
msgstr ""
#: src/MainWindow.vala:58
#: src/MainWindow.vala:64
msgid "We're ready, Commander! Select or create a template. :-)"
msgstr ""
#: src/MainWindow.vala:76 src/MainWindow.vala:120 src/MainWindow.vala:194
#: src/MainWindow.vala:212 src/MainWindow.vala:312
#: src/MainWindow.vala:82 src/MainWindow.vala:125 src/MainWindow.vala:199
#: src/MainWindow.vala:217 src/MainWindow.vala:255 src/MainWindow.vala:321
msgid "Error"
msgstr ""
#: src/MainWindow.vala:84
#: src/MainWindow.vala:90
msgid "Select templates"
msgstr ""
#: src/MainWindow.vala:86 src/MainWindow.vala:268
#: src/MainWindow.vala:92 src/MainWindow.vala:281
msgid "_Cancel"
msgstr ""
#: src/MainWindow.vala:87
#: src/MainWindow.vala:93
msgid "_Open"
msgstr ""
#: src/MainWindow.vala:166
#: src/MainWindow.vala:171
msgid "After composing all objects print the document."
msgstr ""
#: src/MainWindow.vala:248
#: src/MainWindow.vala:261
msgid "Document analized, select an object and set it's properties."
msgstr ""
#: src/MainWindow.vala:253
#: src/MainWindow.vala:266
msgid "Press 'Properties' button to compose the object."
msgstr ""
#: src/MainWindow.vala:262
#: src/MainWindow.vala:275
msgid "Prepare the document first! >;-]"
msgstr ""
#: src/MainWindow.vala:266
#: src/MainWindow.vala:279
msgid "Select destination"
msgstr ""
#: src/MainWindow.vala:269
#: src/MainWindow.vala:282
msgid "_Save"
msgstr ""
#: src/MainWindow.vala:305
#: src/MainWindow.vala:314
msgid "bytes of"
msgstr ""
#: src/MainWindow.vala:306
#: src/MainWindow.vala:315
msgid "bytes copied/saved"
msgstr ""
#: src/MainWindow.vala:309
#: src/MainWindow.vala:318
msgid "Save/Copy operation complete! :-)"
msgstr ""
#: src/main.vala:33
msgid "Show the application's version"
msgstr ""
#: src/main.vala:52
msgid "[FILE]"
msgstr ""
#: src/main.vala:64
#: src/main.vala:64 src/main.vala:83
#, c-format
msgid "Error: %s\n"
msgstr ""
#: src/main.vala:65
#: src/main.vala:84
#, c-format
msgid "Run '%s --help' to see a full list of available command line options.\n"
msgstr ""
@ -137,89 +129,81 @@ msgid "Common"
msgstr ""
#: ui/glade/laview-desktop.glade.h:10
msgid "Protocol Plugins"
msgid "Object plugins"
msgstr ""
#: ui/glade/laview-desktop.glade.h:11
msgid "Protocol plugins"
msgstr ""
#: ui/glade/laview-desktop.glade.h:12
msgid "Data Plugins"
msgstr ""
#: ui/glade/laview-desktop.glade.h:13
msgid "Data plugins"
msgstr ""
#: ui/glade/laview-desktop.glade.h:14
#: ui/glade/laview-desktop.glade.h:12
msgid "LAview Desktop"
msgstr ""
#: ui/glade/laview-desktop.glade.h:15
#: ui/glade/laview-desktop.glade.h:13
msgid "_Template"
msgstr ""
#: ui/glade/laview-desktop.glade.h:16
#: ui/glade/laview-desktop.glade.h:14
msgid "_Document"
msgstr ""
#: ui/glade/laview-desktop.glade.h:17
#: ui/glade/laview-desktop.glade.h:15
msgid "_Application"
msgstr ""
#: ui/glade/laview-desktop.glade.h:18
#: ui/glade/laview-desktop.glade.h:16
msgid "_Help"
msgstr ""
#: ui/glade/laview-desktop.glade.h:19
#: ui/glade/laview-desktop.glade.h:17
msgid "Create a new template"
msgstr ""
#: ui/glade/laview-desktop.glade.h:20
#: ui/glade/laview-desktop.glade.h:18
msgid "Open a template"
msgstr ""
#: ui/glade/laview-desktop.glade.h:21
#: ui/glade/laview-desktop.glade.h:19
msgid "Change selected template"
msgstr ""
#: ui/glade/laview-desktop.glade.h:22
#: ui/glade/laview-desktop.glade.h:20
msgid "Delete selected template"
msgstr ""
#: ui/glade/laview-desktop.glade.h:23
#: ui/glade/laview-desktop.glade.h:21
msgid "Document object preparing"
msgstr ""
#: ui/glade/laview-desktop.glade.h:24
#: ui/glade/laview-desktop.glade.h:22
msgid "View and print the document"
msgstr ""
#: ui/glade/laview-desktop.glade.h:25
#: ui/glade/laview-desktop.glade.h:23
msgid "Edit the result document"
msgstr ""
#: ui/glade/laview-desktop.glade.h:26
#: ui/glade/laview-desktop.glade.h:24
msgid "Save the document as..."
msgstr ""
#: ui/glade/laview-desktop.glade.h:27
#: ui/glade/laview-desktop.glade.h:25
msgid "Application preferences"
msgstr ""
#: ui/glade/laview-desktop.glade.h:28
#: ui/glade/laview-desktop.glade.h:26
msgid "Help and reference"
msgstr ""
#: ui/glade/laview-desktop.glade.h:29
#: ui/glade/laview-desktop.glade.h:27
msgid "Close the application"
msgstr ""
#: ui/glade/laview-desktop.glade.h:30
#: ui/glade/laview-desktop.glade.h:28
msgid "Templates"
msgstr ""
#: ui/glade/laview-desktop.glade.h:31
#: ui/glade/laview-desktop.glade.h:29
msgid "Document Objects"
msgstr ""

92
po/ru/laview-desktop.po

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: laview-desktop\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-01-27 04:50+0300\n"
"POT-Creation-Date: 2016-02-14 15:22+0300\n"
"PO-Revision-Date: 2015-10-24 20:19+0300\n"
"Last-Translator: <backbone@backbone.ws>\n"
"Language-Team: Russian\n"
@ -26,77 +26,69 @@ msgstr "Директория для сохранения pdf файлов (по
msgid "It is too lazy to select a directory each time..."
msgstr "Слишком лениво выбирать каждый раз директорию для сохранения..."
#: src/MainWindow.vala:58
#: src/MainWindow.vala:64
msgid "We're ready, Commander! Select or create a template. :-)"
msgstr "Мы готовы, Командир! Выберите или создайте шаблон. :-)"
#: src/MainWindow.vala:76 src/MainWindow.vala:120 src/MainWindow.vala:194
#: src/MainWindow.vala:212 src/MainWindow.vala:312
#: src/MainWindow.vala:82 src/MainWindow.vala:125 src/MainWindow.vala:199
#: src/MainWindow.vala:217 src/MainWindow.vala:255 src/MainWindow.vala:321
msgid "Error"
msgstr "Ошибка"
#: src/MainWindow.vala:84
#: src/MainWindow.vala:90
msgid "Select templates"
msgstr "Выберите шаблоны"
#: src/MainWindow.vala:86 src/MainWindow.vala:268
#: src/MainWindow.vala:92 src/MainWindow.vala:281
msgid "_Cancel"
msgstr "_Отмена"
#: src/MainWindow.vala:87
#: src/MainWindow.vala:93
msgid "_Open"
msgstr "_Открыть"
#: src/MainWindow.vala:166
#: src/MainWindow.vala:171
msgid "After composing all objects print the document."
msgstr "После компоновки всех объектов напечатайте документ."
#: src/MainWindow.vala:248
#: src/MainWindow.vala:261
msgid "Document analized, select an object and set it's properties."
msgstr "Документ проанализирован, выберите объект и установите его свойства."
#: src/MainWindow.vala:253
#: src/MainWindow.vala:266
msgid "Press 'Properties' button to compose the object."
msgstr "Нажмите кнопку 'Свойства' для компоновки объекта."
#: src/MainWindow.vala:262
#: src/MainWindow.vala:275
msgid "Prepare the document first! >;-]"
msgstr "Сначала подготовьте документ! >;-]"
#: src/MainWindow.vala:266
#: src/MainWindow.vala:279
msgid "Select destination"
msgstr "Выберите назначение"
#: src/MainWindow.vala:269
#: src/MainWindow.vala:282
msgid "_Save"
msgstr "_Сохранить"
#: src/MainWindow.vala:305
#: src/MainWindow.vala:314
msgid "bytes of"
msgstr "байт из"
#: src/MainWindow.vala:306
#: src/MainWindow.vala:315
msgid "bytes copied/saved"
msgstr "байт скопировано/сохранено"
#: src/MainWindow.vala:309
#: src/MainWindow.vala:318
msgid "Save/Copy operation complete! :-)"
msgstr "Операция сохранения/копирования завершена! :-)"
#: src/main.vala:33
msgid "Show the application's version"
msgstr "Показать версию приложения"
#: src/main.vala:52
msgid "[FILE]"
msgstr "[ФАЙЛ]"
#: src/main.vala:64
#: src/main.vala:64 src/main.vala:83
#, c-format
msgid "Error: %s\n"
msgstr "Ошибка: %s\n"
#: src/main.vala:65
#: src/main.vala:84
#, c-format
msgid "Run '%s --help' to see a full list of available command line options.\n"
msgstr "Запустите '%s --help', чтобы увидеть весь список доступных опций.\n"
@ -138,89 +130,81 @@ msgid "Common"
msgstr "Общие"
#: ui/glade/laview-desktop.glade.h:10
msgid "Protocol Plugins"
msgstr "Плагины протоколов"
msgid "Object plugins"
msgstr "Плагины объектов"
#: ui/glade/laview-desktop.glade.h:11
msgid "Protocol plugins"
msgstr "Плагины протоколов"
#: ui/glade/laview-desktop.glade.h:12
msgid "Data Plugins"
msgstr "Плагины данных"
#: ui/glade/laview-desktop.glade.h:13
msgid "Data plugins"
msgstr "Плагины данных"
#: ui/glade/laview-desktop.glade.h:14
#: ui/glade/laview-desktop.glade.h:12
msgid "LAview Desktop"
msgstr "Рабочее окно LAview"
#: ui/glade/laview-desktop.glade.h:15
#: ui/glade/laview-desktop.glade.h:13
msgid "_Template"
msgstr "_Шаблон"
#: ui/glade/laview-desktop.glade.h:16
#: ui/glade/laview-desktop.glade.h:14
msgid "_Document"
msgstr "_Документ"
#: ui/glade/laview-desktop.glade.h:17
#: ui/glade/laview-desktop.glade.h:15
msgid "_Application"
msgstr "_Приложение"
#: ui/glade/laview-desktop.glade.h:18
#: ui/glade/laview-desktop.glade.h:16
msgid "_Help"
msgstr "_Помощь"
#: ui/glade/laview-desktop.glade.h:19
#: ui/glade/laview-desktop.glade.h:17
msgid "Create a new template"
msgstr "Создать новый шаблон"
#: ui/glade/laview-desktop.glade.h:20
#: ui/glade/laview-desktop.glade.h:18
msgid "Open a template"
msgstr "Открыть шаблон"
#: ui/glade/laview-desktop.glade.h:21
#: ui/glade/laview-desktop.glade.h:19
msgid "Change selected template"
msgstr "Изменить выбранный шаблон"
#: ui/glade/laview-desktop.glade.h:22
#: ui/glade/laview-desktop.glade.h:20
msgid "Delete selected template"
msgstr "Удалить выбранный шаблон"
#: ui/glade/laview-desktop.glade.h:23
#: ui/glade/laview-desktop.glade.h:21
msgid "Document object preparing"
msgstr "Подготовка объекта документа"
#: ui/glade/laview-desktop.glade.h:24
#: ui/glade/laview-desktop.glade.h:22
msgid "View and print the document"
msgstr "Просмотр и печать документа"
#: ui/glade/laview-desktop.glade.h:25
#: ui/glade/laview-desktop.glade.h:23
msgid "Edit the result document"
msgstr "Редактировать полученный документ"
#: ui/glade/laview-desktop.glade.h:26
#: ui/glade/laview-desktop.glade.h:24
msgid "Save the document as..."
msgstr "Сохранить документ как..."
#: ui/glade/laview-desktop.glade.h:27
#: ui/glade/laview-desktop.glade.h:25
msgid "Application preferences"
msgstr "Параметры приложения"
#: ui/glade/laview-desktop.glade.h:28
#: ui/glade/laview-desktop.glade.h:26
msgid "Help and reference"
msgstr "Помощь и справка"
#: ui/glade/laview-desktop.glade.h:29
#: ui/glade/laview-desktop.glade.h:27
msgid "Close the application"
msgstr "Закрыть приложение"
#: ui/glade/laview-desktop.glade.h:30
#: ui/glade/laview-desktop.glade.h:28
msgid "Templates"
msgstr "Шаблоны"
#: ui/glade/laview-desktop.glade.h:31
#: ui/glade/laview-desktop.glade.h:29
msgid "Document Objects"
msgstr "Объекты документа"

38
src/MainWindow.vala

@ -161,16 +161,26 @@ namespace LAview.Desktop {
return indices;
}
[CCode (instance_pos = -1)]
public void action_compose_activate (Gtk.Action action) {
void compose_object () {
var t_indices = get_template_indices ();
var o_indices = get_objects_indices ();
if (t_indices.length != 0 && o_indices.length != 0) {
if (t_indices.length != 0 && o_indices.length != 0)
AppCore.core.compose_object (t_indices[0], o_indices[0]);
}
statusbar_show (_("After composing all objects print the document."));
}
[CCode (instance_pos = -1)]
public void action_compose_activate (Gtk.Action action) {
compose_object();
}
[CCode (instance_pos = -1)]
public void objects_activated (Gtk.TreeView treeview,
Gtk.TreePath path,
Gtk.TreeViewColumn column) {
compose_object();
}
[CCode (instance_pos = -1)]
public void action_edit_result_activate (Gtk.Action action) {
var indices = get_template_indices();
@ -242,12 +252,20 @@ namespace LAview.Desktop {
public void templates_cursor_changed (Gtk.TreeView treeview) {
var indices = get_template_indices ();
if (indices.length != 0) {
var doc_objects = AppCore.core.get_objects_list (indices[0]);
liststore_doc_objects.clear();
Gtk.TreeIter iter = Gtk.TreeIter();
foreach (var t in doc_objects) {
liststore_doc_objects.append (out iter);
liststore_doc_objects.set (iter, 0, t);
try {
var doc_objects = AppCore.core.get_objects_list (indices[0]);
liststore_doc_objects.clear();
Gtk.TreeIter iter = Gtk.TreeIter();
foreach (var t in doc_objects) {
liststore_doc_objects.append (out iter);
liststore_doc_objects.set (iter, 0, t);
}
} catch (Error err) {
var msg = new MessageDialog (window, DialogFlags.MODAL, MessageType.ERROR,
ButtonsType.CLOSE, _("Error")+@": $(err.message).");
msg.response.connect ((response_id) => { msg.destroy (); } );
msg.show ();
return;
}
}
statusbar_show (_("Document analized, select an object and set it's properties."));

16
src/PreferencesWindow.vala

@ -8,7 +8,7 @@ namespace LAview.Desktop {
public class PreferencesDialog {
Dialog dialog;
Gtk.ListStore liststore_data;
Gtk.ListStore liststore_protocols;
Gtk.ListStore liststore_objects;
FileChooserButton filechooserbutton_lyx;
FileChooserButton filechooserbutton_pdflatex;
@ -23,12 +23,12 @@ namespace LAview.Desktop {
//dialog.application = application;
dialog.delete_event.connect ((source) => {return true;});
liststore_data = builder.get_object ("liststore_data") as Gtk.ListStore;
liststore_protocols = builder.get_object ("liststore_protocols") as Gtk.ListStore;
liststore_objects = builder.get_object ("liststore_protocol_objects") as Gtk.ListStore;
filechooserbutton_lyx = builder.get_object ("filechooserbutton_lyx") as FileChooserButton;
filechooserbutton_pdflatex = builder.get_object ("filechooserbutton_pdflatex") as FileChooserButton;
fill_liststore_data ();
fill_liststore_protocols ();
fill_liststore_objects ();
filechooserbutton_lyx.set_filename (AppCore.core.lyx_path);
filechooserbutton_pdflatex.set_filename (AppCore.core.pdflatex_path);
@ -43,12 +43,12 @@ namespace LAview.Desktop {
}
}
void fill_liststore_protocols () {
liststore_protocols.clear();
void fill_liststore_objects () {
liststore_objects.clear();
TreeIter iter = TreeIter();
foreach (var p in AppCore.core.protocol_plugins.entries) {
liststore_protocols.append (out iter);
liststore_protocols.set (iter, 0, p.value.get_readable_name ());
foreach (var p in AppCore.core.object_plugins.entries) {
liststore_objects.append (out iter);
liststore_objects.set (iter, 0, p.value.get_readable_name ());
}
}

1
src/main.vala

@ -51,7 +51,6 @@ namespace LAview.Desktop {
}
~LAviewDesktopApp () {
print ("~LAviewDesktopApp()\n");
Resources.terminate ();
AppCore.terminate ();
AppDirs.terminate ();

61
ui/glade/laview-desktop.glade

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
<!-- Generated with glade 3.19.0 -->
<interface domain="laview-desktop-@MAJOR@">
<requires lib="gtk+" version="3.16"/>
<object class="GtkAboutDialog" id="aboutdialog_window">
@ -41,67 +41,79 @@
<object class="GtkActionGroup" id="actiongroup_main">
<child>
<object class="GtkAction" id="action_new">
<property name="icon_name">drive-optical</property>
<property name="stock_id">gtk-new</property>
<property name="always_show_image">True</property>
<signal name="activate" handler="laview_desktop_main_window_action_new_activate" swapped="no"/>
</object>
</child>
<child>
<object class="GtkAction" id="action_open">
<property name="stock_id">gtk-open</property>
<property name="always_show_image">True</property>
<signal name="activate" handler="laview_desktop_main_window_action_open_activate" swapped="no"/>
</object>
</child>
<child>
<object class="GtkAction" id="action_edit_template">
<property name="label" translatable="yes">_Template</property>
<property name="stock_id">gtk-edit</property>
<property name="always_show_image">True</property>
<signal name="activate" handler="laview_desktop_main_window_action_edit_template_activate" swapped="no"/>
</object>
</child>
<child>
<object class="GtkAction" id="action_delete">
<property name="stock_id">gtk-delete</property>
<property name="always_show_image">True</property>
<signal name="activate" handler="laview_desktop_main_window_action_delete_activate" swapped="no"/>
</object>
</child>
<child>
<object class="GtkAction" id="action_prepare">
<property name="stock_id">gtk-properties</property>
<property name="always_show_image">True</property>
<signal name="activate" handler="laview_desktop_main_window_action_compose_activate" swapped="no"/>
</object>
</child>
<child>
<object class="GtkAction" id="action_print">
<property name="stock_id">gtk-print</property>
<property name="always_show_image">True</property>
<signal name="activate" handler="laview_desktop_main_window_action_print_activate" swapped="no"/>
</object>
</child>
<child>
<object class="GtkAction" id="action_ref">
<property name="stock_id">gtk-help</property>
<property name="always_show_image">True</property>
<signal name="activate" handler="laview_desktop_main_window_action_ref_activate" swapped="no"/>
</object>
</child>
<child>
<object class="GtkAction" id="action_preferences">
<property name="stock_id">gtk-preferences</property>
<property name="always_show_image">True</property>
<signal name="activate" handler="laview_desktop_main_window_action_preferences_activate" swapped="no"/>
</object>
</child>
<child>
<object class="GtkAction" id="action_edit_result">
<property name="label" translatable="yes">_Document</property>
<property name="stock_id">gtk-edit</property>
<property name="always_show_image">True</property>
<signal name="activate" handler="laview_desktop_main_window_action_edit_result_activate" swapped="no"/>
</object>
</child>
<child>
<object class="GtkAction" id="action_saveas">
<property name="stock_id">gtk-save</property>
<property name="always_show_image">True</property>
<signal name="activate" handler="laview_desktop_main_window_action_saveas_activate" swapped="no"/>
</object>
</child>
<child>
<object class="GtkAction" id="action_quit">
<property name="stock_id">gtk-quit</property>
<property name="always_show_image">True</property>
<signal name="activate" handler="laview_desktop_main_window_action_quit_activate" swapped="no"/>
</object>
@ -125,7 +137,7 @@
<column type="gchararray"/>
</columns>
</object>
<object class="GtkListStore" id="liststore_protocols">
<object class="GtkListStore" id="liststore_protocol_objects">
<columns>
<!-- column-name name -->
<column type="gchararray"/>
@ -275,16 +287,16 @@
<property name="can_focus">True</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="treeview_protocols">
<object class="GtkTreeView" id="treeview_protocol_objects">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="model">liststore_protocols</property>
<property name="model">liststore_protocol_objects</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection5"/>
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn3">
<property name="title" translatable="yes">Protocol Plugins</property>
<property name="title" translatable="yes">Object plugins</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertext2"/>
<attributes>
@ -311,7 +323,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Protocol plugins</property>
<property name="label" translatable="yes">Object plugins</property>
</object>
<packing>
<property name="position">1</property>
@ -338,7 +350,7 @@
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn4">
<property name="title" translatable="yes">Data Plugins</property>
<property name="title" translatable="yes">Data plugins</property>
<child>
<object class="GtkCellRendererText" id="cellrenderertext3"/>
<attributes>
@ -425,6 +437,7 @@
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="always_show_image">True</property>
<accelerator key="n" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object>
</child>
<child>
@ -437,6 +450,7 @@
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="always_show_image">True</property>
<accelerator key="o" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object>
</child>
<child>
@ -449,6 +463,7 @@
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="always_show_image">True</property>
<accelerator key="e" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object>
</child>
<child>
@ -461,6 +476,7 @@
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="always_show_image">True</property>
<accelerator key="Delete" signal="activate"/>
</object>
</child>
<child>
@ -480,6 +496,7 @@
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="always_show_image">True</property>
<accelerator key="q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object>
</child>
</object>
@ -508,6 +525,7 @@
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="always_show_image">True</property>
<accelerator key="r" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object>
</child>
<child>
@ -520,6 +538,7 @@
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="always_show_image">True</property>
<accelerator key="p" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object>
</child>
<child>
@ -544,6 +563,7 @@
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="always_show_image">True</property>
<accelerator key="s" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object>
</child>
</object>
@ -598,6 +618,8 @@
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="always_show_image">True</property>
<accelerator key="F1" signal="activate"/>
<accelerator key="h" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object>
</child>
<child>
@ -630,7 +652,7 @@
<property name="toolbar_style">both</property>
<child>
<object class="GtkToolButton" id="toolbutton_new">
<property name="use_action_appearance">False</property>
<property name="use_action_appearance">True</property>
<property name="related_action">action_new</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@ -645,7 +667,7 @@
</child>
<child>
<object class="GtkToolButton" id="toolbutton_open">
<property name="use_action_appearance">False</property>
<property name="use_action_appearance">True</property>
<property name="related_action">action_open</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@ -660,7 +682,7 @@
</child>
<child>
<object class="GtkToolButton" id="toolbutton_edit_template">
<property name="use_action_appearance">False</property>
<property name="use_action_appearance">True</property>
<property name="related_action">action_edit_template</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@ -676,7 +698,7 @@
</child>
<child>
<object class="GtkToolButton" id="toolbutton_delete">
<property name="use_action_appearance">False</property>
<property name="use_action_appearance">True</property>
<property name="related_action">action_delete</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@ -701,7 +723,7 @@
</child>
<child>
<object class="GtkToolButton" id="toolbutton_prepare">
<property name="use_action_appearance">False</property>
<property name="use_action_appearance">True</property>
<property name="related_action">action_prepare</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@ -716,7 +738,7 @@
</child>
<child>
<object class="GtkToolButton" id="toolbutton_print">
<property name="use_action_appearance">False</property>
<property name="use_action_appearance">True</property>
<property name="related_action">action_print</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@ -731,7 +753,7 @@
</child>
<child>
<object class="GtkToolButton" id="toolbutton_edit_result">
<property name="use_action_appearance">False</property>
<property name="use_action_appearance">True</property>
<property name="related_action">action_edit_result</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@ -747,7 +769,7 @@
</child>
<child>
<object class="GtkToolButton" id="toolbutton_saveas">
<property name="use_action_appearance">False</property>
<property name="use_action_appearance">True</property>
<property name="related_action">action_saveas</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@ -772,7 +794,7 @@
</child>
<child>
<object class="GtkToolButton" id="toolbutton_preferences">
<property name="use_action_appearance">False</property>
<property name="use_action_appearance">True</property>
<property name="related_action">action_preferences</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@ -787,7 +809,7 @@
</child>
<child>
<object class="GtkToolButton" id="toolbutton_ref">
<property name="use_action_appearance">False</property>
<property name="use_action_appearance">True</property>
<property name="related_action">action_ref</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@ -812,7 +834,7 @@
</child>
<child>
<object class="GtkToolButton" id="toolbutton_quit">
<property name="use_action_appearance">False</property>
<property name="use_action_appearance">True</property>
<property name="related_action">action_quit</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
@ -988,6 +1010,7 @@
<property name="can_focus">True</property>
<property name="model">liststore_objects</property>
<signal name="cursor-changed" handler="laview_desktop_main_window_objects_cursor_changed" swapped="no"/>
<signal name="row-activated" handler="laview_desktop_main_window_objects_activated" swapped="no"/>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection_objects"/>
</child>

Loading…
Cancel
Save