Download as
Browse Code »

Commit b63f2e5251edbbeb4224f15ec0a6003399f62c85

Authored by Perry Werneck
1 parent b0c918c6
Exists in master and in 3 other branches develop, edit-header-bar, script-support

Fixing action view widget.

Showing 4 changed files with 15 additions and 10 deletions   Show diff stats
src/include/pw3270/actions.h
  Diff comments   View file @b63f2e5
... ... @@ -102,6 +102,7 @@
102 102 Pw3270ActionList * pw3270_action_list_new(GtkApplication *application);
103 103 void pw3270_action_list_free(Pw3270ActionList *action_list);
104 104 void pw3270_action_view_set_actions(GtkWidget *view, Pw3270ActionList *list);
  105 + void pw3270_action_view_order_by_label(GtkWidget *view);
105 106 void pw3270_action_view_move_selected(GtkWidget *from, GtkWidget *to);
106 107 void pw3270_action_view_append(GtkWidget *widget, const gchar *label, GdkPixbuf *pixbuf, const gchar *action_name, const PW3270ActionViewFlag flags);
107 108 gchar * pw3270_action_view_get_action_names(GtkWidget *widget);
... ...
src/objects/actions/view.c
  Diff comments   View file @b63f2e5
... ... @@ -125,6 +125,17 @@
125 125  
126 126 }
127 127  
  128 + void pw3270_action_view_order_by_label(GtkWidget *view) {
  129 +
  130 + gtk_tree_view_set_reorderable(GTK_TREE_VIEW(view),FALSE);
  131 +
  132 + gtk_tree_sortable_set_sort_column_id(
  133 + GTK_TREE_SORTABLE(gtk_tree_view_get_model(GTK_TREE_VIEW(view))),
  134 + COLUMN_LABEL,
  135 + GTK_SORT_ASCENDING
  136 + );
  137 + }
  138 +
128 139 static void pw3270_action_view_append_element(GtkListStore * store, struct ListElement * element) {
129 140  
130 141 size_t ix;
... ...
src/objects/toolbar/settings.c
  Diff comments   View file @b63f2e5
... ... @@ -143,7 +143,7 @@
143 143 }
144 144  
145 145 gtk_tree_view_set_reorderable(GTK_TREE_VIEW(page->views[0]),TRUE);
146   - 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);
  146 + pw3270_action_view_order_by_label(page->views[1]);
147 147  
148 148 // Create buttons
149 149 GtkWidget * box = gtk_button_box_new(GTK_ORIENTATION_VERTICAL);
... ... @@ -255,7 +255,7 @@
255 255  
256 256 // Load available actions.
257 257 pw3270_action_view_set_actions(page->views[1], action_list);
258   - pw3270_action_view_append(page->views[1], _( "Separator"), NULL, "separator", 1);
  258 + pw3270_action_view_append(page->views[1], _( "Separator"), NULL, "separator", PW3270_ACTION_VIEW_FLAG_ALLOW_ADD);
259 259  
260 260 pw3270_action_list_free(action_list);
261 261  
... ...
src/objects/window/header-settings.c
  Diff comments   View file @b63f2e5
... ... @@ -159,7 +159,7 @@
159 159  
160 160 gtk_tree_view_set_reorderable(GTK_TREE_VIEW(page->views[0]),TRUE);
161 161 gtk_tree_view_set_reorderable(GTK_TREE_VIEW(page->views[1]),TRUE);
162   - 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);
  162 + pw3270_action_view_order_by_label(page->views[2]);
163 163  
164 164 }
165 165  
... ... @@ -287,13 +287,6 @@
287 287  
288 288 pw3270_action_view_set_actions(page->views[2], action_list);
289 289  
290   -
291   - /*
292   - pw3270_action_view_set_actions(page->views[0], action_list);
293   - pw3270_action_view_set_actions(page->views[1], action_list);
294   - pw3270_action_view_set_actions(page->views[2], action_list);
295   - */
296   -
297 290 pw3270_action_list_free(action_list);
298 291  
299 292 }
... ...