Nemcio/DemonEditor
1
0
Fork 0
mirror of https://github.com/DYefremov/DemonEditor.git synced 2026-01-22 23:43:16 +01:00
Code Issues Packages Projects Releases Activity

ui changes for the service dialog

Browse Source
This commit is contained in:
Dmitriy Yefremov
2018-03-25 10:46:30 +03:00
parent 9e0d8840f3
commit 24023d438d
8 changed files with 142 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/ui/dialogs.glade
View File

@@ -780,7 +780,7 @@ dmitry.v.yefremov@gmail.com
<object class="GtkLabel" id="iptv_type_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Stream type</property>
<property name="label" translatable="yes">Type</property>
</object>
<packing>
<property name="left_attach">2</property>

BIN
app/ui/lang/ru/LC_MESSAGES/demon-editor.mo
View File

Binary file not shown.

1
app/ui/main_window.glade
View File

@@ -392,7 +392,6 @@
<child>
<object class="GtkImageMenuItem" id="services_add_new_popup_item">
<property name="label">gtk-new</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>

241
app/ui/service_details_dialog.glade
View File

@@ -446,8 +446,8 @@
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="editable">False</property>
<property name="width_chars">14</property>
<property name="max_width_chars">14</property>
<property name="width_chars">8</property>
<property name="max_width_chars">10</property>
</object>
<packing>
<property name="left_attach">4</property>
@@ -849,7 +849,7 @@
</packing>
</child>
<child>
<object class="GtkGrid" id="ref_grid">
<object class="GtkGrid" id="caids_grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="column_spacing">2</property>
@@ -1100,75 +1100,13 @@
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label21">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">System</property>
</object>
<packing>
<property name="left_attach">5</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="sys_combo_box">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="model">sys_list_store</property>
<property name="id_column">0</property>
<signal name="changed" handler="on_system_changed" swapped="no"/>
<child>
<object class="GtkCellRendererText" id="sys_cellrenderertext"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
<packing>
<property name="left_attach">5</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label22">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Mod</property>
</object>
<packing>
<property name="left_attach">6</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="mod_combo_box">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="opacity">0.98999999999999999</property>
<property name="model">mod_list_store</property>
<property name="id_column">0</property>
<child>
<object class="GtkCellRendererText" id="mod_cellrenderertext"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
<packing>
<property name="left_attach">6</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="namespace_entry">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="width_chars">14</property>
<property name="max_width_chars">14</property>
<property name="width_chars">12</property>
<property name="max_width_chars">12</property>
<property name="primary_icon_stock">gtk-edit</property>
<signal name="changed" handler="on_non_empty_entry_changed" swapped="no"/>
</object>
@@ -1203,6 +1141,58 @@
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">TID</property>
</object>
<packing>
<property name="left_attach">5</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="transponder_id_entry">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="width_chars">8</property>
<property name="max_width_chars">10</property>
<property name="primary_icon_stock">gtk-edit</property>
<signal name="changed" handler="on_non_empty_entry_changed" swapped="no"/>
</object>
<packing>
<property name="left_attach">5</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">NID</property>
</object>
<packing>
<property name="left_attach">6</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="network_id_entry">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="width_chars">8</property>
<property name="max_width_chars">10</property>
<property name="primary_icon_stock">gtk-edit</property>
<signal name="changed" handler="on_non_empty_entry_changed" swapped="no"/>
</object>
<packing>
<property name="left_attach">6</property>
<property name="top_attach">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
@@ -1219,58 +1209,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="column_spacing">2</property>
<child>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">TID</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="transponder_id_entry">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="width_chars">8</property>
<property name="max_width_chars">10</property>
<property name="primary_icon_stock">gtk-edit</property>
<signal name="changed" handler="on_non_empty_entry_changed" swapped="no"/>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">NID</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="network_id_entry">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="width_chars">8</property>
<property name="max_width_chars">10</property>
<property name="primary_icon_stock">gtk-edit</property>
<signal name="changed" handler="on_non_empty_entry_changed" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label25">
<property name="visible">True</property>
@@ -1409,7 +1347,7 @@
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="width_chars">8</property>
<property name="max_width_chars">9</property>
<property name="max_width_chars">10</property>
<property name="primary_icon_stock">gtk-edit</property>
<signal name="changed" handler="on_digit_entry_changed" swapped="no"/>
</object>
@@ -1470,6 +1408,69 @@
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label21">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">System</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="sys_combo_box">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="model">sys_list_store</property>
<property name="id_column">0</property>
<signal name="changed" handler="on_system_changed" swapped="no"/>
<child>
<object class="GtkCellRendererText" id="sys_cellrenderertext"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label22">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Mod</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="mod_combo_box">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="model">mod_list_store</property>
<property name="id_column">0</property>
<child>
<object class="GtkCellRendererText" id="mod_cellrenderertext"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
</packing>
</child>
</object>
</child>
<child type="label">

4
app/ui/service_details_dialog.py
View File

@@ -154,7 +154,6 @@ class ServiceDetailsDialog:
self._sys_combo_box.set_active(0)
self._invertion_combo_box.set_active(2)
@run_idle
def update_data_elements(self):
model, paths = self._services_view.get_selection().get_selected_rows()
itr = model.get_iter(paths)
@@ -274,12 +273,11 @@ class ServiceDetailsDialog:
self._builder.get_object("flags_box").set_visible(False)
self._builder.get_object("pids_grid").set_visible(False)
self._builder.get_object("tr_grid").remove_column(7)
self._builder.get_object("extra_transponder_grid").remove_column(8)
self._builder.get_object("tr_extra_expander").set_visible(False)
self._builder.get_object("srv_separator").set_visible(False)
# ***************** Init Sat positions *********************#
@run_idle
def set_sat_positions(self, sat_pos):
""" Sat positions initialisation """
self._sat_pos_button.set_value(float(sat_pos))

BIN
deb/usr/share/locale/ru/LC_MESSAGES/demon-editor.mo
View File

Binary file not shown.

BIN
po/ru/demon-editor.mo
View File

Binary file not shown.

92
po/ru/demon-editor.po
View File

@@ -43,294 +43,222 @@ msgstr "№"
msgid "Current IP:"
msgstr "Текущий IP:"
#: main_window.glade:261
msgid "Assign"
msgstr "Привязать"
#: main_window.glade:1826
msgid "Bouquet details"
msgstr "Сервисы букета"
#: main_window.glade:2021
msgid "Bouquets"
msgstr "Букеты"
#: main_window.glade:916
msgid "Copy"
msgstr "Копировать"
#: main_window.glade:287 main_window.glade:416
msgid "Copy reference"
msgstr "Копировать ссылку"
#: main_window.glade:1777
msgid "Data"
msgstr ""
#: main_window.glade:744
msgid "Download"
msgstr "Загрузить"
#: main_window.glade:1014
msgid "Edit"
msgstr "Изменить"
#: main_window.glade:1015
msgid "Edit "
msgstr "Изменить"
#: main_window.glade:213
msgid "Edit mаrker text"
msgstr "Изменить текст маркера"
#: main_window.glade:543 main_window.glade:743
msgid "FTP-transfer"
msgstr "Передача установок по FTP"
#: main_window.glade:808
msgid "Global search"
msgstr "Глобальный поиск"
#: main_window.glade:973
msgid "Hide"
msgstr "Пропустить"
#: main_window.glade:972
msgid "Hide/Skip On/Off Ctrl + H"
msgstr "Скрыть/Пропустить Вкл/Выкл Ctrl + H"
#: main_window.glade:1113
msgid "IPTV"
msgstr ""
#: main_window.glade:231
msgid "Import m3u"
msgstr "Импортировать m3u"
#: main_window.glade:1111
msgid "Import m3u file"
msgstr "Импортировать файл m3u"
#: main_window.glade:201
msgid "Insert marker"
msgstr "Вставить маркер"
#: main_window.glade:184
msgid "Locate in services"
msgstr "Найти в списке сервисов"
#: main_window.glade:957
msgid "Locked"
msgstr "Заблокирован"
#: main_window.glade:834
msgid "Move"
msgstr "Переместить"
#: main_window.glade:999
msgid "New"
msgstr "Новый"
#: main_window.glade:998
msgid "New bouquet"
msgstr "Новый букет"
#: main_window.glade:718 main_window.glade:719
msgid "Open"
msgstr "Открыть"
#: main_window.glade:956
msgid "Parent lock On/Off Ctrl + L"
msgstr "Родительский замок Вкл/Выкл Ctrl + L"
#: main_window.glade:931
msgid "Paste"
msgstr ""
#: main_window.glade:1095
msgid "Picons"
msgstr "Пиконы"
#: main_window.glade:650 main_window.glade:1096
msgid "Picons loader"
msgstr "Загрузчик пиконов"
#: main_window.glade:1055
msgid "Preferences"
msgstr "Настройки"
#: main_window.glade:2195
msgid "Profile:"
msgstr "Профиль:"
#: main_window.glade:1751
msgid "Radio"
msgstr ""
#: main_window.glade:271 main_window.glade:1030
msgid "Remove"
msgstr "Удалить"
#: main_window.glade:640 main_window.glade:1079 main_window.glade:1080
msgid "Satellites editor"
msgstr "Редактор спутников"
#: main_window.glade:768 main_window.glade:769
msgid "Save"
msgstr "Сохранить"
#: main_window.glade:809
msgid "Search"
msgstr "Поиск"
#: main_window.glade:1269
msgid "Services"
msgstr "Сервисы"
#: main_window.glade:793 main_window.glade:794
msgid "Services filter"
msgstr "Фильтр сервисов"
#: main_window.glade:1054
msgid "Settings"
msgstr "Настройки"
#: main_window.glade:1725
msgid "TV"
msgstr ""
#: main_window.glade:859 main_window.glade:860
msgid "Up"
msgstr "Переместить вверх"
msgid "Down"
msgstr "Переместить вниз"
#: dialogs.glade:1101
msgid "Active profile:"
msgstr "Активный профиль:"
#: dialogs.glade:175
msgid "All"
msgstr "Все"
#: dialogs.glade:595
msgid "Are you sure?"
msgstr "Вы уверены?"
#: dialogs.glade:127
msgid "Current data path:"
msgstr "Текущий путь к данным:"
#: dialogs.glade:1192
msgid "Data dir:"
msgstr "Путь к данным:"
#: dialogs.glade:164
msgid "Data:"
msgstr "Данные:"
#: dialogs.glade:16
msgid "Enigma2 channel and satellites list editor for GNU/Linux"
msgstr "Редактор списка каналов и спутников Enigma2\n для GNU/Linux"
#: dialogs.glade:814
msgid "FTP"
msgstr ""
#: dialogs.glade:712
msgid "Host:"
msgstr "Адрес ресивера:"
#: dialogs.glade:1328
msgid "Loading data..."
msgstr "Загрузка данных..."
#: dialogs.glade:735 dialogs.glade:863
msgid "Login:"
msgstr "Логин:"
#: dialogs.glade:625
msgid "Options"
msgstr "Настройки"
#: dialogs.glade:746 dialogs.glade:874
msgid "Password:"
msgstr "Пароль:"
#: dialogs.glade:1235
msgid "Picons dir:"
msgstr "Директория пиконов:"
#: dialogs.glade:1050
msgid "Picons:"
msgstr "Пиконы:"
#: dialogs.glade:769 dialogs.glade:830
msgid "Port:"
msgstr "Порт:"
#: dialogs.glade:94 dialogs.glade:256
msgid "Receive"
msgstr "Получить"
#: dialogs.glade:254
msgid "Receive files from receiver"
msgstr "Получить файлы из ресивера"
#: dialogs.glade:100
msgid "Receiver IP:"
msgstr "IP адрес ресивера:"
#: dialogs.glade:297
msgid "Remove unused bouquets"
msgstr "Удалить не испрльзуемые букеты"
#: dialogs.glade:1148
msgid "Reset profile"
msgstr "Сброс профиля"
#: dialogs.glade:208
msgid "Satellites"
msgstr "Спутники"
#: dialogs.glade:1026
msgid "Satellites.xml file:"
msgstr "Файл satellites.xml:"
#: dialogs.glade:1215 dialogs.glade:1216
msgid "Select"
msgstr ""
#: dialogs.glade:271
msgid "Send"
msgstr "Отправить"
#: dialogs.glade:269
msgid "Send files to receiver"
msgstr "Отправить вайлы в ресивер"
msgstr "Отправить файлы в ресивер"
#: dialogs.glade:978
msgid "Services and Bouquets files:"
msgstr "Файлы сервисов и букетов:"
#: dialogs.glade:932
msgid "Telnet"
msgstr ""
#: dialogs.glade:908
msgid "Timeout between commands in seconds"
msgstr "Пауза между коммандами в сек."
#: dialogs.glade:897
msgid "Timeout:"
msgstr "Тайм-аут:"
#: dialogs.glade:1002
msgid "User bouquet files:"
msgstr "Файлы букетов:"
#: dialogs.glade:224
msgid "WebTV"
msgstr ""
@@ -433,6 +361,24 @@ msgstr "Данные транспондера"
msgid "Changes will be applied to all services of this transponder!\nContinue?"
msgstr "Изменения будут применены ко всем сервисам данного транспондера!\nПродолжить?"
msgid "Reference"
msgstr "Ссылка"
msgid "Namespace"
msgstr "Пр. имен"
msgid "Flags:"
msgstr "Флаги:"
msgid "Delays (ms):"
msgstr "Задержки (mc)"
msgid "Bitstream"
msgstr "Поток"
msgid "Description"
msgstr "Описание"
# Dialogs messages
msgid "Error. No bouquet is selected!"
msgstr "Ошибка. Не выбран букет!"