Changeset c0757e1f in mainline for uspace/app/uidemo/uidemo.c

Timestamp:

2023-04-19T11:13:06Z (20 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

37087c8

Parents:

ec8ef12

Message:

UI display configuration utility

In addition to the command-line utility 'disp', we introduce its UI
equivalent 'display-cfg'. Currently this allows the user to configure
seats in a very comfortable way.

File:

• uspace/app/uidemo/uidemo.c (modified) (9 diffs)

uspace/app/uidemo/uidemo.c

@@ -52 +52 @@
 #include <ui/promptdialog.h>
 #include <ui/resource.h>
+#include <ui/selectdialog.h>
 #include <ui/tab.h>
 #include <ui/tabset.h>
@@ -108 +109 @@
 static void uidemo_file_exit(ui_menu_entry_t *, void *);
 static void uidemo_edit_modify(ui_menu_entry_t *, void *);
+static void uidemo_edit_insert_character(ui_menu_entry_t *, void *);
 
 static void file_dialog_bok(ui_file_dialog_t *, void *, const char *);
@@ -127 +129 @@
         .bcancel = prompt_dialog_bcancel,
         .close = prompt_dialog_close
+};
+
+static void select_dialog_bok(ui_select_dialog_t *, void *, void *);
+static void select_dialog_bcancel(ui_select_dialog_t *, void *);
+static void select_dialog_close(ui_select_dialog_t *, void *);
+
+static ui_select_dialog_cb_t select_dialog_cb = {
+        .bok = select_dialog_bok,
+        .bcancel = select_dialog_bcancel,
+        .close = select_dialog_close
 };
 
@@ -432 +444 @@
         rc = ui_prompt_dialog_create(demo->ui, &pdparams, &dialog);
         if (rc != EOK) {
-                printf("Error creating message dialog.\n");
+                printf("Error creating prompt dialog.\n");
                 return;
         }
 
         ui_prompt_dialog_set_cb(dialog, &prompt_dialog_cb, demo);
+}
+
+/** Edit / Insert Character menu entry selected.
+ *
+ * @param mentry Menu entry
+ * @param arg Argument (demo)
+ */
+static void uidemo_edit_insert_character(ui_menu_entry_t *mentry, void *arg)
+{
+        ui_demo_t *demo = (ui_demo_t *) arg;
+        ui_select_dialog_params_t sdparams;
+        ui_select_dialog_t *dialog;
+        ui_list_entry_attr_t attr;
+        errno_t rc;
+
+        ui_select_dialog_params_init(&sdparams);
+        sdparams.caption = "Insert Character";
+        sdparams.prompt = "Select character to insert";
+
+        rc = ui_select_dialog_create(demo->ui, &sdparams, &dialog);
+        if (rc != EOK) {
+                printf("Error creating select dialog.\n");
+                return;
+        }
+
+        ui_list_entry_attr_init(&attr);
+        attr.caption = "Dollar sign ($)";
+        attr.arg = (void *)'$';
+        rc = ui_select_dialog_append(dialog, &attr);
+        if (rc != EOK) {
+                printf("Error appending entry to list.\n");
+                return;
+        }
+
+        ui_list_entry_attr_init(&attr);
+        attr.caption = "Hash sign (#)";
+        attr.arg = (void *)'#';
+        rc = ui_select_dialog_append(dialog, &attr);
+        if (rc != EOK) {
+                printf("Error appending entry to list.\n");
+                return;
+        }
+
+        ui_list_entry_attr_init(&attr);
+        attr.caption = "Question mark (?)";
+        attr.arg = (void *)'?';
+        rc = ui_select_dialog_append(dialog, &attr);
+        if (rc != EOK) {
+                printf("Error appending entry to list.\n");
+                return;
+        }
+
+        ui_select_dialog_set_cb(dialog, &select_dialog_cb, demo);
+
+        (void) ui_select_dialog_paint(dialog);
 }
 
@@ -525 +592 @@
 /** Prompt dialog cancel button press.
  *
- * @param dialog File dialog
+ * @param dialog Prompt dialog
  * @param arg Argument (ui_demo_t *)
  */
@@ -538 +605 @@
 /** Prompt dialog close request.
  *
- * @param dialog File dialog
+ * @param dialog Prompt dialog
  * @param arg Argument (ui_demo_t *)
  */
@@ -547 +614 @@
         (void) demo;
         ui_prompt_dialog_destroy(dialog);
+}
+
+/** Select dialog OK button press.
+ *
+ * @param dialog Select dialog
+ * @param arg Argument (ui_demo_t *)
+ * @param text Submitted text
+ */
+static void select_dialog_bok(ui_select_dialog_t *dialog, void *arg,
+    void *earg)
+{
+        ui_demo_t *demo = (ui_demo_t *) arg;
+        char str[2];
+
+        ui_select_dialog_destroy(dialog);
+        str[0] = (char)(intptr_t)earg;
+        str[1] = '\0';
+        (void) ui_entry_insert_str(demo->entry, str);
+}
+
+/** Select dialog cancel button press.
+ *
+ * @param dialog Select dialog
+ * @param arg Argument (ui_demo_t *)
+ */
+static void select_dialog_bcancel(ui_select_dialog_t *dialog, void *arg)
+{
+        ui_demo_t *demo = (ui_demo_t *) arg;
+
+        (void) demo;
+        ui_select_dialog_destroy(dialog);
+}
+
+/** Select dialog close request.
+ *
+ * @param dialog Select dialog
+ * @param arg Argument (ui_demo_t *)
+ */
+static void select_dialog_close(ui_select_dialog_t *dialog, void *arg)
+{
+        ui_demo_t *demo = (ui_demo_t *) arg;
+
+        (void) demo;
+        ui_select_dialog_destroy(dialog);
 }
 
@@ -598 +709 @@
         ui_menu_entry_t *mexit;
         ui_menu_entry_t *mmodify;
+        ui_menu_entry_t *minsert_char;
         ui_menu_entry_t *mabout;
         ui_list_entry_attr_t eattr;
@@ -719 +831 @@
 
         ui_menu_entry_set_cb(mmodify, uidemo_edit_modify, (void *) &demo);
+
+        rc = ui_menu_entry_create(demo.medit, "~I~nsert Character",
+            "", &minsert_char);
+        if (rc != EOK) {
+                printf("Error creating menu.\n");
+                return rc;
+        }
+
+        ui_menu_entry_set_cb(minsert_char, uidemo_edit_insert_character,
+            (void *) &demo);
 
         rc = ui_menu_create(demo.mbar, "~P~references", &demo.mpreferences);