diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/ui/documentwidget.c | 7 | ||||
-rw-r--r-- | src/ui/keys.c | 1 | ||||
-rw-r--r-- | src/ui/root.c | 1 | ||||
-rw-r--r-- | src/ui/uploadwidget.c | 4 | ||||
-rw-r--r-- | src/ui/uploadwidget.h | 1 |
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) | |||
4116 | setResponseViewer_UploadWidget(upload, d); | 4116 | setResponseViewer_UploadWidget(upload, d); |
4117 | addChild_Widget(get_Root()->widget, iClob(upload)); | 4117 | addChild_Widget(get_Root()->widget, iClob(upload)); |
4118 | setupSheetTransition_Mobile(as_Widget(upload), iTrue); | 4118 | setupSheetTransition_Mobile(as_Widget(upload), iTrue); |
4119 | if (argLabel_Command(cmd, "copy") && isUtf8_Rangecc(range_Block(&d->sourceContent))) { | ||
4120 | iString text; | ||
4121 | initBlock_String(&text, &d->sourceContent); | ||
4122 | setText_UploadWidget(upload, &text); | ||
4123 | deinit_String(&text); | ||
4124 | } | ||
4119 | postRefresh_App(); | 4125 | postRefresh_App(); |
4120 | } | 4126 | } |
4121 | return iTrue; | 4127 | return iTrue; |
@@ -5080,6 +5086,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e | |||
5080 | { book_Icon " ${menu.page.import}", 0, 0, "bookmark.links confirm:1" }, | 5086 | { book_Icon " ${menu.page.import}", 0, 0, "bookmark.links confirm:1" }, |
5081 | { globe_Icon " ${menu.page.translate}", 0, 0, "document.translate" }, | 5087 | { globe_Icon " ${menu.page.translate}", 0, 0, "document.translate" }, |
5082 | { upload_Icon " ${menu.page.upload}", 0, 0, "document.upload" }, | 5088 | { upload_Icon " ${menu.page.upload}", 0, 0, "document.upload" }, |
5089 | { "${menu.page.upload.edit}", 0, 0, "document.upload copy:1" }, | ||
5083 | { "---" }, | 5090 | { "---" }, |
5084 | { "${menu.page.copyurl}", 0, 0, "document.copylink" } }, | 5091 | { "${menu.page.copyurl}", 0, 0, "document.copylink" } }, |
5085 | 16); | 5092 | 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_[] = | |||
240 | { 100,{ "${keys.hoverurl}", '/', KMOD_PRIMARY, "prefs.hoverlink.toggle" }, 0 }, | 240 | { 100,{ "${keys.hoverurl}", '/', KMOD_PRIMARY, "prefs.hoverlink.toggle" }, 0 }, |
241 | { 110,{ "${menu.save.downloads}", SDLK_s, KMOD_PRIMARY, "document.save" }, 0 }, | 241 | { 110,{ "${menu.save.downloads}", SDLK_s, KMOD_PRIMARY, "document.save" }, 0 }, |
242 | { 120,{ "${keys.upload}", SDLK_u, KMOD_PRIMARY, "document.upload" }, 0 }, | 242 | { 120,{ "${keys.upload}", SDLK_u, KMOD_PRIMARY, "document.upload" }, 0 }, |
243 | { 121,{ "${keys.upload.edit}", SDLK_e, KMOD_PRIMARY, "document.upload copy:1" }, 0 }, | ||
243 | /* The following cannot currently be changed (built-in duplicates). */ | 244 | /* The following cannot currently be changed (built-in duplicates). */ |
244 | #if defined (iPlatformApple) | 245 | #if defined (iPlatformApple) |
245 | { 1002, { NULL, SDLK_LEFTBRACKET, KMOD_PRIMARY, "navigate.back" }, 0 }, | 246 | { 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) { | |||
1402 | { book_Icon " ${menu.page.import}", 0, 0, "bookmark.links confirm:1" }, | 1402 | { book_Icon " ${menu.page.import}", 0, 0, "bookmark.links confirm:1" }, |
1403 | { globe_Icon " ${menu.page.translate}", 0, 0, "document.translate" }, | 1403 | { globe_Icon " ${menu.page.translate}", 0, 0, "document.translate" }, |
1404 | { upload_Icon " ${menu.page.upload}", 0, 0, "document.upload" }, | 1404 | { upload_Icon " ${menu.page.upload}", 0, 0, "document.upload" }, |
1405 | { "${menu.page.upload.edit}", 0, 0, "document.upload copy:1" }, | ||
1405 | { "---" }, | 1406 | { "---" }, |
1406 | { "${menu.page.copyurl}", 0, 0, "document.copylink" }, | 1407 | { "${menu.page.copyurl}", 0, 0, "document.copylink" }, |
1407 | { "${menu.page.copysource}", 'c', KMOD_PRIMARY, "copy" }, | 1408 | { "${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) { | |||
406 | d->viewer = doc; | 406 | d->viewer = doc; |
407 | } | 407 | } |
408 | 408 | ||
409 | void setText_UploadWidget(iUploadWidget *d, const iString *text) { | ||
410 | setText_InputWidget(findChild_Widget(as_Widget(d), "upload.text"), text); | ||
411 | } | ||
412 | |||
409 | static iWidget *acceptButton_UploadWidget_(iUploadWidget *d) { | 413 | static iWidget *acceptButton_UploadWidget_(iUploadWidget *d) { |
410 | return lastChild_Widget(findChild_Widget(as_Widget(d), "dialogbuttons")); | 414 | return lastChild_Widget(findChild_Widget(as_Widget(d), "dialogbuttons")); |
411 | } | 415 | } |
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) | |||
31 | 31 | ||
32 | void setUrl_UploadWidget (iUploadWidget *, const iString *url); | 32 | void setUrl_UploadWidget (iUploadWidget *, const iString *url); |
33 | void setResponseViewer_UploadWidget (iUploadWidget *, iDocumentWidget *doc); | 33 | void setResponseViewer_UploadWidget (iUploadWidget *, iDocumentWidget *doc); |
34 | void setText_UploadWidget (iUploadWidget *, const iString *text); | ||