From e4ed7cef32c637af1466b6b41d77a246576ce9b7 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Fri, 30 Jun 2017 14:15:54 +0200 Subject: Fix revno --- CMakeLists.txt | 18 +++++++++--------- CMakeScripts/inkscape-version.cmake | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8daaabe3b..35871ee28 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -151,22 +151,22 @@ endif() # ----------------------------------------------------------------------------- # Dist Target # ----------------------------------------------------------------------------- -if(EXISTS ${CMAKE_SOURCE_DIR}/.bzr/) +if(EXISTS ${CMAKE_SOURCE_DIR}/.git/) execute_process(COMMAND - bzr revno --tree ${CMAKE_SOURCE_DIR} + git describe OUTPUT_VARIABLE INKSCAPE_REVISION OUTPUT_STRIP_TRAILING_WHITESPACE) else() set(INKSCAPE_REVISION "unknown") endif() set(INKSCAPE_DIST_PREFIX "${PROJECT_NAME}-${INKSCAPE_VERSION}") -add_custom_target(dist - COMMAND sed -i "s/unknown/r${INKSCAPE_REVISION}/" CMakeScripts/inkscape-version.cmake - && sed -i "s/custom//" CMakeScripts/inkscape-version.cmake - && bzr export --uncommitted --root=${INKSCAPE_DIST_PREFIX} - "${CMAKE_BINARY_DIR}/${INKSCAPE_DIST_PREFIX}.tar.bz2" - && bzr revert ${CMAKE_SOURCE_DIR}/CMakeScripts/inkscape-version.cmake - WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}") +#add_custom_target(dist +# COMMAND sed -i "s/unknown/r${INKSCAPE_REVISION}/" CMakeScripts/inkscape-version.cmake +# && sed -i "s/custom//" CMakeScripts/inkscape-version.cmake +# && bzr export --uncommitted --root=${INKSCAPE_DIST_PREFIX} +# "${CMAKE_BINARY_DIR}/${INKSCAPE_DIST_PREFIX}.tar.bz2" +# && bzr revert ${CMAKE_SOURCE_DIR}/CMakeScripts/inkscape-version.cmake +# WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}") # ----------------------------------------------------------------------------- # Uninstall Target diff --git a/CMakeScripts/inkscape-version.cmake b/CMakeScripts/inkscape-version.cmake index 2e23925c4..65903c47b 100644 --- a/CMakeScripts/inkscape-version.cmake +++ b/CMakeScripts/inkscape-version.cmake @@ -11,14 +11,14 @@ set(INKSCAPE_REVISION "unknown") set(INKSCAPE_CUSTOM "custom") -if(EXISTS ${INKSCAPE_SOURCE_DIR}/.bzr/) +if(EXISTS ${INKSCAPE_SOURCE_DIR}/.git/) execute_process(COMMAND - bzr revno --tree ${INKSCAPE_SOURCE_DIR} + git describe ${INKSCAPE_SOURCE_DIR} OUTPUT_VARIABLE INKSCAPE_REVISION OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND - bzr status -S -V ${INKSCAPE_SOURCE_DIR}/src + git status -s ${INKSCAPE_SOURCE_DIR}/src OUTPUT_VARIABLE INKSCAPE_SOURCE_MODIFIED OUTPUT_STRIP_TRAILING_WHITESPACE) if(NOT INKSCAPE_SOURCE_MODIFIED STREQUAL "") -- cgit v1.2.3 From 7811297f0ad86acaad0477096dd919f51e18b3e7 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Fri, 30 Jun 2017 15:20:13 +0200 Subject: Fix revno with git --- CMakeLists.txt | 19 ++++++++++--------- CMakeScripts/inkscape-version.cmake | 16 ++++++++++++---- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 35871ee28..7bd6294ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -152,21 +152,22 @@ endif() # Dist Target # ----------------------------------------------------------------------------- if(EXISTS ${CMAKE_SOURCE_DIR}/.git/) - execute_process(COMMAND - git describe + execute_process( + COMMAND git show --format=format:"%ad %h" --date=short + COMMAND head -n 1 + COMMAND tr "\n" " " OUTPUT_VARIABLE INKSCAPE_REVISION OUTPUT_STRIP_TRAILING_WHITESPACE) else() set(INKSCAPE_REVISION "unknown") endif() set(INKSCAPE_DIST_PREFIX "${PROJECT_NAME}-${INKSCAPE_VERSION}") -#add_custom_target(dist -# COMMAND sed -i "s/unknown/r${INKSCAPE_REVISION}/" CMakeScripts/inkscape-version.cmake -# && sed -i "s/custom//" CMakeScripts/inkscape-version.cmake -# && bzr export --uncommitted --root=${INKSCAPE_DIST_PREFIX} -# "${CMAKE_BINARY_DIR}/${INKSCAPE_DIST_PREFIX}.tar.bz2" -# && bzr revert ${CMAKE_SOURCE_DIR}/CMakeScripts/inkscape-version.cmake -# WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}") +add_custom_target(dist + COMMAND sed -i "s/unknown//" CMakeScripts/inkscape-version.cmake + && sed -i "s/custom//" CMakeScripts/inkscape-version.cmake + && tar cfz ${CMAKE_BINARY_DIR}/${INKSCAPE_DIST_PREFIX}.tar.gz ${CMAKE_SOURCE_DIR} --exclude=".*" --exclude-vcs-ignores + && git checkout ${CMAKE_SOURCE_DIR}/CMakeScripts/inkscape-version.cmake + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}") # ----------------------------------------------------------------------------- # Uninstall Target diff --git a/CMakeScripts/inkscape-version.cmake b/CMakeScripts/inkscape-version.cmake index 65903c47b..12b8a26d8 100644 --- a/CMakeScripts/inkscape-version.cmake +++ b/CMakeScripts/inkscape-version.cmake @@ -12,10 +12,18 @@ set(INKSCAPE_REVISION "unknown") set(INKSCAPE_CUSTOM "custom") if(EXISTS ${INKSCAPE_SOURCE_DIR}/.git/) - execute_process(COMMAND - git describe ${INKSCAPE_SOURCE_DIR} - OUTPUT_VARIABLE INKSCAPE_REVISION - OUTPUT_STRIP_TRAILING_WHITESPACE) + + execute_process(COMMAND git describe + COMMAND tr "\n" " " + WORKING_DIRECTORY ${INKSCAPE_SOURCE_DIR} + OUTPUT_VARIABLE INKSCAPE_REV1) + execute_process(COMMAND git show --format=format:%ad --date=short + COMMAND head -n 1 + COMMAND tr "\n" " " + WORKING_DIRECTORY ${INKSCAPE_SOURCE_DIR} + OUTPUT_VARIABLE INKSCAPE_REV2 + OUTPUT_STRIP_TRAILING_WHITESPACE) + set(INKSCAPE_REVISION ${INKSCAPE_REV1} ${INKSCAPE_REV2}) execute_process(COMMAND git status -s ${INKSCAPE_SOURCE_DIR}/src -- cgit v1.2.3 From 752b8573f6ecb42b590571702ee71215a9f1e1f4 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Fri, 30 Jun 2017 15:21:10 +0200 Subject: Fix and clean clean some icons. --- share/icons/format-text-direction-horizontal.svg | 58 +++++++++------------- share/icons/format-text-direction-r2l.svg | 57 ++++++++++------------ share/icons/format-text-direction-vertical.svg | 62 +++++++++++------------- share/icons/text-orientation-auto.svg | 58 ++++++++++------------ share/icons/text-orientation-sideways.svg | 58 ++++++++++------------ share/icons/text-orientation-upright.svg | 58 ++++++++++------------ 6 files changed, 151 insertions(+), 200 deletions(-) diff --git a/share/icons/format-text-direction-horizontal.svg b/share/icons/format-text-direction-horizontal.svg index ecac387c4..351ea6036 100644 --- a/share/icons/format-text-direction-horizontal.svg +++ b/share/icons/format-text-direction-horizontal.svg @@ -1,48 +1,36 @@ - - - - - - + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - diff --git a/share/icons/format-text-direction-r2l.svg b/share/icons/format-text-direction-r2l.svg index 22abacfcf..fd2cd7ea1 100644 --- a/share/icons/format-text-direction-r2l.svg +++ b/share/icons/format-text-direction-r2l.svg @@ -1,44 +1,37 @@ - - - + + + + + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/share/icons/format-text-direction-vertical.svg b/share/icons/format-text-direction-vertical.svg index fb5b5f7fe..3d61497e7 100644 --- a/share/icons/format-text-direction-vertical.svg +++ b/share/icons/format-text-direction-vertical.svg @@ -1,46 +1,40 @@ - - - - - - - + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/share/icons/text-orientation-auto.svg b/share/icons/text-orientation-auto.svg index 8e4428bac..a4bf06643 100644 --- a/share/icons/text-orientation-auto.svg +++ b/share/icons/text-orientation-auto.svg @@ -1,45 +1,37 @@ - - - - - - - + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/share/icons/text-orientation-sideways.svg b/share/icons/text-orientation-sideways.svg index 97bb55173..a6ce53531 100644 --- a/share/icons/text-orientation-sideways.svg +++ b/share/icons/text-orientation-sideways.svg @@ -1,45 +1,37 @@ - - - - - - + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/share/icons/text-orientation-upright.svg b/share/icons/text-orientation-upright.svg index 5092b267b..222a3d518 100644 --- a/share/icons/text-orientation-upright.svg +++ b/share/icons/text-orientation-upright.svg @@ -1,45 +1,37 @@ - - - - - - - + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 72f835c00565835a536531cd81dc6d9a607b615a Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Fri, 30 Jun 2017 15:47:51 +0200 Subject: Use Meta for shortcuts on Mac OS --- share/keys/default.xml | 368 +++++++++++++++++++++++++------------------------ src/shortcuts.cpp | 6 + 2 files changed, 191 insertions(+), 183 deletions(-) diff --git a/share/keys/default.xml b/share/keys/default.xml index 134251752..9a072d9da 100644 --- a/share/keys/default.xml +++ b/share/keys/default.xml @@ -11,7 +11,9 @@ source locally, you can view that file at: http://git.gnome.org/browse/gtk+/plain/gdk/gdkkeysyms.h - The "modifiers" attribute contains a comma-separated list of modifiers, which can be -one or more of: "Ctrl", "Shift", "Alt". +one or more of: "Ctrl", "Shift", "Alt", "Meta", "Super", "Hyper", or "Primary". + +"Primary" means Meta on Apple and Primary everywhere else, it's recommended over the use of Ctrl. - The "action" attribute contains the name of the action. The complete list of actions (called "verbs") is in the file src/verbs.cpp in Inkscape source; there you can see @@ -41,42 +43,42 @@ override) the bindings in the main default.xml. - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -152,7 +154,7 @@ override) the bindings in the main default.xml. - + @@ -174,13 +176,13 @@ override) the bindings in the main default.xml. - + - + @@ -232,8 +234,8 @@ override) the bindings in the main default.xml. - - + + @@ -245,12 +247,12 @@ override) the bindings in the main default.xml. - + - - - - + + + + @@ -266,11 +268,11 @@ override) the bindings in the main default.xml. - - + + - - + + @@ -281,8 +283,8 @@ override) the bindings in the main default.xml. - - + + @@ -295,35 +297,35 @@ override) the bindings in the main default.xml. - - - + + + - - - - + + + + - - + + - - + + - - - + + + - - + + - - + + - - + + @@ -336,8 +338,8 @@ override) the bindings in the main default.xml. - - + + @@ -352,13 +354,13 @@ override) the bindings in the main default.xml. - - + + - - + + @@ -385,8 +387,8 @@ override) the bindings in the main default.xml. - - + + @@ -414,8 +416,8 @@ override) the bindings in the main default.xml. - - + + @@ -423,18 +425,18 @@ override) the bindings in the main default.xml. - - + + - - - - + + + + - - - - + + + + @@ -471,46 +473,46 @@ override) the bindings in the main default.xml. - - + + - - + + - - + + - - + + - - - + + + - - - + + + - - - - - + + + + + - - + + - - + + - - - + + + - - - - + + + + @@ -518,10 +520,10 @@ override) the bindings in the main default.xml. - - - - + + + + @@ -529,14 +531,14 @@ override) the bindings in the main default.xml. - - + + - - + + - - + + @@ -554,32 +556,32 @@ override) the bindings in the main default.xml. - - + + - - + + - - - - + + + + - - + + - - + + - - + + - - + + @@ -589,8 +591,8 @@ override) the bindings in the main default.xml. - - + + @@ -608,46 +610,46 @@ override) the bindings in the main default.xml. - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -659,26 +661,26 @@ override) the bindings in the main default.xml. - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -699,15 +701,15 @@ override) the bindings in the main default.xml. effect id from the .inx file, for example "org.ekips.filter.addnodes" for the Add Nodes effect. --> - - + + - - + + diff --git a/src/shortcuts.cpp b/src/shortcuts.cpp index 0cb0285f8..8a8d36d5a 100644 --- a/src/shortcuts.cpp +++ b/src/shortcuts.cpp @@ -625,6 +625,12 @@ static void read_shortcuts_file(char const *filename, bool const is_user_set) { modifiers |= SP_SHORTCUT_HYPER_MASK; } else if (!strcmp(mod, "Meta")) { modifiers |= SP_SHORTCUT_META_MASK; + } else if (!strcmp(mod, "Primary")) { +#ifdef __APPLE__ + modifiers |= SP_SHORTCUT_META_MASK; +#else + modifiers |= SP_SHORTCUT_CONTROL_MASK; +#endif } else { g_warning("Unknown modifier %s for %s", mod, verb_name); } -- cgit v1.2.3