5 files changed, 14 insertions, 0 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index f9efdd28..e63e4636 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -4116,6 +4116,12 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
             setResponseViewer_UploadWidget(upload, d);
             addChild_Widget(get_Root()->widget, iClob(upload));
             setupSheetTransition_Mobile(as_Widget(upload), iTrue);
+            if (argLabel_Command(cmd, "copy") && isUtf8_Rangecc(range_Block(&d->sourceContent))) {
+                iString text;
+                initBlock_String(&text, &d->sourceContent);
+                setText_UploadWidget(upload, &text);
+                deinit_String(&text);
+            }
             postRefresh_App();
         }
         return iTrue;
@@ -5080,6 +5086,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                             { book_Icon " ${menu.page.import}", 0, 0, "bookmark.links confirm:1" },
                             { globe_Icon " ${menu.page.translate}", 0, 0, "document.translate" },
                             { upload_Icon " ${menu.page.upload}", 0, 0, "document.upload" },
+                            { "${menu.page.upload.edit}", 0, 0, "document.upload copy:1" },
                             { "---" },
                             { "${menu.page.copyurl}", 0, 0, "document.copylink" } },
                         16);
diff --git a/src/ui/keys.c b/src/ui/keys.c
index 30072572..d4d9320e 100644
--- a/src/ui/keys.c
+++ b/src/ui/keys.c
@@ -240,6 +240,7 @@ static const struct { int id; iMenuItem bind; int flags; } defaultBindings_[] =
     { 100,{ "${keys.hoverurl}",             '/', KMOD_PRIMARY,              "prefs.hoverlink.toggle"            }, 0 },
     { 110,{ "${menu.save.downloads}",       SDLK_s, KMOD_PRIMARY,           "document.save"                     }, 0 },
     { 120,{ "${keys.upload}",               SDLK_u, KMOD_PRIMARY,           "document.upload"                   }, 0 },
+    { 121,{ "${keys.upload.edit}",          SDLK_e, KMOD_PRIMARY,           "document.upload copy:1"            }, 0 },
     /* The following cannot currently be changed (built-in duplicates). */
 #if defined (iPlatformApple)
     { 1002, { NULL, SDLK_LEFTBRACKET,  KMOD_PRIMARY,             "navigate.back"        }, 0 },
diff --git a/src/ui/root.c b/src/ui/root.c
index 3e0124d8..bc2bc0fb 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -1402,6 +1402,7 @@ void createUserInterface_Root(iRoot *d) {
                         { book_Icon " ${menu.page.import}", 0, 0, "bookmark.links confirm:1" },
                         { globe_Icon " ${menu.page.translate}", 0, 0, "document.translate" },
                         { upload_Icon " ${menu.page.upload}", 0, 0, "document.upload" },
+                        { "${menu.page.upload.edit}", 0, 0, "document.upload copy:1" },
                         { "---" },
                         { "${menu.page.copyurl}", 0, 0, "document.copylink" },
                         { "${menu.page.copysource}", 'c', KMOD_PRIMARY, "copy" },
diff --git a/src/ui/uploadwidget.c b/src/ui/uploadwidget.c
index 28a35668..ae777a68 100644
--- a/src/ui/uploadwidget.c
+++ b/src/ui/uploadwidget.c
@@ -406,6 +406,10 @@ void setResponseViewer_UploadWidget(iUploadWidget *d, iDocumentWidget *doc) {
     d->viewer = doc;
 }
 
+void setText_UploadWidget(iUploadWidget *d, const iString *text) {
+    setText_InputWidget(findChild_Widget(as_Widget(d), "upload.text"), text);    
+}
+
 static iWidget *acceptButton_UploadWidget_(iUploadWidget *d) {
     return lastChild_Widget(findChild_Widget(as_Widget(d), "dialogbuttons"));
 }
diff --git a/src/ui/uploadwidget.h b/src/ui/uploadwidget.h
index 5a7de45e..1cc1f193 100644
--- a/src/ui/uploadwidget.h
+++ b/src/ui/uploadwidget.h
@@ -31,3 +31,4 @@ iDeclareType(DocumentWidget)
     
 void    setUrl_UploadWidget             (iUploadWidget *, const iString *url);
 void    setResponseViewer_UploadWidget  (iUploadWidget *, iDocumentWidget *doc);
+void    setText_UploadWidget            (iUploadWidget *, const iString *text);