From 03e7901322461a881cc59fc321234e1efee0fa0e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 22 Apr 2012 23:25:53 +0300 Subject: Remove button "old" from relation settings page. --- src/gui/setup_relations.cpp | 10 +--------- src/gui/setup_relations.h | 1 - 2 files changed, 1 insertion(+), 10 deletions(-) (limited to 'src') diff --git a/src/gui/setup_relations.cpp b/src/gui/setup_relations.cpp index d685cf6f5..d40995ac2 100644 --- a/src/gui/setup_relations.cpp +++ b/src/gui/setup_relations.cpp @@ -229,7 +229,6 @@ public: }; #define ACTION_DELETE "delete" -#define ACTION_OLD "old" #define ACTION_TABLE "table" #define ACTION_STRATEGY "strategy" @@ -243,8 +242,7 @@ Setup_Relations::Setup_Relations(): player_relations.getDefault() & PlayerRelation::TRADE)), mDefaultWhisper(new CheckBox(_("Allow whispers"), player_relations.getDefault() & PlayerRelation::WHISPER)), - mDeleteButton(new Button(_("Delete"), ACTION_DELETE, this)), - mOldButton(new Button(_("Old"), ACTION_OLD, this)) + mDeleteButton(new Button(_("Delete"), ACTION_DELETE, this)) { setName(_("Relations")); @@ -294,7 +292,6 @@ Setup_Relations::Setup_Relations(): place(0, 0, mPlayerTitleTable, 6); place(0, 1, mPlayerScrollArea, 6, 4).setPadding(2); place(0, 5, mDeleteButton); - place(1, 5, mOldButton, 1); place(3, 5, ignore_action_label, 1); place(4, 5, mIgnoreActionChoicesBox, 2).setPadding(2); place(3, 6, mDefaultTrading, 3); @@ -385,11 +382,6 @@ void Setup_Relations::action(const gcn::ActionEvent &event) player_relations.removePlayer(name); } - else if (event.getId() == ACTION_OLD) - { - player_relations.load(true); - updateAll(); - } else if (event.getId() == ACTION_STRATEGY) { PlayerIgnoreStrategy *s = diff --git a/src/gui/setup_relations.h b/src/gui/setup_relations.h index 76ea26875..7d8abaecc 100644 --- a/src/gui/setup_relations.h +++ b/src/gui/setup_relations.h @@ -66,7 +66,6 @@ private: gcn::CheckBox *mDefaultWhisper; gcn::Button *mDeleteButton; - gcn::Button *mOldButton; gcn::ListModel *mIgnoreActionChoicesModel; gcn::DropDown *mIgnoreActionChoicesBox; -- cgit v1.2.3-70-g09d2