diff options
| author | kamalpreetgrewal <grewalkamal005@gmail.com> | 2016-06-11 05:26:41 +0000 |
|---|---|---|
| committer | kamalpreetgrewal <grewalkamal005@gmail.com> | 2016-06-11 05:26:41 +0000 |
| commit | 3a7e812041c58160cd5d2823952420f4e740f16b (patch) | |
| tree | feb34aeb3f2a8fcb527ed26626d265b1b78822dc /src | |
| parent | Populate style dialog with existing selectors in stylesheet (diff) | |
| parent | Enabled using the context menu key additionally to the already working Shift+... (diff) | |
| download | inkscape-3a7e812041c58160cd5d2823952420f4e740f16b.tar.gz inkscape-3a7e812041c58160cd5d2823952420f4e740f16b.zip | |
Merge changes from trunk
(bzr r14949.1.8)
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | src/ui/tools/tool-base.cpp | 5 |
2 files changed, 5 insertions, 11 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index df25728f4..cf5130317 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -513,17 +513,6 @@ add_library(inkscape_base SHARED ${inkscape_SRC} ${sp_SRC}) add_executable(inkscape ${main_SRC} ) add_executable(inkview inkview.cpp ) - - -if(UNIX) -# message after building. -add_custom_command( - TARGET inkscape - POST_BUILD MAIN_DEPENDENCY inkscape - COMMAND ${CMAKE_COMMAND} -E echo 'now run: \"make install\" to copy runtime files & scripts to ${CMAKE_INSTALL_PREFIX}' -) -endif() - add_dependencies(inkscape inkscape_version) if(WITH_DBUS) diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp index abac2c091..36fe26e76 100644 --- a/src/ui/tools/tool-base.cpp +++ b/src/ui/tools/tool-base.cpp @@ -683,6 +683,11 @@ bool ToolBase::root_handler(GdkEvent* event) { } break; + case GDK_KEY_Menu: + sp_event_root_menu_popup(desktop, NULL, event); + ret = TRUE; + break; + case GDK_KEY_F10: if (MOD__SHIFT_ONLY(event)) { sp_event_root_menu_popup(desktop, NULL, event); |