[Freeciv-Dev] (PR#40545) [Patch] Remove old edit menu in player list dialog

[Madeline Book]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=40545 >

The property editor is now used to edit players, so the
edit menu in the player dialog can be removed.


-----------------------------------------------------------------------
七日なのに、アイス屋さんが来なかった。凍え死んだかも。

diff --git a/client/gui-gtk-2.0/plrdlg.c b/client/gui-gtk-2.0/plrdlg.c
index 08ec120..b1ac79e 100644
--- a/client/gui-gtk-2.0/plrdlg.c
+++ b/client/gui-gtk-2.0/plrdlg.c
@@ -35,7 +35,6 @@
 #include "climisc.h"
 #include "connectdlg_common.h"
 #include "dialogs.h"
-#include "editor.h"
 #include "gui_main.h"
 #include "gui_stuff.h"
 #include "inteldlg.h"
@@ -56,8 +55,6 @@ static GtkWidget *players_meet_command;
 static GtkWidget *players_war_command;
 static GtkWidget *players_vision_command;
 static GtkWidget *players_sship_command;
-static GtkWidget *players_edit_menu;
-static GtkWidget *players_edit_nation_command;
 static GtkListStore *store;
 static GtkTreeModel *model;
 
@@ -71,7 +68,6 @@ static void players_intel_callback(GtkMenuItem *item, gpointer data);
 static void players_sship_callback(GtkMenuItem *item, gpointer data);
 static void players_ai_toggle_callback(GtkMenuItem *item, gpointer data);
 static void players_ai_skill_callback(GtkMenuItem *item, gpointer data);
-static void players_edit_nation_callback(GtkMenuItem *item, gpointer data);
 
 
 static void update_views(void);
@@ -523,22 +519,8 @@ void create_players_dialog(void)
   }
   gtk_widget_show_all(menu);
 
-  players_edit_menu = gtk_menu_item_new_with_mnemonic(_("_Editor"));
-  gtk_menu_shell_append(GTK_MENU_SHELL(menubar), players_edit_menu);
-  gtk_widget_set_sensitive(players_edit_menu, can_conn_edit(&client.conn));
-
-  menu = gtk_menu_new();
-  gtk_menu_item_set_submenu(GTK_MENU_ITEM(players_edit_menu), menu);
-
-  players_edit_nation_command = 
-                         gtk_menu_item_new_with_mnemonic(_("_Edit Nation..."));
-  gtk_menu_shell_append(GTK_MENU_SHELL(menu), players_edit_nation_command);
-
   gui_dialog_show_all(players_dialog_shell);
 
-  g_signal_connect(players_edit_nation_command, "activate",
-    G_CALLBACK(players_edit_nation_callback), NULL);
-
   gtk_list_store_clear(store);
   update_players_dialog();
 
@@ -730,9 +712,6 @@ void update_players_dialog(void)
       }
     } players_iterate_end;
 
-    /* menu needs to be updated with edit mode changes */
-    gtk_widget_set_sensitive(players_edit_menu, can_conn_edit(&client.conn));
-
     update_players_menu();
     update_views();
   }
@@ -863,23 +842,6 @@ static void players_ai_skill_callback(GtkMenuItem *item, gpointer data)
 }
 
 /**************************************************************************
- popup the races dialog for the selected player
-**************************************************************************/
-static void players_edit_nation_callback(GtkMenuItem *item, gpointer data)
-{
-  GtkTreeModel *model;
-  GtkTreeIter it;
-  
-  if (gtk_tree_selection_get_selected(players_selection, &model, &it)) {
-    gint plrno;
-
-    gtk_tree_model_get(model, &it, ncolumns - 1, &plrno, -1);
-
-    popup_races_dialog(player_by_number(plrno));
-  }
-}   
-
-/**************************************************************************
 ...
 **************************************************************************/
 static void update_views(void)

_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev