From 23b3bb5814b5b275abb439ce54515def69dde0c1 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Wed, 29 Jun 2016 18:18:20 +0200 Subject: [PATCH] Ask before reloading file changed with external editor To be consistent with other ways of starting external editors. Change-Id: Ia6f8d2179076482999ef527353feb91a49e1a2d9 Reviewed-by: Eike Ziller --- src/share/qtcreator/externaltools/notepad_win.xml | 2 +- src/share/qtcreator/externaltools/vi.xml | 2 +- src/share/qtcreator/externaltools/vi_mac.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/share/qtcreator/externaltools/notepad_win.xml b/src/share/qtcreator/externaltools/notepad_win.xml index f76384db9e0..62cf514e7d2 100644 --- a/src/share/qtcreator/externaltools/notepad_win.xml +++ b/src/share/qtcreator/externaltools/notepad_win.xml @@ -30,7 +30,7 @@ Opens the current file in Notepad Edit with Notepad Text - + notepad "%{CurrentDocument:FilePath}" %{CurrentDocument:Path} diff --git a/src/share/qtcreator/externaltools/vi.xml b/src/share/qtcreator/externaltools/vi.xml index 2f4dcf98f41..f703a5602ad 100644 --- a/src/share/qtcreator/externaltools/vi.xml +++ b/src/share/qtcreator/externaltools/vi.xml @@ -30,7 +30,7 @@ Opens the current file in vi Edit with vi Text - + xterm -geom %{CurrentDocument:ColumnCount}x%{CurrentDocument:RowCount}+%{CurrentDocument:XPos}+%{CurrentDocument:YPos} -e vi "%{CurrentDocument:FilePath}" +%{CurrentDocument:Row} %{CurrentDocument:Path} diff --git a/src/share/qtcreator/externaltools/vi_mac.xml b/src/share/qtcreator/externaltools/vi_mac.xml index 46fdc89dea2..77d878a3144 100644 --- a/src/share/qtcreator/externaltools/vi_mac.xml +++ b/src/share/qtcreator/externaltools/vi_mac.xml @@ -30,7 +30,7 @@ Opens the current file in vi Edit with vi Text - + osascript --Terminal opens a window by default when it is not running, so check