diff --git a/app/ui/dialogs.glade b/app/ui/dialogs.glade index b05d25d0..61ed8db6 100644 --- a/app/ui/dialogs.glade +++ b/app/ui/dialogs.glade @@ -656,109 +656,241 @@ dmitry.v.yefremov@gmail.com False False - 0 + 6 - + True - False - 1 - True + True + + True + False + 2 + True + + + True + False + Host: + + + 0 + 0 + + + + + True + True + 127.0.0.1 + + + 0 + 1 + + + + + True + False + Login: + + + 0 + 2 + + + + + True + False + Password: + + + 1 + 2 + + + + + True + True + 21 + + + 1 + 1 + + + + + True + False + Port: + + + 1 + 0 + + + + + True + True + root + avatar-default-symbolic + False + + + 0 + 3 + + + + + True + True + False + ● + root + emblem-readonly + False + password + + + 1 + 3 + + + + + True False - Host: + FTP - 0 - 0 + False - - True - True - 127.0.0.1 - - - 0 - 1 - - - - + True + False False - Login: + 2 + True + + + True + False + Port: + + + 0 + 0 + + + + + True + True + emblem-readonly + + + 1 + 3 + + + + + True + True + avatar-default-symbolic + + + 0 + 3 + + + + + True + False + Loggin: + + + 0 + 2 + + + + + True + False + Password: + + + 1 + 2 + + + + + True + True + 23 + + + 0 + 1 + + + + + True + False + Timeout: + + + 1 + 0 + + + + + True + True + + + 1 + 1 + + - 0 - 2 + 1 - - - True - False - Password: - - - 1 - 2 - - - - - True - True - 21 - - - 1 - 1 - - - + True False - Port: + Telnet - 1 - 0 + 1 + False - - True - True - root - avatar-default-symbolic - False - - - 0 - 3 - + - - - True - True - False - ● - root - emblem-readonly - False - password - - - 1 - 3 - + + @@ -794,6 +926,7 @@ dmitry.v.yefremov@gmail.com True False Services and Bouquets files: + 0.10000000149011612 0 @@ -816,6 +949,7 @@ dmitry.v.yefremov@gmail.com True False User bouquet files: + 0.10000000149011612 0 @@ -838,6 +972,7 @@ dmitry.v.yefremov@gmail.com True False Satellites.xml file: + 0.10000000149011612 0 @@ -855,6 +990,30 @@ dmitry.v.yefremov@gmail.com 5 + + + True + False + Picons directory: + 0.10000000149011612 + + + 0 + 6 + + + + + True + False + True + /usr/share/enigma2/picon + + + 0 + 7 + + True @@ -973,23 +1132,24 @@ dmitry.v.yefremov@gmail.com 3 + + + True + False + Data directory: + 0 + + + False + True + 4 + + True False True - - - True - False - Data directory: - 0 - - - 0 - 0 - - True @@ -1003,7 +1163,7 @@ dmitry.v.yefremov@gmail.com 0 - 1 + 0 diff --git a/app/ui/main_app_window.py b/app/ui/main_app_window.py index a637a5f3..c80462f9 100644 --- a/app/ui/main_app_window.py +++ b/app/ui/main_app_window.py @@ -8,6 +8,7 @@ from app.eparser import get_services, get_bouquets, write_bouquets, write_servic from app.eparser.ecommons import CAS, FLAG from app.eparser.enigma.bouquets import BqServiceType from app.properties import get_config, write_config, Profile +from .picons_dialog import PiconsDialog from . import Gtk, Gdk, UI_RESOURCES_PATH, LOCKED_ICON, HIDE_ICON from .dialogs import show_dialog, DialogType from .download_dialog import show_download_dialog @@ -88,7 +89,8 @@ class MainAppWindow: "on_insert_marker": self.on_insert_marker, "on_edit_marker": self.on_edit_marker, "on_fav_popup": self.on_fav_popup, - "on_locate_in_services": self.on_locate_in_services} + "on_locate_in_services": self.on_locate_in_services, + "on_picons_loader_show": self.on_picons_loader_show} self.__options = get_config() self.__profile = self.__options.get("profile") @@ -102,6 +104,7 @@ class MainAppWindow: builder = Gtk.Builder() builder.add_from_file(UI_RESOURCES_PATH + "main_window.glade") + builder.connect_signals(handlers) self.__main_window = builder.get_object("main_window") main_window_size = self.__options.get("window_size", None) # Setting the last size of the window if it was saved @@ -126,7 +129,9 @@ class MainAppWindow: self.__radio_count_label = builder.get_object("radio_count_label") self.__data_count_label = builder.get_object("data_count_label") self.__fav_edit_marker_popup_item = builder.get_object("fav_edit_marker_popup_item") - builder.connect_signals(handlers) + # Adding custom image for tools menu button + add_menu_tool_button = builder.get_object("toolbar_tools_menu_button") + add_menu_tool_button.set_image(builder.get_object("tools_menu_butoon_image")) self.init_drag_and_drop() # drag and drop self.__main_window.show() @@ -799,6 +804,10 @@ class MainAppWindow: def on_locate_in_services(self, view): locate_in_services(view, self.__services_view, self.__main_window) + def on_picons_loader_show(self, item): + dialog = PiconsDialog(self.__main_window, self.__options.get(self.__profile).get("data_dir_path")) + dialog.show() + def start_app(): MainAppWindow() diff --git a/app/ui/main_window.glade b/app/ui/main_window.glade index 18f5ff95..7c7954c3 100644 --- a/app/ui/main_window.glade +++ b/app/ui/main_window.glade @@ -80,10 +80,15 @@ False emblem-downloads + + True + False + emblem-shared + True False - applications-utilities + emblem-shared True @@ -219,6 +224,40 @@ + + True + False + emblem-photos + + + True + False + emblem-photos + + + True + False + + + Satellites editor + True + False + image10 + False + + + + + + Picons loader + True + False + image9 + False + + + + True False @@ -411,6 +450,17 @@ + + + Picons loader + True + False + True + image8 + False + + + True @@ -812,18 +862,25 @@ - + True False - Satellites editor - Tools - True - applications-utilities - + + + True + True + True + tools_popup_menu + none + + + + + False - True + False @@ -1798,4 +1855,10 @@ + + True + False + applications-utilities + 3 + diff --git a/app/ui/picons_dialog.glade b/app/ui/picons_dialog.glade new file mode 100644 index 00000000..30d75df0 --- /dev/null +++ b/app/ui/picons_dialog.glade @@ -0,0 +1,155 @@ + + + + + + True + False + gtk-goto-bottom + + + False + Picons download tool + False + True + emblem-photos + dialog + + + 320 + False + 2 + 2 + vertical + 2 + + + False + 2 + 2 + True + spread + + + gtk-cancel + True + True + True + True + True + + + True + True + 0 + + + + + True + True + 0 + + + + + True + False + vertical + 2 + + + True + False + Url: + 0.019999999552965164 + + + False + True + 0 + + + + + True + True + gtk-edit + url + + + False + True + 1 + + + + + True + False + Data directory: + 0.019999999552965164 + + + False + True + 2 + + + + + True + True + emblem-photos + + + False + True + 3 + + + + + True + False + 2 + + + False + True + 4 + + + + + Recive + True + True + True + recive_image + True + True + + + + False + False + 5 + + + + + True + True + 1 + + + + + + cancel_button + + + diff --git a/app/ui/picons_dialog.py b/app/ui/picons_dialog.py new file mode 100644 index 00000000..b24188e0 --- /dev/null +++ b/app/ui/picons_dialog.py @@ -0,0 +1,20 @@ +from . import Gtk, Gdk, UI_RESOURCES_PATH + + +class PiconsDialog: + def __init__(self, transient, path): + handlers = {} + + builder = Gtk.Builder() + builder.add_objects_from_file(UI_RESOURCES_PATH + "picons_dialog.glade", ("picons_dialog", "recive_image")) + builder.connect_signals(handlers) + self._dialog = builder.get_object("picons_dialog") + self._dialog.set_transient_for(transient) + + def show(self): + self._dialog.run() + self._dialog.destroy() + + +if __name__ == "__main__": + pass