diff options
| -rw-r--r-- | gtk/menus.c | 9 | ||||
| -rw-r--r-- | gtk/new_packet_list.c | 24 | ||||
| -rw-r--r-- | gtk/new_packet_list.h | 2 |
3 files changed, 33 insertions, 2 deletions
diff --git a/gtk/menus.c b/gtk/menus.c index 4f5d2817c9..f544f7696e 100644 --- a/gtk/menus.c +++ b/gtk/menus.c @@ -769,9 +769,14 @@ static GtkItemFactoryEntry packet_list_heading_items[] = {"/<separator>", NULL, NULL, 0, "<Separator>", NULL,}, + {"/Align Left", NULL, GTK_MENU_FUNC(new_packet_list_column_clicked), COLUMN_SELECTED_ALIGN_LEFT, "<StockItem>", GTK_STOCK_JUSTIFY_LEFT,}, + {"/Align Right", NULL, GTK_MENU_FUNC(new_packet_list_column_clicked), COLUMN_SELECTED_ALIGN_RIGHT, "<StockItem>", GTK_STOCK_JUSTIFY_RIGHT,}, + + {"/<separator>", NULL, NULL, 0, "<Separator>", NULL,}, + {"/Column Preferences", NULL, GTK_MENU_FUNC(prefs_cb), PREFS_PAGE_COLUMNS, "<StockItem>", GTK_STOCK_PREFERENCES,}, {"/Resize Column", NULL, GTK_MENU_FUNC(new_packet_list_column_clicked), COLUMN_SELECTED_RESIZE, "<StockItem>", WIRESHARK_STOCK_RESIZE_COLUMNS,}, - {"/Rename Column", NULL, GTK_MENU_FUNC(new_packet_list_column_clicked), COLUMN_SELECTED_RENAME, "<StockItem>", GTK_STOCK_BOLD,}, + {"/Rename Column Title", NULL, GTK_MENU_FUNC(new_packet_list_column_clicked), COLUMN_SELECTED_RENAME, "<StockItem>", GTK_STOCK_BOLD,}, {"/<separator>", NULL, NULL, 0, "<Separator>", NULL,}, @@ -784,7 +789,7 @@ static GtkItemFactoryEntry packet_list_heading_items[] = {"/Column Preferences", NULL, GTK_MENU_FUNC(prefs_cb), PREFS_PAGE_COLUMNS, "<StockItem>", GTK_STOCK_PREFERENCES,}, {"/Resize Column", NULL, GTK_MENU_FUNC(packet_list_column_clicked), COLUMN_SELECTED_RESIZE, "<StockItem>", WIRESHARK_STOCK_RESIZE_COLUMNS,}, - {"/Rename Column", NULL, GTK_MENU_FUNC(packet_list_column_clicked), COLUMN_SELECTED_RENAME, "<StockItem>", GTK_STOCK_BOLD,}, + {"/Rename Column Title", NULL, GTK_MENU_FUNC(packet_list_column_clicked), COLUMN_SELECTED_RENAME, "<StockItem>", GTK_STOCK_BOLD,}, {"/<separator>", NULL, NULL, 0, "<Separator>", NULL,}, diff --git a/gtk/new_packet_list.c b/gtk/new_packet_list.c index ce26c907d2..ccf4e37abc 100644 --- a/gtk/new_packet_list.c +++ b/gtk/new_packet_list.c @@ -260,6 +260,24 @@ new_packet_list_sort_column (gint col_id, GtkTreeViewColumn *col, GtkSortType or } static void +new_packet_list_xalign_column (GtkTreeViewColumn *col, gdouble value) +{ + GList *renderers = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT(col)); + GList *entry; + GtkCellRenderer *renderer; + + entry = g_list_first(renderers); + while (entry) { + renderer = (GtkCellRenderer *)entry->data; + g_object_set(G_OBJECT(renderer), "xalign", value, NULL); + entry = g_list_next (entry); + } + g_list_free (renderers); + + gtk_widget_queue_draw (packetlist->view); +} + +static void new_packet_list_remove_column (gint col_id, GtkTreeViewColumn *col _U_) { column_prefs_remove(col_id); @@ -285,6 +303,12 @@ new_packet_list_column_clicked (GtkWidget *w _U_, gpointer user_data _U_, COLUMN case COLUMN_SELECTED_SORT_DESCENDING: new_packet_list_sort_column (col_id, col, GTK_SORT_DESCENDING); break; + case COLUMN_SELECTED_ALIGN_LEFT: + new_packet_list_xalign_column (col, 0.0); + break; + case COLUMN_SELECTED_ALIGN_RIGHT: + new_packet_list_xalign_column (col, 1.0); + break; case COLUMN_SELECTED_RESIZE: new_packet_list_resize_column (col_id); break; diff --git a/gtk/new_packet_list.h b/gtk/new_packet_list.h index ae411096d6..ff65a60730 100644 --- a/gtk/new_packet_list.h +++ b/gtk/new_packet_list.h @@ -33,6 +33,8 @@ typedef enum { COLUMN_SELECTED_SORT_ASCENDING, COLUMN_SELECTED_SORT_DESCENDING, + COLUMN_SELECTED_ALIGN_LEFT, + COLUMN_SELECTED_ALIGN_RIGHT, COLUMN_SELECTED_RESIZE, COLUMN_SELECTED_RENAME, COLUMN_SELECTED_REMOVE |