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

« back to all changes in this revision

Viewing changes to applets/wncklet/workspace-switcher.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:
7
7
    <property name="title" translatable="yes">Workspace Switcher Preferences</property>
8
8
    <property name="resizable">False</property>
9
9
    <property name="type_hint">normal</property>
10
 
    <property name="has_separator">False</property>
11
10
    <child internal-child="vbox">
12
11
      <object class="GtkVBox" id="dialog-vbox1">
13
12
        <property name="visible">True</property>
20
19
            <property name="orientation">vertical</property>
21
20
            <property name="spacing">12</property>
22
21
            <child>
23
 
              <object class="GtkFrame" id="switcher_frame">
 
22
              <object class="GtkFrame" id="frame1">
24
23
                <property name="visible">True</property>
25
24
                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
26
25
                <property name="label_xalign">0</property>
253
252
                <property name="position">1</property>
254
253
              </packing>
255
254
            </child>
256
 
            <child>
257
 
              <object class="GtkFrame" id="viewports_frame">
258
 
                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
259
 
                <property name="no_show_all">True</property>
260
 
                <property name="label_xalign">0</property>
261
 
                <property name="shadow_type">none</property>
262
 
                <child>
263
 
                  <object class="GtkAlignment" id="viewports_alignment">
264
 
                    <property name="visible">True</property>
265
 
                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
266
 
                    <property name="left_padding">12</property>
267
 
                    <child>
268
 
                      <object class="GtkVBox" id="viewports_vbox">
269
 
                        <property name="visible">True</property>
270
 
                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
271
 
                        <property name="spacing">6</property>
272
 
                        <child>
273
 
                          <object class="GtkTable" id="viewports_table">
274
 
                            <property name="visible">True</property>
275
 
                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
276
 
                            <property name="n_rows">2</property>
277
 
                            <property name="n_columns">2</property>
278
 
                            <property name="column_spacing">6</property>
279
 
                            <property name="row_spacing">6</property>
280
 
                            <child>
281
 
                              <object class="GtkLabel" id="hsize_label">
282
 
                                <property name="visible">True</property>
283
 
                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
284
 
                                <property name="label" translatable="yes">Co_lumns:</property>
285
 
                                <property name="use_underline">True</property>
286
 
                                <property name="mnemonic_widget">hsize_spin</property>
287
 
                              </object>
288
 
                              <packing>
289
 
                                <property name="x_options"></property>
290
 
                                <property name="y_options"></property>
291
 
                              </packing>
292
 
                            </child>
293
 
                            <child>
294
 
                              <object class="GtkSpinButton" id="hsize_spin">
295
 
                                <property name="visible">True</property>
296
 
                                <property name="can_focus">True</property>
297
 
                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
298
 
                                <property name="adjustment">hsize_spin_adjustment</property>
299
 
                                <property name="climb_rate">1</property>
300
 
                              </object>
301
 
                              <packing>
302
 
                                <property name="left_attach">1</property>
303
 
                                <property name="right_attach">2</property>
304
 
                                <property name="x_options"></property>
305
 
                                <property name="y_options"></property>
306
 
                              </packing>
307
 
                            </child>
308
 
                            <child>
309
 
                              <object class="GtkLabel" id="vsize_label">
310
 
                                <property name="visible">True</property>
311
 
                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
312
 
                                <property name="label" translatable="yes">_Rows:</property>
313
 
                                <property name="use_underline">True</property>
314
 
                                <property name="mnemonic_widget">vsize_spin</property>
315
 
                              </object>
316
 
                              <packing>
317
 
                                <property name="top_attach">1</property>
318
 
                                <property name="bottom_attach">2</property>
319
 
                                <property name="x_options"></property>
320
 
                                <property name="y_options"></property>
321
 
                              </packing>
322
 
                            </child>
323
 
                            <child>
324
 
                              <object class="GtkSpinButton" id="vsize_spin">
325
 
                                <property name="visible">True</property>
326
 
                                <property name="can_focus">True</property>
327
 
                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
328
 
                                <property name="adjustment">vsize_spin_adjustment</property>
329
 
                                <property name="climb_rate">1</property>
330
 
                              </object>
331
 
                              <packing>
332
 
                                <property name="left_attach">1</property>
333
 
                                <property name="right_attach">2</property>
334
 
                                <property name="top_attach">1</property>
335
 
                                <property name="bottom_attach">2</property>
336
 
                                <property name="x_options"></property>
337
 
                                <property name="y_options"></property>
338
 
                              </packing>
339
 
                            </child>
340
 
                          </object>
341
 
                          <packing>
342
 
                            <property name="expand">False</property>
343
 
                            <property name="fill">False</property>
344
 
                            <property name="position">0</property>
345
 
                          </packing>
346
 
                        </child>
347
 
                      </object>
348
 
                    </child>
349
 
                  </object>
350
 
                </child>
351
 
                <child type="label">
352
 
                  <object class="GtkLabel" id="label_viewports">
353
 
                    <property name="visible">True</property>
354
 
                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
355
 
                    <property name="label" translatable="yes">&lt;b&gt;Workspaces&lt;/b&gt;</property>
356
 
                    <property name="use_markup">True</property>
357
 
                  </object>
358
 
                </child>
359
 
              </object>
360
 
              <packing>
361
 
                <property name="position">2</property>
362
 
              </packing>
363
 
            </child>
364
255
          </object>
365
256
          <packing>
366
257
            <property name="position">1</property>
428
319
    <property name="step_increment">1</property>
429
320
    <property name="page_increment">10</property>
430
321
  </object>
431
 
  <object class="GtkAdjustment" id="hsize_spin_adjustment">
432
 
    <property name="value">1</property>
433
 
    <property name="lower">1</property>
434
 
    <property name="upper">16</property>
435
 
    <property name="step_increment">1</property>
436
 
    <property name="page_increment">10</property>
437
 
  </object>
438
 
  <object class="GtkAdjustment" id="vsize_spin_adjustment">
439
 
    <property name="value">1</property>
440
 
    <property name="lower">1</property>
441
 
    <property name="upper">16</property>
442
 
    <property name="step_increment">1</property>
443
 
    <property name="page_increment">10</property>
444
 
  </object>
445
322
</interface>