# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: removemarenhachmannthis@yahoo.com-20160601012725-\ # t6h9m19vnupqas6l # target_branch: bzr+ssh://bazaar.launchpad.net/+branch/inkscape-docs/ # testament_sha1: 2d4cedf7269af4ea7b43f532a0b6a54ce737ef30 # timestamp: 2016-06-01 03:27:35 +0200 # base_revision_id: nicoduf@yahoo.fr-20160531152926-p0333zvyv8jbbtce # # Begin patch === modified file 'keys/keys.xml' --- keys/keys.xml 2015-02-04 13:28:45 +0000 +++ keys/keys.xml 2016-06-01 01:27:25 +0000 @@ -8,15 +8,14 @@ This document describes the default keyboard and mouse shortcuts of Inkscape, corresponding to the -share/keys/default.xml file in Inkscape distribution. Most (but not all) of these keys -are configurable by the user; see the default.xml file for details on how to do that. +share/keys/default.xml file in your Inkscape installation. Some of the keyboard shortcuts may not be available for non-US keyboard layouts, but most (not all) of these shortcuts are configurable by the user. You can create custom shortcuts and load custom keyboard shortcut files in the Inkscape Preferences, or by following the instructions in the default.xml file. Unless noted otherwise, keypad keys (such as arrows, Home, End, +, -, digits) are supposed to work the same as corresponding regular keys. If you have a new shortcut idea, please contact the developers (by writing to the devel mailing list -or by submitting an -RFE). +or by submitting a +feature request). @@ -69,7 +68,7 @@ ShiftCtrlOObject Properties ShiftCtrlHUndo History ShiftCtrlXXML Editor -ShiftCtrlDDocument Preferences +ShiftCtrlDDocument Properties ShiftCtrlPInkscape Preferences ShiftCtrlEExport to PNG CtrlFFind @@ -101,11 +100,11 @@ -Controls bar +Tool controls bar Access -The Controls bar at the top of the document window provides different buttons and controls for each tool. +The tool controls bar at the top of the document window provides different buttons and controls for each tool. AltXjump to the first editable field @@ -113,7 +112,7 @@ Navigate Tabjump to next field ShiftTabjump to previous field -Use these to navigate between fields in the Controls bar (the value in the field you leave, if changed, is accepted). +Use these to navigate between fields in the tool controls bar (the value in the field you leave, if changed, is accepted). @@ -186,14 +185,14 @@ Shiftmouse dragdrag a guide (not near anchor) to rotate it ShiftCtrlmouse dragrotate guide with angle snapping Deldelete guide -| Shift\toggle guides and snapping to guides -If you want to see the guides but not snap to them, use the global snapping toggle (% key). -When you create a new guide by dragging off the ruler, guide visibility and snapping are turned on. -#Shift3toggle grids and snapping to grids -If you want to see the grids but not snap to them, use the global snapping toggle (% key). +| Shift\toggle guide visibility +For activating / deactivating snapping to guides, use the snap bar or the global snapping toggle (% key). +When you create a new guide by dragging off the ruler, guide visibility is automatically turned on. +#Shift3toggle grids visibility +For activating / deactivating snapping to grids, use the snap bar or the global snapping toggle (% key). Note that only the 3 key on the main keyboard works, not on the keypad. %toggle snapping on and off -This toggle affects snapping to grids, guides, and objects in all tools. +This toggle affects snapping to grids, guides, and objects in all tools. The settings in the snap bar determine which snap targets and snapping points will snap. @@ -353,7 +352,7 @@ Bitmaps AltBcreate a bitmap copy -This exports the selected object(s) (all other objects hidden) as PNG in the document's directory and imports it back. +This exports the selected object(s) (all other objects hidden) as PNG in the document's directory and imports it back as embedded bitmap. The imported bitmap is placed over the original selection and is selected. ShiftAltBtrace bitmap This opens the Trace Bitmap dialog allowing you to convert a bitmap object to path(s). @@ -468,7 +467,7 @@ When you left-click on an object, previous selection is deselected. Shiftclicktoggle selection Shift+click adds an object to the current selection if it was not selected, or deselects it otherwise. -clickclickedit the object +double-clickedit the object For paths, double clicking switches to Node tool; for shapes, to corresponding shape tool; for text, to Text tool. For groups, double clicking performs the "Enter group" command (the group becomes a temporary layer). Double clicking in empty space switches to the parent layer in the hierarchy, if any. @@ -535,7 +534,7 @@ If your keyboard has a Meta key, you may wish to set your "Modifier key" to use it instead of Alt. Ctrlmouse dragrestrict movement to horizontal or vertical Shiftmouse dragtemporarily disable snapping -This temporarily disables snapping to grid or guides when you are dragging with grid or guides on. +This temporarily disables snapping when you are dragging with snapping activated. mouse dragSpacedrop a copy When dragging or transforming with mouse, each Space leaves a copy of the selected object. You can press and hold Space while dragging for a nice "trail." @@ -579,7 +578,7 @@ Alt. Alt>scale selection up by 1 pixel Alt, Alt<scale selection down by 1 pixel The actual size increment for pixel scaling depends on zoom level. Zoom in for finer scaling. -Scaling is uniform around the center, so that the size increment applies to the larger of the two dimensions. +The default size increment is added to (or subtracted from) either the selection's height or width, whichever one is larger. Scaling is done around the center of the selection's bounding box and keeps the proportions of the selected object(s). @@ -589,6 +588,7 @@ Holding Ctrl when dragging a skew (non-corner) handle snaps the skew angle to angle steps (default 15 degrees). Ctrlmouse dragsnap rotation angle Holding Ctrl when dragging a rotation (corner) handle snaps the rotation angle to angle steps (default 15 degrees). +Shiftmouse dragrotate around opposite corner @@ -684,7 +684,7 @@ CtrlPgUp CtrlPgDngrow/shrink selection (along path) Ctrlmouse wheelgrow/shrink selection (along path) Your mouse pointer must be over a node for growing/shrinking. -Each key press or wheel click selects the nearest unselected node or deselects the farthest selected node. +Each key press or turn of the mouse wheel selects the nearest unselected node or deselects the farthest selected node. Distance to nodes can be calculated directly (spatial mode) or along path. @@ -693,7 +693,7 @@ mouse dragmove selected nodes Ctrlmouse dragrestrict movement to horizontal or vertical CtrlAltmouse dragmove along handles -This restricts movement to the directions of the node's handles, their continuations and perpendiculars (total 8 snaps). +This restricts movement to the directions of the node's handles, their counter directions and perpendiculars (total 8 snaps). If the node has straight lines on one or both sides, this will snap it to these lines' directions and perpendiculars instead. Shiftmouse dragtemporarily disable snapping Shiftmouse dragdrag out handle @@ -721,7 +721,7 @@ Move node handle (mouse) mouse dragmove a node handle Ctrlmouse dragsnap the handle to angle steps -The default angle step is 15 degrees. This also snaps to the handle's original angle, its continuation and perpendiculars. +The default angle step is 15 degrees. This also snaps to the handle's original angle, its counter direction and perpendiculars. Shiftmouse dragrotate both handles Altmouse draglock the handle length Ctrl, Shift, Alt can be combined when dragging handles. @@ -781,7 +781,7 @@ Alt. Alt>scale nodes up by 1 pixel Alt, Alt<scale nodes down by 1 pixel The actual size increment for pixel scaling depends on zoom level. Zoom in for finer scaling. -Scaling is uniform around the center, so that the size increment applies to the larger of the two dimensions. +The default size increment is added to (or subtracted from) either the node selection's height or width, whichever one is larger. Scaling keeps the proportions of the node selection. @@ -842,7 +842,7 @@ CtrlAltclickcreate/delete node Ctrl+Alt+click on a node deletes it; Ctrl+Alt+click on the path between nodes creates a new node in the click point. Deleting nodes this way always tries to preserve the shape of the curve (same as Del/Backspace). -clickclickcreate node +double-clickcreate node Double clicking on the path between nodes creates a node in the click point. InsShiftIinsert new node(s) This adds new node(s) in the middle(s) of selected segment(s), so it requires that more than two adjacent nodes be selected. @@ -900,8 +900,8 @@ Operation mouse dragact on selected paths in the current mode Shiftmouse dragreverse current mode (when applicable) -Ctrlmouse dragact temporarily switching to shrink mode -ShiftCtrlmouse dragact temporarily switching to grow mode +Ctrlmouse dragtemporarily switch to shrink mode +ShiftCtrlmouse dragtemporarily switch to grow mode The amount of tweaking action is the greatest at the center of the circular area and drops off smoothly towards the edges. @@ -931,7 +931,7 @@ Parameters Left arrow Right arrowadjust brush width by 1 -Home Endset brush width to 1 / 100 +Home Endset brush width to its minimum or maximum Up arrow Down arrowadjust tweaking force Width and force can be adjusted while drawing. With a pressure-sensitive tablet, force also depends on pen pressure. @@ -953,7 +953,7 @@ mouse dragmeasure distance and angle between the start point and the cursor -Shiftmouse dragset the measure base to the cursor +Shiftmouse dragset base of angle measurement to cursor position Ctrlmouse dragsnap angle measure to angle steps The default angle step is 15 degrees. @@ -966,7 +966,7 @@ Draw mouse dragdraw a rectangle Ctrlmouse dragmake a square or integer-ratio rectangle -This restricts rectangle so its height/width ratio is a whole number. +This restricts width/height ratio or its inverse to a whole number or the golden ratio. Shiftmouse dragdraw around the starting point This creates a rectangle symmetric around the starting point of the mouse drag. @@ -1059,7 +1059,7 @@ With Alt the ellipse is enlarged so that its circumference passes through these two points (Ctrl+Alt is a special case; see below). mouse dragdraw an ellipse Ctrlmouse dragmake circle or integer-ratio ellipse -This restricts ellipse so its height/width ratio is a whole number. +This restricts width/height ratio or its inverse to a whole number or the golden ratio. Shiftmouse dragdraw around the starting point This creates an ellipse symmetric around the starting point of the mouse drag. CtrlAltmouse dragcreate circle passing through the starting and ending point @@ -1167,12 +1167,13 @@ Pencil tool -mouse dragdraw a freehand line +mouse dragdraw a freehand path Shiftmouse dragadd to selected path -If a path is selected, Shift+clicking anywhere starts a new subpath instead of a new independent path. +If a path is selected, Shift+dragging from anywhere starts a new subpath instead of a new independent path. Shiftmouse dragtemporarily disable snapping -This temporarily disables snapping to grid or guides when you are dragging with grid or guides on. +This temporarily disables snapping when you are dragging with snapping activated. Altmouse dragaveraging draw (sketch mode) +clickstart a straight path (finish with another click) @@ -1231,10 +1232,10 @@ Finish -Enterfinish current line -right clickfinish current line -clickclickfinish current line -Enter, right click, or double left click finish the current line, discarding the last unfinished (red) segment. +Enterfinish current path +right clickfinish current path +double-clickfinish current path +Enter or right click finish the current line, discarding the last unfinished (red) segment. Double left click finishes the current line where double-clicked. @@ -1249,7 +1250,7 @@ Calligraphy tool -mouse dragdraw a calligraphic line +mouse dragdraw a calligraphic stroke Shiftmouse dragadd to selected path Drawing with Shift unions the newly created stroke with the previous selection. Altmouse dragsubtract from selected path @@ -1257,7 +1258,7 @@ Ctrlmouse dragtrack a guide path Drawing with Ctrl tracks a selected guide path at the constant distance. Left arrow Right arrowadjust pen width by 1 -Home Endset pen width to 1 or 100 +Home Endset pen width to its minimum or maximum Up arrow Down arrowadjust pen angle Width and angle can be adjusted while drawing. Escdeselect @@ -1285,7 +1286,7 @@ Home Endgo to beginning/end of line CtrlHome CtrlEndgo to beginning/end of text PgUp PgDnmove cursor by one screen -All these commands cancel current text selection, if any. Use them with Shift to extend selection instead. +All these commands cancel current text selection, if any. Use them with Shift to add to / subtract from selection instead. @@ -1338,7 +1339,7 @@ ShiftHome ShiftEndselect to beginning/end of line ShiftCtrlHome ShiftCtrlEndselect to beginning/end of text ShiftPgUp ShiftPgDnselect one screen up/down -clickclickselect word +double-clickselect word clickclickclickselect line CtrlAselect all text This selects the entire text of the current text object. @@ -1406,7 +1407,7 @@ Parameters Left arrow Right arrowadjust spray width by 1 Up arrow Down arrowadjust spray population by 1 -Home Endset spray width to 1 / 100 +Home Endset spray width to its minimum or maximum @@ -1416,7 +1417,7 @@ Left arrow Right arrowadjust eraser width by 1 -Home Endset eraser width to 1 / 100 +Home Endset eraser width to its minimum or maximum @@ -1431,7 +1432,7 @@ mouse dragfill from each point From each point, the fill spreads to the neighbors with the colors similar to that point. This can be used to fill an area currently filled with a gradient or blur. -Altmouse dragfill from each point same as initial point +Altmouse dragfill from each point similar to the initial point From each point, the fill spreads to the neighbors with the colors similar to the initial point of the drag. This can be used to fill several disjoint bounded areas by starting in one and dragging over all of the areas. Ctrlclickset fill color @@ -1454,8 +1455,8 @@ Create gradients mouse dragcreate gradient -This creates gradient on selected objects. The Controls bar lets you select linear/radial and fill/stroke for the new gradient. -clickclickcreate default gradient +This creates gradient on selected objects. The tool controls bar lets you select linear/radial and fill/stroke for the new gradient. +double-clickcreate default gradient This creates default (horizontal edge-to-edge for linear, centered edge-to-edge-to-edge for radial) gradient on clicked object. @@ -1474,12 +1475,12 @@ Create/delete intermediate stops CtrlAltclickcreate a stop -clickclickcreate a stop +double-clickcreate a stop Ctrl+Alt+click or double click on a gradient line creates a new intermediate stop. CtrlAltclickdelete stop Ctrl+Alt+click on a stop's handle deletes the stop; if it was an end stop, gradient shortens or disappears. Insinsert new stop(s) -This adds new stop(s) in the middle(s) of selected segment(s), so it requires that more than two adjacent handles be selected. +This adds new stop(s) in the middle(s) between adjacent, selected stops or, if only one stop is selected, in the middle of the segment that starts with the selected stop. Deldelete selected stops @@ -1506,13 +1507,6 @@ This mirrors the stop positions of the current gradient without moving the gradient handles. - - -Gradient editor -clickclickopen gradient editor -Double clicking a gradient handle opens the Gradient Editor with that gradient and the clicked handle chosen in the stops list. - - # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbhg1iwABbRfgEAQWu//93/j TqS////0YA29tB9KLZ97zy8KV7wcAiFekmQoClHTXXp3dzp0QkiJk0mTENGlDR6nqNGgaAAxA0AD TQImIIm0RPUnqephANBoAABmoHMARgmIBgEwTRkNDAJgjEwk1ISaInop5NpM1J+lHo0RtRgI9TAm TCMgilKfokPNUNGgYgAABoAaAAaCREJoEDRBGIMmlPTJknqeoaAAB6nFx7SQMPv2e0yrkMWrQksi xdlUDElIFPTh25hEGRREHrXJsuokZdeucmDMtVVbAha0E2WjUeFJPIseuvDT7i/41des+H36+kjv 6MmZgEfb5iAzjrhhszBEDmq9OjIxgh3UdpgpJoqjoSaljJnXazmoXuNzmKm9KUxWGYNUXrhYdXZ6 mMqWaxoqscoWzPR5JL9XYVhbKrZK58du5B6V8nTivKB3ehQnP2if3qVr1DyLBmS8mWHLTxYZmTel NG/uPaLjw/zWHso9hIKiX8z8YnVa0J9N6tnIksNQLrMU2ZxslOyr+oaO/IuyY6G+SWBLOddiu+sM 3anlXXoZ3uTO2+VaigFejtxRtmLLAGTpQMn3w+rhkqRy2Vx0pga6yKzSnEagU0p8Y/Xe4sDPattE dmAhUIG28zEc9JOhR1lN48oJHMKOT2wIdee2l6GPbPTHU5BgjPIEdG2fYixQjnOlNMDsqOAYYTAo 2p4cqsKmKjZkg5nV1XhCMm0kRTYOFFPTWpI2rxJ+BuvEchzwLbg9l34NrzVzYBxxguFiAoqwUE0L xsDOOT9lFwmWMzJsJc551Iqq3iuW4RczKq7MRknI1vTQxWqbI2EYzV0H7rtp4919vqT1iMYIDjzm i2pxvGgGXdWHXWTxBxgcmBx32iBjdbMzhXMKm49i3FAMBHGVQAa+fLmE0YI+Qm6Q289c/C+qcmIV dDfFTOVMSUpqpKG44I6QHXlYVSRSddAqZk7cpIzDxbd88SRQLJ1oBZJdBWWC5KkohzjmvjHxK2VO 6BVRjXxLY9qgh2V7FZ/2tEgKM/FrDPOXhpk/tXD36IPRRLken6StyaCaQZK8CuJjS5duioxXvO9j FcyZLBkZ303Tq0sRIK2DxQMA56OScp1I08oqyV0y7LcUJGVcLM3beReU5tdFm3oWOWBlivTEPdBc 9LFBTRQQMXA7YJxW0hTtN486gZvlbbXDlNMVhKYTIKIFWIVNARRsiq3f369d8YAwb1Q4guFxoSrc noAxedgznUZdWFxS6O6LAuWQdwBFg5ylHm2qxaHi7EnMJ62G5m9hLoDqjDcLa1VN00o6ZLJRVUUc R6u3XEQDk9wbqu1bqVnGYroIgtpZ+GGzWQzai9ovIW6vDTUnThZrSTqNfJVSwPlIsE3DjjK4Qqki vDgkzC4xm2ktK+Wk6DCmooHrRKTsIz0XOAMaZBcgajXXxS2g2D1rLidxUqUUVsn6pOLm0EYEGpOd T3CkXPLhoFOd9DynRg4FGQ3qsjICcjHO+PQD8Ovm6EUHnPfAeixu+HImh91BvsiMiGwIrdOAg3lW +qQGKFTsz3Wkh2DCQQkKpBCCys9/l6e1ZSHFVeJA62QWfuk2sBRE0kvzQM5IIeNIsVYIXkg0MiVA WRgyGRkALSU5hfK1AqINiIBRaJGc6FAIF0MspN4NZnrRX3Whw3qB/lqgnk+VT6IXIsbbbQfOIG9L 6sNfXQsvqwJDyOBr759B2fePVnoZ/bpvP8b0vy9Ga1SRySRkFzudhDchFgjYfnKW5gfBIf5cfr2P efYj9mZahGGFKF6pcmme1woAasFRDmAQFZBZC8ezjPI2V8ln/rRKyL4muoXJJ5sk+4tbWwxzwiS/ yg975D1AsSGQZVz1FOZTlYuh1/Z/BfX7P7Z+Jp1jAy9qjA0UHYfn3Kbi9JQBp2AO9VJ846KVHtYv kIRl8zQ4cj+JhZmghB4o8jA4ejE3etTNMdKSZ2ImaskCXA2oWnWCnW2DzyawDHbSGSjmbNPRBEAS SDraIzUxG1F5lA35CTDE0aGhXnSgWzQWGhTp/LBC0ivLyb2iWjmhadOWhLR5RomNGhomHazUnIvg qkSNZEznCWdcKt7VXATlpf2aknO2YJ6ok92u8l4d0YUty4VkbbFEpMpI/tAQPnH4k5vMeLrs4AmC MvVOlCmkJSOWppeiVBVIkxmpPnHpaVaxd5/Pr4nh7Mjyw9f6eA1Z8uudsNj+BDhNk5EVFIgooMYx QQ0ghmu6HE6h6TIsdfWZ9QssV5poJYmoIQH+s6UMmRYxAo6tbFt3JjQz5XpbnsafMWkjSJjbaxS/ HJHQ0pg9XO+D1GSQX70sdVDS2B4Gp2YKKEppdjYzKkBKNIihE4qFjbErTGo3YfQgW37R7N89TYVm tTjiWjFIaFPljfF8MSShjqg/cg6uRhLVZHWUJhNGovDaJIWjh+mvTIyYOB0cdyvOnQPAxvvqKbM8 2SPNmhneIrc4/SDFne2n9Kw2L4fgECvkBxVbHFiRolVojrUBwRQD0oMTUd6bxUMVQX01C/NNsTdE ppBKKKZ7SIVYNEmegvfEP9jABQRnBbqyP2MFj/qCCsBc2osPmBkIslYCpskXEkpwjkl+faAi5v90 deC8pcs9y5tAwlWPp91bzPQvgzBW2A8TFaHJQsgMbm85sjfjTWBeSejsGhx14h8ghI6M+APHXRnT Jeg2xqOaGFZSoUwDclju7u+Q9h4vqvwYNRDjRVJILDZwBcO4KqMRIVOiXYlSdi7RgWm514JcjoqC qohY/NYC8AxYjiPIDikbIQMQmAwI8CW0SHgHyVw8TwWQcuRxKTEDJqRBWZqHIIgO1eRvPYOvnFsR +C53cERFDqhjlKg+sjDBIHrnSxevUC0hcCybb/5BHdBuyi24vEKoqVFe03NmT44LAGb2B9RSEdPA DayXRV3onAlCNaTQ3sgj1bio7wGfPyRmUXwSZ3pB3pBqlO7QkNBHOCMazXaoq4FA1KQJK0bYA3yX hwVJSDQdgUhk0JeAQFry+6UTaqBWB4JdWgShfMZhYC6Xk+CEcEIpUWeAZpDYhsge44JQr4g1NJ3y WhmdXcALDxsozkNgBtYmknR72ai9B2esLAs0e9UM0d54HCiKMs2y6UMA/D8wg4mbDVqGIFuhe6sX qiUaJEr4szaGFo/8ecm9ifVHgMJYWDYPjNFpoJJVRYGdLZjToUTHuYDFDpZ62i7MprVSIAkU8ret X2jVsJSGM9yxmQAN34iNvI86NPNi8sS4cBFNOBBoarcsOoRVYhYfwoUqIzsxemm5qmhY7IuJtngp LdFWsVKYVChGoFFVSLzhUswarguXiutK4MKc6UC+gWNOeasyzM4jsFuDv327rumZZibxtfhu0jJN 2BOizU7qXByClz7lgqvJlMOVlKvwIkDZGW25ZZEaZGQqEERkJJOSCGE2x2sBtzmVQe8vaqhvcA8e rvh1qZd0gLTSrpQEKKLu4Xsi1yBwUG5wlFO4KxNIG9M6TrpUNRXrIGSWDNPWEVOSV3DP5GZMpINv BrptAlVzy25QvqC7+eDm7tzLdDcyQZCLQWihzlEtazggM9T4E2wYxbGogNiMjAGqV71ScKpuZLFr X1uxjv7y2m9ZAVlhCBCi/g9BGGF1swoDYsmAwMOoVqFrBZmGYhKuRGlzc1HgtTeJJfhkEsKiEY4G qDuZUyNiuodT5WsuMaDGuolIhcJDcmswVOHTJljFXNhRvIoayLhAFVvr7ZF1KqzSRxOJ1Z0RLYGG 5b69SqH3VYGh7seb0yGUmAkJZaK1pNFUrXt46lCqgRrFTY4GhD6K8uqIXnBFCeysXfAxKlC1XDGe mQpy50ZdKgGA0kDzlaNISyarPsVLcRRUDNchkTVUD8hf5+SqUVhjWpgGTSU7iBRWwfpRCNd/UQRl alWVcyV3Ox90iiEkfDMWFRFdQlxVKtQdSq6Vw/4u5IpwoSFwwaxY