~ubuntu-branches/ubuntu/saucy/gnome-control-center/saucy-proposed

« back to all changes in this revision

Viewing changes to .pc/56_use_ubuntu_info_branding.patch/panels/info/info.ui

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher, Sebastien Bacher, Robert Ancell, Iain Lane, Edward Donovan, Rico Tzschichholz, Jeremy Bicha, David Henningsson
  • Date: 2012-11-21 19:32:45 UTC
  • mfrom: (1.1.63)
  • Revision ID: package-import@ubuntu.com-20121121193245-mj61nzz1z4fk3z25
Tags: 1:3.6.3-0ubuntu1
[ Sebastien Bacher ]
* New upstream version
* debian/control.in: recommends libcanberra-pulse (lp: #1004973)
* debian/patches/58_ubuntu_icon_views_redesign.patch:
  - drop most of the changes, keep the different grid size though
    to fit on screen with our extra icons
* debian/patches/91_dont_show_in_unity.patch:
  - dropped, show the upstream printer panel and the layout tab
* debian/patches/revert_git_keyboard_gsettings.patch,
  debian/patches/revert_git_stop_using_gconf.patch:
  - dropped the gconf->gsettings reverts

[ Robert Ancell ]
* New upstream release (LP: #1010317)
* debian/control:
  - Bump build-depends on libgnome-desktop-3-dev, libwacom-dev
  - Add build-depends on libclutter-1.0-dev, libclutter-gtk-1.0-dev,
    libpwquality-dev
  - Drop build-depends on libgnomekbd-dev
* debian/patches/60_ubuntu_nav_bar.patch:
  - Disabled for now, doesn't apply
* debian/patches/revert_ua_gsettings.patch:
  - We can use GSettings for universal access now
* debian/patches/00git_online_accounts_gtkgrid.patch:
* debian/patches/00git_online_accounts_layout.part:
* debian/patches/git_wacom_translations.patch:
  - Applied upstream

[ Iain Lane ]
* Add Build-Depends on libxkbfile-dev
* New upstream release.
* Refresh all patches to apply cleanly.

[ Edward Donovan ]
* debian/source_gnome-control-center.py: Fix for Python 3. (LP: #1013171)

[ Rico Tzschichholz ]
* debian/control.in:
  - Build-depend on gtk-doc-tools instead of docbook directly
  - Bump minimum glib-2.0, gnome-desktop3, gnome-settings-daemon
     and gsettings-desktop-schemas

[ Jeremy Bicha ]
* Dropped more patches applied in new version:
  - git_unmute_sound_event.patch
  - git_fix_big_editable_labels.patch
  - 96_sound_nua_panel.patch
* debian/patches/04_new_appearance_settings.patch:
  - Dropped, this is now packaged separately as gnome-control-center-unity
* debian/patches/10_keyboard_layout_on_unity.patch:
  - Don't change the keyboard panel name when not running Unity
* debian/patches/52_ubuntu_language_list_mods.patch:
  - Don't disable adding current language to the list. While this
    fix shows the current language twice, at least it avoids the
    "Ubuntu suddenly in Chinese" bug (LP: #1035219)
* debian/patches/53_use_ubuntu_help.patch:
  - Only show Ubuntu help when running Unity
* debian/patches/58_hide_gdm_notifications.patch:
  - Hide "Show notifications when locked" settings when running Unity
    since it's a GNOME Shell-specific feature
* debian/patches/63_normal_scrollbar_in_a11y.patch:
  - Drop, overlay-scrollbars should handle this instead
* debian/patches/91_dont_show_in_unity.patch:
  - Hide Printers & Region panels in Unity until we're ready to switch
    to them.
* debian/patches/fix-crash-on-user-panel.patch:
  - Dropped, GNOME says it's obsolete
* debian/rules:
  - Build with -z,defs again
  - Explicitly disable ibus support since ibus 1.4 isn't supported in
    this version
* debian/control.in:
  - Drop ubuntu-docs and gnome-user-guide from recommends to suggests
  - Don't recommend indicators; let's leave that to Unity

[ David Henningsson ]
* sound_nua_panel.patch: Rebase to gnome 3.6 

Show diffs side-by-side

added added

removed removed

Lines of Context:
48
48
          </packing>
49
49
        </child>
50
50
        <child>
51
 
          <object class="GtkVBox" id="vbox1">
 
51
          <object class="GtkBox" id="vbox1">
52
52
            <property name="visible">True</property>
53
53
            <property name="can_focus">False</property>
54
54
            <property name="border_width">5</property>
 
55
            <property name="orientation">vertical</property>
55
56
            <child>
56
 
              <object class="GtkVBox" id="vbox50">
 
57
              <object class="GtkBox" id="vbox50">
57
58
                <property name="visible">True</property>
58
59
                <property name="can_focus">False</property>
59
60
                <property name="spacing">10</property>
 
61
                <property name="orientation">vertical</property>
60
62
                <child>
61
63
                  <object class="GtkLabel" id="label61">
62
64
                    <property name="visible">True</property>
79
81
                    <property name="can_focus">False</property>
80
82
                    <property name="left_padding">12</property>
81
83
                    <child>
82
 
                      <object class="GtkVBox" id="vbox51">
 
84
                      <object class="GtkBox" id="vbox51">
83
85
                        <property name="visible">True</property>
84
86
                        <property name="can_focus">False</property>
85
87
                        <property name="spacing">6</property>
 
88
                        <property name="orientation">vertical</property>
86
89
                        <child>
87
 
                          <object class="GtkTable" id="table5">
 
90
                          <object class="GtkGrid" id="table5">
88
91
                            <property name="visible">True</property>
89
92
                            <property name="can_focus">False</property>
90
 
                            <property name="n_rows">2</property>
91
 
                            <property name="n_columns">2</property>
92
93
                            <property name="column_spacing">6</property>
93
94
                            <property name="row_spacing">10</property>
94
95
                            <child>
98
99
                              </object>
99
100
                              <packing>
100
101
                                <property name="left_attach">1</property>
101
 
                                <property name="right_attach">2</property>
102
 
                                <property name="y_options">GTK_FILL</property>
 
102
                                <property name="top_attach">0</property>
103
103
                              </packing>
104
104
                            </child>
105
105
                            <child>
106
 
                              <object class="GtkLabel" id="label64">
 
106
                              <object class="GtkLabel" id="media_other_action_label">
107
107
                                <property name="visible">True</property>
108
108
                                <property name="can_focus">False</property>
109
109
                                <property name="xalign">0</property>
110
 
                                <property name="label" translatable="yes">Acti_on:</property>
 
110
                                <property name="label" translatable="yes">_Action:</property>
111
111
                                <property name="use_underline">True</property>
112
 
                                <property name="mnemonic_widget">media_other_action_container</property>
113
112
                              </object>
114
113
                              <packing>
 
114
                                <property name="left_attach">0</property>
115
115
                                <property name="top_attach">1</property>
116
 
                                <property name="bottom_attach">2</property>
117
 
                                <property name="x_options">GTK_FILL</property>
118
 
                                <property name="y_options"></property>
119
116
                              </packing>
120
117
                            </child>
121
118
                            <child>
125
122
                              </object>
126
123
                              <packing>
127
124
                                <property name="left_attach">1</property>
128
 
                                <property name="right_attach">2</property>
129
125
                                <property name="top_attach">1</property>
130
 
                                <property name="bottom_attach">2</property>
131
 
                                <property name="x_options">GTK_FILL</property>
132
 
                                <property name="y_options">GTK_FILL</property>
133
126
                              </packing>
134
127
                            </child>
135
128
                            <child>
142
135
                                <property name="mnemonic_widget">media_other_type_combobox</property>
143
136
                              </object>
144
137
                              <packing>
145
 
                                <property name="x_options">GTK_FILL</property>
146
 
                                <property name="y_options"></property>
 
138
                                <property name="left_attach">0</property>
 
139
                                <property name="top_attach">0</property>
147
140
                              </packing>
148
141
                            </child>
149
142
                          </object>
185
178
  <object class="GtkWindow" id="window1">
186
179
    <property name="can_focus">False</property>
187
180
    <child>
188
 
      <object class="GtkVBox" id="info_vbox">
 
181
      <object class="GtkBox" id="info_vbox">
189
182
        <property name="visible">True</property>
190
183
        <property name="can_focus">False</property>
191
184
        <property name="border_width">10</property>
 
185
        <property name="orientation">vertical</property>
192
186
        <child>
193
 
          <object class="GtkHBox" id="hbox1">
 
187
          <object class="GtkBox" id="hbox1">
194
188
            <property name="visible">True</property>
195
189
            <property name="can_focus">False</property>
196
190
            <property name="spacing">10</property>
 
191
            <property name="orientation">horizontal</property>
197
192
            <child>
198
193
              <object class="GtkScrolledWindow" id="scrolledwindow1">
199
194
                <property name="visible">True</property>
218
213
              </packing>
219
214
            </child>
220
215
            <child>
221
 
              <object class="GtkVBox" id="detail_vbox">
 
216
              <object class="GtkBox" id="detail_vbox">
222
217
                <property name="visible">True</property>
223
218
                <property name="can_focus">False</property>
224
219
                <property name="spacing">20</property>
 
220
                <property name="orientation">vertical</property>
225
221
                <child>
226
222
                  <object class="GtkNotebook" id="notebook">
227
223
                    <property name="visible">True</property>
234
230
                        <property name="can_focus">False</property>
235
231
                        <property name="top_padding">20</property>
236
232
                        <child>
237
 
                          <object class="GtkVBox" id="vbox2">
 
233
                          <object class="GtkBox" id="vbox2">
238
234
                            <property name="visible">True</property>
239
235
                            <property name="can_focus">False</property>
240
236
                            <property name="spacing">18</property>
 
237
                            <property name="orientation">vertical</property>
241
238
                            <child>
242
239
                              <object class="GtkImage" id="system_image">
243
240
                                <property name="visible">True</property>
542
539
                              </packing>
543
540
                            </child>
544
541
                            <child>
545
 
                              <object class="GtkHButtonBox" id="hbuttonbox1">
 
542
                              <object class="GtkButtonBox" id="hbuttonbox1">
546
543
                                <property name="visible">True</property>
547
544
                                <property name="can_focus">False</property>
548
545
                                <property name="layout_style">end</property>
 
546
                                <property name="orientation">horizontal</property>
549
547
                                <child>
550
548
                                  <placeholder/>
551
549
                                </child>
586
584
                      </packing>
587
585
                    </child>
588
586
                    <child>
589
 
                      <object class="GtkVBox" id="default_apps_container">
 
587
                      <object class="GtkBox" id="default_apps_container">
590
588
                        <property name="visible">True</property>
591
589
                        <property name="can_focus">False</property>
592
590
                        <property name="halign">center</property>
593
591
                        <property name="valign">start</property>
594
592
                        <property name="border_width">20</property>
595
593
                        <property name="spacing">10</property>
 
594
                        <property name="orientation">vertical</property>
596
595
                        <child>
597
596
                          <object class="GtkTable" id="default_apps_table">
598
597
                            <property name="visible">True</property>
819
818
                      </packing>
820
819
                    </child>
821
820
                    <child>
822
 
                      <object class="GtkHBox" id="media_preferences_vbox">
 
821
                      <object class="GtkBox" id="media_preferences_vbox">
823
822
                        <property name="visible">True</property>
824
823
                        <property name="can_focus">False</property>
 
824
                        <property name="orientation">horizontal</property>
825
825
                        <child>
826
826
                          <object class="GtkAlignment" id="alignment1">
827
827
                            <property name="visible">True</property>
828
828
                            <property name="can_focus">False</property>
829
829
                            <child>
830
 
                              <object class="GtkVBox" id="media_preferences_vbox3">
 
830
                              <object class="GtkBox" id="media_preferences_vbox3">
831
831
                                <property name="visible">True</property>
832
832
                                <property name="can_focus">False</property>
833
833
                                <property name="border_width">10</property>
834
834
                                <property name="spacing">10</property>
 
835
                                <property name="orientation">vertical</property>
835
836
                                <child>
836
 
                                  <object class="GtkVBox" id="media_handling_vbox">
 
837
                                  <object class="GtkBox" id="media_handling_vbox">
837
838
                                    <property name="visible">True</property>
838
839
                                    <property name="can_focus">False</property>
839
840
                                    <property name="spacing">10</property>
840
841
                                    <property name="valign">start</property>
841
842
                                    <property name="vexpand">False</property>
 
843
                                    <property name="orientation">vertical</property>
842
844
                                    <child>
843
 
                                      <object class="GtkVBox" id="vbox44">
 
845
                                      <object class="GtkBox" id="vbox44">
844
846
                                        <property name="visible">True</property>
845
847
                                        <property name="can_focus">False</property>
846
848
                                        <property name="spacing">10</property>
 
849
                                        <property name="orientation">vertical</property>
847
850
                                        <child>
848
851
                                          <object class="GtkLabel" id="label42">
849
852
                                            <property name="visible">True</property>
866
869
                                            <property name="can_focus">False</property>
867
870
                                            <property name="left_padding">12</property>
868
871
                                            <child>
869
 
                                              <object class="GtkVBox" id="vbox52">
 
872
                                              <object class="GtkBox" id="vbox52">
870
873
                                                <property name="visible">True</property>
871
874
                                                <property name="can_focus">False</property>
872
875
                                                <property name="spacing">6</property>
 
876
                                                <property name="orientation">vertical</property>
873
877
                                                <child>
874
878
                                                  <object class="GtkTable" id="table4">
875
879
                                                    <property name="visible">True</property>
1051
1055
                                                  </packing>
1052
1056
                                                </child>
1053
1057
                                                <child>
1054
 
                                                  <object class="GtkHBox" id="hbox2">
 
1058
                                                  <object class="GtkBox" id="hbox2">
1055
1059
                                                    <property name="visible">True</property>
1056
1060
                                                    <property name="can_focus">False</property>
 
1061
                                                    <property name="orientation">horizontal</property>
1057
1062
                                                    <child>
1058
1063
                                                      <object class="GtkButton" id="extra_options_button">
1059
1064
                                                        <property name="label" translatable="yes">_Other Media...</property>
1239
1244
                              </packing>
1240
1245
                            </child>
1241
1246
                            <child>
1242
 
                              <object class="GtkHBox" id="graphics_fallback_switch_box">
 
1247
                              <object class="GtkBox" id="graphics_fallback_switch_box">
1243
1248
                                <property name="visible">True</property>
1244
1249
                                <property name="can_focus">False</property>
1245
1250
                                <property name="halign">start</property>
1246
1251
                                <property name="valign">center</property>
 
1252
                                <property name="orientation">horizontal</property>
1247
1253
                                <child>
1248
1254
                                  <placeholder/>
1249
1255
                                </child>