← Back to branch summary

~ubuntu-branches/ubuntu/utopic/network-manager-applet/utopic-proposed

« back to all changes in this revision

Viewing changes to src/connection-editor/ce-page-general.ui

  • Committer: Package Import Robot
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2012-11-19 14:46:29 UTC
  • mfrom: (1.2.31)
  • Revision ID: package-import@ubuntu.com-20121119144629-5423hii02a4vrh2n
Tags: 0.9.6.2+git201211052130.2d666bc-0ubuntu1
* upstream snapshot 2012-11-05 21:30:03 (GMT)
  + 2d666bc7aa6f0b731d131319b36f07b0f2bdce16
* debian/patches/git_fix_some_leaks_80ef61b.patch,
  debian/patches/git_indicate_hspa+_lte_tech_dbe3b12.patch,
  debian/patches/git_mac_addr_string_leakage_6dae878.patch: dropped, included
  in upstream tarball.
* debian/patches/lp328572-dxteam-connect-text.patch: refreshed.
* debian/patches/lp330571_dxteam_wired_connect_text.patch: refreshed.
* debian/patches/lp337960_dxteam_notification_icon_names.diff,
  debian/patches/lp337960_dxteam_notification_icon_names_part2-images.diff:
  disabled patches, they don't seem to be used (the icons don't match up with
  what is currently observable on the desktop). Let's see if someone screams.
* debian/patches/applet-wifi-menu-before-vpn.patch: refreshed.
* debian/patches/lp830178_adhoc_ip6_ignore.patch: refreshed.
* debian/patches/lp829673_gconf_hide_applet.patch: refreshed.
* debian/patches/nm-applet-use-indicator.patch: refreshed.
* debian/patches/hide_policy_items_env_var.patch: refreshed.
* debian/patches/applet_adhoc_use_wpa_rsn_part1.patch: refreshed.
* debian/patches/lp341684_device_sensitive_disconnect_notify.patch:
  refreshed.
* debian/patches/lp460144_correctly_update_notification.patch: refreshed.
* debian/patches/make_menu_items_insensitive_based_on_permissions.patch:
  refreshed.
* debian/control:
  - add gobject-introspection to Build-Depends.
  - add gudev-dev to Build-Depends.
  - bump network-manager and libnm-* Build-Depends and Depends to require
    at least 0.9.6.0+git201211131441.e9e2c56-0ubuntu1.
* debian/rules:
  - use autogen.sh with dh_autoreconf instead of calling intltoolize and
    gtkdocize manually.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/connection-editor/ce-page-general.ui
 
1
<?xml version="1.0" encoding="UTF-8"?>
 
2
<interface>
 
3
  <requires lib="gtk+" version="2.16"/>
 
4
  <object class="GtkListStore" id="dependent_vpn_model">
 
5
    <columns>
 
6
      <!-- column-name gchararray -->
 
7
      <column type="gchararray"/>
 
8
      <!-- column-name gchararray1 -->
 
9
      <column type="gchararray"/>
 
10
    </columns>
 
11
  </object>
 
12
  <object class="GtkTable" id="GeneralPage">
 
13
    <property name="visible">True</property>
 
14
    <property name="can_focus">False</property>
 
15
    <property name="border_width">12</property>
 
16
    <property name="n_rows">5</property>
 
17
    <property name="n_columns">2</property>
 
18
    <property name="column_spacing">12</property>
 
19
    <property name="row_spacing">6</property>
 
20
    <child>
 
21
      <object class="GtkVBox" id="vbox1">
 
22
        <property name="visible">True</property>
 
23
        <property name="can_focus">False</property>
 
24
        <child>
 
25
          <object class="GtkCheckButton" id="connection_autoconnect">
 
26
            <property name="label" translatable="yes">_Automatically connect to this network when it is available</property>
 
27
            <property name="visible">True</property>
 
28
            <property name="can_focus">True</property>
 
29
            <property name="receives_default">False</property>
 
30
            <property name="use_underline">True</property>
 
31
            <property name="xalign">0</property>
 
32
            <property name="active">True</property>
 
33
            <property name="draw_indicator">True</property>
 
34
          </object>
 
35
          <packing>
 
36
            <property name="expand">False</property>
 
37
            <property name="fill">False</property>
 
38
            <property name="position">0</property>
 
39
          </packing>
 
40
        </child>
 
41
        <child>
 
42
          <object class="GtkCheckButton" id="system_checkbutton">
 
43
            <property name="label" translatable="yes">All _users may connect to this network</property>
 
44
            <property name="visible">True</property>
 
45
            <property name="can_focus">True</property>
 
46
            <property name="receives_default">False</property>
 
47
            <property name="use_underline">True</property>
 
48
            <property name="xalign">0</property>
 
49
            <property name="draw_indicator">True</property>
 
50
          </object>
 
51
          <packing>
 
52
            <property name="expand">False</property>
 
53
            <property name="fill">False</property>
 
54
            <property name="position">1</property>
 
55
          </packing>
 
56
        </child>
 
57
      </object>
 
58
      <packing>
 
59
        <property name="right_attach">2</property>
 
60
        <property name="y_options"/>
 
61
      </packing>
 
62
    </child>
 
63
    <child>
 
64
      <object class="GtkLabel" id="firewall_zone_label">
 
65
        <property name="visible">True</property>
 
66
        <property name="can_focus">False</property>
 
67
        <property name="xalign">0</property>
 
68
        <property name="label" translatable="yes">Firewall _zone:</property>
 
69
        <property name="use_underline">True</property>
 
70
      </object>
 
71
      <packing>
 
72
        <property name="top_attach">4</property>
 
73
        <property name="bottom_attach">5</property>
 
74
        <property name="x_options">GTK_FILL</property>
 
75
        <property name="y_options"/>
 
76
        <property name="y_padding">12</property>
 
77
      </packing>
 
78
    </child>
 
79
    <child>
 
80
      <object class="GtkAlignment" id="firewall_zone_alignment">
 
81
        <property name="visible">True</property>
 
82
        <property name="can_focus">True</property>
 
83
      </object>
 
84
      <packing>
 
85
        <property name="left_attach">1</property>
 
86
        <property name="right_attach">2</property>
 
87
        <property name="top_attach">4</property>
 
88
        <property name="bottom_attach">5</property>
 
89
        <property name="x_options">GTK_FILL</property>
 
90
        <property name="y_options"/>
 
91
      </packing>
 
92
    </child>
 
93
    <child>
 
94
      <object class="GtkCheckButton" id="dependent_vpn_checkbox">
 
95
        <property name="label" translatable="yes">Automatically connect to _VPN when using this connection</property>
 
96
        <property name="visible">True</property>
 
97
        <property name="can_focus">True</property>
 
98
        <property name="receives_default">False</property>
 
99
        <property name="use_underline">True</property>
 
100
        <property name="xalign">0</property>
 
101
        <property name="draw_indicator">True</property>
 
102
      </object>
 
103
      <packing>
 
104
        <property name="right_attach">2</property>
 
105
        <property name="top_attach">2</property>
 
106
        <property name="bottom_attach">3</property>
 
107
        <property name="x_options">GTK_FILL</property>
 
108
        <property name="y_options"/>
 
109
      </packing>
 
110
    </child>
 
111
    <child>
 
112
      <object class="GtkComboBox" id="dependent_vpn_combo">
 
113
        <property name="visible">True</property>
 
114
        <property name="can_focus">False</property>
 
115
        <property name="margin_left">26</property>
 
116
        <property name="model">dependent_vpn_model</property>
 
117
        <child>
 
118
          <object class="GtkCellRendererText" id="renderer1"/>
 
119
          <attributes>
 
120
            <attribute name="text">0</attribute>
 
121
          </attributes>
 
122
        </child>
 
123
      </object>
 
124
      <packing>
 
125
        <property name="right_attach">2</property>
 
126
        <property name="top_attach">3</property>
 
127
        <property name="bottom_attach">4</property>
 
128
        <property name="y_options"/>
 
129
      </packing>
 
130
    </child>
 
131
    <child>
 
132
      <object class="GtkLabel" id="gap">
 
133
        <property name="visible">True</property>
 
134
        <property name="can_focus">False</property>
 
135
      </object>
 
136
      <packing>
 
137
        <property name="right_attach">2</property>
 
138
        <property name="top_attach">1</property>
 
139
        <property name="bottom_attach">2</property>
 
140
        <property name="y_options">GTK_FILL</property>
 
141
      </packing>
 
142
    </child>
 
143
  </object>
 
144
</interface>