--- a/application/settings.c Sat Apr 05 17:57:04 2025 +0200
+++ b/application/settings.c Sun Jul 20 22:04:39 2025 +0200
@@ -636,18 +636,18 @@
wdata->obj = obj;
settings_init(obj, wdata);
- ui_tabview(obj, .tabview = UI_TABVIEW_NAVIGATION_TOP) {
+ ui_tabview(obj, .tabview = UI_TABVIEW_NAVIGATION_TOP, .fill = TRUE) {
ui_tab(obj, "General") {
- ui_grid(obj, .margin = 10) {
+ ui_grid(obj, .margin = 10, .fill = TRUE) {
ui_label(obj, .label = "TODO");
}
}
ui_tab(obj, "Repositories") {
- ui_tabview(obj, .value = wdata->repo_tabview, .tabview = UI_TABVIEW_INVISIBLE) {
+ ui_tabview(obj, .value = wdata->repo_tabview, .tabview = UI_TABVIEW_INVISIBLE, .fill = TRUE) {
ui_tab(obj, "list") {
- ui_grid(obj, .margin = 16, .columnspacing = 10, .rowspacing = 10) {
+ ui_grid(obj, .margin = 16, .columnspacing = 10, .rowspacing = 10, .fill = TRUE) {
ui_hbox(obj, .spacing = 4) {
ui_button(obj, .label = "Add", .onclick = repolist_add);
ui_button(obj, .label = "Edit", .onclick = repolist_edit, .groups = UI_GROUPS(SETTINGS_STATE_REPOLIST_SELECTED));
@@ -663,18 +663,19 @@
.multiselection = FALSE,
.onactivate = repolist_activate,
.onselection = repolist_selection,
- .vexpand = TRUE, .hexpand = TRUE, .colspan = 3);
+ .vexpand = TRUE, .hexpand = TRUE,
+ .hfill = TRUE, .vfill = TRUE, .colspan = 3);
}
}
ui_tab(obj, "repo") {
- ui_vbox(obj, .margin = 16, .spacing = 10) {
- ui_hbox(obj, .fill = UI_OFF, .spacing = 4) {
+ ui_vbox(obj, .margin = 16, .spacing = 10, .fill = TRUE) {
+ ui_hbox(obj, .spacing = 4) {
ui_button(obj, .icon = UI_ICON_GO_BACK, .onclick = editrepo_go_back);
ui_label(obj, .label = "Repository List");
}
- ui_scrolledwindow(obj, .hexpand = TRUE, .vexpand = TRUE, .subcontainer = UI_CONTAINER_NO_SUB) {
+ ui_scrolledwindow(obj, .subcontainer = UI_CONTAINER_NO_SUB, .fill = TRUE) {
ui_grid(obj, .margin = 10, .columnspacing = 10, .rowspacing = 10) {
ui_llabel(obj, .label = "Name");
ui_textfield(obj, .value = wdata->repo_name, .width = 15);
@@ -740,19 +741,19 @@
}
ui_tab(obj, "Sync Directories") {
- ui_grid(obj, .margin = 10) {
+ ui_grid(obj, .margin = 10, .fill = TRUE) {
ui_label(obj, .label = "TODO");
}
}
ui_tab(obj, "Credentials") {
- ui_hbox(obj, .margin = 16, .spacing = 30) {
- ui_vbox(obj, .fill = UI_OFF, .spacing = 4) {
- ui_hbox(obj, .fill = UI_OFF, .spacing = 4) {
+ ui_hbox(obj, .margin = 16, .spacing = 30, .fill = TRUE) {
+ ui_vbox(obj, .spacing = 4) {
+ ui_hbox(obj, .spacing = 4) {
ui_button(obj, .label = "Add", .onclick = credentials_add);
ui_button(obj, .label = "Remove", .onclick = credentials_remove, .groups = UI_GROUPS(SETTINGS_STATE_CREDENTIALS_SELECTED));
}
- ui_listview(obj, .list = wdata->credentials_users, .fill = UI_ON, .onselection = credentials_onselect);
+ ui_listview(obj, .list = wdata->credentials_users, .fill = TRUE, .onselection = credentials_onselect);
}
ui_grid(obj, .columnspacing = 30, .rowspacing = 10) {
@@ -783,8 +784,8 @@
#else
ui_callback credentials_activate_callback = NULL;
#endif
- ui_listview(obj, .list = wdata->credentials_locations, .onactivate = credentials_activate_callback, .onselection = credentials_location_onselect, .colspan = 2, .fill = UI_ON, .groups = UI_GROUPS(SETTINGS_STATE_CREDENTIALS_SELECTED));
- ui_vbox(obj, .fill = UI_OFF, .spacing = 4) {
+ ui_listview(obj, .list = wdata->credentials_locations, .onactivate = credentials_activate_callback, .onselection = credentials_location_onselect, .colspan = 2, .fill = TRUE, .groups = UI_GROUPS(SETTINGS_STATE_CREDENTIALS_SELECTED));
+ ui_vbox(obj, .spacing = 4) {
ui_button(obj, .label = "Add", .onclick = credentials_location_add, .groups = UI_GROUPS(SETTINGS_STATE_CREDENTIALS_SELECTED));
ui_button(obj, .label = "Edit", .onclick = credentials_location_edit, .groups = UI_GROUPS(SETTINGS_STATE_CREDENTIALS_SELECTED, SETTINGS_STATE_CREDENTIALS_LOCATION_SELECTED));
ui_button(obj, .label = "Remove", .onclick = credentials_location_remove, .groups = UI_GROUPS(SETTINGS_STATE_CREDENTIALS_SELECTED, SETTINGS_STATE_CREDENTIALS_LOCATION_SELECTED));
@@ -798,12 +799,12 @@
ui_tab(obj, "Keys") {
ui_hbox(obj, .margin = 16, .spacing = 30) {
- ui_vbox(obj, .fill = UI_OFF, .spacing = 4) {
- ui_hbox(obj, .fill = UI_OFF, .spacing = 4) {
+ ui_vbox(obj, .spacing = 4) {
+ ui_hbox(obj, .spacing = 4) {
ui_button(obj, .label = "Add", .onclick = keys_add);
ui_button(obj, .label = "Remove", .onclick = keys_remove, .groups = UI_GROUPS(SETTINGS_STATE_KEYS_SELECTED));
}
- ui_listview(obj, .list = wdata->keys_list, .fill = UI_ON, .onselection = keys_onselect, .getvalue = keylist_getvalue);
+ ui_listview(obj, .list = wdata->keys_list, .fill = TRUE, .onselection = keys_onselect, .getvalue = keylist_getvalue);
}
ui_grid(obj, .columnspacing = 30, .rowspacing = 10) {
@@ -828,9 +829,9 @@
*/
}
- ui_hbox(obj, .fill = UI_OFF, .margin = 10) {
+ ui_hbox(obj, .margin = 10) {
ui_button(obj, .label = "Cancel", .onclick = settings_cancel);
- ui_label(obj, .fill = UI_ON);
+ ui_label(obj, .fill = TRUE);
ui_button(obj, .label = "Save", .onclick = settings_ok);
}
