← Back to branch summary

~ubuntu-branches/ubuntu/wily/blueman/wily

« back to all changes in this revision

Viewing changes to data/ui/assistant.ui

  • Committer: Package Import Robot
  • Author(s): Sean Davis
  • Date: 2015-09-07 12:48:18 UTC
  • mfrom: (2.3.11 sid)
  • Revision ID: package-import@ubuntu.com-20150907124818-evulc0mhjotz8q29
Tags: 2.0-1ubuntu1
https://launchpad.net/bugs/1482626
* Merge from Debian unstable (LP: #1482626). Remaining changes:
  - debian/patches/03_filemanage_fix.patch:
    + Dropped, no longer needed.
  - debian/patches/dhcpclient_priority
  - debian/patches/01_dont_autostart_lxde.patch
    + Refreshed patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
data/ui/assistant.ui
79
79
              </packing>
80
80
            </child>
81
81
            <child>
82
 
              <object class="GtkBox" id="hbox2">
83
 
                <property name="orientation">horizontal</property>
84
 
                <property name="visible">True</property>
85
 
                <property name="spacing">4</property>
86
 
                <child>
87
 
                  <object class="GtkRadioButton" id="r_myp">
88
 
                    <property name="label" translatable="yes">Use Custom Passkey:</property>
89
 
                    <property name="visible">True</property>
90
 
                    <property name="can_focus">True</property>
91
 
                    <property name="receives_default">False</property>
92
 
                    <property name="draw_indicator">True</property>
93
 
                    <property name="group">r_randp</property>
94
 
                  </object>
95
 
                  <packing>
96
 
                    <property name="expand">False</property>
97
 
                    <property name="position">0</property>
98
 
                  </packing>
99
 
                </child>
100
 
                <child>
101
 
                  <object class="GtkEntry" id="e_myp">
102
 
                    <property name="visible">True</property>
103
 
                    <property name="can_focus">True</property>
104
 
                    <property name="width_chars">16</property>
105
 
                  </object>
106
 
                  <packing>
107
 
                    <property name="expand">False</property>
108
 
                    <property name="position">1</property>
109
 
                  </packing>
110
 
                </child>
111
 
              </object>
112
 
              <packing>
113
 
                <property name="position">2</property>
114
 
              </packing>
115
 
            </child>
116
 
            <child>
117
82
              <object class="GtkRadioButton" id="r_dontp">
118
83
                <property name="label" translatable="yes">Proceed Without Pairing</property>
119
84
                <property name="visible">True</property>