[Freeciv-commits] r33597 - in /trunk/tools/ruledit: req_edit.cpp req_edit.h univ_value.c

[cazfi74]

Author: cazfi
Date: Mon Aug 15 05:45:47 2016
New Revision: 33597

URL: http://svn.gna.org/viewcvs/freeciv?rev=33597&view=rev
Log:
S2_6 network protocol frozen.

See task #7924

Modified:
    trunk/tools/ruledit/req_edit.cpp
    trunk/tools/ruledit/req_edit.h
    trunk/tools/ruledit/univ_value.c

Modified: trunk/tools/ruledit/req_edit.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/req_edit.cpp?rev=33597&r1=33596&r2=33597&view=diff
==============================================================================
--- trunk/tools/ruledit/req_edit.cpp    (original)
+++ trunk/tools/ruledit/req_edit.cpp    Mon Aug 15 05:45:47 2016
@@ -89,6 +89,7 @@
   active_layout->addWidget(edit_value_enum_button, 3, 0);
   edit_value_nbr_field = new QLineEdit();
   edit_value_nbr_field->setVisible(false);
+  connect(edit_value_nbr_field, SIGNAL(returnPressed()), this, 
SLOT(univ_value_edit()));
   active_layout->addWidget(edit_value_nbr_field, 4,0 );
 
   lbl = new QLabel(R__("Range:"));
@@ -185,6 +186,7 @@
   QLineEdit *number;
   QToolButton *enum_button;
   QMenu *menu;
+  struct universal *univ;
 };
 
 /**************************************************************************
@@ -195,6 +197,10 @@
   struct uvb_data *data = (struct uvb_data *)cbdata;
   
   if (value == NULL) {
+    int kind, val;
+
+    universal_extraction(data->univ, &kind, &val);
+    data->number->setText(QString::number(val));
     data->number->setVisible(true);
   } else {
     data->enum_button->setVisible(true);
@@ -217,6 +223,7 @@
     data.number = edit_value_nbr_field;
     data.enum_button = edit_value_enum_button;
     data.menu = edit_value_enum_menu;
+    data.univ = &selected->source;
     edit_value_enum_menu->clear();
     edit_value_enum_button->setVisible(false);
     edit_value_nbr_field->setVisible(false);
@@ -263,6 +270,19 @@
 {
   if (selected != nullptr) {
     universal_value_from_str(&selected->source, 
action->text().toUtf8().data());
+
+    refresh();
+  }
+}
+
+/**************************************************************************
+  User entered numerical requirement value.
+**************************************************************************/
+void req_edit::univ_value_edit()
+{
+  if (selected != nullptr) {
+    universal_value_from_str(&selected->source,
+                             edit_value_nbr_field->text().toUtf8().data());
 
     refresh();
   }

Modified: trunk/tools/ruledit/req_edit.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/req_edit.h?rev=33597&r1=33596&r2=33597&view=diff
==============================================================================
--- trunk/tools/ruledit/req_edit.h      (original)
+++ trunk/tools/ruledit/req_edit.h      Mon Aug 15 05:45:47 2016
@@ -59,6 +59,7 @@
     void req_type_menu(QAction *action);
     void req_range_menu(QAction *action);
     void univ_value_enum_menu(QAction *action);
+    void univ_value_edit();
 };
 
 #endif // FC__REQ_EDIT_H

Modified: trunk/tools/ruledit/univ_value.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/univ_value.c?rev=33597&r1=33596&r2=33597&view=diff
==============================================================================
--- trunk/tools/ruledit/univ_value.c    (original)
+++ trunk/tools/ruledit/univ_value.c    Mon Aug 15 05:45:47 2016
@@ -216,11 +216,20 @@
       cb(advance_rule_name(padv), univ->value.advance == padv, data);
     } advance_active_iterate_end;
     break;
-#ifdef INTEGER_UNIV_VALUES
   case VUT_MINSIZE:
-    cb(NULL, data);
-    break;
-#endif
+  case VUT_MINYEAR:
+  case VUT_MAXTILEUNITS:
+  case VUT_MINCULTURE:
+  case VUT_MINMOVES:
+  case VUT_MINVETERAN:
+  case VUT_MINHP:
+  case VUT_AGE:
+  case VUT_MINTECHS:
+    cb(NULL, FALSE, data);
+    break;
+  case VUT_COUNT:
+    fc_assert(univ->kind != VUT_COUNT);
+    break;
   default:
     break;
   }


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