3 files changed, 71 insertions, 12 deletions

diff --git a/src/ui/translation.c b/src/ui/translation.c
index c2f332be..63d64d1b 100644
--- a/src/ui/translation.c
+++ b/src/ui/translation.c
@@ -23,6 +23,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "translation.h"
 
 #include "app.h"
+#include "defs.h"
 #include "gmdocument.h"
 #include "ui/command.h"
 #include "ui/documentwidget.h"
@@ -54,6 +55,7 @@ struct Impl_TranslationProgressWidget {
     uint32_t startTime;
     int font;
     iArray sprites;
+    iString message;
 };
 
 void init_TranslationProgressWidget(iTranslationProgressWidget *d) {
@@ -62,6 +64,7 @@ void init_TranslationProgressWidget(iTranslationProgressWidget *d) {
     setId_Widget(w, "xlt.progress");
     init_Array(&d->sprites, sizeof(iSprite));
     d->startTime = SDL_GetTicks();
+    init_String(&d->message);
     /* Set up some letters to animate. */
     const char *chars = "ARGOS";
     const size_t n = strlen(chars);
@@ -84,6 +87,7 @@ void init_TranslationProgressWidget(iTranslationProgressWidget *d) {
 }
 
 void deinit_TranslationProgressWidget(iTranslationProgressWidget *d) {
+    deinit_String(&d->message);
     iForEach(Array, i, &d->sprites) {
         iSprite *spr = i.value;
         deinit_String(&spr->text);
@@ -97,6 +101,11 @@ static void draw_TranslationProgressWidget_(const iTranslationProgressWidget *d)
     const iWidget *w = &d->widget;
     const float t = (float) (SDL_GetTicks() - d->startTime) / 1000.0f;
     const iRect bounds = bounds_Widget(w);
+    if (!isEmpty_String(&d->message)) {
+        drawCentered_Text(
+            uiLabel_FontId, bounds, iFalse, uiText_ColorId, "%s", cstr_String(&d->message));
+        return;
+    }
     iPaint p;
     init_Paint(&p);
     const iInt2 mid = mid_Rect(bounds);
@@ -109,7 +118,8 @@ static void draw_TranslationProgressWidget_(const iTranslationProgressWidget *d)
         int bg = uiBackgroundSelected_ColorId;
         int fg = uiTextSelected_ColorId;
         iInt2 pos = add_I2(mid, spr->pos);
-        pos.y += sin(angle + t) * spr->size.y * iClamp(t * 0.25f - 0.3f, 0.0f, 1.0f);
+        float t2 = sin(0.2f * t);
+        pos.y += sin(angle + t) * spr->size.y * t2 * t2 * iClamp(t * 0.25f - 0.3f, 0.0f, 1.0f);
         if (bg >= 0) {
             p.alpha = opacity * 255;
             fillRect_Paint(&p, (iRect){ pos, spr->size }, bg);
@@ -146,6 +156,7 @@ static const char *tripleBacktickSymbol = "\u20e3";
 static const char *h1Symbol             = "\u20e4";
 static const char *h2Symbol             = "\u20e5";
 static const char *h3Symbol             = "\u20e6";
+static const char *bulletSymbol         = "\n\u20e7";
 
 static iString *quote_String_(const iString *d) {
     iString *quot = new_String();
@@ -265,6 +276,7 @@ void submit_Translation(iTranslation *d) {
     replace_String(docSrc, "###", h3Symbol);
     replace_String(docSrc, "##", h2Symbol);
     replace_String(docSrc, "#", h1Symbol);
+    replace_String(docSrc, "\n*", bulletSymbol);
     printf_Block(json,
                  "{\"q\":\"%s\",\"source\":\"%s\",\"target\":\"%s\"}",
                  cstrCollect_String(quote_String_(docSrc)),
@@ -283,11 +295,19 @@ void submit_Translation(iTranslation *d) {
     d->timer = SDL_AddTimer(1000 / 30, animate_Translation_, d);
 }
 
-static void processResult_Translation_(iTranslation *d) {
+static void setFailed_Translation_(iTranslation *d, const char *msg) {
+    iTranslationProgressWidget *prog = findChild_Widget(d->dlg, "xlt.progress");
+    if (prog && isEmpty_String(&prog->message)) {
+        setCStr_String(&prog->message, msg);
+    }
+}
+
+static iBool processResult_Translation_(iTranslation *d) {
     SDL_RemoveTimer(d->timer);
     d->timer = 0;
     if (status_TlsRequest(d->request) == error_TlsRequestStatus) {
-        return;
+        setFailed_Translation_(d, explosion_Icon "  Request Failed");
+        return iFalse;
     }
     iBlock *resultData = collect_Block(readAll_TlsRequest(d->request));
 //    printf("result(%zu):\n%s\n", size_Block(resultData), cstr_Block(resultData));
@@ -299,16 +319,19 @@ static void processResult_Translation_(iTranslation *d) {
         iString *translation = unquote_String_(collect_String(captured_RegExpMatch(&m, 1)));
         replace_String(translation, tripleBacktickSymbol, "```");
         replace_String(translation, doubleArrowSymbol, "=>");
-        replace_String(translation, h3Symbol, "###");
-        replace_String(translation, h2Symbol, "##");
-        replace_String(translation, h1Symbol, "#");
+        replace_String(translation, h3Symbol, "### ");
+        replace_String(translation, h2Symbol, "## ");
+        replace_String(translation, h1Symbol, "# ");
+        replace_String(translation, bulletSymbol, "\n* ");
         setSource_DocumentWidget(d->doc, translation);
         postCommand_App("sidebar.update");
         delete_String(translation);
     }
     else {
-        /* TODO: Report failure! */
+        setFailed_Translation_(d, unhappy_Icon "  Service Unavailable");
+        return iFalse;
     }
+    return iTrue;
 }
 
 static iLabelWidget *acceptButton_Translation_(const iTranslation *d) {
@@ -342,14 +365,26 @@ iBool handleCommand_Translation(iTranslation *d, const char *cmd) {
     }
     if (equalWidget_Command(cmd, w, "translation.finished")) {
         if (!isFinished_Translation(d)) {
-            processResult_Translation_(d);
-            destroy_Widget(d->dlg);
-            d->dlg = NULL;
+            if (processResult_Translation_(d)) {
+                destroy_Widget(d->dlg);
+                d->dlg = NULL;
+            }
         }
         return iTrue;
     }
     if (equalWidget_Command(cmd, d->dlg, "translation.cancel")) {
-        cancel_TlsRequest(d->request);
+        if (status_TlsRequest(d->request) == submitted_TlsRequestStatus) {
+            setFailed_Translation_(d, "Cancelled");
+            updateTextCStr_LabelWidget(
+                findMenuItem_Widget(findChild_Widget(d->dlg, "dialogbuttons"),
+                                    "translation.cancel"),
+                "Dismiss");
+            cancel_TlsRequest(d->request);
+        }
+        else {
+            destroy_Widget(d->dlg);
+            d->dlg = NULL;
+        }
         return iTrue;
     }
     return iFalse;
diff --git a/src/ui/util.c b/src/ui/util.c
index 61ecf948..9d75129e 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -2222,6 +2222,7 @@ const char *languageId_String(const iString *menuItemLabel) {
 
 iWidget *makeTranslation_Widget(iWidget *parent) {
     iWidget *dlg = makeSheet_Widget("xlt");
+    setFlags_Widget(dlg, keepOnTop_WidgetFlag, iFalse);
     setCommandHandler_Widget(dlg, translationHandler_);
     addChildFlags_Widget(dlg,
                          iClob(new_LabelWidget(uiHeading_ColorEscape "TRANSLATE PAGE", NULL)),
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 19546235..6a6480e5 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -619,15 +619,30 @@ iBool dispatchEvent_Widget(iWidget *d, const SDL_Event *ev) {
         iReverseForEach(PtrArray, i, rootData_.onTop) {
             iWidget *widget = *i.value;
             if (isVisible_Widget(widget) && dispatchEvent_Widget(widget, ev)) {
+#if 0
+                if (ev->type == SDL_MOUSEMOTION) {
+                    printf("[%p] %s:'%s' (on top) ate the motion\n",
+                           widget, class_Widget(widget)->name,
+                           cstr_String(id_Widget(widget)));
+                    fflush(stdout);
+                }
+#endif
                 return iTrue;
             }
         }
     }
-    else if (ev->type == SDL_MOUSEMOTION && !rootData_.hover &&
+    else if (ev->type == SDL_MOUSEMOTION &&
+             (!rootData_.hover || hasParent_Widget(d, rootData_.hover)) &&
              flags_Widget(d) & hover_WidgetFlag && ~flags_Widget(d) & hidden_WidgetFlag &&
              ~flags_Widget(d) & disabled_WidgetFlag) {
         if (contains_Widget(d, init_I2(ev->motion.x, ev->motion.y))) {
             setHover_Widget(d);
+#if 0
+            printf("set hover to [%p] %s:'%s'\n",
+                   d, class_Widget(d)->name,
+                   cstr_String(id_Widget(d)));
+            fflush(stdout);
+#endif
         }
     }
     if (filterEvent_Widget_(d, ev)) {
@@ -644,6 +659,14 @@ iBool dispatchEvent_Widget(iWidget *d, const SDL_Event *ev) {
             }
             if (dispatchEvent_Widget(child, ev)) {
 #if 0
+                if (ev->type == SDL_MOUSEMOTION) {
+                    printf("[%p] %s:'%s' (on top) ate the motion\n",
+                           child, class_Widget(child)->name,
+                           cstr_String(id_Widget(child)));
+                    fflush(stdout);
+                }
+#endif
+#if 0
                 if (ev->type == SDL_MOUSEBUTTONDOWN) {
                     printf("[%p] %s:'%s' ate the button %d\n",
                            child, class_Widget(child)->name,