Deluge
diff options
| author | Calum Lind <calumlind@gmail.com> | 2018-11-07 15:49:28 +0000 |
|---|---|---|
| committer | Calum Lind <calumlind@gmail.com> | 2018-11-07 15:52:26 +0000 |
| commit | 841cb889aae8ebbf73168d99d34764486f57b919 (patch) | |
| tree | 2bad26368e3d066deb9b26b561931cef5377b70a | |
| parent | 6b2f14e51ea503fcff5c0544a5d24be21b5740f4 (diff) | |
| download | deluge-841cb889aae8ebbf73168d99d34764486f57b919.tar.gz deluge-841cb889aae8ebbf73168d99d34764486f57b919.tar.bz2 deluge-841cb889aae8ebbf73168d99d34764486f57b919.zip | |
[Execute] Fix Glade layout and Py3 bytes issue
| -rw-r--r-- | deluge/plugins/Execute/deluge/plugins/execute/core.py | 2 | ||||
| -rw-r--r-- | deluge/plugins/Execute/deluge/plugins/execute/data/execute_prefs.ui | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/deluge/plugins/Execute/deluge/plugins/execute/core.py b/deluge/plugins/Execute/deluge/plugins/execute/core.py index c7824e5f0..9dcd97aaa 100644 --- a/deluge/plugins/Execute/deluge/plugins/execute/core.py +++ b/deluge/plugins/Execute/deluge/plugins/execute/core.py @@ -154,7 +154,7 @@ class Core(CorePluginBase): # Exported RPC methods # @export def add_command(self, event, command): - command_id = hashlib.sha1(str(time.time())).hexdigest() + command_id = hashlib.sha1(str(time.time()).encode()).hexdigest() self.config['commands'].append((command_id, event, command)) self.config.save() component.get('EventManager').emit( diff --git a/deluge/plugins/Execute/deluge/plugins/execute/data/execute_prefs.ui b/deluge/plugins/Execute/deluge/plugins/execute/data/execute_prefs.ui index fc02a54a8..e2a5cd507 100644 --- a/deluge/plugins/Execute/deluge/plugins/execute/data/execute_prefs.ui +++ b/deluge/plugins/Execute/deluge/plugins/execute/data/execute_prefs.ui @@ -30,6 +30,7 @@ <property name="can_focus">False</property> <property name="top_padding">5</property> <property name="left_padding">12</property> + <property name="right_padding">10</property> <child> <object class="GtkTable" id="add_table"> <property name="visible">True</property> @@ -85,6 +86,7 @@ <object class="GtkComboBox" id="event_combobox"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="model">liststore1</property> <child> <object class="GtkCellRendererText" id="cellrenderertext1"/> @@ -103,6 +105,7 @@ <object class="GtkHButtonBox" id="hbuttonbox1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">center</property> <property name="layout_style">end</property> <child> <object class="GtkButton" id="button_add"> @@ -164,6 +167,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="halign">start</property> <property name="orientation">vertical</property> <child> <placeholder/> |