zheiling/BBS-Client-TUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

R: changes name convention on objective elements

Browse Source
This commit is contained in:
zheiling
2026-04-06 15:02:20 +03:00
parent 707087b8fe
commit 2414abbdcb
59 changed files with 643 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modals/ask_server_addr.c
+18 -18
View File
@@ -7,20 +7,20 @@
#include "group.h"
typedef struct {
button_t *element;
w_button_t *element;
enum w_type type;
} group_bt_t;
void asa_modal_dialogue_callback(callback_args_t *args) {
callback_args_t d_args;
app_t *app = args->app;
dialogue_t *d = (dialogue_t *)app->active_widget;
memcpy(&d_args, args, sizeof(callback_args_t));
void asa_modal_dialogue_callback(w_cb_args_t *args) {
w_cb_args_t d_args;
w_app_t *app = args->app;
w_dialogue_t *d = (w_dialogue_t *)app->active_widget;
memcpy(&d_args, args, sizeof(w_cb_args_t));
d_args.app = NULL;
d_args.element = app->active_widget;
input_t *in_ip = d->g_content->elements[0].element;
input_t *in_port = d->g_content->elements[1].element;
dialogue_default_callback(&d_args);
w_input_t *in_ip = d->g_content->elements[0].element;
w_input_t *in_port = d->g_content->elements[1].element;
w_dialogue_callback_default(&d_args);
if (d_args.resp_data.code == cbrp_val) {
switch (d_args.resp_data.val.val.num) {
case 1:
@@ -30,33 +30,33 @@ void asa_modal_dialogue_callback(callback_args_t *args) {
app->query_args->state = S_WAIT_SERVER;
break;
case 2:
destroy_app(app, 0);
w_app_destroy(app, 0);
}
}
}
dialogue_t *init_asa_modal(app_t *app) {
w_dialogue_t *m_asa_init(w_app_t *app) {
if (app == NULL)
return NULL;
group_el_init_t content[] = {
w_group_el_init_t content[] = {
{.type = w_input, .label = "Address", .length = 15},
{.type = w_input, .label = "Port", .length = 5},
{.type = w_end}};
group_el_init_t actions[] = {
w_group_el_init_t actions[] = {
{.type = w_button, .label = "Connect", .is_default = true, .val.num = 1},
{.type = w_button, .label = "Cancel", .is_default = false, .val.num = 2},
{.type = w_end}};
init_dialogue(&(app->modal), "Connect to server",
w_dialogue_init(&(app->modal), "Connect to server",
"There is information needed", &(app->coordinates));
dialogue_t *d = &(app->modal);
w_dialogue_t *d = &(app->modal);
d->w.callback = asa_modal_dialogue_callback;
d->g_content = init_group(&(d->win), &(d->w), content,&(d->id_map), horizontal, g_content);
d->g_action = init_group(&(d->win), &(d->w), actions,&(d->id_map), horizontal, g_action);
d->g_content = w_group_init(&(d->win), &(d->w), content,&(d->id_map), horizontal, g_content);
d->g_action = w_group_init(&(d->win), &(d->w), actions,&(d->id_map), horizontal, g_action);
dialogue_init_active_id(d);
w_dialogue_init_active_id(d);
return NULL;
}
src/modals/ask_server_addr.h
+3 -3
View File
@@ -1,8 +1,8 @@
#ifndef ASK_SERVER_ADDR_H
#define ASK_SERVER_ADDR_H
#ifndef M_ASK_SERVER_ADDR_H
#define M_ASK_SERVER_ADDR_H
#include <widget.h>
dialogue_t *init_asa_modal(app_t *app);
w_dialogue_t *m_asa_init(w_app_t *app);
#endif
src/modals/download_pr.h
-8
View File
@@ -1,8 +0,0 @@
#ifndef DOWNLOAD_PR_H
#define DOWNLOAD_PR_H
#include <widget.h>
dialogue_t *init_dwn_pr_modal(app_t *app, bool is_upload);
#endif
src/modals/download_pr.c → src/modals/load_pr.c
+9 -9
View File
@@ -4,36 +4,36 @@
#include <stdint.h>
#include <stdio.h>
void dwn_pr_modal_cb(callback_args_t *args) {
void dwn_pr_modal_cb(w_cb_args_t *args) {
/* TODO: cancel action */
}
dialogue_t *init_dwn_pr_modal(app_t *app, bool is_upload) {
w_dialogue_t *m_load_pr_init(w_app_t *app, bool is_upload) {
if (app == NULL)
return NULL;
group_el_init_t content[] = {
w_group_el_init_t content[] = {
{.type = w_progress, .label = "", .length = 30}, /* length is ignored */
{.type = w_end}};
char text[256];
sprintf(text, "%s file: %s", is_upload ? "Uploading" : "Downloading",
is_upload ? app->query_args->file->name : app->file_args->f_selected.name);
group_el_init_t actions[] = {
w_group_el_init_t actions[] = {
{.type = w_button, .label = "Cancel", .is_default = true, .val.num = 1}, {.type = w_end}};
app->modal.w.parent_win = &app->win;
init_dialogue(&(app->modal), is_upload ? "Upload" : "Download", text,
w_dialogue_init(&(app->modal), is_upload ? "Upload" : "Download", text,
&(app->coordinates));
dialogue_t *d = &(app->modal);
w_dialogue_t *d = &(app->modal);
d->w.callback = dwn_pr_modal_cb;
d->g_content = init_group(&(d->win), &(d->w), content, &(d->id_map), horizontal, g_content);
d->g_action = init_group(&(d->win), &(d->w), actions, &(d->id_map), horizontal, g_action);
d->g_content = w_group_init(&(d->win), &(d->w), content, &(d->id_map), horizontal, g_content);
d->g_action = w_group_init(&(d->win), &(d->w), actions, &(d->id_map), horizontal, g_action);
app->query_args->progress_bar = d->g_content->elements[0].element;
app->query_args->active_dialogue = d;
dialogue_init_active_id(d);
w_dialogue_init_active_id(d);
return NULL;
}
src/modals/load_pr.h
+8
View File
@@ -0,0 +1,8 @@
#ifndef M_LOAD_PR_H
#define M_LOAD_PR_H
#include <widget.h>
w_dialogue_t *m_load_pr_init(w_app_t *app, bool is_upload);
#endif
src/modals/login_credentials.c
+18 -18
View File
@@ -9,20 +9,20 @@
#include "../server.h"
typedef struct {
button_t *element;
w_button_t *element;
enum w_type type;
} group_bt_t;
void init_login_credentials_modal_cb(callback_args_t *args) {
callback_args_t d_args;
app_t *app = args->app;
dialogue_t *d = (dialogue_t *)app->active_widget;
memcpy(&d_args, args, sizeof(callback_args_t));
void init_login_credentials_modal_cb(w_cb_args_t *args) {
w_cb_args_t d_args;
w_app_t *app = args->app;
w_dialogue_t *d = (w_dialogue_t *)app->active_widget;
memcpy(&d_args, args, sizeof(w_cb_args_t));
d_args.app = NULL;
d_args.element = app->active_widget;
input_t *in_name = d->g_content->elements[0].element;
input_t *in_pass = d->g_content->elements[1].element;
dialogue_default_callback(&d_args);
w_input_t *in_name = d->g_content->elements[0].element;
w_input_t *in_pass = d->g_content->elements[1].element;
w_dialogue_callback_default(&d_args);
if (d_args.resp_data.code == cbrp_val) {
switch (d_args.resp_data.val.val.num) {
case 1:
@@ -35,7 +35,7 @@ void init_login_credentials_modal_cb(callback_args_t *args) {
server_send_string(app->query_args, app->params->uname);
app->query_args->state = S_WAIT_SERVER;
d->needs_destroy = true;
print_bars(app);
w_app_print_bars(app);
break;
case 2:
app->query_args->state = S_ASK_LOGIN_TYPE;
@@ -44,10 +44,10 @@ void init_login_credentials_modal_cb(callback_args_t *args) {
}
}
dialogue_t *init_login_credentials_modal(app_t *app) {
w_dialogue_t *m_login_credentials_init(w_app_t *app) {
if (app == NULL)
return NULL;
group_el_init_t content[] = {
w_group_el_init_t content[] = {
{.type = w_input, .label = "Username", .length = 15},
{.type = w_input,
.label = "Password",
@@ -55,20 +55,20 @@ dialogue_t *init_login_credentials_modal(app_t *app) {
.is_hidden_value = true},
{.type = w_end}};
group_el_init_t actions[] = {
w_group_el_init_t actions[] = {
{.type = w_button, .label = "Login", .is_default = true, .val.num = 1},
{.type = w_button, .label = "Cancel", .is_default = false, .val.num = 2},
{.type = w_end}};
init_dialogue(&(app->modal), "Login", "Your login credentials",
w_dialogue_init(&(app->modal), "Login", "Your login credentials",
&(app->coordinates));
dialogue_t *d = &(app->modal);
w_dialogue_t *d = &(app->modal);
d->w.callback = init_login_credentials_modal_cb;
d->g_content = init_group(&(d->win), &(d->w), content, &(d->id_map), horizontal, g_content);
d->g_action = init_group(&(d->win), &(d->w), actions, &(d->id_map), horizontal, g_action);
d->g_content = w_group_init(&(d->win), &(d->w), content, &(d->id_map), horizontal, g_content);
d->g_action = w_group_init(&(d->win), &(d->w), actions, &(d->id_map), horizontal, g_action);
dialogue_init_active_id(d);
w_dialogue_init_active_id(d);
return NULL;
}
src/modals/login_credentials.h
+3 -3
View File
@@ -1,8 +1,8 @@
#ifndef LOGIN_CREDENTIALS_MODAL_H
#define LOGIN_CREDENTIALS_MODAL_H
#ifndef M_LOGIN_CREDENTIALS_H
#define M_LOGIN_CREDENTIALS_H
#include <widget.h>
dialogue_t *init_login_credentials_modal(app_t *app);
w_dialogue_t *m_login_credentials_init(w_app_t *app);
#endif
src/modals/login_option.c
+13 -13
View File
@@ -9,18 +9,18 @@
#include "../server.h"
typedef struct {
button_t *element;
w_button_t *element;
enum w_type type;
} group_bt_t;
void login_modal_option_cb(callback_args_t *args) {
callback_args_t d_args;
app_t *app = args->app;
dialogue_t *d = (dialogue_t *)app->active_widget;
memcpy(&d_args, args, sizeof(callback_args_t));
void login_modal_option_cb(w_cb_args_t *args) {
w_cb_args_t d_args;
w_app_t *app = args->app;
w_dialogue_t *d = (w_dialogue_t *)app->active_widget;
memcpy(&d_args, args, sizeof(w_cb_args_t));
d_args.app = NULL;
d_args.element = app->active_widget;
dialogue_default_callback(&d_args);
w_dialogue_callback_default(&d_args);
if (d_args.resp_data.code == cbrp_val) {
switch (d_args.resp_data.val.val.num) {
case 1:
@@ -29,7 +29,7 @@ void login_modal_option_cb(callback_args_t *args) {
strcpy(app->params->uname, "anonymous");
server_send_string(app->query_args, app->params->uname);
app->query_args->state = S_WAIT_SERVER;
print_bars(app);
w_app_print_bars(app);
break;
case 2:
d->needs_destroy = true;
@@ -43,22 +43,22 @@ void login_modal_option_cb(callback_args_t *args) {
}
}
dialogue_t *init_login_option_modal(app_t *app) {
w_dialogue_t *m_login_option_init(w_app_t *app) {
if (app == NULL)
return NULL;
group_el_init_t children[] = {{.type = w_button, .label = "Anonymous", .val.num = 1},
w_group_el_init_t children[] = {{.type = w_button, .label = "Anonymous", .val.num = 1},
{.type = w_button, .label = "User", .val.num = 2},
{.type = w_button, .label = "Register", .val.num = 3},
{.type = w_end}};
init_dialogue(&(app->modal), "Login",
w_dialogue_init(&(app->modal), "Login",
"Select your login "
"option",
&(app->coordinates));
app->modal.g_action = init_group(&(app->modal.win), &(app->modal.w), children,
app->modal.g_action = w_group_init(&(app->modal.win), &(app->modal.w), children,
&(app->modal.id_map), horizontal, g_action);
app->modal.w.callback = login_modal_option_cb;
dialogue_init_active_id(&(app->modal));
w_dialogue_init_active_id(&(app->modal));
return NULL;
}
src/modals/login_option.h
+3 -3
View File
@@ -1,8 +1,8 @@
#ifndef LOGIN_OPTION_MODAL_H
#define LOGIN_OPTION_MODAL_H
#ifndef M_LOGIN_OPTION_H
#define M_LOGIN_OPTION_H
#include <widget.h>
dialogue_t *init_login_option_modal(app_t *app);
w_dialogue_t *m_login_option_init(w_app_t *app);
#endif
src/modals/modals.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef MODALS_H
#define MODALS_H
#include "ask_server_addr.h"
#include "download_pr.h"
#include "load_pr.h"
#include "login_credentials.h"
#include "login_option.h"
#include "notification.h"
src/modals/notification.c
+13 -13
View File
@@ -7,44 +7,44 @@
#include <widget.h>
typedef struct {
button_t *element;
w_button_t *element;
enum w_type type;
} group_bt_t;
void init_notification_modal_cb(callback_args_t *args) {
callback_args_t d_args;
app_t *app = args->app;
dialogue_t *d = (dialogue_t *)app->active_widget;
memcpy(&d_args, args, sizeof(callback_args_t));
void init_notification_modal_cb(w_cb_args_t *args) {
w_cb_args_t d_args;
w_app_t *app = args->app;
w_dialogue_t *d = (w_dialogue_t *)app->active_widget;
memcpy(&d_args, args, sizeof(w_cb_args_t));
d_args.app = NULL;
d_args.element = app->active_widget;
dialogue_default_callback(&d_args);
w_dialogue_callback_default(&d_args);
app->query_args->state = WAIT_CLIENT;
d->needs_destroy = true;
}
dialogue_t *init_notification_modal(app_t *app) {
w_dialogue_t *m_notification_init(w_app_t *app) {
if (app == NULL)
return NULL;
group_el_init_t actions[] = {
w_group_el_init_t actions[] = {
{.type = w_button, .label = "OK", .is_default = true, .val.num = 1},
{.type = w_end}};
init_dialogue(&(app->modal), "Notification", app->query_args->notification,
w_dialogue_init(&(app->modal), "Notification", app->query_args->notification,
&(app->coordinates));
free(app->query_args->notification);
app->query_args->notification = NULL;
dialogue_t *d = &(app->modal);
w_dialogue_t *d = &(app->modal);
app->query_args->active_dialogue = d;
d->w.callback = init_notification_modal_cb;
d->g_content = NULL;
d->g_action = init_group(&(d->win), &(d->w), actions, &(d->id_map),
d->g_action = w_group_init(&(d->win), &(d->w), actions, &(d->id_map),
horizontal, g_action);
dialogue_init_active_id(d);
w_dialogue_init_active_id(d);
return NULL;
}
src/modals/notification.h
+3 -3
View File
@@ -1,8 +1,8 @@
#ifndef NOTIFICATION_H
#define NOTIFICATION_H
#ifndef M_NOTIFICATION_H
#define M_NOTIFICATION_H
#include <widget.h>
dialogue_t *init_notification_modal(app_t *app);
w_dialogue_t *m_notification_init(w_app_t *app);
#endif
src/modals/register.c
+25 -25
View File
@@ -11,18 +11,18 @@
#include "../server.h"
typedef struct {
button_t *element;
w_button_t *element;
enum w_type type;
} group_bt_t;
void init_register_modal_cb(callback_args_t *args) {
callback_args_t d_args;
app_t *app = args->app;
dialogue_t *d = (dialogue_t *)app->active_widget;
memcpy(&d_args, args, sizeof(callback_args_t));
void init_register_modal_cb(w_cb_args_t *args) {
w_cb_args_t d_args;
w_app_t *app = args->app;
w_dialogue_t *d = (w_dialogue_t *)app->active_widget;
memcpy(&d_args, args, sizeof(w_cb_args_t));
d_args.app = NULL;
d_args.element = app->active_widget;
dialogue_default_callback(&d_args);
w_dialogue_callback_default(&d_args);
if (d_args.resp_data.code == cbrp_val &&
d_args.resp_data.val.type == val_num) {
@@ -32,25 +32,25 @@ void init_register_modal_cb(callback_args_t *args) {
return;
}
input_t *in_name = d->g_content->elements[0].element;
group_t *g_passwords = d->g_content->elements[1].element;
input_t *in_email = d->g_content->elements[2].element;
input_t *in_pass = g_passwords->elements[0].element;
input_t *in_pass_r = g_passwords->elements[1].element;
w_input_t *in_name = d->g_content->elements[0].element;
w_group_t *g_passwords = d->g_content->elements[1].element;
w_input_t *in_email = d->g_content->elements[2].element;
w_input_t *in_pass = g_passwords->elements[0].element;
w_input_t *in_pass_r = g_passwords->elements[1].element;
if (in_name->value_len == 0) {
alert("Name field is empty!");
w_alert("Name field is empty!");
return;
}
if (in_email->value_len == 0) {
alert("Email field is empty!");
w_alert("Email field is empty!");
return;
}
if (!in_pass->value_len || !in_pass->value_len) {
alert("One of password's field is empty!");
w_alert("One of password's field is empty!");
return;
}
if (strcmp(in_pass->value, in_pass_r->value)) {
alert("Your passwords do not match!");
w_alert("Your passwords do not match!");
in_pass->value[0] = '\0';
in_pass->value_len = 0;
in_pass_r->value[0] = '\0';
@@ -70,11 +70,11 @@ void init_register_modal_cb(callback_args_t *args) {
}
}
dialogue_t *init_register_modal(app_t *app) {
w_dialogue_t *m_register_init(w_app_t *app) {
if (app == NULL)
return NULL;
group_el_init_t content_pass[] = {{.type = w_input,
w_group_el_init_t content_pass[] = {{.type = w_input,
.label = "Password",
.length = 18,
.is_hidden_value = true},
@@ -84,28 +84,28 @@ dialogue_t *init_register_modal(app_t *app) {
.is_hidden_value = true},
{.type = w_end}};
group_el_init_t content[] = {
w_group_el_init_t content[] = {
{.type = w_input, .label = "Username", .length = 18},
{.type = w_group, .direction = horizontal, .children = content_pass},
{.type = w_input, .label = "Email", .length = 40},
{.type = w_end}};
group_el_init_t actions[] = {
w_group_el_init_t actions[] = {
{.type = w_button, .label = "Register", .is_default = true, .val.num = 1},
{.type = w_button, .label = "Cancel", .is_default = false, .val.num = 2},
{.type = w_end}};
init_dialogue(&(app->modal), "Credentials", "There is information needed",
w_dialogue_init(&(app->modal), "Credentials", "There is information needed",
&(app->coordinates));
dialogue_t *d = &(app->modal);
w_dialogue_t *d = &(app->modal);
d->w.callback = init_register_modal_cb;
d->g_content = init_group(&(d->win), &(d->w), content, &(d->id_map), vertical,
d->g_content = w_group_init(&(d->win), &(d->w), content, &(d->id_map), vertical,
g_content);
d->g_action = init_group(&(d->win), &(d->w), actions, &(d->id_map),
d->g_action = w_group_init(&(d->win), &(d->w), actions, &(d->id_map),
horizontal, g_action);
dialogue_init_active_id(d);
w_dialogue_init_active_id(d);
return NULL;
}
src/modals/register.h
+3 -3
View File
@@ -1,8 +1,8 @@
#ifndef REGISTER_MODAL_H
#define REGISTER_MODAL_H
#ifndef M_REGISTER_H
#define M_REGISTER_H
#include <widget.h>
dialogue_t *init_register_modal(app_t *app);
w_dialogue_t *m_register_init(w_app_t *app);
#endif
src/modals/server_message.c
+12 -12
View File
@@ -7,18 +7,18 @@
#include <widget.h>
typedef struct {
button_t *element;
w_button_t *element;
enum w_type type;
} group_bt_t;
void server_message_modal_cb(callback_args_t *args) {
callback_args_t d_args;
app_t *app = args->app;
dialogue_t *d = (dialogue_t *)app->active_widget;
memcpy(&d_args, args, sizeof(callback_args_t));
void server_message_modal_cb(w_cb_args_t *args) {
w_cb_args_t d_args;
w_app_t *app = args->app;
w_dialogue_t *d = (w_dialogue_t *)app->active_widget;
memcpy(&d_args, args, sizeof(w_cb_args_t));
d_args.app = NULL;
d_args.element = app->active_widget;
dialogue_default_callback(&d_args);
w_dialogue_callback_default(&d_args);
if (d_args.resp_data.code == cbrp_val) {
switch (d_args.resp_data.val.val.num) {
case 1:
@@ -34,18 +34,18 @@ void server_message_modal_cb(callback_args_t *args) {
}
}
void *init_server_message_modal(app_t *app) {
void *m_server_message_init(w_app_t *app) {
if (app == NULL)
return NULL;
group_el_init_t children[] = {
w_group_el_init_t children[] = {
{.type = w_button, .label = "OK", .is_default = true, .val.num = 1}, {.type = w_end}};
init_dialogue(&(app->modal), "Server response",
w_dialogue_init(&(app->modal), "Server response",
app->query_args->server_message.text, &(app->coordinates));
app->modal.g_action =
init_group(&(app->modal.win), &(app->modal.w), children, &(app->modal.id_map), horizontal, g_action);
w_group_init(&(app->modal.win), &(app->modal.w), children, &(app->modal.id_map), horizontal, g_action);
app->modal.w.callback = server_message_modal_cb;
dialogue_init_active_id(&(app->modal));
w_dialogue_init_active_id(&(app->modal));
return NULL;
}
src/modals/server_message.h
+3 -3
View File
@@ -1,8 +1,8 @@
#ifndef SERVER_MESSAGE_H
#define SERVER_MESSAGE_H
#ifndef M_SERVER_MESSAGE_H
#define M_SERVER_MESSAGE_H
#include <widget.h>
void *init_server_message_modal(app_t *app);
void *m_server_message_init(w_app_t *app);
#endif
src/modals/upload_dialogue.c
+16 -16
View File
@@ -5,16 +5,16 @@
#include <string.h>
#include <widget.h>
void upload_dialogue_modal_cb(callback_args_t *args) {
callback_args_t d_args;
app_t *app = args->app;
dialogue_t *d = (dialogue_t *)app->active_widget;
memcpy(&d_args, args, sizeof(callback_args_t));
void upload_dialogue_modal_cb(w_cb_args_t *args) {
w_cb_args_t d_args;
w_app_t *app = args->app;
w_dialogue_t *d = (w_dialogue_t *)app->active_widget;
memcpy(&d_args, args, sizeof(w_cb_args_t));
d_args.app = NULL;
d_args.element = app->active_widget;
dialogue_default_callback(&d_args);
ui_fs_file_list_t *fui =
(ui_fs_file_list_t *)d->g_content->elements[0].element;
w_dialogue_callback_default(&d_args);
w_lfl_ui_t *fui =
(w_lfl_ui_t *)d->g_content->elements[0].element;
if (d_args.resp_data.code == cbrp_val) {
switch (d_args.resp_data.val.val.num) {
case 0:
@@ -33,31 +33,31 @@ void upload_dialogue_modal_cb(callback_args_t *args) {
}
}
dialogue_t *init_upload_dialogue_modal(app_t *app) {
w_dialogue_t *m_upload_dialogue_init(w_app_t *app) {
if (app == NULL)
return NULL;
group_el_init_t content[] = {
w_group_el_init_t content[] = {
// {.type = w_input, .label = "File description", .length = 30},
{.type = w_fs_file_list, .label = "File", .length = 30},
{.type = w_end}};
group_el_init_t actions[] = {
w_group_el_init_t actions[] = {
{.type = w_button, .label = "Cancel", .is_default = false, .val.num = 0}, {.type = w_end}};
app->modal.w.parent_win = &app->win;
init_dialogue(&(app->modal), "Upload new file", "Enter essential data",
w_dialogue_init(&(app->modal), "Upload new file", "Enter essential data",
&(app->coordinates));
dialogue_t *d = &(app->modal);
w_dialogue_t *d = &(app->modal);
d->w.callback = upload_dialogue_modal_cb;
d->g_content = init_group(&(d->win), &(d->w), content, &(d->id_map),
d->g_content = w_group_init(&(d->win), &(d->w), content, &(d->id_map),
horizontal, g_content);
d->g_action = init_group(&(d->win), &(d->w), actions, &(d->id_map),
d->g_action = w_group_init(&(d->win), &(d->w), actions, &(d->id_map),
horizontal, g_action);
app->query_args->active_dialogue = d;
dialogue_init_active_id(d);
w_dialogue_init_active_id(d);
return NULL;
}
src/modals/upload_dialogue.h
+3 -3
View File
@@ -1,8 +1,8 @@
#ifndef UPLOAD_DIALOGUE_H
#define UPLOAD_DIALOGUE_H
#ifndef M_UPLOAD_DIALOGUE_H
#define M_UPLOAD_DIALOGUE_H
#include <widget.h>
dialogue_t *init_upload_dialogue_modal(app_t *app);
w_dialogue_t *m_upload_dialogue_init(w_app_t *app);
#endif
src/modals/upload_props_dialogue.c
+17 -17
View File
@@ -11,19 +11,19 @@
#include "../server.h"
void upload_props_dialogue_modal_cb(callback_args_t *args) {
callback_args_t d_args;
app_t *app = args->app;
dialogue_t *d = (dialogue_t *)app->active_widget;
memcpy(&d_args, args, sizeof(callback_args_t));
void upload_props_dialogue_modal_cb(w_cb_args_t *args) {
w_cb_args_t d_args;
w_app_t *app = args->app;
w_dialogue_t *d = (w_dialogue_t *)app->active_widget;
memcpy(&d_args, args, sizeof(w_cb_args_t));
d_args.app = NULL;
d_args.element = app->active_widget;
dialogue_default_callback(&d_args);
w_dialogue_callback_default(&d_args);
int32_t query_len = 0;
if (d_args.resp_data.code == cbrp_val) {
checkbox_t *reg_cbx = (checkbox_t *)d->g_content->elements[0].element;
checkbox_t *anon_cbx = (checkbox_t *)d->g_content->elements[1].element;
checkbox_t *comp_cbx = (checkbox_t *)d->g_content->elements[2].element;
w_checkbox_t *reg_cbx = (w_checkbox_t *)d->g_content->elements[0].element;
w_checkbox_t *anon_cbx = (w_checkbox_t *)d->g_content->elements[1].element;
w_checkbox_t *comp_cbx = (w_checkbox_t *)d->g_content->elements[2].element;
int32_t privileges = 0;
if (anon_cbx->value == true)
@@ -57,10 +57,10 @@ void upload_props_dialogue_modal_cb(callback_args_t *args) {
}
}
dialogue_t *init_upload_props_dialogue_modal(app_t *app) {
w_dialogue_t *m_upload_props_dialogue_init(w_app_t *app) {
if (app == NULL)
return NULL;
group_el_init_t content[] = {{.type = w_checkbox,
w_group_el_init_t content[] = {{.type = w_checkbox,
.label = "Visible for registered",
.is_default = true},
{.type = w_checkbox,
@@ -71,26 +71,26 @@ dialogue_t *init_upload_props_dialogue_modal(app_t *app) {
.is_default = false},
{.type = w_end}};
group_el_init_t actions[] = {
w_group_el_init_t actions[] = {
{.type = w_button, .label = "Upload", .is_default = false, .val.num = 1},
{.type = w_button, .label = "Cancel", .is_default = false, .val.num = 2},
{.type = w_end},
};
app->modal.w.parent_win = &app->win;
init_dialogue(&(app->modal), "Description for the file",
w_dialogue_init(&(app->modal), "Description for the file",
"Enter essential data", &(app->coordinates));
dialogue_t *d = &(app->modal);
w_dialogue_t *d = &(app->modal);
d->w.callback = upload_props_dialogue_modal_cb;
d->g_content = init_group(&(d->win), &(d->w), content, &(d->id_map), vertical,
d->g_content = w_group_init(&(d->win), &(d->w), content, &(d->id_map), vertical,
g_content);
d->g_action = init_group(&(d->win), &(d->w), actions, &(d->id_map),
d->g_action = w_group_init(&(d->win), &(d->w), actions, &(d->id_map),
horizontal, g_action);
app->query_args->active_dialogue = d;
dialogue_init_active_id(d);
w_dialogue_init_active_id(d);
return NULL;
}
src/modals/upload_props_dialogue.h
+1 -1
View File
@@ -3,6 +3,6 @@
#include <widget.h>
dialogue_t *init_upload_props_dialogue_modal(app_t *app);
w_dialogue_t *m_upload_props_dialogue_init(w_app_t *app);
#endif