Changeset 80d4aea in mainline

Timestamp:

2021-09-17T15:53:48Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6df564c

Parents:

5ecac7e

Message:

Prompt dialog

Stock dialog window that requests the user to enter a single line of
text.

Location:

uspace

Files:

• app/uidemo/uidemo.c (modified) (12 diffs)
• lib/ui/include/types/ui/promptdialog.h (added)
• lib/ui/include/ui/promptdialog.h (added)
• lib/ui/meson.build (modified) (2 diffs)
• lib/ui/private/promptdialog.h (added)
• lib/ui/src/promptdialog.c (added)
• lib/ui/test/promptdialog.c (added)

uspace/app/uidemo/uidemo.c

@@ -49 +49 @@
 #include <ui/msgdialog.h>
 #include <ui/pbutton.h>
+#include <ui/promptdialog.h>
 #include <ui/resource.h>
 #include <ui/ui.h>
@@ -89 +90 @@
 static void uidemo_file_message(ui_menu_entry_t *, void *);
 static void uidemo_file_exit(ui_menu_entry_t *, void *);
+static void uidemo_edit_modify(ui_menu_entry_t *, void *);
 
 static void file_dialog_bok(ui_file_dialog_t *, void *, const char *);
@@ -98 +100 @@
         .bcancel = file_dialog_bcancel,
         .close = file_dialog_close
+};
+
+static void prompt_dialog_bok(ui_prompt_dialog_t *, void *, const char *);
+static void prompt_dialog_bcancel(ui_prompt_dialog_t *, void *);
+static void prompt_dialog_close(ui_prompt_dialog_t *, void *);
+
+static ui_prompt_dialog_cb_t prompt_dialog_cb = {
+        .bok = prompt_dialog_bok,
+        .bcancel = prompt_dialog_bcancel,
+        .close = prompt_dialog_close
 };
 
@@ -229 +241 @@
 }
 
-/** File/load menu entry selected.
+/** File / Load menu entry selected.
  *
  * @param mentry Menu entry
@@ -253 +265 @@
 }
 
-/** File/message menu entry selected.
+/** File / Message menu entry selected.
  *
  * @param mentry Menu entry
@@ -278 +290 @@
 }
 
-/** File/exit menu entry selected.
+/** File / Exit menu entry selected.
  *
  * @param mentry Menu entry
@@ -288 +300 @@
 
         ui_quit(demo->ui);
+}
+
+/** Edit / Modify menu entry selected.
+ *
+ * @param mentry Menu entry
+ * @param arg Argument (demo)
+ */
+static void uidemo_edit_modify(ui_menu_entry_t *mentry, void *arg)
+{
+        ui_demo_t *demo = (ui_demo_t *) arg;
+        ui_prompt_dialog_params_t pdparams;
+        ui_prompt_dialog_t *dialog;
+        errno_t rc;
+
+        ui_prompt_dialog_params_init(&pdparams);
+        pdparams.caption = "Modify Entry Text";
+        pdparams.prompt = "Enter New Text";
+
+        rc = ui_prompt_dialog_create(demo->ui, &pdparams, &dialog);
+        if (rc != EOK) {
+                printf("Error creating message dialog.\n");
+                return;
+        }
+
+        ui_prompt_dialog_set_cb(dialog, &prompt_dialog_cb, demo);
 }
 
@@ -346 +383 @@
 }
 
-/** Message dialog close request.
+/** File dialog close request.
  *
  * @param dialog File dialog
@@ -357 +394 @@
         (void) demo;
         ui_file_dialog_destroy(dialog);
+}
+
+/** Prompt dialog OK button press.
+ *
+ * @param dialog Prompt dialog
+ * @param arg Argument (ui_demo_t *)
+ * @param text Submitted text
+ */
+static void prompt_dialog_bok(ui_prompt_dialog_t *dialog, void *arg,
+    const char *text)
+{
+        ui_demo_t *demo = (ui_demo_t *) arg;
+
+        ui_prompt_dialog_destroy(dialog);
+        ui_entry_set_text(demo->entry, text);
+}
+
+/** Prompt dialog cancel button press.
+ *
+ * @param dialog File dialog
+ * @param arg Argument (ui_demo_t *)
+ */
+static void prompt_dialog_bcancel(ui_prompt_dialog_t *dialog, void *arg)
+{
+        ui_demo_t *demo = (ui_demo_t *) arg;
+
+        (void) demo;
+        ui_prompt_dialog_destroy(dialog);
+}
+
+/** Prompt dialog close request.
+ *
+ * @param dialog File dialog
+ * @param arg Argument (ui_demo_t *)
+ */
+static void prompt_dialog_close(ui_prompt_dialog_t *dialog, void *arg)
+{
+        ui_demo_t *demo = (ui_demo_t *) arg;
+
+        (void) demo;
+        ui_prompt_dialog_destroy(dialog);
 }
 
@@ -405 +483 @@
         ui_menu_entry_t *mbar;
         ui_menu_entry_t *mfoobar;
+        ui_menu_entry_t *msep;
         ui_menu_entry_t *mexit;
+        ui_menu_entry_t *mmodify;
         ui_menu_entry_t *mabout;
         errno_t rc;
@@ -499 +579 @@
         }
 
-        rc = ui_menu_entry_sep_create(demo.mfile, &mexit);
+        rc = ui_menu_entry_sep_create(demo.mfile, &msep);
         if (rc != EOK) {
                 printf("Error creating menu.\n");
@@ -518 +598 @@
                 return rc;
         }
+
+        rc = ui_menu_entry_create(demo.medit, "Modify", "", &mmodify);
+        if (rc != EOK) {
+                printf("Error creating menu.\n");
+                return rc;
+        }
+
+        ui_menu_entry_set_cb(mmodify, uidemo_edit_modify, (void *) &demo);
 
         rc = ui_menu_create(demo.mbar, "Preferences", &demo.mpreferences);

uspace/lib/ui/meson.build

@@ -44 +44 @@
         'src/pbutton.c',
         'src/popup.c',
+        'src/promptdialog.c',
         'src/rbutton.c',
         'src/resource.c',
@@ -68 +69 @@
         'test/pbutton.c',
         'test/popup.c',
+        'test/promptdialog.c',
         'test/rbutton.c',
         'test/resource.c',