Remove the filename from the GTK+ open file preview.
svn path=/trunk/; revision=43878
This commit is contained in:
parent
b0a562b82d
commit
75564d57c1
|
@ -94,7 +94,6 @@ static int set_file_type_list(GtkWidget *combo_box, capture_file *cf,
|
||||||
#define E_COMPRESSED_CB_KEY "compressed_cb"
|
#define E_COMPRESSED_CB_KEY "compressed_cb"
|
||||||
|
|
||||||
#define PREVIEW_TABLE_KEY "preview_table_key"
|
#define PREVIEW_TABLE_KEY "preview_table_key"
|
||||||
#define PREVIEW_FILENAME_KEY "preview_filename_key"
|
|
||||||
#define PREVIEW_FORMAT_KEY "preview_format_key"
|
#define PREVIEW_FORMAT_KEY "preview_format_key"
|
||||||
#define PREVIEW_SIZE_KEY "preview_size_key"
|
#define PREVIEW_SIZE_KEY "preview_size_key"
|
||||||
#define PREVIEW_ELAPSED_KEY "preview_elapsed_key"
|
#define PREVIEW_ELAPSED_KEY "preview_elapsed_key"
|
||||||
|
@ -112,7 +111,6 @@ static wtap *
|
||||||
preview_set_filename(GtkWidget *prev, const gchar *cf_name)
|
preview_set_filename(GtkWidget *prev, const gchar *cf_name)
|
||||||
{
|
{
|
||||||
GtkWidget *label;
|
GtkWidget *label;
|
||||||
gchar *display_basename;
|
|
||||||
wtap *wth;
|
wtap *wth;
|
||||||
int err = 0;
|
int err = 0;
|
||||||
gchar *err_info;
|
gchar *err_info;
|
||||||
|
@ -121,8 +119,6 @@ preview_set_filename(GtkWidget *prev, const gchar *cf_name)
|
||||||
|
|
||||||
|
|
||||||
/* init preview labels */
|
/* init preview labels */
|
||||||
label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_FILENAME_KEY);
|
|
||||||
gtk_label_set_text(GTK_LABEL(label), "-");
|
|
||||||
label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_FORMAT_KEY);
|
label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_FORMAT_KEY);
|
||||||
gtk_label_set_text(GTK_LABEL(label), "-");
|
gtk_label_set_text(GTK_LABEL(label), "-");
|
||||||
label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_SIZE_KEY);
|
label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_SIZE_KEY);
|
||||||
|
@ -138,11 +134,6 @@ preview_set_filename(GtkWidget *prev, const gchar *cf_name)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_FILENAME_KEY);
|
|
||||||
display_basename = g_filename_display_basename(cf_name);
|
|
||||||
gtk_label_set_text(GTK_LABEL(label), display_basename);
|
|
||||||
g_free(display_basename);
|
|
||||||
|
|
||||||
if (test_for_directory(cf_name) == EISDIR) {
|
if (test_for_directory(cf_name) == EISDIR) {
|
||||||
label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_FORMAT_KEY);
|
label = (GtkWidget *)g_object_get_data(G_OBJECT(prev), PREVIEW_FORMAT_KEY);
|
||||||
gtk_label_set_text(GTK_LABEL(label), "directory");
|
gtk_label_set_text(GTK_LABEL(label), "directory");
|
||||||
|
@ -404,9 +395,6 @@ preview_new(void)
|
||||||
gtk_table_set_row_spacings(GTK_TABLE(table), 3);
|
gtk_table_set_row_spacings(GTK_TABLE(table), 3);
|
||||||
row = 0;
|
row = 0;
|
||||||
|
|
||||||
label = add_string_to_table(table, &row, "Filename:", "-");
|
|
||||||
gtk_widget_set_size_request(label, DEF_WIDTH/3, -1);
|
|
||||||
g_object_set_data(G_OBJECT(table), PREVIEW_FILENAME_KEY, label);
|
|
||||||
label = add_string_to_table(table, &row, "Format:", "-");
|
label = add_string_to_table(table, &row, "Format:", "-");
|
||||||
g_object_set_data(G_OBJECT(table), PREVIEW_FORMAT_KEY, label);
|
g_object_set_data(G_OBJECT(table), PREVIEW_FORMAT_KEY, label);
|
||||||
label = add_string_to_table(table, &row, "Size:", "-");
|
label = add_string_to_table(table, &row, "Size:", "-");
|
||||||
|
|
Loading…
Reference in New Issue