# HG changeset patch # User Olaf Wintermann # Date 1727634341 -7200 # Node ID ab71409644b0634e427d0f1d03f8829c3b8e80c4 # Parent 473954dc6b7460f3be0a9cbd13f7ec145a8978f4 update toolkit, fix download/upload progressbar diff -r 473954dc6b74 -r ab71409644b0 application/davcontroller.c --- a/application/davcontroller.c Sun Sep 29 13:32:51 2024 +0200 +++ b/application/davcontroller.c Sun Sep 29 20:25:41 2024 +0200 @@ -707,7 +707,7 @@ if (sz_downloaded_end) { *sz_downloaded_end = 0; } - + if (download->total_bytes > 0) { double progress = (double)download->downloaded_bytes / (double)download->total_bytes; ui_set(download->progress, progress*100); @@ -780,7 +780,6 @@ DavResource *res = dav_resource_new(file->download->download_sn, file->path); dav_get_content(res, file, (dav_write_func)ddfile_write); - file->download->downloaded_bytes += ftell(f); file->download->downloaded_files++; ui_call_mainthread(uithr_download_update_progress, file->download); @@ -928,7 +927,7 @@ ui_rlabel(dialog, .value = download->label_top_right); ui_newline(dialog); - ui_progressbar(dialog, .value = download->progress, .colspan = 2, .hexpand = TRUE); + ui_progressbar(dialog, .value = download->progress, .min = 0, .max = 100, .colspan = 2, .hexpand = TRUE); ui_newline(dialog); ui_llabel(dialog, .value = download->label_bottom_left); diff -r 473954dc6b74 -r ab71409644b0 application/window.c --- a/application/window.c Sun Sep 29 13:32:51 2024 +0200 +++ b/application/window.c Sun Sep 29 20:25:41 2024 +0200 @@ -57,11 +57,11 @@ // navigation bar - ui_hbox(obj, .fill = UI_OFF, .margin = 8) { - ui_button(obj, .icon = UI_ICON_GO_BACK, .onclick = action_go_back); - ui_button(obj, .icon = UI_ICON_GO_FORWARD, .onclick = action_go_forward); - - ui_label(obj, .label = " "); // replace when we have a ui_space widget + ui_hbox(obj, .fill = UI_OFF, .margin = 8, .spacing = 8) { + ui_hbox(obj, .fill = UI_OFF, .style_class="linked") { + ui_button(obj, .icon = UI_ICON_GO_BACK, .onclick = action_go_back); + ui_button(obj, .icon = UI_ICON_GO_FORWARD, .onclick = action_go_forward); + } ui_path_textfield(obj, .fill = UI_ON, .getpathelm = dav_get_pathelm, .onactivate = action_path_selected, .varname = "path"); diff -r 473954dc6b74 -r ab71409644b0 ui/gtk/button.c --- a/ui/gtk/button.c Sun Sep 29 13:32:51 2024 +0200 +++ b/ui/gtk/button.c Sun Sep 29 20:25:41 2024 +0200 @@ -90,6 +90,7 @@ UIWIDGET ui_button_create(UiObject *obj, UiButtonArgs args) { UiObject* current = uic_current_obj(obj); GtkWidget *button = ui_create_button(obj, args.label, args.icon, args.onclick, args.onclickdata); + ui_set_name_and_style(button, args.name, args.style_class); UI_APPLY_LAYOUT1(current, args); current->container->add(current->container, button, FALSE); return button; @@ -230,6 +231,7 @@ UiObject* current = uic_current_obj(obj); ui_setup_togglebutton(current, widget, args.label, args.icon, args.varname, args.value, args.onchange, args.onchangedata); + ui_set_name_and_style(widget, args.name, args.style_class); UI_APPLY_LAYOUT1(current, args); current->container->add(current->container, widget, FALSE); @@ -340,6 +342,7 @@ } GtkWidget *rbutton = RADIOBUTTON_NEW(rg, args.label); + ui_set_name_and_style(rbutton, args.name, args.style_class); if(rgroup) { #if GTK_MAJOR_VERSION >= 4 if(rg) { diff -r 473954dc6b74 -r ab71409644b0 ui/gtk/container.c --- a/ui/gtk/container.c Sun Sep 29 13:32:51 2024 +0200 +++ b/ui/gtk/container.c Sun Sep 29 20:25:41 2024 +0200 @@ -266,6 +266,7 @@ UI_APPLY_LAYOUT1(current, args); GtkWidget *box = type == UI_CONTAINER_VBOX ? ui_gtk_vbox_new(args.spacing) : ui_gtk_hbox_new(args.spacing); + ui_set_name_and_style(box, args.name, args.style_class); GtkWidget *widget = args.margin > 0 ? box_set_margin(box, args.margin) : box; ct->add(ct, widget, TRUE); @@ -303,6 +304,7 @@ GtkWidget *widget; GtkWidget *grid = create_grid(args.columnspacing, args.rowspacing); + ui_set_name_and_style(grid, args.name, args.style_class); widget = box_set_margin(grid, args.margin); current->container->add(current->container, widget, TRUE); @@ -319,6 +321,7 @@ UI_APPLY_LAYOUT1(current, args); GtkWidget *sw = SCROLLEDWINDOW_NEW(); + ui_set_name_and_style(sw, args.name, args.style_class); UiObject *newobj = uic_object_new(obj, sw); newobj->container = ui_scrolledwindow_container(obj, sw); uic_obj_add(obj, newobj); diff -r 473954dc6b74 -r ab71409644b0 ui/gtk/display.c --- a/ui/gtk/display.c Sun Sep 29 13:32:51 2024 +0200 +++ b/ui/gtk/display.c Sun Sep 29 20:25:41 2024 +0200 @@ -119,10 +119,27 @@ /* ------------------------- progress bar ------------------------- */ +typedef struct UiProgressBarRange { + double min; + double max; +} UiProgressBarRange; + UIWIDGET ui_progressbar_create(UiObject *obj, UiProgressbarArgs args) { UiObject* current = uic_current_obj(obj); GtkWidget *progressbar = gtk_progress_bar_new(); + if(args.max > args.min) { + UiProgressBarRange *range = malloc(sizeof(UiProgressBarRange)); + range->min = args.min; + range->max = args.max; + g_signal_connect( + progressbar, + "destroy", + G_CALLBACK(ui_destroy_userdata), + range); + g_object_set_data(G_OBJECT(progressbar), "ui_range", range); + } + UiVar* var = uic_widget_var(obj->ctx, current->ctx, args.value, args.varname, UI_VAR_DOUBLE); if(var && var->value) { @@ -130,7 +147,7 @@ value->get = ui_progressbar_get; value->set = ui_progressbar_set; value->obj = progressbar; - gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progressbar), 0.5); + ui_progressbar_set(value, value->value); } UI_APPLY_LAYOUT1(current, args); @@ -140,13 +157,22 @@ } double ui_progressbar_get(UiDouble *d) { - d->value = gtk_progress_bar_get_fraction(GTK_PROGRESS_BAR(d->obj)); + UiProgressBarRange *range = g_object_get_data(d->obj, "ui_range"); + double fraction = gtk_progress_bar_get_fraction(GTK_PROGRESS_BAR(d->obj)); + if(range) { + fraction = range->min + (range->max - range->min) * fraction; + } + d->value = fraction; return d->value; } void ui_progressbar_set(UiDouble *d, double value) { + d->value = value; + UiProgressBarRange *range = g_object_get_data(d->obj, "ui_range"); + if(range) { + value = (value - range->min) / (range->max - range->min); + } gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(d->obj), value); - d->value = value; } diff -r 473954dc6b74 -r ab71409644b0 ui/gtk/entry.c --- a/ui/gtk/entry.c Sun Sep 29 13:32:51 2024 +0200 +++ b/ui/gtk/entry.c Sun Sep 29 20:25:41 2024 +0200 @@ -70,6 +70,7 @@ } #endif GtkWidget *spin = gtk_spin_button_new_with_range(min, max, args.step); + ui_set_name_and_style(spin, args.name, args.style_class); gtk_spin_button_set_digits(GTK_SPIN_BUTTON(spin), args.digits); UiObserver **obs = NULL; if(var) { diff -r 473954dc6b74 -r ab71409644b0 ui/gtk/headerbar.c --- a/ui/gtk/headerbar.c Sun Sep 29 13:32:51 2024 +0200 +++ b/ui/gtk/headerbar.c Sun Sep 29 20:25:41 2024 +0200 @@ -152,19 +152,28 @@ UiObject *obj, enum UiToolbarPos pos) { + + +#if GTK_MAJOR_VERSION >= 4 GtkWidget *menubutton = gtk_menu_button_new(); - if(item->args.label) { gtk_menu_button_set_label(GTK_MENU_BUTTON(menubutton), item->args.label); } if(item->args.icon) { gtk_menu_button_set_icon_name(GTK_MENU_BUTTON(menubutton), item->args.icon); } - + GMenu *menu = g_menu_new(); ui_gmenu_add_menu_items(menu, 0, &item->menu, obj); gtk_menu_button_set_menu_model(GTK_MENU_BUTTON(menubutton), G_MENU_MODEL(menu)); +#else + GtkWidget *menubutton = gtk_menu_button_new(); + + // TODO + + +#endif headerbar_add(headerbar, box, menubutton, pos); } diff -r 473954dc6b74 -r ab71409644b0 ui/gtk/text.c --- a/ui/gtk/text.c Sun Sep 29 13:32:51 2024 +0200 +++ b/ui/gtk/text.c Sun Sep 29 20:25:41 2024 +0200 @@ -542,6 +542,7 @@ static UIWIDGET create_textfield(UiObject *obj, UiBool frameless, UiBool password, UiTextFieldArgs args) { GtkWidget *textfield = gtk_entry_new(); + ui_set_name_and_style(textfield, args.name, args.style_class); UiObject* current = uic_current_obj(obj); UiVar* var = uic_widget_var(obj->ctx, current->ctx, args.value, args.varname, UI_VAR_STRING); @@ -700,7 +701,6 @@ } static void ui_path_textfield_destroy(GtkWidget *object, UiPathTextField *pathtf) { - free(pathtf->hbox); g_object_unref(pathtf->entry); free(pathtf); } diff -r 473954dc6b74 -r ab71409644b0 ui/gtk/toolkit.c --- a/ui/gtk/toolkit.c Sun Sep 29 13:32:51 2024 +0200 +++ b/ui/gtk/toolkit.c Sun Sep 29 20:25:41 2024 +0200 @@ -383,4 +383,26 @@ -#endif \ No newline at end of file +#endif + +void ui_set_name_and_style(GtkWidget *widget, const char *name, const char *style_classes) { + if(name) { + gtk_widget_set_name(widget, name); + } + if(style_classes) { + cxstring *cls = NULL; + size_t numClasses = cx_strsplit_a(cxDefaultAllocator, cx_str(style_classes), CX_STR(" "), 128, &cls); + for(int i=0;i= 4 + gtk_widget_add_css_class(widget, m.ptr); +#elif GTK_MAJOR_VERSION >= 3 + GtkStyleContext *ctx = gtk_widget_get_style_context(widget); + gtk_style_context_add_class(ctx, m.ptr); +#endif + free(m.ptr); + } + free(cls); + + } +} diff -r 473954dc6b74 -r ab71409644b0 ui/gtk/toolkit.h --- a/ui/gtk/toolkit.h Sun Sep 29 13:32:51 2024 +0200 +++ b/ui/gtk/toolkit.h Sun Sep 29 20:25:41 2024 +0200 @@ -136,6 +136,8 @@ int ui_get_scalefactor(); +void ui_set_name_and_style(GtkWidget *widget, const char *name, const char *style); + void ui_destroy_userdata(GtkWidget *object, void *userdata); void ui_destroy_vardata(GtkWidget *object, UiVarEventData *data); void ui_destroy_boundvar(UiContext *ctx, UiVar *var); diff -r 473954dc6b74 -r ab71409644b0 ui/gtk/window.c --- a/ui/gtk/window.c Sun Sep 29 13:32:51 2024 +0200 +++ b/ui/gtk/window.c Sun Sep 29 20:25:41 2024 +0200 @@ -119,11 +119,13 @@ GtkWidget *toolbar_view = adw_toolbar_view_new(); adw_application_window_set_content(ADW_APPLICATION_WINDOW(obj->widget), toolbar_view); adw_toolbar_view_set_content(ADW_TOOLBAR_VIEW(toolbar_view), vbox); - + GtkWidget *headerbar = adw_header_bar_new(); adw_toolbar_view_add_top_bar(ADW_TOOLBAR_VIEW(toolbar_view), headerbar); - ui_fill_headerbar(obj, headerbar); + if(!simple) { + ui_fill_headerbar(obj, headerbar); + } #elif GTK_MAJOR_VERSION >= 4 WINDOW_SET_CONTENT(obj->widget, vbox); #else @@ -259,12 +261,176 @@ } -#if GTK_MAJOR_VERSION >= 4 -static void ui_gtkfilechooser(UiObject *obj, GtkFileChooserAction action, unsigned int mode, ui_callback file_selected_callback, void *cbdata) { - // TODO +#if GTK_MAJOR_VERSION >= 3 +UiFileList listmodel2filelist(GListModel *selection) { + UiFileList flist; + flist.files = NULL; + flist.nfiles = 0; + flist.nfiles = g_list_model_get_n_items(selection); + flist.files = calloc(flist.nfiles, sizeof(char*)); + for(int i=0;ivalue; + int multi = mode & UI_FILEDIALOG_SELECT_MULTI; + if((mode & UI_FILEDIALOG_SELECT_FOLDER) == UI_FILEDIALOG_SELECT_FOLDER) { + if(multi) { + selection = gtk_file_dialog_select_multiple_folders_finish(GTK_FILE_DIALOG(source), result, &error); + } else { + file = gtk_file_dialog_select_folder_finish(GTK_FILE_DIALOG(source), result, &error); + } + } else if((mode & UI_GTK_FILEDIALOG_OPEN) == UI_GTK_FILEDIALOG_OPEN) { + if(multi) { + selection = gtk_file_dialog_open_multiple_finish(GTK_FILE_DIALOG(source), result, &error); + } else { + file = gtk_file_dialog_open_finish(GTK_FILE_DIALOG(source), result, &error); + } + } else { + file = gtk_file_dialog_save_finish(GTK_FILE_DIALOG(source), result, &error); + } + + UiEvent evt; + evt.obj = event->obj; + evt.document = evt.obj->ctx->document; + evt.window = evt.obj->window; + evt.intval = 0; + + UiFileList flist; + flist.files = NULL; + flist.nfiles = 0; + evt.eventdata = &flist; + + if(selection) { + flist = listmodel2filelist(selection); + g_object_unref(selection); + } else if(file) { + char *path = g_file_get_path(file); + if(path) { + flist.nfiles = 1; + flist.files = calloc(flist.nfiles, sizeof(char*)); + flist.files[0] = strdup(path); + } + g_object_unref(file); + } + + if(event->callback) { + event->callback(&evt, event->userdata); + } + + for(int i=0;icallback = file_selected_callback; + event->userdata = cbdata; + event->customdata = NULL; + event->value = mode; + event->obj = obj; + + GtkWindow *parent = GTK_WINDOW(gtk_widget_get_root(obj->widget)); + GtkFileDialog *dialog = gtk_file_dialog_new(); + if(name) { + gtk_file_dialog_set_initial_name(dialog, name); + } + + int multi = mode & UI_FILEDIALOG_SELECT_MULTI; + if((mode & UI_FILEDIALOG_SELECT_FOLDER) == UI_FILEDIALOG_SELECT_FOLDER) { + if(multi) { + gtk_file_dialog_select_multiple_folders(dialog, parent, NULL, filechooser_opened, event); + } else { + gtk_file_dialog_select_folder(dialog, parent, NULL, filechooser_opened, event); + } + } else if(action == GTK_FILE_CHOOSER_ACTION_OPEN) { + if(multi) { + gtk_file_dialog_open_multiple(dialog, parent, NULL, filechooser_opened, event); + } else { + gtk_file_dialog_open(dialog, parent, NULL, filechooser_opened, event); + } + } else { + gtk_file_dialog_save(dialog, parent, NULL, filechooser_opened, event); + } + + g_object_unref(dialog); } #else -static void ui_gtkfilechooser(UiObject *obj, GtkFileChooserAction action, unsigned int mode, ui_callback file_selected_callback, void *cbdata) { + + + +static void filechooser_response(GtkDialog* self, gint response_id, UiEventData *data) { + UiEvent evt; + evt.obj = data->obj; + evt.document = evt.obj->ctx->document; + evt.window = evt.obj->window; + evt.intval = 0; + + UiFileList flist; + flist.files = NULL; + flist.nfiles = 0; + evt.eventdata = &flist; + + if(response_id == GTK_RESPONSE_ACCEPT) { +#if GTK_CHECK_VERSION(4, 0, 0) + GListModel *selection = gtk_file_chooser_get_files(GTK_FILE_CHOOSER(self)); + flist = flist = listmodel2filelist(selection); + g_object_unref(selection); +#else + GSList *selection = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(self)); + flist.nfiles = g_slist_length(selection); + flist.files = calloc(flist.nfiles, sizeof(char*)); + int i = 0; + while(selection) { + char *file = selection->data; + flist.files[i] = strdup(file); + g_free(file); + selection = selection->next; + i++; + } + g_slist_free(selection); +#endif + } + + + if(data->callback) { + data->callback(&evt, data->userdata); + } + + for(int i=0;iobj = obj; + event->userdata = cbdata; + event->callback = file_selected_callback; + event->value = 0; + event->customdata = NULL; + + g_signal_connect( + dialog, + "response", + G_CALLBACK(filechooser_response), + event); + g_signal_connect( + dialog, + "destroy", + G_CALLBACK(ui_destroy_userdata), + event); + + UiEvent evt; evt.obj = obj; evt.document = evt.obj->ctx->document; @@ -316,39 +501,15 @@ flist.nfiles = 0; evt.eventdata = &flist; - int result = gtk_dialog_run(GTK_DIALOG (dialog)); - GSList *selection = NULL; - if(result == GTK_RESPONSE_ACCEPT) { - selection = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(dialog)); - flist.nfiles = g_slist_length(selection); - flist.files = calloc(flist.nfiles, sizeof(char*)); - int i = 0; - while(selection) { - flist.files[i] = selection->data; - selection = selection->next; - i++; - } - } - - if(file_selected_callback) { - file_selected_callback(&evt, cbdata); - } - - for(int i=0;i