[Freeciv-commits] r32535 - in /trunk/tools/ruledit: tab_misc.cpp tab_misc.h

[cazfi74]

Author: cazfi
Date: Sun May  1 15:54:28 2016
New Revision: 32535

URL: http://svn.gna.org/viewcvs/freeciv?rev=32535&view=rev
Log:
Support using ruleset version number as suffix for the save directory.

See patch #7136

Modified:
    trunk/tools/ruledit/tab_misc.cpp
    trunk/tools/ruledit/tab_misc.h

Modified: trunk/tools/ruledit/tab_misc.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/tab_misc.cpp?rev=32535&r1=32534&r2=32535&view=diff
==============================================================================
--- trunk/tools/ruledit/tab_misc.cpp    (original)
+++ trunk/tools/ruledit/tab_misc.cpp    Sun May  1 15:54:28 2016
@@ -1,4 +1,4 @@
-/********************************************************************** 
+/***********************************************************************
  Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 #include <QLineEdit>
 #include <QMessageBox>
 #include <QPushButton>
+#include <QRadioButton>
 #include <QTableWidget>
 
 // utility
@@ -48,6 +49,7 @@
 {
   QGridLayout *main_layout = new QGridLayout(this);
   QLabel *save_label;
+  QLabel *save_ver_label;
   QLabel *name_label;
   QLabel *version_label;
   QPushButton *save_button;
@@ -76,6 +78,11 @@
   savedir->setText("ruledit-tmp");
   savedir->setFocus();
   main_layout->addWidget(savedir, row++, 1);
+  save_ver_label = new QLabel(QString::fromUtf8(R__("Version suffix to 
directory name")));
+  save_ver_label->setParent(this);
+  main_layout->addWidget(save_ver_label, row, 0);
+  savedir_version = new QRadioButton(this);
+  main_layout->addWidget(savedir_version, row++, 1);
   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);
@@ -180,6 +187,7 @@
 void tab_misc::save_now()
 {
   char nameUTF8[MAX_LEN_NAME];
+  QString full_dir;
 
   ui->flush_widgets();
 
@@ -204,7 +212,13 @@
     }
   }
 
-  save_ruleset(savedir->text().toUtf8().data(), nameUTF8,
+  if (savedir_version->isChecked()) {
+    full_dir = savedir->text() + "-" + version->text();
+  } else {
+    full_dir = savedir->text();
+  }
+
+  save_ruleset(full_dir.toUtf8().data(), nameUTF8,
                &(ui->data));
 
   ui->display_msg(R__("Ruleset saved"));

Modified: trunk/tools/ruledit/tab_misc.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/tab_misc.h?rev=32535&r1=32534&r2=32535&view=diff
==============================================================================
--- trunk/tools/ruledit/tab_misc.h      (original)
+++ trunk/tools/ruledit/tab_misc.h      Sun May  1 15:54:28 2016
@@ -1,4 +1,4 @@
-/********************************************************************** 
+/***********************************************************************
  Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
 #include <QWidget>
 
 class QLineEdit;
+class QRadioButton;
 class QTableWidget;
 
 class ruledit_gui;
@@ -40,6 +41,7 @@
     QLineEdit *name;
     QLineEdit *version;
     QLineEdit *savedir;
+    QRadioButton *savedir_version;
     QTableWidget *stats;
 };
 


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