diff --git a/src/include/pw3270/actions.h b/src/include/pw3270/actions.h index 12f5803..f949678 100644 --- a/src/include/pw3270/actions.h +++ b/src/include/pw3270/actions.h @@ -102,6 +102,7 @@ Pw3270ActionList * pw3270_action_list_new(GtkApplication *application); void pw3270_action_list_free(Pw3270ActionList *action_list); void pw3270_action_view_set_actions(GtkWidget *view, Pw3270ActionList *list); + void pw3270_action_view_order_by_label(GtkWidget *view); void pw3270_action_view_move_selected(GtkWidget *from, GtkWidget *to); void pw3270_action_view_append(GtkWidget *widget, const gchar *label, GdkPixbuf *pixbuf, const gchar *action_name, const PW3270ActionViewFlag flags); gchar * pw3270_action_view_get_action_names(GtkWidget *widget); diff --git a/src/objects/actions/view.c b/src/objects/actions/view.c index 2929a01..404d036 100644 --- a/src/objects/actions/view.c +++ b/src/objects/actions/view.c @@ -125,6 +125,17 @@ } + void pw3270_action_view_order_by_label(GtkWidget *view) { + + gtk_tree_view_set_reorderable(GTK_TREE_VIEW(view),FALSE); + + gtk_tree_sortable_set_sort_column_id( + GTK_TREE_SORTABLE(gtk_tree_view_get_model(GTK_TREE_VIEW(view))), + COLUMN_LABEL, + GTK_SORT_ASCENDING + ); + } + static void pw3270_action_view_append_element(GtkListStore * store, struct ListElement * element) { size_t ix; diff --git a/src/objects/toolbar/settings.c b/src/objects/toolbar/settings.c index 8b4223c..74d8616 100644 --- a/src/objects/toolbar/settings.c +++ b/src/objects/toolbar/settings.c @@ -143,7 +143,7 @@ } gtk_tree_view_set_reorderable(GTK_TREE_VIEW(page->views[0]),TRUE); - gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(gtk_tree_view_get_model(GTK_TREE_VIEW(page->views[1]))), GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, GTK_SORT_ASCENDING); + pw3270_action_view_order_by_label(page->views[1]); // Create buttons GtkWidget * box = gtk_button_box_new(GTK_ORIENTATION_VERTICAL); @@ -255,7 +255,7 @@ // Load available actions. pw3270_action_view_set_actions(page->views[1], action_list); - pw3270_action_view_append(page->views[1], _( "Separator"), NULL, "separator", 1); + pw3270_action_view_append(page->views[1], _( "Separator"), NULL, "separator", PW3270_ACTION_VIEW_FLAG_ALLOW_ADD); pw3270_action_list_free(action_list); diff --git a/src/objects/window/header-settings.c b/src/objects/window/header-settings.c index e117f90..bebbe8b 100644 --- a/src/objects/window/header-settings.c +++ b/src/objects/window/header-settings.c @@ -159,7 +159,7 @@ gtk_tree_view_set_reorderable(GTK_TREE_VIEW(page->views[0]),TRUE); gtk_tree_view_set_reorderable(GTK_TREE_VIEW(page->views[1]),TRUE); - gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(gtk_tree_view_get_model(GTK_TREE_VIEW(page->views[1]))), GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, GTK_SORT_ASCENDING); + pw3270_action_view_order_by_label(page->views[2]); } @@ -287,13 +287,6 @@ pw3270_action_view_set_actions(page->views[2], action_list); - - /* - pw3270_action_view_set_actions(page->views[0], action_list); - pw3270_action_view_set_actions(page->views[1], action_list); - pw3270_action_view_set_actions(page->views[2], action_list); - */ - pw3270_action_list_free(action_list); } -- libgit2 0.21.2