I added a key configuration for this command, changed a variable name and added the...

diff --git a/AUTHORS b/AUTHORS
index d65e9dd2af8423f39bcc3746a68a5db50c888155..ea794f84508308714ec3496895f9b1a515c2f425 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -84,3 +84,4 @@ David Yip
 Masatake Yamato
 Jos Hirth
 Alan Horkan
+Johan Engelen

diff --git a/share/keys/default.xml b/share/keys/default.xml
index ba5c855622588494f972331950a1c266fecc1ac2..0ab7c934f9620329faf4a2cfbbedad964aa0f09e 100644 (file)
--- a/share/keys/default.xml
+++ b/share/keys/default.xml
@@ -55,6 +55,9 @@ override) the bindings in the main default.xml.
   <bind key="s" modifiers="Ctrl,Shift" action="FileSaveAs" display="true"/>
   <bind key="S" modifiers="Ctrl,Shift" action="FileSaveAs" />
 
+  <bind key="s" modifiers="Ctrl,Shift,Alt" action="FileSaveACopy" display="true"/>
+  <bind key="S" modifiers="Ctrl,Shift,Alt" action="FileSaveACopy" />
+
   <bind key="p" modifiers="Ctrl" action="FilePrint" display="true"/>
   <bind key="P" modifiers="Ctrl" action="FilePrint" />
 

diff --git a/share/keys/inkscape.xml b/share/keys/inkscape.xml
index ba5c855622588494f972331950a1c266fecc1ac2..0ab7c934f9620329faf4a2cfbbedad964aa0f09e 100644 (file)
--- a/share/keys/inkscape.xml
+++ b/share/keys/inkscape.xml
@@ -55,6 +55,9 @@ override) the bindings in the main default.xml.
   <bind key="s" modifiers="Ctrl,Shift" action="FileSaveAs" display="true"/>
   <bind key="S" modifiers="Ctrl,Shift" action="FileSaveAs" />
 
+  <bind key="s" modifiers="Ctrl,Shift,Alt" action="FileSaveACopy" display="true"/>
+  <bind key="S" modifiers="Ctrl,Shift,Alt" action="FileSaveACopy" />
+
   <bind key="p" modifiers="Ctrl" action="FilePrint" display="true"/>
   <bind key="P" modifiers="Ctrl" action="FilePrint" />
 

diff --git a/src/file.cpp b/src/file.cpp
index b350ce97b6e7756d8bf3cbc01276b095ee21efcc..4bb5763b6f74a831c5f6e48bd468fef000977094 100644 (file)
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -535,7 +535,7 @@ static Inkscape::UI::Dialog::FileSaveDialog *saveDialogInstance = NULL;
  * \param    ascopy  (optional) wether to set the documents->uri to the new filename or not
  */
 bool
-sp_file_save_dialog(SPDocument *doc, bool bAsCopy)
+sp_file_save_dialog(SPDocument *doc, bool is_copy)
 {
 
     Inkscape::XML::Node *repr = sp_document_repr_root(doc);
@@ -605,7 +605,7 @@ sp_file_save_dialog(SPDocument *doc, bool bAsCopy)
              Inkscape::UI::Dialog::FileSaveDialog::create(
                  save_loc,
                  Inkscape::UI::Dialog::SVG_TYPES,
-                 bAsCopy ? (char const *) _("Select file to save copy to") : (char const *) _("Select file to save to"),
+                 is_copy ? (char const *) _("Select file to save copy to") : (char const *) _("Select file to save to"),
                  default_extension
             );
 
@@ -627,7 +627,7 @@ sp_file_save_dialog(SPDocument *doc, bool bAsCopy)
         else
             g_warning( "Error converting save filename to UTF-8." );
 
-        success = file_save(doc, fileName, selectionType, TRUE, !bAsCopy);
+        success = file_save(doc, fileName, selectionType, TRUE, !is_copy);
 
         if (success)
             prefs_set_recent_file(SP_DOCUMENT_URI(doc), SP_DOCUMENT_NAME(doc));