Nemcio/DemonEditor
1
0
Fork 0
mirror of https://github.com/DYefremov/DemonEditor.git synced 2026-06-20 19:31:10 +02:00
Code Issues Packages Projects Releases Activity

picon tab refactoring

Browse Source
This commit is contained in:
DYefremov
2024-12-01 16:02:42 +03:00
parent 25fba17b9c
commit 4867b1b648
2 changed files with 23 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
app/ui/picons.glade
View File

@@ -347,7 +347,7 @@ Author: Dmitriy Yefremov
</child>
<child>
<object class="GtkCheckButton" id="info_check_button">
<property name="visible">True</property>
<property name="visible" bind-source="filter_button" bind-property="visible">True</property>
<property name="can-focus">False</property>
<property name="receives-default">False</property>
<property name="tooltip-text" translatable="yes">Details</property>
@@ -413,12 +413,13 @@ Author: Dmitriy Yefremov
</child>
<child>
<object class="GtkBox" id="header_download_box">
<property name="visible">True</property>
<property name="visible" bind-source="cancel_button" bind-property="visible" bind-flags="invert-boolean">True</property>
<property name="visible" bind-source="convert_button" bind-property="visible" bind-flags="invert-boolean">True</property>
<property name="can-focus">False</property>
<property name="spacing">5</property>
<child>
<object class="GtkMenuButton" id="add_menu_button">
<property name="visible">True</property>
<property name="visible" bind-source="manager_button" bind-property="active">True</property>
<property name="can-focus">True</property>
<property name="focus-on-click">False</property>
<property name="receives-default">True</property>
@@ -440,6 +441,7 @@ Author: Dmitriy Yefremov
</child>
<child>
<object class="GtkButton" id="receive_button">
<property name="visible" bind-source="download_source_button" bind-property="visible">False</property>
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="receives-default">False</property>
@@ -462,7 +464,7 @@ Author: Dmitriy Yefremov
</child>
<child>
<object class="GtkButton" id="remove_button">
<property name="visible">True</property>
<property name="visible" bind-source="filter_button" bind-property="visible">True</property>
<property name="can-focus">False</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Remove all picons from the receiver</property>
@@ -490,7 +492,7 @@ Author: Dmitriy Yefremov
</child>
<child>
<object class="GtkToggleButton" id="src_button">
<property name="visible">True</property>
<property name="visible" bind-source="filter_button" bind-property="visible">True</property>
<property name="can-focus">False</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes">Additional source</property>
@@ -529,6 +531,7 @@ Author: Dmitriy Yefremov
<property name="spacing">5</property>
<child>
<object class="GtkBox" id="filter_bar">
<property name="visible" bind-source="filter_button" bind-property="active">False</property>
<property name="can-focus">False</property>
<property name="margin-top">5</property>
<property name="spacing">5</property>
@@ -591,6 +594,7 @@ Author: Dmitriy Yefremov
<property name="wide-handle">True</property>
<child>
<object class="GtkFrame" id="src_picon_box_frame">
<property name="visible" bind-source="src_button" bind-property="active">False</property>
<property name="can-focus">False</property>
<property name="label-xalign">0.49000000953674316</property>
<property name="shadow-type">none</property>
@@ -606,6 +610,7 @@ Author: Dmitriy Yefremov
<property name="can-focus">False</property>
<child>
<object class="GtkCheckButton" id="src_filter_button">
<property name="visible" bind-source="filter_button" bind-property="active">False</property>
<property name="label" translatable="yes">Filter</property>
<property name="can-focus">False</property>
<property name="focus-on-click">False</property>
@@ -740,6 +745,7 @@ Author: Dmitriy Yefremov
<property name="can-focus">False</property>
<child>
<object class="GtkCheckButton" id="dst_filter_button">
<property name="visible" bind-source="filter_button" bind-property="active">False</property>
<property name="label" translatable="yes">Filter</property>
<property name="can-focus">False</property>
<property name="focus-on-click">False</property>
@@ -849,6 +855,7 @@ Author: Dmitriy Yefremov
</child>
<child type="label">
<object class="GtkLabel" id="explorer_dst_label">
<property name="visible" bind-source="src_button" bind-property="active">False</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Destination:</property>
</object>
@@ -868,6 +875,7 @@ Author: Dmitriy Yefremov
</child>
<child>
<object class="GtkFrame" id="explorer_info_box_frame">
<property name="visible" bind-source="info_check_button" bind-property="active">False</property>
<property name="can-focus">False</property>
<property name="label-xalign">0</property>
<property name="shadow-type">in</property>
@@ -952,7 +960,7 @@ Author: Dmitriy Yefremov
<property name="margin-bottom">5</property>
<child>
<object class="GtkComboBoxText" id="download_source_button">
<property name="sensitive">False</property>
<property name="sensitive" bind-source="satellite_label" bind-property="visible">False</property>
<property name="can-focus">False</property>
<property name="tooltip-text" translatable="yes">Source:</property>
<property name="active">0</property>
@@ -1026,7 +1034,7 @@ Author: Dmitriy Yefremov
</child>
<child>
<object class="GtkLabel" id="loading_data_label">
<property name="visible">True</property>
<property name="visible" bind-source="satellite_label" bind-property="visible" bind-flags="invert-boolean">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Loading data...</property>
<property name="ellipsize">end</property>
@@ -1039,10 +1047,10 @@ Author: Dmitriy Yefremov
</child>
<child>
<object class="GtkSpinner" id="loading_data_spinner">
<property name="visible">True</property>
<property name="visible" bind-source="satellite_label" bind-property="visible" bind-flags="invert-boolean">True</property>
<property name="active" bind-source="satellite_label" bind-property="visible" bind-flags="invert-boolean">True</property>
<property name="can-focus">False</property>
<property name="margin-right">5</property>
<property name="active">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1057,6 +1065,7 @@ Author: Dmitriy Yefremov
<property name="can-focus">False</property>
<property name="margin-right">5</property>
<property name="column-spacing">5</property>
<property name="tooltip-text" translatable="yes">Filter by current satellite positions</property>
<child>
<object class="GtkLabel" id="satellite_filter_label">
<property name="visible">True</property>
@@ -1072,7 +1081,6 @@ Author: Dmitriy Yefremov
<object class="GtkSwitch" id="satellite_filter_switch">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="active">True</property>
<signal name="state-set" handler="on_satellite_filter_toggled" swapped="no"/>
</object>
<packing>
@@ -1103,6 +1111,7 @@ Author: Dmitriy Yefremov
<child>
<object class="GtkTreeView" id="satellites_view">
<property name="visible">True</property>
<property name="sensitive" bind-source="satellite_label" bind-property="visible">False</property>
<property name="can-focus">True</property>
<property name="model">satellites_list_store</property>
<property name="headers-visible">False</property>
@@ -1807,7 +1816,7 @@ Author: Dmitriy Yefremov
<property name="margin-bottom">2</property>
<child>
<object class="GtkLabel" id="manager_label">
<property name="visible">True</property>
<property name="visible" bind-source="manager_button" bind-property="active">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Picons manager</property>
<attributes>
@@ -1822,6 +1831,7 @@ Author: Dmitriy Yefremov
</child>
<child>
<object class="GtkLabel" id="downloader_label">
<property name="visible" bind-source="downloader_button" bind-property="active">False</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Picons download tool</property>
<attributes>
@@ -1836,8 +1846,9 @@ Author: Dmitriy Yefremov
</child>
<child>
<object class="GtkLabel" id="converter_label">
<property name="visible" bind-source="converter_button" bind-property="active">False</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Converter between name formats</property>
<property name="label" translatable="yes">Converter between formats</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>

20
app/ui/picons.py
View File

@@ -153,13 +153,6 @@ class PiconManager(Gtk.Box):
self._bouquet_filter_switch = builder.get_object("bouquet_filter_switch")
self._providers_header_box = builder.get_object("providers_header_box")
self._header_download_box = builder.get_object("header_download_box")
self._satellite_label.bind_property("visible", builder.get_object("loading_data_label"), "visible", 4)
self._satellite_label.bind_property("visible", builder.get_object("loading_data_spinner"), "visible", 4)
self._satellite_label.bind_property("visible", self._download_source_button, "sensitive")
self._satellite_label.bind_property("visible", self._satellites_view, "sensitive")
self._cancel_button.bind_property("visible", self._header_download_box, "visible", 4)
self._convert_button.bind_property("visible", self._header_download_box, "visible", 4)
self._download_source_button.bind_property("visible", self._receive_button, "visible")
# Info.
self._dst_count_label = builder.get_object("dst_count_label")
self._info_check_button = builder.get_object("info_check_button")
@@ -169,24 +162,11 @@ class PiconManager(Gtk.Box):
self._filter_bar = builder.get_object("filter_bar")
self._auto_filter_switch = builder.get_object("auto_filter_switch")
self._filter_button = builder.get_object("filter_button")
self._filter_button.bind_property("active", self._filter_bar, "visible")
self._filter_button.bind_property("active", self._src_filter_button, "visible")
self._filter_button.bind_property("active", self._dst_filter_button, "visible")
self._filter_button.bind_property("visible", self._info_check_button, "visible")
self._filter_button.bind_property("visible", self._remove_button, "visible")
self._src_button = builder.get_object("src_button")
self._src_button.bind_property("active", builder.get_object("explorer_dst_label"), "visible")
self._src_button.bind_property("active", builder.get_object("src_picon_box_frame"), "visible")
self._filter_button.bind_property("visible", self._src_button, "visible")
self._info_check_button.bind_property("active", builder.get_object("explorer_info_box_frame"), "visible")
# Header buttons. -> Used instead stack switcher.
self._manager_button = builder.get_object("manager_button")
self._manager_button.bind_property("active", builder.get_object("manager_label"), "visible")
self._downloader_button = builder.get_object("downloader_button")
self._downloader_button.bind_property("active", builder.get_object("downloader_label"), "visible")
self._converter_button = builder.get_object("converter_button")
self._converter_button.bind_property("active", builder.get_object("converter_label"), "visible")
self._manager_button.bind_property("active", builder.get_object("add_menu_button"), "visible")
# Init drag-and-drop
self.init_drag_and_drop()
# Rendering.