Changes in uspace/app/uidemo/uidemo.c [08499f0:ef4d684] in mainline

File:

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

uspace/app/uidemo/uidemo.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2026 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -33 +33 @@
  */
 
-#include <fibril_synch.h>
 #include <gfx/bitmap.h>
 #include <gfx/coord.h>
@@ -61 +60 @@
 #include "uidemo.h"
 
-enum {
-        scrollbar_update_interval_ms = 1000,
-        ui_demo_progress_step = 17
-};
-
 static errno_t bitmap_moire(gfx_bitmap_t *, gfx_coord_t, gfx_coord_t);
 
@@ -114 +108 @@
 static void uidemo_file_load(ui_menu_entry_t *, void *);
 static void uidemo_file_message(ui_menu_entry_t *, void *);
-static void uidemo_file_confirmation(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 *);
@@ -347 +340 @@
 }
 
-/** Display a message window with OK button.
+/** Display a message window.
  *
  * @param demo UI demo
@@ -412 +405 @@
         mdparams.caption = "Message For You";
         mdparams.text = "Hello, world!";
-
-        rc = ui_msg_dialog_create(demo->ui, &mdparams, &dialog);
-        if (rc != EOK) {
-                printf("Error creating message dialog.\n");
-                return;
-        }
-
-        ui_msg_dialog_set_cb(dialog, &msg_dialog_cb, &demo);
-}
-
-/** File / Confirmation menu entry selected.
- *
- * @param mentry Menu entry
- * @param arg Argument (demo)
- */
-static void uidemo_file_confirmation(ui_menu_entry_t *mentry, void *arg)
-{
-        ui_demo_t *demo = (ui_demo_t *) arg;
-        ui_msg_dialog_params_t mdparams;
-        ui_msg_dialog_t *dialog;
-        errno_t rc;
-
-        ui_msg_dialog_params_init(&mdparams);
-        mdparams.caption = "Confirmation";
-        mdparams.text = "This will not actually do anything. Proceed?";
-        mdparams.choice = umdc_ok_cancel;
 
         rc = ui_msg_dialog_create(demo->ui, &mdparams, &dialog);
@@ -720 +687 @@
         (void) demo;
         ui_msg_dialog_destroy(dialog);
-}
-
-static void ui_demo_timer_fun(void *arg)
-{
-        ui_demo_t *demo = (ui_demo_t *) arg;
-
-        if (demo->progress_value < 100) {
-                demo->progress_value += ui_demo_progress_step;
-                if (demo->progress_value > 100)
-                        demo->progress_value = 100;
-        } else {
-                demo->progress_value = 0;
-        }
-
-        ui_progress_set_value(demo->progress, demo->progress_value);
-
-        if (ui_tab_is_selected(demo->tbars)) {
-                ui_lock(demo->ui);
-                ui_progress_paint(demo->progress);
-                ui_unlock(demo->ui);
-        }
-
-        fibril_timer_set(demo->timer, 1000 * scrollbar_update_interval_ms,
-            ui_demo_timer_fun, (void *)demo);
 }
 
@@ -798 +741 @@
         }
 
-        /* Only allow making the window larger */
-        gfx_rect_dims(&params.rect, &params.min_size);
-
         rc = ui_window_create(ui, &params, &window);
         if (rc != EOK) {
@@ -838 +778 @@
 
         ui_menu_entry_set_cb(mmsg, uidemo_file_message, (void *) &demo);
-
-        rc = ui_menu_entry_create(demo.mfile, "~C~onfirmation", "", &mmsg);
-        if (rc != EOK) {
-                printf("Error creating menu.\n");
-                return rc;
-        }
-
-        ui_menu_entry_set_cb(mmsg, uidemo_file_confirmation, (void *) &demo);
 
         rc = ui_menu_entry_create(demo.mfile, "~L~oad", "", &mload);
@@ -981 +913 @@
 
         rc = ui_tab_create(demo.tabset, "Lists", &demo.tlists);
-        if (rc != EOK) {
-                printf("Error creating tab.\n");
-                return rc;
-        }
-
-        rc = ui_tab_create(demo.tabset, "Bars", &demo.tbars);
         if (rc != EOK) {
                 printf("Error creating tab.\n");
@@ -1465 +1391 @@
         ui_tab_add(demo.tlists, ui_fixed_ctl(demo.lfixed));
 
-        rc = ui_fixed_create(&demo.bars_fixed);
-        if (rc != EOK) {
-                printf("Error creating fixed layout.\n");
-                return rc;
-        }
-
-        rc = ui_progress_create(ui_res, 0, &demo.progress);
-        if (rc != EOK) {
-                printf("Error creating entry.\n");
-                return rc;
-        }
-
-        /* FIXME: Auto layout */
-        if (ui_is_textmode(ui)) {
-                rect.p0.x = 4;
-                rect.p0.y = 5;
-                rect.p1.x = 42;
-                rect.p1.y = 6;
-        } else {
-                rect.p0.x = 15;
-                rect.p0.y = 88;
-                rect.p1.x = 243;
-                rect.p1.y = 113;
-        }
-
-        ui_progress_set_rect(demo.progress, &rect);
-
-        rc = ui_fixed_add(demo.bars_fixed, ui_progress_ctl(demo.progress));
-        if (rc != EOK) {
-                printf("Error adding control to layout.\n");
-                return rc;
-        }
-
-        ui_tab_add(demo.tbars, ui_fixed_ctl(demo.bars_fixed));
-
         ui_window_add(window, ui_fixed_ctl(demo.fixed));
 
-        demo.timer = fibril_timer_create(NULL);
-        if (demo.timer == NULL) {
-                printf("Error creating timer.\n");
-                return ENOMEM;
-        }
-
-        fibril_timer_set(demo.timer, 1000 * scrollbar_update_interval_ms,
-            ui_demo_timer_fun, (void *)&demo);
-
         rc = ui_window_paint(window);
         if (rc != EOK) {
@@ -1518 +1400 @@
 
         ui_run(ui);
-
-        fibril_timer_clear(demo.timer);
-        fibril_timer_destroy(demo.timer);
 
         ui_window_destroy(window);