diff options
author | Antenore Gatta <antenore@simbiosi.org> | 2014-08-25 03:29:11 +0400 |
---|---|---|
committer | Antenore Gatta <antenore@simbiosi.org> | 2014-08-25 03:29:11 +0400 |
commit | 1a92fa699c526c53a2f4eb0ddd57ee8de9670f28 (patch) | |
tree | 922854dff41f983220634e6bc8cb308f410f186e | |
parent | a0eb24d0b937a0023d63da239795dbbb8ff51960 (diff) |
GTK3 migration - gtk_image_menu_item_new_from_stock deprecated
fix gtk_grid_attach
-rw-r--r-- | remmina-plugins/rdp/rdp_settings.c | 29 | ||||
-rw-r--r-- | remmina/src/remmina_ftp_client.c | 3 | ||||
-rw-r--r-- | remmina/src/remmina_icon.c | 9 |
3 files changed, 23 insertions, 18 deletions
diff --git a/remmina-plugins/rdp/rdp_settings.c b/remmina-plugins/rdp/rdp_settings.c index 9d36b8604..507b4c159 100644 --- a/remmina-plugins/rdp/rdp_settings.c +++ b/remmina-plugins/rdp/rdp_settings.c @@ -275,16 +275,17 @@ static void remmina_rdp_settings_grid_init(RemminaPluginRdpsetGrid *grid) gtk_grid_set_row_spacing(GTK_GRID(grid), 4); gtk_grid_set_column_spacing(GTK_GRID(grid), 4); + //gtk_grid_attach (GtkGrid *grid, GtkWidget *child, gint left, gint top, gint width, gint height); /* Create the content */ widget = gtk_label_new(_("Keyboard layout")); gtk_widget_show(widget); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); - gtk_grid_attach(GTK_GRID(grid), widget, 0, 1, 0, 1); + gtk_grid_attach(GTK_GRID(grid), widget, 0, 0, 1, 1); grid->keyboard_layout_store = gtk_list_store_new(2, G_TYPE_UINT, G_TYPE_STRING); widget = gtk_combo_box_new_with_model(GTK_TREE_MODEL(grid->keyboard_layout_store)); gtk_widget_show(widget); - gtk_grid_attach(GTK_GRID(grid), widget, 1, 4, 0, 1); + gtk_grid_attach(GTK_GRID(grid), widget, 1, 0, 4, 1); renderer = gtk_cell_renderer_text_new(); gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(widget), renderer, TRUE); @@ -294,14 +295,14 @@ static void remmina_rdp_settings_grid_init(RemminaPluginRdpsetGrid *grid) widget = gtk_label_new("-"); gtk_widget_show(widget); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); - gtk_grid_attach(GTK_GRID(grid), widget, 1, 4, 1, 2); + gtk_grid_attach(GTK_GRID(grid), widget, 1, 1, 4, 2); grid->keyboard_layout_label = widget; remmina_rdp_settings_grid_load_layout(grid); widget = gtk_check_button_new_with_label(_("Use client keyboard mapping")); gtk_widget_show(widget); - gtk_grid_attach(GTK_GRID(grid), widget, 1, 3, 2, 3); + gtk_grid_attach(GTK_GRID(grid), widget, 1, 3, 3, 3); grid->use_client_keymap_check = widget; s = remmina_plugin_service->pref_get_value("rdp_use_client_keymap"); @@ -312,12 +313,12 @@ static void remmina_rdp_settings_grid_init(RemminaPluginRdpsetGrid *grid) widget = gtk_label_new(_("Quality option")); gtk_widget_show(widget); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); - gtk_grid_attach(GTK_GRID(grid), widget, 0, 1, 3, 4); + gtk_grid_attach(GTK_GRID(grid), widget, 0, 6, 1, 4); grid->quality_store = gtk_list_store_new(2, G_TYPE_UINT, G_TYPE_STRING); widget = gtk_combo_box_new_with_model(GTK_TREE_MODEL(grid->quality_store)); gtk_widget_show(widget); - gtk_grid_attach(GTK_GRID(grid), widget, 1, 4, 3, 4); + gtk_grid_attach(GTK_GRID(grid), widget, 1, 6, 4, 4); renderer = gtk_cell_renderer_text_new(); gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(widget), renderer, TRUE); @@ -330,56 +331,56 @@ static void remmina_rdp_settings_grid_init(RemminaPluginRdpsetGrid *grid) widget = gtk_check_button_new_with_label(_("Wallpaper")); gtk_widget_show(widget); - gtk_grid_attach(GTK_GRID(grid), widget, 1, 2, 4, 5); + gtk_grid_attach(GTK_GRID(grid), widget, 1, 10, 2, 5); g_signal_connect(G_OBJECT(widget), "toggled", G_CALLBACK(remmina_rdp_settings_quality_option_on_toggled), grid); grid->wallpaper_check = widget; widget = gtk_check_button_new_with_label(_("Window drag")); gtk_widget_show(widget); - gtk_grid_attach(GTK_GRID(grid), widget, 2, 3, 4, 5); + gtk_grid_attach(GTK_GRID(grid), widget, 3, 10, 3, 5); g_signal_connect(G_OBJECT(widget), "toggled", G_CALLBACK(remmina_rdp_settings_quality_option_on_toggled), grid); grid->windowdrag_check = widget; widget = gtk_check_button_new_with_label(_("Menu animation")); gtk_widget_show(widget); - gtk_grid_attach(GTK_GRID(grid), widget, 1, 2, 5, 6); + gtk_grid_attach(GTK_GRID(grid), widget, 1, 13, 2, 6); g_signal_connect(G_OBJECT(widget), "toggled", G_CALLBACK(remmina_rdp_settings_quality_option_on_toggled), grid); grid->menuanimation_check = widget; widget = gtk_check_button_new_with_label(_("Theme")); gtk_widget_show(widget); - gtk_grid_attach(GTK_GRID(grid), widget, 2, 3, 5, 6); + gtk_grid_attach(GTK_GRID(grid), widget, 3, 13, 3, 6); g_signal_connect(G_OBJECT(widget), "toggled", G_CALLBACK(remmina_rdp_settings_quality_option_on_toggled), grid); grid->theme_check = widget; widget = gtk_check_button_new_with_label(_("Cursor shadow")); gtk_widget_show(widget); - gtk_grid_attach(GTK_GRID(grid), widget, 1, 2, 6, 7); + gtk_grid_attach(GTK_GRID(grid), widget, 1, 16, 2, 7); g_signal_connect(G_OBJECT(widget), "toggled", G_CALLBACK(remmina_rdp_settings_quality_option_on_toggled), grid); grid->cursorshadow_check = widget; widget = gtk_check_button_new_with_label(_("Cursor blinking")); gtk_widget_show(widget); - gtk_grid_attach(GTK_GRID(grid), widget, 2, 3, 6, 7); + gtk_grid_attach(GTK_GRID(grid), widget, 3, 16, 3, 7); g_signal_connect(G_OBJECT(widget), "toggled", G_CALLBACK(remmina_rdp_settings_quality_option_on_toggled), grid); grid->cursorblinking_check = widget; widget = gtk_check_button_new_with_label(_("Font smoothing")); gtk_widget_show(widget); - gtk_grid_attach(GTK_GRID(grid), widget, 1, 2, 7, 8); + gtk_grid_attach(GTK_GRID(grid), widget, 1, 19, 2, 8); g_signal_connect(G_OBJECT(widget), "toggled", G_CALLBACK(remmina_rdp_settings_quality_option_on_toggled), grid); grid->fontsmoothing_check = widget; widget = gtk_check_button_new_with_label(_("Composition")); gtk_widget_show(widget); - gtk_grid_attach(GTK_GRID(grid), widget, 2, 3, 7, 8); + gtk_grid_attach(GTK_GRID(grid), widget, 3, 19, 3, 8); g_signal_connect(G_OBJECT(widget), "toggled", G_CALLBACK(remmina_rdp_settings_quality_option_on_toggled), grid); grid->composition_check = widget; diff --git a/remmina/src/remmina_ftp_client.c b/remmina/src/remmina_ftp_client.c index 45911f15c..95f400360 100644 --- a/remmina/src/remmina_ftp_client.c +++ b/remmina/src/remmina_ftp_client.c @@ -679,7 +679,8 @@ static void remmina_ftp_client_popup_menu(RemminaFTPClient *client, GdkEventButt gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(remmina_ftp_client_action_upload), client); - menuitem = gtk_image_menu_item_new_from_stock(GTK_STOCK_DELETE, NULL); + //menuitem = gtk_image_menu_item_new_from_stock(GTK_STOCK_DELETE, NULL); + menuitem = gtk_menu_item_new_with_mnemonic(_("_Delete")); gtk_widget_show(menuitem); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(remmina_ftp_client_action_delete), client); diff --git a/remmina/src/remmina_icon.c b/remmina/src/remmina_icon.c index d0354b576..23b528a41 100644 --- a/remmina/src/remmina_icon.c +++ b/remmina/src/remmina_icon.c @@ -129,12 +129,14 @@ static void remmina_icon_populate_additional_menu_item(GtkWidget *menu) gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(remmina_icon_main), NULL); - menuitem = gtk_image_menu_item_new_from_stock(GTK_STOCK_PREFERENCES, NULL); + //menuitem = gtk_image_menu_item_new_from_stock(GTK_STOCK_PREFERENCES, NULL); + menuitem = gtk_menu_item_new_with_mnemonic(_("_Preferences")); gtk_widget_show(menuitem); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(remmina_icon_preferences), NULL); - menuitem = gtk_image_menu_item_new_from_stock(GTK_STOCK_ABOUT, NULL); + //menuitem = gtk_image_menu_item_new_from_stock(GTK_STOCK_ABOUT, NULL); + menuitem = gtk_menu_item_new_with_mnemonic(_("_About")); gtk_widget_show(menuitem); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(remmina_icon_about), NULL); @@ -158,7 +160,8 @@ static void remmina_icon_populate_additional_menu_item(GtkWidget *menu) gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); #endif - menuitem = gtk_image_menu_item_new_from_stock(GTK_STOCK_QUIT, NULL); + //menuitem = gtk_image_menu_item_new_from_stock(GTK_STOCK_QUIT, NULL); + menuitem = gtk_menu_item_new_with_mnemonic(_("_Quit")); gtk_widget_show(menuitem); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(remmina_icon_destroy), NULL); |