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

some minor fixes

Browse Source
This commit is contained in:
DYefremov
2021-03-06 14:32:33 +03:00
parent 5f79b27daa
commit 653ef1422f
9 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/connections.py
View File

@@ -712,7 +712,7 @@ def test_http(host, port, user, password, timeout=5, use_ssl=False, skip_message
try:
return get_response(HttpAPI.Request.TEST, "{}/web/{}".format(base_url, params), data).get("e2statetext", "")
except (RemoteDisconnected, URLError, HTTPError) as e:
except (URLError, HTTPError) as e:
raise TestException(e)

4
app/tools/media.py
View File

@@ -53,7 +53,7 @@ class Player:
self._player.set_property("uri", mrl)
log("Setting the URL for playback: : {}".format(mrl))
log("Setting the URL for playback: {}".format(mrl))
ret = self._player.set_state(self.STATE.PLAYING)
if ret == self.STAT_RETURN.FAILURE:
@@ -79,7 +79,7 @@ class Player:
self.__INSTANCE = None
def set_xwindow(self, xid):
self._player.set_xwindow(xid)
self._player.set_window_handle(xid)
def set_handle(self, widget):
""" Used on Windows to set window pointer.

12
app/ui/control.py
View File

@@ -6,6 +6,7 @@ from urllib.parse import quote
from gi.repository import GLib
from app.settings import IS_WIN
from .dialogs import get_dialogs_string, show_dialog, DialogType, get_message
from .uicommons import Gtk, Gdk, UI_RESOURCES_PATH, Column
from ..commons import run_task, run_with_delay, log, run_idle
@@ -313,18 +314,17 @@ class ControlBox(Gtk.HBox):
img = data.get("img_data", None)
if img:
is_darwin = self._settings.is_darwin
GLib.idle_add(self._screenshot_button_box.set_sensitive, is_darwin)
path = os.path.expanduser("~/Desktop") if is_darwin else None
GLib.idle_add(self._screenshot_button_box.set_sensitive, IS_WIN)
path = os.path.expanduser("~/Desktop") if IS_WIN else None
try:
import tempfile
import subprocess
with tempfile.NamedTemporaryFile(mode="wb", suffix=".jpg", dir=path, delete=not is_darwin) as tf:
with tempfile.NamedTemporaryFile(mode="wb", suffix=".jpg", dir=path, delete=not IS_WIN) as tf:
tf.write(img)
cmd = ["open" if is_darwin else "xdg-open", tf.name]
subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
f_name = tf.name
subprocess.Popen([f_name], stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True).communicate()
finally:
GLib.idle_add(self._screenshot_button_box.set_sensitive, True)

10
app/ui/main_app_window.py
View File

@@ -261,7 +261,7 @@ class Application(Gtk.Application):
self._radio_count_label = builder.get_object("radio_count_label")
self._data_count_label = builder.get_object("data_count_label")
self._signal_level_bar.bind_property("visible", builder.get_object("play_current_service_button"), "visible")
self._signal_level_bar.bind_property("visible", builder.get_object("record_button"), "visible")
# self._signal_level_bar.bind_property("visible", builder.get_object("record_button"), "visible")
self._receiver_info_box.bind_property("visible", self._http_status_image, "visible", 4)
self._receiver_info_box.bind_property("visible", self._signal_box, "visible")
# Alternatives
@@ -2453,16 +2453,15 @@ class Application(Gtk.Application):
def on_player_previous(self, item):
if self._fav_view.do_move_cursor(self._fav_view, Gtk.MovementStep.DISPLAY_LINES, -1):
self._fav_view.set_sensitive(False)
self.set_player_action()
def on_player_next(self, item):
if self._fav_view.do_move_cursor(self._fav_view, Gtk.MovementStep.DISPLAY_LINES, 1):
self._fav_view.set_sensitive(False)
self.set_player_action()
@run_with_delay(1)
def set_player_action(self):
self._fav_view.set_sensitive(False)
if self._fav_click_mode is FavClickMode.PLAY:
self.on_stream()
elif self._fav_click_mode is FavClickMode.ZAP_PLAY:
@@ -2529,7 +2528,7 @@ class Application(Gtk.Application):
error_cb=self.on_player_error,
playing_cb=self.set_playback_elms_active)
except (ImportError, NameError, AttributeError):
self.show_error_dialog("No VLC is found. Check that it is installed!")
self.show_error_dialog("No GStreamer is found. Check that it is installed!")
return True
else:
if IS_WIN:
@@ -2540,6 +2539,7 @@ class Application(Gtk.Application):
finally:
if self._settings.play_streams_mode is PlayStreamsMode.BUILT_IN:
self.set_player_area_size(widget)
self._fav_view.do_grab_focus(self._fav_view)
@run_idle
def set_player_area_size(self, widget):
@@ -2699,7 +2699,7 @@ class Application(Gtk.Application):
""" Switch to the channel and watch in the player """
if not self._app_info_box.get_visible() and self._settings.play_streams_mode is PlayStreamsMode.BUILT_IN:
self.set_player_area_size(self._player_box)
self._player_box.set_visible(True)
GLib.idle_add(self._player_box.set_visible, True)
GLib.idle_add(self._app_info_box.set_visible, False)
self._http_api.send(HttpAPI.Request.STREAM_CURRENT, None, self.watch)

15
app/ui/main_window.glade
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.19.0
<!-- Generated with glade 3.22.2
The MIT License (MIT)
@@ -30,8 +30,8 @@ Author: Dmitriy Yefremov
<requires lib="gtk+" version="3.16"/>
<!-- interface-license-type mit -->
<!-- interface-name DemonEditor -->
<!-- interface-description Enigma2 channel and satellites list editor for macOS. -->
<!-- interface-copyright 2018-2020 Dmitriy Yefremov -->
<!-- interface-description Enigma2 channel and satellites list editor for MS Windows. -->
<!-- interface-copyright 2018-2021 Dmitriy Yefremov -->
<!-- interface-authors Dmitriy Yefremov -->
<object class="GtkListStore" id="alt_list_store">
<columns>
@@ -1017,9 +1017,9 @@ Author: Dmitriy Yefremov
<object class="GtkComboBoxText" id="profile_combo_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="focus_on_click">False</property>
<property name="tooltip_text" translatable="yes">Profile</property>
<property name="active">0</property>
<property name="focus_on_click">False</property>
<signal name="changed" handler="on_profile_changed" swapped="no"/>
</object>
<packing>
@@ -1520,11 +1520,11 @@ Author: Dmitriy Yefremov
<object class="GtkButton" id="play_current_service_button">
<property name="width_request">28</property>
<property name="can_focus">False</property>
<property name="focus_on_click">False</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Play</property>
<property name="halign">center</property>
<property name="valign">center</property>
<property name="focus_on_click">False</property>
<signal name="clicked" handler="on_watch" swapped="no"/>
<child>
<object class="GtkImage" id="play_current_service_image">
@@ -1602,6 +1602,8 @@ Author: Dmitriy Yefremov
<property name="spacing">1</property>
<child>
<object class="GtkDrawingArea" id="player_drawing_area">
<property name="width_request">320</property>
<property name="height_request">240</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<signal name="button-press-event" handler="on_player_press" swapped="no"/>
@@ -2978,9 +2980,10 @@ Author: Dmitriy Yefremov
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">label</property>
<property name="ellipsize">end</property>
</object>
<packing>
<property name="expand">False</property>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>

4
app/ui/satellites_dialog.glade
View File

@@ -1490,7 +1490,6 @@ Author: Dmitriy Yefremov
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Cancel</property>
<property name="valign">center</property>
<property name="image">sat_update_cancel_image</property>
<property name="always_show_image">True</property>
<signal name="clicked" handler="on_cancel_receive" swapped="no"/>
@@ -1566,13 +1565,11 @@ Author: Dmitriy Yefremov
<object class="GtkButtonBox" id="satellites_update_right_action_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="layout_style">expand</property>
<child>
<object class="GtkComboBox" id="source_combo_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="model">update_source_store</property>
<property name="active">0</property>
<child>
@@ -1595,7 +1592,6 @@ Author: Dmitriy Yefremov
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Update</property>
<property name="valign">center</property>
<property name="image">sat_update_image</property>
<property name="always_show_image">True</property>
<signal name="clicked" handler="on_update_satellites_list" swapped="no"/>

2
app/ui/service_details_dialog.glade
View File

@@ -1568,7 +1568,7 @@ Author: Dmitriy Yefremov
</child>
<child>
<object class="GtkImage" id="tr_edit_switch_image">
<property name="visible">True</property>
<property name="visible">False</property>
<property name="can_focus">False</property>
<property name="margin_left">10</property>
<property name="icon_name">document-edit-symbolic</property>

2
app/ui/settings_dialog.py
View File

@@ -716,7 +716,6 @@ class SettingsDialog:
log("Unpacking end.")
finally:
self.update_theme_button(button, dst)
self._appearance_box.set_sensitive(True)
@run_idle
def update_theme_button(self, button, dst):
@@ -729,6 +728,7 @@ class SettingsDialog:
button.append(theme, theme)
button.set_active_id(theme)
self.show_info_message("Done!", Gtk.MessageType.INFO)
self._appearance_box.set_sensitive(True)
@run_idle
def remove_theme(self, button, path):

2
start.py
View File

@@ -1,5 +1,7 @@
#!/usr/bin/env python3
if __name__ == "__main__":
from multiprocessing import freeze_support
from app.ui.main_app_window import start_app
freeze_support()
start_app()