diff options
| author | George Joseph <gjoseph@digium.com> | 2016-07-24 17:27:26 -0600 |
|---|---|---|
| committer | George Joseph <gjoseph@digium.com> | 2016-08-01 11:46:36 -0500 |
| commit | 56a07fbab9bdabc562d88706067ce53f7025a660 (patch) | |
| tree | a86230f99f4d4feff2269d79ee45841eeb1f1a5d /menuselect/menuselect_gtk.c | |
| parent | 948a9b615ff9bb6c9233e3efdf94f9224c605c98 (diff) | |
menuselect: Various menuselect enhancements
* Add 'external' as a support level.
* Add ability for module directories to add entries to the menu
by adding members to the <module_prefix>/<module_prefix>.xml file.
* Expand the description field to 3 lines in the ncurses implementation.
* Allow the description field to wrap in the newt implementation.
* Add description field to the gtk implementation.
Change-Id: I7f9600a1984a42ce0696db574c1051bc9ad7c808
(cherry picked from commit 90f445729d5d86050d9d379485ff0a99f4a006c1)
Diffstat (limited to 'menuselect/menuselect_gtk.c')
| -rw-r--r-- | menuselect/menuselect_gtk.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/menuselect/menuselect_gtk.c b/menuselect/menuselect_gtk.c index cd31b3580..9379d7de6 100644 --- a/menuselect/menuselect_gtk.c +++ b/menuselect/menuselect_gtk.c @@ -16,6 +16,8 @@ enum { COLUMN_USES, /*! Conflicts */ COLUMN_CNFS, + /*! Description */ + COLUMN_DESC, /*! Number of columns, must be the last element in the enum */ NUM_COLUMNS, }; @@ -254,7 +256,8 @@ int run_menu(void) G_TYPE_BOOLEAN, /* COLUMN_SELECTED */ G_TYPE_STRING, /* COLUMN_DEPS */ G_TYPE_STRING, /* COLUMN_USES */ - G_TYPE_STRING); /* COLUMN_CNFS */ + G_TYPE_STRING, /* COLUMN_CNFS */ + G_TYPE_STRING); /* COLUMN_DESC */ AST_LIST_TRAVERSE(&categories, cat, list) { GtkTreeIter iter, iter2; @@ -307,6 +310,7 @@ int run_menu(void) COLUMN_DEPS, dep_buf, COLUMN_USES, use_buf, COLUMN_CNFS, cnf_buf, + COLUMN_DESC, mem->displayname, -1); } } @@ -344,6 +348,11 @@ int run_menu(void) renderer, "text", COLUMN_CNFS, NULL); gtk_tree_view_append_column(GTK_TREE_VIEW(tree), column); + renderer = gtk_cell_renderer_text_new(); + column = gtk_tree_view_column_new_with_attributes("Description", + renderer, "text", COLUMN_DESC, NULL); + gtk_tree_view_append_column(GTK_TREE_VIEW(tree), column); + g_signal_connect(tree, "row-activated", (GCallback) row_activated_handler, store); gtk_container_add(GTK_CONTAINER(s_window), GTK_WIDGET(tree)); |