Commit 8338dec52e3956b4ff497b366a0346939f4211c3
1 parent
4bb46b9d
Exists in
master
and in
2 other branches
Small adjustments.
Showing
1 changed file
with
1 additions
and
30 deletions
Show diff stats
src/objects/toolbar/toolbar.c
| @@ -234,6 +234,7 @@ | @@ -234,6 +234,7 @@ | ||
| 234 | // Toolbar preferences. | 234 | // Toolbar preferences. |
| 235 | { | 235 | { |
| 236 | GtkWidget * item = gtk_menu_item_new_with_mnemonic( _("_Preferences") ); | 236 | GtkWidget * item = gtk_menu_item_new_with_mnemonic( _("_Preferences") ); |
| 237 | + gtk_menu_shell_append(GTK_MENU_SHELL(widget->menu),gtk_separator_menu_item_new()); | ||
| 237 | gtk_menu_shell_append(GTK_MENU_SHELL(widget->menu),item); | 238 | gtk_menu_shell_append(GTK_MENU_SHELL(widget->menu),item); |
| 238 | g_signal_connect(item, "activate", G_CALLBACK(open_preferences), widget); | 239 | g_signal_connect(item, "activate", G_CALLBACK(open_preferences), widget); |
| 239 | } | 240 | } |
| @@ -282,21 +283,6 @@ | @@ -282,21 +283,6 @@ | ||
| 282 | else | 283 | else |
| 283 | gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),style); | 284 | gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),style); |
| 284 | 285 | ||
| 285 | - /* | ||
| 286 | - // Update menu | ||
| 287 | - pw3270ToolBar * tb = PW3270_TOOLBAR(toolbar); | ||
| 288 | - if(tb && tb->menu) { | ||
| 289 | - size_t ix; | ||
| 290 | - for(ix = 0; ix < G_N_ELEMENTS(styles); ix++) { | ||
| 291 | - | ||
| 292 | - gtk_check_menu_item_set_active( | ||
| 293 | - GTK_CHECK_MENU_ITEM(tb->popup.styles[ix]), | ||
| 294 | - styles[ix].style == style | ||
| 295 | - ); | ||
| 296 | - } | ||
| 297 | - } | ||
| 298 | - */ | ||
| 299 | - | ||
| 300 | g_object_notify(G_OBJECT(toolbar), "style"); | 286 | g_object_notify(G_OBJECT(toolbar), "style"); |
| 301 | 287 | ||
| 302 | } | 288 | } |
| @@ -323,21 +309,6 @@ | @@ -323,21 +309,6 @@ | ||
| 323 | else | 309 | else |
| 324 | gtk_toolbar_set_icon_size(GTK_TOOLBAR(toolbar),icon_size); | 310 | gtk_toolbar_set_icon_size(GTK_TOOLBAR(toolbar),icon_size); |
| 325 | 311 | ||
| 326 | - // Update menu | ||
| 327 | - /* | ||
| 328 | - pw3270ToolBar * tb = PW3270_TOOLBAR(toolbar); | ||
| 329 | - if(tb && tb->menu) { | ||
| 330 | - size_t ix; | ||
| 331 | - for(ix = 0; ix < G_N_ELEMENTS(icon_sizes); ix++) { | ||
| 332 | - | ||
| 333 | - gtk_check_menu_item_set_active( | ||
| 334 | - GTK_CHECK_MENU_ITEM(tb->popup.icon_sizes[ix]), | ||
| 335 | - icon_sizes[ix].icon_size == icon_size | ||
| 336 | - ); | ||
| 337 | - } | ||
| 338 | - } | ||
| 339 | - */ | ||
| 340 | - | ||
| 341 | // Store value | 312 | // Store value |
| 342 | g_object_notify(G_OBJECT(toolbar), "icon-size"); | 313 | g_object_notify(G_OBJECT(toolbar), "icon-size"); |
| 343 | 314 |