~ubuntu-branches/ubuntu/maverick/gnome-panel/maverick

« back to all changes in this revision

Viewing changes to applets/wncklet/workspace-switcher.ui

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2010-06-03 13:55:42 UTC
  • mfrom: (2.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100603135542-1ys3aove4edi3r94
Tags: 1:2.30.0-2ubuntu1
* Rebase on Debian unstable, remaining Ubuntu changes:
* debian/control:
  - Build-depend on sharutils.
  - Add Vcs-Bzr info.
  - gnome-panel suggests menu-xdg rather than depends on it.
  - gnome-panel recommends indicator-applet.
* debian/rules:
  - Run autotools on build
  - Compile with --disable-initial-animation
  - don't build in process applets during the unstable cycle so crash issues
    should be easier to debug and reported on the corresponding binary
  - Update translations template.
  - Install the default menu icon.
* debian/add-indicator-applet.py:
  - Add indicator applet to existing panel configs on upgrade.
* debian/application-default-icon.png.uue:
  - Default icon for the menu entries.
* debian/fusa-applet.note.in:
* debian/migrate-fusa-config.py,
  - Show an update-notifer hook about the FUSA applet and
    add a script that can do the config migration.
* debian/gnome-panel-data.install:
  - Install apport hook
  - Install the "About Ubuntu" menu item.
* debian/gnome-panel-data.preinst:
  - Clean conffiles which are not in the new version on upgrade.
* debian/gnome-panel.install:
  - Install the files necessary to migrate existing panel configs
    on upgrade, to add the FUSA and indicator applet.
  - No /usr/lib/gnome-panel/*.so due to not building in process applets
* debian/gnome-panel.postinst:
  - Show note for adding FUSA applet on upgrade.
  - Add GConf defaults for directory fixup and indicator-applet
    migration on upgrade.
* debian/gnome-panel.postrm:
  - Remove GConf defaults on uninstall.
* debian/source_gnome-panel.py:
  - Apport hook
* debian/indicator-applet.desktop:
  - Indicator applet
* debian/ubuntu-about.desktop.in:
  - "About Ubuntu" menu item.
* debian/patches/01_layout.patch:
  - Changes to the panel layout.
* debian/patches/03_dnd_places_link.patch:
  - When using Drag'n'Drop from Places menu, install a link launcher
    (.desktop file) instead of copying the entir directory.
* debian/patches/04_default_panel_config.patch:
  - Change to the default configuration.
* debian/patches/05_no_session_delay.patch:
  - Don't set X-GNOME-Autostart-Phase=Panel to avoid delaying other softwares
    start on login
* debian/patches/06_higher_priority_for_applets_loading.patch:
  - Set higher priority to the applet loading idle function on start,
    the change leads to have the redraws delayed and reduced (disabled)
* debian/patches/16_compiz_workspace_switcher.patch:
  - Allow the workspace switcher to change the desktop layout 
    when using compiz.
* debian/patches/17_about-ubuntu-translation.patch:
  - List ubuntu-about.desktop for translation.
* debian/patches/18_lockdown_lock_editor.patch:
  - Change to have lockdown locking the menu editor
* debian/patches/20_fusa_migration_note_i18n.patch:
  - Show an update-notifer hook about the FUSA applet and
    add a script that can do the config migration.
* debian/patches/25_dynamic_fusa_detection.patch:
  - Removes the shutdown, logout and lock screen items when the 
    FUSA applet is on the panel
* debian/patches/30_disable-initial-animation.patch:
  - Patch to add build-time flag to disable the initial slide-in animation.
* debian/patches/71_change_bookmark_submenu_limit_value.patch:
  - Set the bookmarks number before submenu to 8 which should let users 
    configure some before hitting the limit
* debian/patches/85_disable_shutdown_on_ltsp.patch:
  - Suppress the shutdown option in the panel if LTSP_CLIENT is set.
* debian/patches/90_git_new_unhidden.patch:
  - git change to fix an issue leading to new gnome-panel bars not being 
    displayed until restart
* 01_panel_submenus.patch.
  - Dropped
* 02_panel_logout.patch.
  - Dropped
* 06_clock_permissions.patch.
  - Dropped
* debian/watch:
  - watch unstable versions

Show diffs side-by-side

added added

removed removed

Lines of Context:
20
20
            <property name="orientation">vertical</property>
21
21
            <property name="spacing">12</property>
22
22
            <child>
23
 
              <object class="GtkFrame" id="frame1">
 
23
              <object class="GtkFrame" id="switcher_frame">
24
24
                <property name="visible">True</property>
25
25
                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
26
26
                <property name="label_xalign">0</property>
253
253
                <property name="position">1</property>
254
254
              </packing>
255
255
            </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>
256
364
          </object>
257
365
          <packing>
258
366
            <property name="position">1</property>
320
428
    <property name="step_increment">1</property>
321
429
    <property name="page_increment">10</property>
322
430
  </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>
323
445
</interface>