← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gnome-shell/trusty-proposed

« back to all changes in this revision

Viewing changes to js/ui/windowManager.js

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-06-16 19:14:01 UTC
  • mfrom: (1.1.50) (19.1.37 experimental)
  • Revision ID: package-import@ubuntu.com-20130616191401-kef9vj3obfuvusrn
Tags: 3.8.3-1ubuntu1
* Merge with Debian. Remaining changes:
  - debian/control.in:
    + Build-depend on libsystemd-login-dev & libsystemd-daemon-dev
    + Depend on gdm instead of gdm3
  - debian/patches/40_change-pam-name-to-match-gdm.patch:
  - debian/patches/revert-suspend-break.patch:
    + Disabled, not needed on Ubuntu
  - debian/patches/ubuntu-lightdm-user-switching.patch:
    + Allow user switching when using LightDM.
  - debian/patches/ubuntu_lock_on_suspend.patch
    + Respect Ubuntu's lock-on-suspend setting.
      Disabled until it can be rewritten.
  - debian/patches/git_relock_screen_after_crash.patch:
    + Backport fix to ensure session is locked after crash
* debian/patches/revert-input-source-changes.patch:
  - Temporarily revert input source changes that need gnome-settings-daemon
    and gnome-control-center 3.8.3 to be useful
* debian/patches/revert-notification-settings-link.patch:
  - Don't link to Notification Settings since that's only available
    with gnome-control-center >= 3.8.

Show diffs side-by-side

added added

removed removed

Lines of Context:
js/ui/windowManager.js
136
136
                                        Shell.KeyBindingMode.NORMAL |
137
137
                                        Shell.KeyBindingMode.OVERVIEW,
138
138
                                        Lang.bind(this, this._showWorkspaceSwitcher));
 
139
        this.allowKeybinding('switch-to-workspace-1',
 
140
                             Shell.KeyBindingMode.NORMAL |
 
141
                             Shell.KeyBindingMode.OVERVIEW);
 
142
        this.allowKeybinding('switch-to-workspace-2',
 
143
                             Shell.KeyBindingMode.NORMAL |
 
144
                             Shell.KeyBindingMode.OVERVIEW);
 
145
        this.allowKeybinding('switch-to-workspace-3',
 
146
                             Shell.KeyBindingMode.NORMAL |
 
147
                             Shell.KeyBindingMode.OVERVIEW);
 
148
        this.allowKeybinding('switch-to-workspace-4',
 
149
                             Shell.KeyBindingMode.NORMAL |
 
150
                             Shell.KeyBindingMode.OVERVIEW);
 
151
        this.allowKeybinding('switch-to-workspace-5',
 
152
                             Shell.KeyBindingMode.NORMAL |
 
153
                             Shell.KeyBindingMode.OVERVIEW);
 
154
        this.allowKeybinding('switch-to-workspace-6',
 
155
                             Shell.KeyBindingMode.NORMAL |
 
156
                             Shell.KeyBindingMode.OVERVIEW);
 
157
        this.allowKeybinding('switch-to-workspace-7',
 
158
                             Shell.KeyBindingMode.NORMAL |
 
159
                             Shell.KeyBindingMode.OVERVIEW);
 
160
        this.allowKeybinding('switch-to-workspace-8',
 
161
                             Shell.KeyBindingMode.NORMAL |
 
162
                             Shell.KeyBindingMode.OVERVIEW);
 
163
        this.allowKeybinding('switch-to-workspace-9',
 
164
                             Shell.KeyBindingMode.NORMAL |
 
165
                             Shell.KeyBindingMode.OVERVIEW);
 
166
        this.allowKeybinding('switch-to-workspace-10',
 
167
                             Shell.KeyBindingMode.NORMAL |
 
168
                             Shell.KeyBindingMode.OVERVIEW);
 
169
        this.allowKeybinding('switch-to-workspace-11',
 
170
                             Shell.KeyBindingMode.NORMAL |
 
171
                             Shell.KeyBindingMode.OVERVIEW);
 
172
        this.allowKeybinding('switch-to-workspace-12',
 
173
                             Shell.KeyBindingMode.NORMAL |
 
174
                             Shell.KeyBindingMode.OVERVIEW);
139
175
        this.setCustomKeybindingHandler('switch-applications',
140
176
                                        Shell.KeyBindingMode.NORMAL,
141
177
                                        Lang.bind(this, this._startAppSwitcher));