Author: cazfi
Date: Sun May 14 21:47:15 2017
New Revision: 35577
URL: http://svn.gna.org/viewcvs/freeciv?rev=35577&view=rev
Log:
Add editing of always active effects
See hrm Feature #659227
Modified:
trunk/tools/ruledit/effect_edit.cpp
trunk/tools/ruledit/tab_misc.cpp
trunk/tools/ruledit/tab_misc.h
Modified: trunk/tools/ruledit/effect_edit.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/effect_edit.cpp?rev=35577&r1=35576&r2=35577&view=diff
==============================================================================
--- trunk/tools/ruledit/effect_edit.cpp (original)
+++ trunk/tools/ruledit/effect_edit.cpp Sun May 14 21:47:15 2017
@@ -52,7 +52,11 @@
ui = ui_in;
selected = nullptr;
- filter = *filter_in;
+ if (filter_in == nullptr) {
+ filter.kind = VUT_NONE;
+ } else {
+ filter = *filter_in;
+ }
name = target;
list_widget = new QListWidget(this);
@@ -108,7 +112,7 @@
{
struct effect_list_fill_data *cbdata = (struct effect_list_fill_data *)data;
- if (cbdata->filter == nullptr) {
+ if (cbdata->filter->kind == VUT_NONE) {
// Look for empty req lists.
if (requirement_vector_size(&peffect->reqs) == 0) {
cbdata->edit->add_effect_to_list(peffect, cbdata);
Modified: trunk/tools/ruledit/tab_misc.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/tab_misc.cpp?rev=35577&r1=35576&r2=35577&view=diff
==============================================================================
--- trunk/tools/ruledit/tab_misc.cpp (original)
+++ trunk/tools/ruledit/tab_misc.cpp Sun May 14 21:47:15 2017
@@ -39,6 +39,7 @@
#include "rssanity.h"
// ruledit
+#include "effect_edit.h"
#include "ruledit.h"
#include "ruledit_qt.h"
#include "rulesave.h"
@@ -56,6 +57,7 @@
QLabel *name_label;
QLabel *version_label;
QPushButton *save_button;
+ QPushButton *always_active_effects;
QPushButton *refresh_button;
int row = 0;
QTableWidgetItem *item;
@@ -89,6 +91,9 @@
save_button = new QPushButton(QString::fromUtf8(R__("Save now")), this);
connect(save_button, SIGNAL(pressed()), this, SLOT(save_now()));
main_layout->addWidget(save_button, row++, 1);
+ always_active_effects = new QPushButton(QString::fromUtf8(R__("Always active
Effects")), this);
+ connect(always_active_effects, SIGNAL(pressed()), this,
SLOT(edit_aae_effects()));
+ main_layout->addWidget(always_active_effects, row++, 1);
stats = new QTableWidget(this);
stats->setColumnCount(8);
@@ -336,3 +341,16 @@
stats->resizeColumnsToContents();
}
+
+/**************************************************************************
+ User wants to edit always active effects
+**************************************************************************/
+void tab_misc::edit_aae_effects()
+{
+ effect_edit *e_edit;
+
+ e_edit = new effect_edit(ui, QString::fromUtf8(R__("Always active")),
+ nullptr);
+
+ e_edit->show();
+}
Modified: trunk/tools/ruledit/tab_misc.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/tab_misc.h?rev=35577&r1=35576&r2=35577&view=diff
==============================================================================
--- trunk/tools/ruledit/tab_misc.h (original)
+++ trunk/tools/ruledit/tab_misc.h Sun May 14 21:47:15 2017
@@ -35,6 +35,7 @@
private slots:
void save_now();
void refresh_stats();
+ void edit_aae_effects();
private:
ruledit_gui *ui;
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
