Skip to content

Commit

Permalink
redesigned info output for sat update dialog
Browse files Browse the repository at this point in the history
  • Loading branch information
@DYefremov
DYefremov committed Oct 26, 2021
1 parent de5ec53 commit 791c073
Show file tree
Hide file tree
Showing 2 changed files with 84 additions and 58 deletions.
125 changes: 75 additions & 50 deletions app/ui/satellites.glade
View file
Expand Up @@ -292,24 +292,12 @@ Author: Dmitriy Yefremov
<property name="icon_name">window-close-symbolic</property>
<property name="icon_size">1</property>
</object>
<object class="GtkImage" id="sat_update_filter_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">edit-find-replace-symbolic</property>
<property name="icon_size">1</property>
</object>
<object class="GtkImage" id="sat_update_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">emblem-synchronizing-symbolic</property>
<property name="icon_size">1</property>
</object>
<object class="GtkImage" id="sat_update_search_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">edit-find-symbolic</property>
<property name="icon_size">1</property>
</object>
<object class="GtkListStore" id="satellite_view_model">
<columns>
<!-- column-name name -->
Expand Down Expand Up @@ -1413,9 +1401,7 @@ Author: Dmitriy Yefremov
<object class="GtkBox" id="satellites_update_main_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_bottom">2</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property>
<child>
<object class="GtkBox" id="sat_update_header">
<property name="visible">True</property>
Expand Down Expand Up @@ -1518,14 +1504,20 @@ Author: Dmitriy Yefremov
<property name="layout_style">expand</property>
<child>
<object class="GtkToggleButton" id="sat_update_filter_button">
<property name="label" translatable="yes">Filter</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Filter</property>
<property name="image">sat_update_filter_image</property>
<property name="always_show_image">True</property>
<signal name="toggled" handler="on_filter_toggled" swapped="no"/>
<child>
<object class="GtkImage" id="sat_update_filter_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">edit-find-replace-symbolic</property>
<property name="icon_size">1</property>
</object>
</child>
<accelerator key="f" signal="clicked" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
</object>
<packing>
Expand All @@ -1536,14 +1528,20 @@ Author: Dmitriy Yefremov
</child>
<child>
<object class="GtkToggleButton" id="sat_update_find_button">
<property name="label" translatable="yes">Search</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Find</property>
<property name="image">sat_update_search_image</property>
<property name="always_show_image">True</property>
<signal name="toggled" handler="on_find_toggled" swapped="no"/>
<child>
<object class="GtkImage" id="sat_update_search_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">edit-find-symbolic</property>
<property name="icon_size">1</property>
</object>
</child>
<accelerator key="f" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
</object>
<packing>
Expand Down Expand Up @@ -1584,6 +1582,8 @@ Author: Dmitriy Yefremov
<object class="GtkBox" id="search_bar_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">2</property>
<property name="margin_bottom">2</property>
<child>
<object class="GtkSearchEntry" id="sat_update_search_entry">
<property name="width_request">200</property>
Expand Down Expand Up @@ -1658,6 +1658,7 @@ Author: Dmitriy Yefremov
<object class="GtkGrid" id="source_header_grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">2</property>
<property name="margin_bottom">2</property>
<property name="column_spacing">2</property>
<child>
Expand Down Expand Up @@ -1779,6 +1780,8 @@ Author: Dmitriy Yefremov
<property name="can_focus">True</property>
<property name="margin_left">5</property>
<property name="margin_right">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="wide_handle">True</property>
<child>
<object class="GtkFrame" id="sat_update_frame">
Expand Down Expand Up @@ -2099,42 +2102,70 @@ Author: Dmitriy Yefremov
</packing>
</child>
<child>
<object class="GtkExpander" id="sat_update_expander">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="margin_left">1</property>
<property name="margin_right">1</property>
<property name="margin_top">2</property>
<property name="margin_bottom">2</property>
<object class="GtkFrame" id="log_frame">
<property name="can_focus">False</property>
<property name="margin_left">4</property>
<property name="margin_right">5</property>
<property name="margin_bottom">5</property>
<property name="label_xalign">0</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkScrolledWindow" id="text_view_scrolled_window">
<property name="height_request">120</property>
<object class="GtkInfoBar" id="log_info_bar">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTextView" id="text_view">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">False</property>
<property name="left_margin">5</property>
<property name="right_margin">5</property>
<property name="can_focus">False</property>
<property name="message_type">other</property>
<property name="show_close_button">True</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="log_info_bar_button_box">
<property name="can_focus">False</property>
<property name="spacing">6</property>
<property name="layout_style">end</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child internal-child="content_area">
<object class="GtkBox" id="log_info_bar_box">
<property name="can_focus">False</property>
<child>
<object class="GtkScrolledWindow" id="text_view_scrolled_window">
<property name="height_request">120</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTextView" id="text_view">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">False</property>
<property name="left_margin">5</property>
<property name="right_margin">5</property>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="Extra:">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Extra:</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">5</property>
<property name="position">4</property>
</packing>
</child>
<child>
Expand All @@ -2148,9 +2179,6 @@ Author: Dmitriy Yefremov
<property name="can_focus">False</property>
<property name="spacing">6</property>
<property name="layout_style">end</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
Expand Down Expand Up @@ -2181,9 +2209,6 @@ Author: Dmitriy Yefremov
<property name="position">0</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
Expand Down
17 changes: 9 additions & 8 deletions app/ui/satellites.py
View file
Expand Up @@ -435,8 +435,7 @@ def __init__(self, transient, settings, title=None):
"update_sat_list_model_filter", "update_sat_list_model_sort", "side_store",
"pos_adjustment", "pos_adjustment2", "satellites_update_popup_menu",
"remove_selection_image", "sat_update_cancel_image", "sat_receive_image",
"sat_update_filter_image", "sat_update_search_image", "sat_update_image",
"update_transponder_store", "update_service_store"))
"sat_update_image", "update_transponder_store", "update_service_store"))

self._window = builder.get_object("satellites_update_window")
self._window.set_transient_for(transient)
Expand All @@ -448,7 +447,6 @@ def __init__(self, transient, settings, title=None):
self._transponder_view = builder.get_object("sat_update_tr_view")
self._service_view = builder.get_object("sat_update_srv_view")
self._source_box = builder.get_object("source_combo_box")
self._sat_update_expander = builder.get_object("sat_update_expander")
self._text_view = builder.get_object("text_view")
self._receive_button = builder.get_object("receive_data_button")
self._sat_update_info_bar = builder.get_object("sat_update_info_bar")
Expand All @@ -470,7 +468,10 @@ def __init__(self, transient, settings, title=None):
self._filter_model.set_visible_func(self.filter_function)
self._filter_positions = (0, 0)
self._filter_bar.bind_property("search-mode-enabled", self._filter_bar, "visible")
# Search
# Log.
self._log_frame = builder.get_object("log_frame")
builder.get_object("log_info_bar").connect("response", lambda b, r: self._log_frame.set_visible(False))
# Search.
self._search_bar = builder.get_object("sat_update_search_bar")
self._search_bar.bind_property("search-mode-enabled", self._search_bar, "visible")
search_provider = SearchProvider(self._sat_view,
Expand Down Expand Up @@ -541,8 +542,8 @@ def on_receive_data(self, item):
return

@run_idle
def update_expander(self):
self._sat_update_expander.set_expanded(True)
def update_log_visibility(self):
self._log_frame.set_visible(True)
self._text_view.get_buffer().set_text("", 0)

def append_output(self):
Expand Down Expand Up @@ -652,7 +653,7 @@ def on_receive_data(self, item):
@run_task
def receive_satellites(self):
self.is_download = True
self.update_expander()
self.update_log_visibility()
model = self._sat_view.get_model()
start = time.time()

Expand Down Expand Up @@ -744,7 +745,7 @@ def on_receive_data(self, item):
@run_task
def receive_services(self):
self.is_download = True
self.update_expander()
self.update_log_visibility()
model = self._sat_view.get_model()
appender = self.append_output()
next(appender)
Expand Down

0 comments on commit 791c073

Please sign in to comment.