~ubuntu-branches/ubuntu/oneiric/gnome-panel/oneiric

« back to all changes in this revision

Viewing changes to gnome-panel/panel-properties-dialog.ui

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher, Sebastien Bacher, Jeremy Bicha
  • Date: 2011-05-30 11:04:49 UTC
  • mfrom: (1.13.10 upstream) (2.2.5 experimental)
  • Revision ID: james.westby@ubuntu.com-20110530110449-hinl17kxkcefjw6x
Tags: 1:3.0.2-0ubuntu1
[ Sebastien Bacher ]
* New upstream version
* debian/control.in:
  - the new libgweather version is in oneiric, use it
  - drop the python and python-gconf depends, 
    they were added for gnome-panel-add which is still using gconf and buggy
* debian/gnome-panel-data.install:
  - don't install the apport hook, it's only getting gconf datas which 
    doesn't work since gnome-panel uses gsettings
* debian/patches/90_build_fixes.patch:
  - restore build fix from git not applied in the new serie
* debian/patches/01_panel_submenus.patch:
  - don't take that Debian diff, the .menus use the upstream naming in Ubuntu
* debian/patches/06_no_resize_grip.patch:
  - dropped, the issue is fixed in the new version
* debian/patches/50_fix-potfiles.patch:
  - dropped, the issue is fixed in the new version
* debian/watch:
  - track unstable series as well

Drop those delta, since gnome-panel is not the default Ubuntu session now we
can go back to an experience closer to the upstream one: 
* debian/control.in:
  - drop the indicators recommends, unity-2d is the ubuntu fallback session
    so we can get back to use an upstream config for gnome-panel and reduce
    the delta we carry
* debian/patches/04_default_panel_config.patch:
  - don't modify the upstream layout
* debian/patches/05_no_session_delay.patch:
  - no need to tweak the upstream session to optimize it
* debian/patches/16_compiz_workspace_switcher.patch:
  - go back to the upstream switcher behaviour    
* debian/patches/25_dynamic_fusa_detection.patch:
  - not needed since we use the upstream layout, could be ported if someone
    is wanting to do the work though
* debian/patches/30_disable-initial-animation.patch, debian/rules:
  - drop the --disable-initial-animation, that was some login optimization
    but since it's not the default desktop you should go back to the 
    upstream behaviour

[ Jeremy Bicha ]   
* New upstream version
* Merge from Debian experimental, remaining Ubuntu changes:
* debian/control:
  - Recommends gnome-settings-daemon which has the timezone polkit service
* debian/rules:
  - Update translations template.
* debian/gnome-panel-data.install:
  - Install apport hook
  - Install the "About Ubuntu" menu item.
* debian/patches/01_layout.patch:
  - Disabled, Help & About Ubuntu don't fit as well in Gnome Panel 3
* debian/patches/01_panel_submenus.patch.
  - Dropped
* debian/patches/03_dnd_places_link.patch:
  - Disabled, when using Drag'n'Drop from Places menu, install a link launcher
    (.desktop file) instead of copying the entire directory.
* debian/patches/17_about-ubuntu-translation.patch:
  - List ubuntu-about.desktop for translation.
* debian/patches/40_unset_menuproxy.patch:
  - Make sure gnome-panel and the applets don't pick up menu proxies.
* debian/patches/50_fix-potfiles.patch
  - Fix i18n
* debian/patches/85_disable_shutdown_on_ltsp.patch:
  - Suppress the shutdown option in the panel if LTSP_CLIENT is set.
* debian/patches/71_change_bookmark_submenu_limit_value.patch
  - Dropped, picked up by Debian
* debian/patches/18_lockdown_lock_editor.patch:
* debian/patches/90_git_wnck_show_realize.patch:
* debian/patches/90_fix_linking_DSO_link.patch:
* debian/patches/91_gir_annotations.patch
* debian/patches/92_git_calendar_day.patch
* debian/patches/92_git_fix_applets_in_multiscreen.patch:
  - Dropped, applied upstream
* debian/watch:
  - watch unstable versions

Show diffs side-by-side

added added

removed removed

Lines of Context:
8
8
    <property name="resizable">False</property>
9
9
    <property name="window_position">center</property>
10
10
    <property name="type_hint">dialog</property>
11
 
    <property name="has_separator">False</property>
12
11
    <child internal-child="vbox">
13
12
      <object class="GtkVBox" id="dialog-vbox1">
14
13
        <property name="visible">True</property>
55
54
                <child>
56
55
                  <object class="GtkTable" id="general_table">
57
56
                    <property name="visible">True</property>
58
 
                    <property name="n_rows">3</property>
 
57
                    <property name="n_rows">2</property>
59
58
                    <property name="n_columns">2</property>
60
59
                    <property name="column_spacing">12</property>
61
60
                    <property name="row_spacing">6</property>
62
61
                    <child>
63
 
                      <object class="GtkAlignment" id="icon_align">
64
 
                        <property name="visible">True</property>
65
 
                        <property name="xalign">0</property>
66
 
                        <property name="xscale">0</property>
67
 
                        <child>
68
 
                          <placeholder/>
69
 
                        </child>
70
 
                      </object>
71
 
                      <packing>
72
 
                        <property name="left_attach">1</property>
73
 
                        <property name="right_attach">2</property>
74
 
                        <property name="top_attach">2</property>
75
 
                        <property name="bottom_attach">3</property>
76
 
                        <property name="x_options">GTK_FILL</property>
77
 
                        <property name="y_options">GTK_FILL</property>
78
 
                      </packing>
79
 
                    </child>
80
 
                    <child>
81
 
                      <object class="GtkLabel" id="icon_label">
82
 
                        <property name="visible">True</property>
83
 
                        <property name="xalign">0</property>
84
 
                        <property name="yalign">0</property>
85
 
                        <property name="label" translatable="yes">_Icon:</property>
86
 
                        <property name="use_markup">True</property>
87
 
                        <property name="use_underline">True</property>
88
 
                      </object>
89
 
                      <packing>
90
 
                        <property name="top_attach">2</property>
91
 
                        <property name="bottom_attach">3</property>
92
 
                        <property name="x_options">GTK_FILL</property>
93
 
                        <property name="y_options"></property>
94
 
                      </packing>
95
 
                    </child>
96
 
                    <child>
97
62
                      <object class="GtkHBox" id="size_widgets">
98
63
                        <property name="visible">True</property>
99
64
                        <property name="spacing">6</property>
230
195
                        <child>
231
196
                          <object class="GtkLabel" id="label3">
232
197
                            <property name="visible">True</property>
233
 
                            <property name="label" translatable="no">    </property>
 
198
                            <property name="label">    </property>
234
199
                          </object>
235
200
                          <packing>
236
201
                            <property name="expand">False</property>
613
578
    <property name="title" translatable="yes">Image Background Details</property>
614
579
    <property name="resizable">False</property>
615
580
    <property name="type_hint">dialog</property>
616
 
    <property name="has_separator">False</property>
617
581
    <child internal-child="vbox">
618
582
      <object class="GtkVBox" id="dialog-vbox2">
619
583
        <property name="visible">True</property>
754
718
    </action-widgets>
755
719
  </object>
756
720
  <object class="GtkAdjustment" id="adjustment1">
 
721
    <property name="upper">100</property>
757
722
    <property name="value">33.75</property>
758
 
    <property name="upper">100</property>
759
723
    <property name="step_increment">5</property>
760
724
    <property name="page_increment">10</property>
761
725
  </object>
762
726
  <object class="GtkAdjustment" id="adjustment2">
763
 
    <property name="value">12</property>
764
727
    <property name="lower">12</property>
765
728
    <property name="upper">120</property>
 
729
    <property name="value">12</property>
766
730
    <property name="step_increment">1</property>
767
731
    <property name="page_increment">12</property>
768
732
  </object>