aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--epan/uat.c6
-rw-r--r--epan/uat.h26
-rw-r--r--gtk/uat_gui.c38
3 files changed, 56 insertions, 14 deletions
diff --git a/epan/uat.c b/epan/uat.c
index 97066e732a..8283ea38f0 100644
--- a/epan/uat.c
+++ b/epan/uat.c
@@ -208,8 +208,10 @@ static void putfld(FILE* fp, void* rec, uat_field_t* f) {
f->cb.tostr(rec,&fld_ptr,&fld_len,f->cbdata.tostr,f->fld_data);
switch(f->mode){
- case PT_TXTMOD_ENUM:
- case PT_TXTMOD_STRING: {
+ case PT_TXTMOD_ENUM:
+ case PT_TXTMOD_FILENAME:
+ case PT_TXTMOD_DIRECTORYNAME:
+ case PT_TXTMOD_STRING: {
guint i;
putc('"',fp);
diff --git a/epan/uat.h b/epan/uat.h
index 9f19ecbc60..7c4424f361 100644
--- a/epan/uat.h
+++ b/epan/uat.h
@@ -182,7 +182,12 @@ typedef enum _uat_text_mode_t {
"invalid" as NULL,3
"a1b" as NULL, 1
*/
- PT_TXTMOD_ENUM
+ PT_TXTMOD_ENUM,
+
+ PT_TXTMOD_FILENAME,
+ /* processed like a PT_TXTMOD_STRING, but shows a filename dialog */
+ PT_TXTMOD_DIRECTORYNAME,
+ /* processed like a PT_TXTMOD_STRING, but shows a directory dialog */
} uat_text_mode_t;
/*
@@ -364,15 +369,24 @@ static void basename ## _ ## field_name ## _tostr_cb(void* rec, const char** out
{#field_name, title, PT_TXTMOD_STRING,{ chk ,basename ## _ ## field_name ## _set_cb,basename ## _ ## field_name ## _tostr_cb},{0,0,0},0,desc,FLDFILL}
/*
- * PATHNAME - for now, just a CSTRING, but we might want to have a
- * way to pop up a dialog to let you browse for a file name.
+ * FILENAME and DIRECTORYNAME,
+ * a simple c-string contained in (((rec_t*)rec)->(field_name))
*/
-#define UAT_FLD_PATHNAME(basename,field_name,title,desc) \
- {#field_name, title, PT_TXTMOD_STRING,{uat_fld_chk_str,basename ## _ ## field_name ## _set_cb,basename ## _ ## field_name ## _tostr_cb},{0,0,0},0,desc,FLDFILL}
+#define UAT_FILENAME_CB_DEF(basename,field_name,rec_t) UAT_CSTRING_CB_DEF(basename,field_name,rec_t)
+
+#define UAT_FLD_FILENAME(basename,field_name,title,desc) \
+ {#field_name, title, PT_TXTMOD_FILENAME,{uat_fld_chk_str,basename ## _ ## field_name ## _set_cb,basename ## _ ## field_name ## _tostr_cb},{0,0,0},0,desc,FLDFILL}
+
+#define UAT_FLD_FILENAME_OTHER(basename,field_name,title,chk,desc) \
+ {#field_name, title, PT_TXTMOD_FILENAME,{chk,basename ## _ ## field_name ## _set_cb,basename ## _ ## field_name ## _tostr_cb},{0,0,0},0,desc,FLDFILL}
+
+#define UAT_DIRECTORYNAME_CB_DEF(basename,field_name,rec_t) UAT_CSTRING_CB_DEF(basename,field_name,rec_t)
+
+#define UAT_FLD_DIRECTORYNAME(basename,field_name,title,desc) \
+ {#field_name, title, PT_TXTMOD_DIRECTORYNAME,{uat_fld_chk_str,basename ## _ ## field_name ## _set_cb,basename ## _ ## field_name ## _tostr_cb},{0,0,0},0,desc,FLDFILL}
/*
* OID - just a CSTRING with a specific check routine
- *
*/
#define UAT_FLD_OID(basename,field_name,title,desc) \
{#field_name, title, PT_TXTMOD_STRING,{uat_fld_chk_oid,basename ## _ ## field_name ## _set_cb,basename ## _ ## field_name ## _tostr_cb},{0,0,0},0,desc,FLDFILL}
diff --git a/gtk/uat_gui.c b/gtk/uat_gui.c
index dc6ee7b53e..f315ddad36 100644
--- a/gtk/uat_gui.c
+++ b/gtk/uat_gui.c
@@ -158,6 +158,8 @@ static char* fld_tostr(void* rec, uat_field_t* f) {
switch(f->mode) {
case PT_TXTMOD_STRING:
case PT_TXTMOD_ENUM:
+ case PT_TXTMOD_FILENAME:
+ case PT_TXTMOD_DIRECTORYNAME:
out = ep_strndup(ptr,len);
break;
case PT_TXTMOD_HEXBYTES: {
@@ -302,10 +304,22 @@ static gboolean uat_dlg_cb(GtkWidget *win _U_, gpointer user_data) {
for ( colnum = 0; colnum < ncols; colnum++ ) {
void* e = g_ptr_array_index(dd->entries,colnum);
- const char* text;
+ const char *text = NULL;
+ char *text_free = NULL;
unsigned len = 0;
switch(f[colnum].mode) {
+ case PT_TXTMOD_FILENAME:
+ case PT_TXTMOD_DIRECTORYNAME:
+ text = text_free = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(e));
+ if (text) {
+ len = (unsigned) strlen(text);
+ } else {
+ text = "";
+ len = 0;
+ }
+ break;
+
case PT_TXTMOD_STRING:
text = gtk_entry_get_text(GTK_ENTRY(e));
len = (unsigned) strlen(text);
@@ -333,7 +347,6 @@ static gboolean uat_dlg_cb(GtkWidget *win _U_, gpointer user_data) {
return FALSE;
}
-
if (f[colnum].cb.chk) {
if (! f[colnum].cb.chk(dd->rec, text, len, f[colnum].cbdata.chk, f[colnum].fld_data, &err)) {
err = ep_strdup_printf("error in column '%s': %s",f[colnum].title,err);
@@ -342,6 +355,8 @@ static gboolean uat_dlg_cb(GtkWidget *win _U_, gpointer user_data) {
}
f[colnum].cb.set(dd->rec,text,len, f[colnum].cbdata.set, f[colnum].fld_data);
+
+ g_free(text_free);
}
if (dd->uat->update_cb) {
@@ -477,17 +492,28 @@ static void uat_edit_dialog(uat_t* uat, gint row, gboolean copy) {
gtk_container_add(GTK_CONTAINER(event_box), label);
switch(f[colnum].mode) {
- case PT_TXTMOD_STRING:
- case PT_TXTMOD_HEXBYTES: {
- entry = gtk_entry_new();
+ case PT_TXTMOD_FILENAME:
+ case PT_TXTMOD_DIRECTORYNAME:
+ entry = gtk_file_chooser_button_new(f[colnum].desc,
+ (f[colnum].mode == PT_TXTMOD_FILENAME) ? GTK_FILE_CHOOSER_ACTION_OPEN : GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+ if (! dd->is_new || copy) {
+ gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(entry), text);
+ }
g_ptr_array_add(dd->entries,entry);
gtk_table_attach_defaults(GTK_TABLE(main_tb), entry, 1, 2, colnum+1, colnum + 2);
+ break;
+
+ case PT_TXTMOD_STRING:
+ case PT_TXTMOD_HEXBYTES:
+ entry = gtk_entry_new();
if (! dd->is_new || copy) {
gtk_entry_set_text(GTK_ENTRY(entry),text);
}
+ g_ptr_array_add(dd->entries,entry);
+ gtk_table_attach_defaults(GTK_TABLE(main_tb), entry, 1, 2, colnum+1, colnum + 2);
dlg_set_activate(entry, bt_ok);
break;
- }
+
case PT_TXTMOD_ENUM: {
GtkWidget *combo_box;
int idx;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 22:12:53 +0000