Merge lp:~mc-return/unity/unity.merge-unityshell-compiz-ccsm-plug-in-refactoring into lp:unity
- unity.merge-unityshell-compiz-ccsm-plug-in-refactoring
- Merge into trunk
Proposed by
MC Return
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Brandon Schaefer | ||||
| Approved revision: | no longer in the source branch. | ||||
| Merged at revision: | 2843 | ||||
| Proposed branch: | lp:~mc-return/unity/unity.merge-unityshell-compiz-ccsm-plug-in-refactoring | ||||
| Merge into: | lp:unity | ||||
| Diff against target: |
745 lines (+344/-294) 1 file modified
plugins/unityshell/unityshell.xml.in (+344/-294) |
||||
| To merge this branch: | bzr merge lp:~mc-return/unity/unity.merge-unityshell-compiz-ccsm-plug-in-refactoring | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Brandon Schaefer (community) | Approve | ||
| PS Jenkins bot | continuous-integration | Pending | |
|
Review via email:
|
|||
Commit message
Minor refactoring of the unityshell Compiz plug-in, replacing the "Experimental" tab with "Launcher" and "Dash" tabs.
Description of the change
To post a comment you must log in.
Revision history for this message
| MC Return (mc-return) wrote : | # |
Revision history for this message
| Brandon Schaefer (brandontschaefer) wrote : | # |
Looks a lot better then what it use to be :)
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'plugins/unityshell/unityshell.xml.in' |
| 2 | --- plugins/unityshell/unityshell.xml.in 2012-10-11 10:59:23 +0000 |
| 3 | +++ plugins/unityshell/unityshell.xml.in 2012-10-16 01:14:19 +0000 |
| 4 | @@ -39,248 +39,120 @@ |
| 5 | <plugin>expo</plugin> |
| 6 | </requirement> |
| 7 | </deps> |
| 8 | + |
| 9 | <options> |
| 10 | <group> |
| 11 | - <_short>Behaviour</_short> |
| 12 | + <_short>General</_short> |
| 13 | + |
| 14 | <option name="show_hud" type="key"> |
| 15 | <_short>Key to show the HUD</_short> |
| 16 | - <_long>Make the HUD appear with this key</_long> |
| 17 | + <_long>Make the HUD appear with this key.</_long> |
| 18 | <default><Alt></default> |
| 19 | - </option> |
| 20 | - <option name="launcher_hide_mode" type="int"> |
| 21 | - <_short>Hide Launcher</_short> |
| 22 | - <_long>Make the launcher hide automatically after some time of inactivity: always or just when the focussed window is not over the launcher</_long> |
| 23 | - <min>0</min> |
| 24 | - <max>1</max> |
| 25 | - <default>0</default> |
| 26 | - <desc> |
| 27 | - <value>0</value> |
| 28 | - <_name>Never</_name> |
| 29 | - </desc> |
| 30 | - <desc> |
| 31 | - <value>1</value> |
| 32 | - <_name>Autohide</_name> |
| 33 | - </desc> |
| 34 | - </option> |
| 35 | - <option name="reveal_trigger" type="int"> |
| 36 | - <_short>Reveal Trigger</_short> |
| 37 | - <_long></_long> |
| 38 | - <min>0</min> |
| 39 | - <max>1</max> |
| 40 | - <default>0</default> |
| 41 | - <desc> |
| 42 | - <value>0</value> |
| 43 | - <_name>Left Edge</_name> |
| 44 | - </desc> |
| 45 | - <desc> |
| 46 | - <value>1</value> |
| 47 | - <_name>Top Left Corner</_name> |
| 48 | - </desc> |
| 49 | - </option> |
| 50 | + </option> |
| 51 | + |
| 52 | + <option name="execute_command" type="key"> |
| 53 | + <_short>Key to execute a command</_short> |
| 54 | + <_long>Key to open a folder or execute a command.</_long> |
| 55 | + <default><Alt>F2</default> |
| 56 | + </option> |
| 57 | + |
| 58 | + <option name="panel_first_menu" type="key"> |
| 59 | + <_short>Key to open the first panel menu</_short> |
| 60 | + <_long>Open the first indicator menu on the top panel, allowing keyboard navigation thereafter.</_long> |
| 61 | + <default><Alt>F10</default> |
| 62 | + </option> |
| 63 | + |
| 64 | + <option name="panel_opacity" type="float"> |
| 65 | + <_short>Panel Opacity</_short> |
| 66 | + <_long>The opacity of the Panel background.</_long> |
| 67 | + <default>1.0</default> |
| 68 | + <min>0.0</min> |
| 69 | + <max>1.0</max> |
| 70 | + <precision>0.01</precision> |
| 71 | + </option> |
| 72 | + |
| 73 | + <option name="panel_opacity_maximized_toggle" type="bool"> |
| 74 | + <_short>Panel Opacity for Maximized Windows Toggle</_short> |
| 75 | + <_long>When a window is maximized and visible in the current viewport, the panel opacity is disabled.</_long> |
| 76 | + <default>false</default> |
| 77 | + </option> |
| 78 | + |
| 79 | + <option name="background_color" type="color"> |
| 80 | + <_short>Background Color</_short> |
| 81 | + <_long>Background color override for the dash, launcher and switcher.</_long> |
| 82 | + <default> |
| 83 | + <red>0x00</red> |
| 84 | + <green>0x00</green> |
| 85 | + <blue>0x00</blue> |
| 86 | + <alpha>0x00</alpha> |
| 87 | + </default> |
| 88 | + </option> |
| 89 | + |
| 90 | + <option name="dash_blur_experimental" type="int"> |
| 91 | + <_short>Dash Blur</_short> |
| 92 | + <_long>Type of blur in the Dash.</_long> |
| 93 | + <min>0</min> |
| 94 | + <max>2</max> |
| 95 | + <default>2</default> |
| 96 | + <desc> |
| 97 | + <value>0</value> |
| 98 | + <_name>No Blur</_name> |
| 99 | + </desc> |
| 100 | + <desc> |
| 101 | + <value>1</value> |
| 102 | + <_name>Static Blur</_name> |
| 103 | + </desc> |
| 104 | + <desc> |
| 105 | + <value>2</value> |
| 106 | + <_name>Active Blur</_name> |
| 107 | + </desc> |
| 108 | + </option> |
| 109 | + |
| 110 | + <option name="automaximize_value" type="int"> |
| 111 | + <_short>Automaximize value</_short> |
| 112 | + <_long>The minimum value to trigger automaximize.</_long> |
| 113 | + <min>1</min> |
| 114 | + <max>100</max> |
| 115 | + <default>75</default> |
| 116 | + </option> |
| 117 | + |
| 118 | + <option name="shortcut_overlay" type="bool"> |
| 119 | + <_short>Enable Shortcut Hints Overlay</_short> |
| 120 | + <_long>Enables possibility to display an overlay showing available mouse and keyboard shortcuts.</_long> |
| 121 | + <default>true</default> |
| 122 | + </option> |
| 123 | + |
| 124 | + </group> |
| 125 | + |
| 126 | + <group> |
| 127 | + <_short>Launcher</_short> |
| 128 | + |
| 129 | <option name="show_launcher" type="key"> |
| 130 | <_short>Key to show the launcher</_short> |
| 131 | - <_long>Make the launcher appear with that key</_long> |
| 132 | + <_long>Make the launcher appear with that key.</_long> |
| 133 | <tap_detection>false</tap_detection> |
| 134 | <default><Super></default> |
| 135 | - </option> |
| 136 | - <option name="keyboard_focus" type="key"> |
| 137 | - <_short>Key to put keyboard-focus on launcher</_short> |
| 138 | - <_long>Set the keyboard-focus on the launcher so it can be navigated with the cursor-keys</_long> |
| 139 | + </option> |
| 140 | + |
| 141 | + <option name="keyboard_focus" type="key"> |
| 142 | + <_short>Key to put keyboard-focus on the launcher</_short> |
| 143 | + <_long>Set the keyboard-focus on the launcher so it can be navigated with the cursor-keys.</_long> |
| 144 | <default><Alt>F1</default> |
| 145 | - </option> |
| 146 | - <option name="execute_command" type="key"> |
| 147 | - <_short>Key to execute a command</_short> |
| 148 | - <_long>Key to open a folder or execute a command</_long> |
| 149 | - <default><Alt>F2</default> |
| 150 | - </option> |
| 151 | - <option name="panel_first_menu" type="key"> |
| 152 | - <_short>Key to open the first panel menu</_short> |
| 153 | - <_long>Open the first menu on the panel, allowing keyboard navigation thereafter.</_long> |
| 154 | - <default><Alt>F10</default> |
| 155 | - </option> |
| 156 | - <option name="launcher_switcher_forward" type="key"> |
| 157 | + </option> |
| 158 | + |
| 159 | + <option name="launcher_switcher_forward" type="key"> |
| 160 | <_short>Key to start the launcher application switcher</_short> |
| 161 | - <_long>Switch the applications using the launcher</_long> |
| 162 | + <_long>Switch applications using the launcher.</_long> |
| 163 | <default><Super>Tab</default> |
| 164 | - </option> |
| 165 | - <option name="launcher_switcher_prev" type="key"> |
| 166 | + </option> |
| 167 | + |
| 168 | + <option name="launcher_switcher_prev" type="key"> |
| 169 | <_short>Key to start the launcher application switcher in reverse</_short> |
| 170 | - <_long>Switch the applications using the launcher, in reverse order</_long> |
| 171 | + <_long>Switch applications using the launcher, in reverse order.</_long> |
| 172 | <default><Super><Shift>Tab</default> |
| 173 | - </option> |
| 174 | - </group> |
| 175 | - <group> |
| 176 | - <_short>Switcher</_short> |
| 177 | - <option name="alt_tab_timeout" type="bool"> |
| 178 | - <_short>Automatically grid windows on timer in switcher</_short> |
| 179 | - <_long>After a short time, spread multiple windows of the same application out into a grid</_long> |
| 180 | - <default>true</default> |
| 181 | - </option> |
| 182 | - <option name="alt_tab_bias_viewport" type="bool"> |
| 183 | - <_short>Bias alt-tab to prefer windows on the current viewport</_short> |
| 184 | - <_long>Bias the switcher to windows which are placed on the current viewport</_long> |
| 185 | - <default>true</default> |
| 186 | - </option> |
| 187 | - <option name="disable_show_desktop" type="bool"> |
| 188 | - <_short>Disable Show Desktop in the switcher</_short> |
| 189 | - <_long>Disables the Show Desktop icon in the switcher</_long> |
| 190 | - <default>false</default> |
| 191 | - </option> |
| 192 | - <option name="alt_tab_forward" type="key"> |
| 193 | - <_short>Key to start the switcher</_short> |
| 194 | - <_long>Start switching between windows</_long> |
| 195 | - <default><Alt>Tab</default> |
| 196 | - </option> |
| 197 | - <option name="alt_tab_prev" type="key"> |
| 198 | - <_short>Key to start the switcher in reverse</_short> |
| 199 | - <_long>Start switching between windows in reverse order</_long> |
| 200 | - <default><Alt><Shift>Tab</default> |
| 201 | - </option> |
| 202 | - <option name="alt_tab_forward_all" type="key"> |
| 203 | - <_short>Key to start the switcher for all viewports</_short> |
| 204 | - <_long>Start switching between windows on all viewports</_long> |
| 205 | - <default><Control><Alt>Tab</default> |
| 206 | - </option> |
| 207 | - <option name="alt_tab_prev_all" type="key"> |
| 208 | - <_short>Key to start the switcher in reverse for all viewports</_short> |
| 209 | - <_long>Start switching between windows on all viewports, in reverse order</_long> |
| 210 | - <default><Control><Alt><Shift>Tab</default> |
| 211 | - </option> |
| 212 | - <option name="alt_tab_right" type="key"> |
| 213 | - <_short>Go right in the switcher</_short> |
| 214 | - <_long>Navigate one window right in the switcher</_long> |
| 215 | - <default><Alt>Right</default> |
| 216 | - <passive_grab>false</passive_grab> |
| 217 | - <internal/> |
| 218 | - </option> |
| 219 | - <option name="alt_tab_left" type="key"> |
| 220 | - <_short>Go left in the switcher</_short> |
| 221 | - <_long>Navigate one window left in the switcher</_long> |
| 222 | - <default><Alt>Left</default> |
| 223 | - <passive_grab>false</passive_grab> |
| 224 | - <internal/> |
| 225 | - </option> |
| 226 | - <option name="alt_tab_detail_start" type="key"> |
| 227 | - <_short>Key to expose the windows in the switcher</_short> |
| 228 | - <_long>Display a preview of the selected window; grid if there is multiple windows of that application</_long> |
| 229 | - <default><Alt>Down</default> |
| 230 | - <passive_grab>false</passive_grab> |
| 231 | - <internal/> |
| 232 | - </option> |
| 233 | - <option name="alt_tab_detail_stop" type="key"> |
| 234 | - <_short>Key to collapse windows in the switcher</_short> |
| 235 | - <_long>Return the previews to icons in the switcher</_long> |
| 236 | - <default><Alt>Up</default> |
| 237 | - <passive_grab>false</passive_grab> |
| 238 | - <internal/> |
| 239 | - </option> |
| 240 | - <option name="alt_tab_next_window" type="key"> |
| 241 | - <_short>Key to flip through windows in the switcher</_short> |
| 242 | - <_long>Flip through all the windows present in the switcher</_long> |
| 243 | - <passive_grab>false</passive_grab> |
| 244 | - </option> |
| 245 | - <option name="alt_tab_prev_window" type="key"> |
| 246 | - <_short>Key to flip through windows in the switcher backwards</_short> |
| 247 | - <_long>Flip through all the windows present in the switcher, in reverse order</_long> |
| 248 | - <passive_grab>false</passive_grab> |
| 249 | - </option> |
| 250 | - <option name="show_minimized_windows" type="bool"> |
| 251 | - <_short>Show minimized windows in switcher</_short> |
| 252 | - <_long>Hack to enable minimized windows in switcher. Disable and report bugs if problems are caused</_long> |
| 253 | - <default>true</default> |
| 254 | - </option> |
| 255 | - </group> |
| 256 | - <group> |
| 257 | - <_short>Experimental</_short> |
| 258 | - <option name="background_color" type="color"> |
| 259 | - <_short>Background Color</_short> |
| 260 | - <_long>Background color override used for testing purposes</_long> |
| 261 | - <default> |
| 262 | - <red>0x00</red> |
| 263 | - <green>0x00</green> |
| 264 | - <blue>0x00</blue> |
| 265 | - <alpha>0x00</alpha> |
| 266 | - </default> |
| 267 | - </option> |
| 268 | - <option name="backlight_mode" type="int"> |
| 269 | - <_short>Backlight Mode</_short> |
| 270 | - <_long>Change how the icons are backlit</_long> |
| 271 | - <min>0</min> |
| 272 | - <max>4</max> |
| 273 | - <default>1</default> |
| 274 | - <desc> |
| 275 | - <value>0</value> |
| 276 | - <_name>Backlight Always On</_name> |
| 277 | - </desc> |
| 278 | - <desc> |
| 279 | - <value>1</value> |
| 280 | - <_name>Backlight Toggles</_name> |
| 281 | - </desc> |
| 282 | - <desc> |
| 283 | - <value>2</value> |
| 284 | - <_name>Backlight Always Off</_name> |
| 285 | - </desc> |
| 286 | - <desc> |
| 287 | - <value>3</value> |
| 288 | - <_name>Edge Illumination Toggles</_name> |
| 289 | - </desc> |
| 290 | - <desc> |
| 291 | - <value>4</value> |
| 292 | - <_name>Backlight and Edge Illumination Toggles</_name> |
| 293 | - </desc> |
| 294 | - </option> |
| 295 | - <option name="launch_animation" type="int"> |
| 296 | - <_short>Launch Animation</_short> |
| 297 | - <_long>Animation played when a launcher icon is in the process of spawning a process</_long> |
| 298 | - <min>0</min> |
| 299 | - <max>2</max> |
| 300 | - <default>1</default> |
| 301 | - <desc> |
| 302 | - <value>0</value> |
| 303 | - <_name>None</_name> |
| 304 | - </desc> |
| 305 | - <desc> |
| 306 | - <value>1</value> |
| 307 | - <_name>Pulse Until Running</_name> |
| 308 | - </desc> |
| 309 | - <desc> |
| 310 | - <value>2</value> |
| 311 | - <_name>Blink</_name> |
| 312 | - </desc> |
| 313 | - </option> |
| 314 | - <option name="urgent_animation" type="int"> |
| 315 | - <_short>Urgent Animation</_short> |
| 316 | - <_long>Animation played when a launcher icon is in the urgent state</_long> |
| 317 | - <min>0</min> |
| 318 | - <max>2</max> |
| 319 | - <default>2</default> |
| 320 | - <desc> |
| 321 | - <value>0</value> |
| 322 | - <_name>None</_name> |
| 323 | - </desc> |
| 324 | - <desc> |
| 325 | - <value>1</value> |
| 326 | - <_name>Pulse</_name> |
| 327 | - </desc> |
| 328 | - <desc> |
| 329 | - <value>2</value> |
| 330 | - <_name>Wiggle</_name> |
| 331 | - </desc> |
| 332 | - </option> |
| 333 | - <option type="float" name="panel_opacity"> |
| 334 | - <_short>Panel Opacity</_short> |
| 335 | - <_long>The opacity of the Panel background.</_long> |
| 336 | - <default>1.0</default> |
| 337 | - <min>0.0</min> |
| 338 | - <max>1.0</max> |
| 339 | - <precision>0.01</precision> |
| 340 | - </option> |
| 341 | - <option type="bool" name="panel_opacity_maximized_toggle"> |
| 342 | - <_short>Panel Opacity for Maximized Windows Toggle.</_short> |
| 343 | - <_long>When a window is maximized and visible in the current viewport, the panel opacity is disabled</_long> |
| 344 | - <default>false</default> |
| 345 | - </option> |
| 346 | - <option type="float" name="launcher_opacity"> |
| 347 | + </option> |
| 348 | + |
| 349 | + <option name="launcher_opacity" type="float"> |
| 350 | <_short>Launcher Opacity</_short> |
| 351 | <_long>The opacity of the Launcher background.</_long> |
| 352 | <default>0.6667</default> |
| 353 | @@ -288,119 +160,220 @@ |
| 354 | <max>1.0</max> |
| 355 | <precision>0.0001</precision> |
| 356 | </option> |
| 357 | - <option name="icon_size" type="int"> |
| 358 | - <_short>Launcher icon size</_short> |
| 359 | - <_long>The size of the launcher icons</_long> |
| 360 | - <default>48</default> |
| 361 | - <min>32</min> |
| 362 | - <max>64</max> |
| 363 | - <precision>1</precision> |
| 364 | - </option> |
| 365 | + |
| 366 | + <option name="launcher_hide_mode" type="int"> |
| 367 | + <_short>Hide Launcher</_short> |
| 368 | + <_long>Make the launcher hide automatically after some time of inactivity: always or never.</_long> |
| 369 | + <min>0</min> |
| 370 | + <max>1</max> |
| 371 | + <default>0</default> |
| 372 | + <desc> |
| 373 | + <value>0</value> |
| 374 | + <_name>Never</_name> |
| 375 | + </desc> |
| 376 | + <desc> |
| 377 | + <value>1</value> |
| 378 | + <_name>Autohide</_name> |
| 379 | + </desc> |
| 380 | + </option> |
| 381 | + |
| 382 | + <option name="autohide_animation" type="int"> |
| 383 | + <_short>Hide Animation</_short> |
| 384 | + <_long>Animation played when the launcher is showing or hiding.</_long> |
| 385 | + <min>0</min> |
| 386 | + <max>3</max> |
| 387 | + <default>3</default> |
| 388 | + <desc> |
| 389 | + <value>0</value> |
| 390 | + <_name>Fade on bfb and Slide</_name> |
| 391 | + </desc> |
| 392 | + <desc> |
| 393 | + <value>1</value> |
| 394 | + <_name>Slide only</_name> |
| 395 | + </desc> |
| 396 | + <desc> |
| 397 | + <value>2</value> |
| 398 | + <_name>Fade only</_name> |
| 399 | + </desc> |
| 400 | + <desc> |
| 401 | + <value>3</value> |
| 402 | + <_name>Fade and Slide</_name> |
| 403 | + </desc> |
| 404 | + </option> |
| 405 | + |
| 406 | + <option name="reveal_trigger" type="int"> |
| 407 | + <_short>Reveal Trigger</_short> |
| 408 | + <_long></_long> |
| 409 | + <min>0</min> |
| 410 | + <max>1</max> |
| 411 | + <default>0</default> |
| 412 | + <desc> |
| 413 | + <value>0</value> |
| 414 | + <_name>Left Edge</_name> |
| 415 | + </desc> |
| 416 | + <desc> |
| 417 | + <value>1</value> |
| 418 | + <_name>Top Left Corner</_name> |
| 419 | + </desc> |
| 420 | + </option> |
| 421 | + |
| 422 | + <option name="num_launchers" type="int"> |
| 423 | + <_short>Launcher Monitors</_short> |
| 424 | + <_long>Selects on which monitor the launcher is present.</_long> |
| 425 | + <min>0</min> |
| 426 | + <max>1</max> |
| 427 | + <default>0</default> |
| 428 | + <desc> |
| 429 | + <value>0</value> |
| 430 | + <_name>All Displays</_name> |
| 431 | + </desc> |
| 432 | + <desc> |
| 433 | + <value>1</value> |
| 434 | + <_name>Primary Display</_name> |
| 435 | + </desc> |
| 436 | + </option> |
| 437 | + |
| 438 | + <option name="launcher_capture_mouse" type="bool"> |
| 439 | + <_short>Launcher Capture Mouse</_short> |
| 440 | + <_long>Determines if the launcher edges should capture the mousepointer.</_long> |
| 441 | + <default>true</default> |
| 442 | + </option> |
| 443 | + |
| 444 | <option name="edge_responsiveness" type="float"> |
| 445 | <_short>Launcher Reveal Edge Responsiveness</_short> |
| 446 | - <_long>A conglomerate setting that modifies the overall responsiveness of the launcher reveal</_long> |
| 447 | + <_long>A conglomerate setting that modifies the overall responsiveness of the launcher reveal.</_long> |
| 448 | <default>2.0</default> |
| 449 | <min>0.2</min> |
| 450 | <max>8.0</max> |
| 451 | <precision>0.1</precision> |
| 452 | </option> |
| 453 | + |
| 454 | <option name="reveal_pressure" type="int"> |
| 455 | <_short>Launcher Reveal Pressure</_short> |
| 456 | - <_long>Amount of mouse pressure required to reveal launcher</_long> |
| 457 | + <_long>Amount of mouse pressure required to reveal the launcher.</_long> |
| 458 | <default>20</default> |
| 459 | <min>1</min> |
| 460 | <max>1000</max> |
| 461 | <precision>1</precision> |
| 462 | </option> |
| 463 | + |
| 464 | <option name="overcome_pressure" type="int"> |
| 465 | <_short>Launcher Edge Stop Overcome Pressure</_short> |
| 466 | - <_long>Amount of mouse pressure required to push into the next monitor</_long> |
| 467 | + <_long>Amount of mouse pressure required to push the mousepointer into the next monitor.</_long> |
| 468 | <default>20</default> |
| 469 | <min>1</min> |
| 470 | <max>1000</max> |
| 471 | <precision>1</precision> |
| 472 | </option> |
| 473 | + |
| 474 | <option name="decay_rate" type="int"> |
| 475 | <_short>Pressure Decay Rate</_short> |
| 476 | - <_long>The rate at which mouse pressure decays</_long> |
| 477 | + <_long>The rate at which mouse pressure decays.</_long> |
| 478 | <default>15</default> |
| 479 | <min>1</min> |
| 480 | <max>1000</max> |
| 481 | <precision>1</precision> |
| 482 | </option> |
| 483 | + |
| 484 | <option name="stop_velocity" type="int"> |
| 485 | <_short>Edge Stop Velocity</_short> |
| 486 | - <_long>The maximum velocity at which the mouse will still be stopped</_long> |
| 487 | + <_long>The maximum velocity at which the mouse will still be stopped.</_long> |
| 488 | <default>65</default> |
| 489 | <min>1</min> |
| 490 | <max>1000</max> |
| 491 | <precision>1</precision> |
| 492 | </option> |
| 493 | + |
| 494 | <option name="edge_passed_disabled_ms" type="int"> |
| 495 | <_short>Duration of Sticky Edge Release after Break</_short> |
| 496 | - <_long>Sticky edges deactivated for number of milliseconds after the user breaks the barrier</_long> |
| 497 | + <_long>The number of milliseconds Sticky Edges are deactivated for after the barrier has been broken.</_long> |
| 498 | <default>1000</default> |
| 499 | <min>0</min> |
| 500 | <max>5000</max> |
| 501 | <precision>1</precision> |
| 502 | </option> |
| 503 | - <option name="autohide_animation" type="int"> |
| 504 | - <_short>Hide Animation</_short> |
| 505 | - <_long>Animation played when the launcher is showing or hiding</_long> |
| 506 | + |
| 507 | + <option name="icon_size" type="int"> |
| 508 | + <_short>Launcher icon size</_short> |
| 509 | + <_long>The size of the icons in the launcher.</_long> |
| 510 | + <default>48</default> |
| 511 | + <min>32</min> |
| 512 | + <max>64</max> |
| 513 | + <precision>1</precision> |
| 514 | + </option> |
| 515 | + |
| 516 | + <option name="backlight_mode" type="int"> |
| 517 | + <_short>Backlight Mode</_short> |
| 518 | + <_long>Change how the icons in the launcher are backlit.</_long> |
| 519 | <min>0</min> |
| 520 | - <max>3</max> |
| 521 | - <default>3</default> |
| 522 | + <max>4</max> |
| 523 | + <default>1</default> |
| 524 | <desc> |
| 525 | <value>0</value> |
| 526 | - <_name>Fade on bfb and Slide</_name> |
| 527 | + <_name>Backlight Always On</_name> |
| 528 | </desc> |
| 529 | <desc> |
| 530 | <value>1</value> |
| 531 | - <_name>Slide only</_name> |
| 532 | + <_name>Backlight Toggles</_name> |
| 533 | </desc> |
| 534 | <desc> |
| 535 | <value>2</value> |
| 536 | - <_name>Fade only</_name> |
| 537 | + <_name>Backlight Always Off</_name> |
| 538 | </desc> |
| 539 | <desc> |
| 540 | <value>3</value> |
| 541 | - <_name>Fade and Slide</_name> |
| 542 | - </desc> |
| 543 | - </option> |
| 544 | - |
| 545 | - <option name="dash_blur_experimental" type="int"> |
| 546 | - <_short>Dash Blur</_short> |
| 547 | - <_long>Type of blur in the Dash</_long> |
| 548 | + <_name>Edge Illumination Toggles</_name> |
| 549 | + </desc> |
| 550 | + <desc> |
| 551 | + <value>4</value> |
| 552 | + <_name>Backlight and Edge Illumination Toggles</_name> |
| 553 | + </desc> |
| 554 | + </option> |
| 555 | + |
| 556 | + <option name="launch_animation" type="int"> |
| 557 | + <_short>Launch Animation</_short> |
| 558 | + <_long>The icon animation playing during the launch of a process.</_long> |
| 559 | + <min>0</min> |
| 560 | + <max>2</max> |
| 561 | + <default>1</default> |
| 562 | + <desc> |
| 563 | + <value>0</value> |
| 564 | + <_name>None</_name> |
| 565 | + </desc> |
| 566 | + <desc> |
| 567 | + <value>1</value> |
| 568 | + <_name>Pulse Until Running</_name> |
| 569 | + </desc> |
| 570 | + <desc> |
| 571 | + <value>2</value> |
| 572 | + <_name>Blink</_name> |
| 573 | + </desc> |
| 574 | + </option> |
| 575 | + |
| 576 | + <option name="urgent_animation" type="int"> |
| 577 | + <_short>Urgent Animation</_short> |
| 578 | + <_long>The icon animation playing when a launcher icon is in the urgent state.</_long> |
| 579 | <min>0</min> |
| 580 | <max>2</max> |
| 581 | <default>2</default> |
| 582 | <desc> |
| 583 | <value>0</value> |
| 584 | - <_name>No Blur</_name> |
| 585 | + <_name>None</_name> |
| 586 | </desc> |
| 587 | <desc> |
| 588 | <value>1</value> |
| 589 | - <_name>Static Blur</_name> |
| 590 | + <_name>Pulse</_name> |
| 591 | </desc> |
| 592 | <desc> |
| 593 | <value>2</value> |
| 594 | - <_name>Active Blur</_name> |
| 595 | + <_name>Wiggle</_name> |
| 596 | </desc> |
| 597 | </option> |
| 598 | |
| 599 | - <option name="automaximize_value" type="int"> |
| 600 | - <_short>Automaximize value</_short> |
| 601 | - <_long>The minimum value to trigger automaximize.</_long> |
| 602 | - <min>1</min> |
| 603 | - <max>100</max> |
| 604 | - <default>75</default> |
| 605 | - </option> |
| 606 | + </group> |
| 607 | |
| 608 | - <option name="shortcut_overlay" type="bool"> |
| 609 | - <_short>Enable Shortcut Hints Overlay</_short> |
| 610 | - <_long>Enable Shortcut Hints Overlay</_long> |
| 611 | - <default>true</default> |
| 612 | - </option> |
| 613 | + <group> |
| 614 | + <_short>Menus</_short> |
| 615 | |
| 616 | <option name="menus_fadein" type="int"> |
| 617 | <_short>Menus Fade-in duration</_short> |
| 618 | @@ -442,28 +415,105 @@ |
| 619 | <default>300</default> |
| 620 | </option> |
| 621 | |
| 622 | - <option name="num_launchers" type="int"> |
| 623 | - <_short>Launcher Monitors</_short> |
| 624 | - <_long>Monitors on which launchers will be displayed</_long> |
| 625 | - <min>0</min> |
| 626 | - <max>1</max> |
| 627 | - <default>0</default> |
| 628 | - <desc> |
| 629 | - <value>0</value> |
| 630 | - <_name>All Desktops</_name> |
| 631 | - </desc> |
| 632 | - <desc> |
| 633 | - <value>1</value> |
| 634 | - <_name>Primary Desktop</_name> |
| 635 | - </desc> |
| 636 | - </option> |
| 637 | - |
| 638 | - <option name="launcher_capture_mouse" type="bool"> |
| 639 | - <_short>Launcher Capture Mouse</_short> |
| 640 | - <_long>Determines if the launcher edges should capture the mouse</_long> |
| 641 | - <default>true</default> |
| 642 | - </option> |
| 643 | - </group> |
| 644 | + </group> |
| 645 | + |
| 646 | + <group> |
| 647 | + <_short>Switcher</_short> |
| 648 | + |
| 649 | + <option name="alt_tab_forward" type="key"> |
| 650 | + <_short>Key to start the switcher</_short> |
| 651 | + <_long>Starts switching between windows.</_long> |
| 652 | + <default><Alt>Tab</default> |
| 653 | + </option> |
| 654 | + |
| 655 | + <option name="alt_tab_prev" type="key"> |
| 656 | + <_short>Key to start the switcher in reverse</_short> |
| 657 | + <_long>Starts switching between windows in reverse order.</_long> |
| 658 | + <default><Alt><Shift>Tab</default> |
| 659 | + </option> |
| 660 | + |
| 661 | + <option name="alt_tab_forward_all" type="key"> |
| 662 | + <_short>Key to start the switcher for all viewports</_short> |
| 663 | + <_long>Starts switching between windows on all viewports.</_long> |
| 664 | + <default><Control><Alt>Tab</default> |
| 665 | + </option> |
| 666 | + |
| 667 | + <option name="alt_tab_prev_all" type="key"> |
| 668 | + <_short>Key to start the switcher in reverse for all viewports</_short> |
| 669 | + <_long>Starts switching between windows on all viewports, in reverse order.</_long> |
| 670 | + <default><Control><Alt><Shift>Tab</default> |
| 671 | + </option> |
| 672 | + |
| 673 | + <option name="alt_tab_right" type="key"> |
| 674 | + <_short>Go right in the switcher</_short> |
| 675 | + <_long>Navigates one window to the right in the switcher.</_long> |
| 676 | + <default><Alt>Right</default> |
| 677 | + <passive_grab>false</passive_grab> |
| 678 | + <internal/> |
| 679 | + </option> |
| 680 | + |
| 681 | + <option name="alt_tab_left" type="key"> |
| 682 | + <_short>Go left in the switcher</_short> |
| 683 | + <_long>Navigates one window to the left in the switcher.</_long> |
| 684 | + <default><Alt>Left</default> |
| 685 | + <passive_grab>false</passive_grab> |
| 686 | + <internal/> |
| 687 | + </option> |
| 688 | + |
| 689 | + <option name="alt_tab_detail_start" type="key"> |
| 690 | + <_short>Key to expose the windows in the switcher</_short> |
| 691 | + <_long>Displays a preview of the selected window; a grid if there are multiple windows of the selected application open.</_long> |
| 692 | + <default><Alt>Down</default> |
| 693 | + <passive_grab>false</passive_grab> |
| 694 | + <internal/> |
| 695 | + </option> |
| 696 | + |
| 697 | + <option name="alt_tab_detail_stop" type="key"> |
| 698 | + <_short>Key to collapse windows in the switcher</_short> |
| 699 | + <_long>Closes the previews and return to icons in the switcher.</_long> |
| 700 | + <default><Alt>Up</default> |
| 701 | + <passive_grab>false</passive_grab> |
| 702 | + <internal/> |
| 703 | + </option> |
| 704 | + |
| 705 | + <option name="alt_tab_next_window" type="key"> |
| 706 | + <_short>Key to flip through windows in the switcher</_short> |
| 707 | + <_long>Flips through all the windows present in the switcher.</_long> |
| 708 | + <passive_grab>false</passive_grab> |
| 709 | + </option> |
| 710 | + |
| 711 | + <option name="alt_tab_prev_window" type="key"> |
| 712 | + <_short>Key to flip through windows in the switcher backwards</_short> |
| 713 | + <_long>Flips through all the windows present in the switcher, in reverse order.</_long> |
| 714 | + <passive_grab>false</passive_grab> |
| 715 | + </option> |
| 716 | + |
| 717 | + <option name="show_minimized_windows" type="bool"> |
| 718 | + <_short>Show previews of windows in switcher</_short> |
| 719 | + <_long>Enables miniature windows in the switcher.</_long> |
| 720 | + <default>true</default> |
| 721 | + </option> |
| 722 | + |
| 723 | + <option name="alt_tab_timeout" type="bool"> |
| 724 | + <_short>Enable timed automatic to show previews in switcher</_short> |
| 725 | + <_long>Spread multiple windows of the same application out into a grid automatically after a short time.</_long> |
| 726 | + <default>true</default> |
| 727 | + </option> |
| 728 | + |
| 729 | + <option name="alt_tab_bias_viewport" type="bool"> |
| 730 | + <_short>Bias alt-tab to prefer windows on the current viewport</_short> |
| 731 | + <_long>Bias the switcher to prefer windows which are placed on the current viewport.</_long> |
| 732 | + <default>true</default> |
| 733 | + </option> |
| 734 | + |
| 735 | + <option name="disable_show_desktop" type="bool"> |
| 736 | + <_short>Disable Show Desktop in the switcher</_short> |
| 737 | + <_long>Disables the Show Desktop icon in the switcher.</_long> |
| 738 | + <default>false</default> |
| 739 | + </option> |
| 740 | + |
| 741 | + </group> |
| 742 | + |
| 743 | </options> |
| 744 | </plugin> |
| 745 | </compiz> |
I would like to continue in this direction, because unityshell.xml.in could need some more love to be better readable and adjustable.
1. I would like to add a "General" tab, where options that are valid for Dash and Launcher and other general things like menu options could be adjusted, maybe it is best to rename the "Behaviour" tab to "General".
2. If possible, key combinations should be in one group, on/off switches in another, things that belong together should be next to each other.
3. For better readability the indentation of unityshell.xml should be fixed.
Opinions ?