Changeset 27682c

Timestamp:

07/09/2014 05:52:40 PM (11 years ago)

Author:

Calum Lind <calumlind+deluge@gmail.com>

Branches:

2.0.x, develop, master

Children:

5eba76

Parents:

67873f

git-author:

Calum Lind <calumlind+deluge@gmail.com> (07/09/2014 05:52:26 PM)

git-committer:

Calum Lind <calumlind+deluge@gmail.com> (07/09/2014 05:52:40 PM)

Message:

#2464 [GTKUI] Fix unable add trackers in createtorrentdialog

Location:

deluge/ui/gtkui

Files:

• createtorrentdialog.py (modified) (1 diff)
• glade/edit_trackers.add.ui (modified) (4 diffs)
• glade/edit_trackers.edit.ui (modified) (5 diffs)

deluge/ui/gtkui/createtorrentdialog.py

@@ -434 +434 @@
         builder = gtk.Builder()
         builder.add_from_file(deluge.common.resource_filename(
-            "deluge.ui.gtkui", os.path.join("glade", "edit_trackers.ui")
+            "deluge.ui.gtkui", os.path.join("glade", "edit_trackers.add.ui")
         ))
         dialog = builder.get_object("add_tracker_dialog")

deluge/ui/gtkui/glade/edit_trackers.add.ui

@@ -12 +12 @@
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
-    <property name="decorated">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox5">
@@ -26 +25 @@
               <object class="GtkButton" id="button_add_cancel">
                 <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
                 <signal name="clicked" handler="on_button_add_cancel_clicked" swapped="no"/>
@@ -42 +41 @@
               <object class="GtkButton" id="button_add_ok">
                 <property name="label">gtk-ok</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -47 +47 @@
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
                 <signal name="clicked" handler="on_button_add_ok_clicked" swapped="no"/>

deluge/ui/gtkui/glade/edit_trackers.edit.ui

@@ -11 +11 @@
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
-    <property name="decorated">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox7">
@@ -25 +24 @@
               <object class="GtkButton" id="button_add_cancel1">
                 <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
                 <signal name="clicked" handler="on_button_edit_cancel_clicked" swapped="no"/>
@@ -41 +40 @@
               <object class="GtkButton" id="button_add_ok1">
                 <property name="label">gtk-ok</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -46 +46 @@
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
                 <signal name="clicked" handler="on_button_edit_ok_clicked" swapped="no"/>
@@ -141 +140 @@
                     <property name="can_focus">True</property>
                     <property name="invisible_char">•</property>
+                    <property name="activates_default">True</property>
                     <property name="truncate_multiline">True</property>
-                    <property name="activates_default">True</property>
                     <property name="invisible_char_set">True</property>
                     <property name="primary_icon_activatable">False</property>