Changeset 5e109e1 in mainline for uspace/lib/ui

Timestamp:

2021-08-10T09:49:21Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

307d4d2, 3a4a944f

Parents:

edeee9f

git-author:

Jiri Svoboda <jiri@…> (2021-08-09 18:49:14)

git-committer:

Jiri Svoboda <jiri@…> (2021-08-10 09:49:21)

Message:

File dialog prototype

This only contains a text entry for entering the file path and
OK / Cancel buttons.

Location:

uspace/lib/ui

Files:

• include/types/ui/filedialog.h (added)
• include/ui/entry.h (modified) (1 diff)
• include/ui/filedialog.h (added)
• include/ui/msgdialog.h (modified) (1 diff)
• meson.build (modified) (2 diffs)
• private/filedialog.h (added)
• src/entry.c (modified) (1 diff)
• src/filedialog.c (added)
• src/msgdialog.c (modified) (2 diffs)
• test/filedialog.c (added)
• test/main.c (modified) (2 diffs)
• test/msgdialog.c (modified) (1 diff)

uspace/lib/ui/include/ui/entry.h

@@ -52 +52 @@
 extern void ui_entry_set_read_only(ui_entry_t *, bool);
 extern errno_t ui_entry_set_text(ui_entry_t *, const char *);
+extern const char *ui_entry_get_text(ui_entry_t *);
 extern errno_t ui_entry_paint(ui_entry_t *);
 extern void ui_entry_backspace(ui_entry_t *);

uspace/lib/ui/include/ui/msgdialog.h

@@ -31 +31 @@
  */
 /**
- * @file Message Dialog
+ * @file Message dialog
  */
 
-#ifndef _UI_MSG_DIALOG_H
-#define _UI_MSG_DIALOG_H
+#ifndef _UI_MSGDIALOG_H
+#define _UI_MSGDIALOG_H
 
 #include <errno.h>

uspace/lib/ui/meson.build

@@ -33 +33 @@
         'src/dummygc.c',
         'src/entry.c',
+        'src/filedialog.c',
         'src/fixed.c',
         'src/image.c',
@@ -55 +56 @@
         'test/control.c',
         'test/entry.c',
+        'test/filedialog.c',
         'test/fixed.c',
         'test/image.c',

uspace/lib/ui/src/entry.c

@@ -190 +190 @@
         entry->pos = str_size(text);
         entry->sel_start = entry->pos;
+
         ui_entry_scroll_update(entry, false);
         ui_entry_paint(entry);
 
         return EOK;
+}
+
+/** Get entry text.
+ *
+ * @return Pointer to entry text.
+ */
+const char *ui_entry_get_text(ui_entry_t *entry)
+{
+        return entry->text;
 }
 

uspace/lib/ui/src/msgdialog.c

@@ -177 +177 @@
                 goto error;
 
+        dialog->bok = bok;
         bok = NULL;
 
@@ -187 +188 @@
 
         dialog->window = window;
-        dialog->bok = bok;
         *rdialog = dialog;
         return EOK;
 error:
+        if (bok != NULL)
+                ui_pbutton_destroy(bok);
         if (label != NULL)
                 ui_label_destroy(label);

uspace/lib/ui/test/main.c

@@ -34 +34 @@
 PCUT_IMPORT(checkbox);
 PCUT_IMPORT(entry);
+PCUT_IMPORT(file_dialog);
 PCUT_IMPORT(fixed);
 PCUT_IMPORT(image);
@@ -40 +41 @@
 PCUT_IMPORT(menubar);
 PCUT_IMPORT(menuentry);
+PCUT_IMPORT(msg_dialog);
 PCUT_IMPORT(paint);
 PCUT_IMPORT(pbutton);

uspace/lib/ui/test/msgdialog.c

@@ -108 +108 @@
         ui_pbutton_clicked(dialog->bok);
 
-        /* Button callback with unfocus callback not implemented */
+        /* Button callback with callback not implemented */
         ui_msg_dialog_set_cb(dialog, &dummy_msg_dialog_cb, NULL);
         ui_pbutton_clicked(dialog->bok);