Commit 63f3d48eba76a18d25bab1565a379d9a30761592
1 parent
89d54a5f
Exists in
master
and in
3 other branches
Working on header-bar editor.
Showing
1 changed file
with
29 additions
and
0 deletions
Show diff stats
src/objects/window/header-settings.c
@@ -93,6 +93,8 @@ | @@ -93,6 +93,8 @@ | ||
93 | // Create dialog grid | 93 | // Create dialog grid |
94 | GtkGrid * grid = GTK_GRID(gtk_grid_new()); | 94 | GtkGrid * grid = GTK_GRID(gtk_grid_new()); |
95 | gtk_grid_set_row_homogeneous(grid,FALSE); | 95 | gtk_grid_set_row_homogeneous(grid,FALSE); |
96 | + gtk_grid_set_row_spacing(GTK_GRID(grid),12); | ||
97 | + gtk_grid_set_column_spacing(GTK_GRID(grid),6); | ||
96 | 98 | ||
97 | gtk_grid_attach( | 99 | gtk_grid_attach( |
98 | GTK_GRID(settings), | 100 | GTK_GRID(settings), |
@@ -223,12 +225,39 @@ | @@ -223,12 +225,39 @@ | ||
223 | 225 | ||
224 | void load(GtkWidget *widget, PW3270SettingsPrivate *page) { | 226 | void load(GtkWidget *widget, PW3270SettingsPrivate *page) { |
225 | 227 | ||
228 | + size_t view, action; | ||
229 | + g_autoptr(GSettings) settings = pw3270_application_window_settings_new(); | ||
230 | + | ||
226 | // Populate views | 231 | // Populate views |
227 | Pw3270ActionList * action_list = pw3270_action_list_new(GTK_APPLICATION(g_application_get_default())); | 232 | Pw3270ActionList * action_list = pw3270_action_list_new(GTK_APPLICATION(g_application_get_default())); |
228 | 233 | ||
234 | + g_autofree gchar * action_names = g_settings_get_string(settings,"header-action-names"); | ||
235 | + gchar **views = g_strsplit(action_names,":",-1); | ||
236 | + | ||
237 | + for(view = 0; view < 2; view++) { | ||
238 | + | ||
239 | + if(!views[view]) | ||
240 | + break; | ||
241 | + | ||
242 | + gchar ** actions = g_strsplit(views[view],",",-1); | ||
243 | + | ||
244 | + for(action = 0; actions[action];action++) { | ||
245 | + action_list = pw3270_action_list_move_action(action_list,actions[action],page->views[view]); | ||
246 | + } | ||
247 | + | ||
248 | + g_strfreev(actions); | ||
249 | + } | ||
250 | + | ||
251 | + g_strfreev(views); | ||
252 | + | ||
253 | + pw3270_action_view_set_actions(page->views[2], action_list); | ||
254 | + | ||
255 | + | ||
256 | + /* | ||
229 | pw3270_action_view_set_actions(page->views[0], action_list); | 257 | pw3270_action_view_set_actions(page->views[0], action_list); |
230 | pw3270_action_view_set_actions(page->views[1], action_list); | 258 | pw3270_action_view_set_actions(page->views[1], action_list); |
231 | pw3270_action_view_set_actions(page->views[2], action_list); | 259 | pw3270_action_view_set_actions(page->views[2], action_list); |
260 | + */ | ||
232 | 261 | ||
233 | pw3270_action_list_free(action_list); | 262 | pw3270_action_list_free(action_list); |
234 | 263 |