Added missing parts of Revised Julian Calendar

5 files changed, 275 insertions, 113 deletions

diff --git a/plugins/Calendars/src/RevisedJulianCalendar.cpp b/plugins/Calendars/src/RevisedJulianCalendar.cpp
index c00d924cf5..0381b6daf9 100644
--- a/plugins/Calendars/src/RevisedJulianCalendar.cpp
+++ b/plugins/Calendars/src/RevisedJulianCalendar.cpp
@@ -24,6 +24,70 @@
 
 RevisedJulianCalendar::RevisedJulianCalendar(double jd): JulianCalendar(jd)
 {
+	RevisedJulianCalendar::retranslate();
+}
+
+QMap<int, QString> RevisedJulianCalendar::weekDayNames;
+QMap<int, QString> RevisedJulianCalendar::monthNames;
+
+void RevisedJulianCalendar::retranslate()
+{
+	// fill the name lists with translated month and day names
+	weekDayNames={
+		{0, qc_("Sunday"   , "long day name")},
+		{1, qc_("Monday"   , "long day name")},
+		{2, qc_("Tuesday"  , "long day name")},
+		{3, qc_("Wednesday", "long day name")},
+		{4, qc_("Thursday" , "long day name")},
+		{5, qc_("Friday"   , "long day name")},
+		{6, qc_("Saturday" , "long day name")}};
+	monthNames={
+		{ 1, qc_("January"  , "long month name")},
+		{ 2, qc_("February" , "long month name")},
+		{ 3, qc_("March"    , "long month name")},
+		{ 4, qc_("April"    , "long month name")},
+		{ 5, qc_("May"      , "long month name")},
+		{ 6, qc_("June"     , "long month name")},
+		{ 7, qc_("July"     , "long month name")},
+		{ 8, qc_("August"   , "long month name")},
+		{ 9, qc_("September", "long month name")},
+		{10, qc_("October"  , "long month name")},
+		{11, qc_("November" , "long month name")},
+		{12, qc_("December" , "long month name")}};
+}
+
+// get a stringlist of calendar date elements sorted from the largest to the smallest.
+// Year, Month, MonthName, Day, DayName
+// Again, in this plugin only, note no year zero, and AD/BC counting.
+QStringList RevisedJulianCalendar::getDateStrings() const
+{
+	QStringList list;
+	list << QString("%1 %2").arg(abs(parts.at(0))).arg(parts.at(0)>0 ? q_("A.D.") : q_("B.C."));
+	list << QString::number(parts.at(1));
+	list << QString::number(parts.at(2));
+	list << weekday(JD);
+
+	return list;
+}
+
+// get a formatted complete string for a date
+QString RevisedJulianCalendar::getFormattedDateString() const
+{
+	QStringList str=getDateStrings();
+	// TODO: Maybe use QDate with user's localisation here? Weekday has to be taken from our results, though.
+	return QString("%1, %2 - %3 (%4) - %5").arg(
+			str.at(3), // weekday
+			str.at(2), // day
+			str.at(1), // month, numerical
+			monthNames.value(parts.at(1)), // month, name
+			str.at(0));// year
+}
+
+// return name of week day
+QString RevisedJulianCalendar::weekday(double jd)
+{
+	const int dow = StelUtils::getDayOfWeek(jd+StelApp::getInstance().getCore()->getUTCOffset(jd)/24.);
+	return weekDayNames.value(dow);
 }
 
 // Set a calendar date from the Julian day number
diff --git a/plugins/Calendars/src/RevisedJulianCalendar.hpp b/plugins/Calendars/src/RevisedJulianCalendar.hpp
index 9b43ba1306..0574ed5f38 100644
--- a/plugins/Calendars/src/RevisedJulianCalendar.hpp
+++ b/plugins/Calendars/src/RevisedJulianCalendar.hpp
@@ -38,6 +38,8 @@ public:
 	virtual ~RevisedJulianCalendar() Q_DECL_OVERRIDE {}
 
 public slots:
+	virtual void retranslate() Q_DECL_OVERRIDE;
+
 	//! Set a calendar date from the Julian day number
 	virtual void setJD(double JD) Q_DECL_OVERRIDE;
 
@@ -45,7 +47,17 @@ public slots:
 	//! Year-Month[1...12]-Day[1...31]
 	virtual void setDate(QVector<int> parts) Q_DECL_OVERRIDE;
 
+	//! get a stringlist of calendar date elements sorted from the largest to the smallest.
+	//! Year, Month, MonthName, Day, DayName
+	virtual QStringList getDateStrings() const Q_DECL_OVERRIDE;
+
+	//! get a formatted complete string for a date
+	virtual QString getFormattedDateString() const Q_DECL_OVERRIDE;
+
 public:
+	//! return name of week day. This is actually independent from any calendar, just a modulo of JD.
+	static QString weekday(double jd);
+
 	//! returns true for leap years. We handle years prior to 325 like in the regular Julian calendar.
 	static bool isLeap(int year);
 
@@ -56,6 +68,10 @@ public:
 	static QVector<int> revisedJulianFromFixed(int rd);
 
 	constexpr static const int revisedJulianEpoch=1; //! RD of January 1, AD1.
+
+protected:
+	static QMap<int, QString> weekDayNames;
+	static QMap<int, QString> monthNames;
 };
 
 #endif
diff --git a/plugins/Calendars/src/gui/CalendarsDialog.cpp b/plugins/Calendars/src/gui/CalendarsDialog.cpp
index eb6be4bbeb..0914e20727 100644
--- a/plugins/Calendars/src/gui/CalendarsDialog.cpp
+++ b/plugins/Calendars/src/gui/CalendarsDialog.cpp
@@ -31,6 +31,7 @@
 
 // We only need to include calendars when we have to call special functions.
 #include "JulianCalendar.hpp"
+#include "RevisedJulianCalendar.hpp"
 #include "GregorianCalendar.hpp"
 //#include "MayaHaabCalendar.hpp"
 //#include "MayaTzolkinCalendar.hpp"
@@ -91,6 +92,7 @@ void CalendarsDialog::createDialogContent()
 
 	// MAKE SURE to connect each calendar's partsChanged to a respective populate... method here.
 	connect(cal->getCal("Julian"),             SIGNAL(partsChanged(QVector<int>)), this, SLOT(populateJulianParts(QVector<int>)));
+	connect(cal->getCal("RevisedJulian"),      SIGNAL(partsChanged(QVector<int>)), this, SLOT(populateRevisedJulianParts(QVector<int>)));
 	connect(cal->getCal("Gregorian"),          SIGNAL(partsChanged(QVector<int>)), this, SLOT(populateGregorianParts(QVector<int>)));
 	connect(cal->getCal("ISO"),                SIGNAL(partsChanged(QVector<int>)), this, SLOT(populateISOParts(QVector<int>)));
 	connect(cal->getCal("MayaLongCount"),      SIGNAL(partsChanged(QVector<int>)), this, SLOT(populateMayaLongCountParts(QVector<int>)));
@@ -127,20 +129,23 @@ void CalendarsDialog::createDialogContent()
 	connectBoolProperty(ui->persianArithmeticCheckBox,  "Calendars.flagShowPersianArithmetic");
 
 	// MAKE SURE to connect all part edit elements respective ...Changed() method here.
-	connect(ui->julianYearSpinBox,      SIGNAL(valueChanged(int)), this, SLOT(julianChanged()));
-	connect(ui->julianMonthSpinBox,     SIGNAL(valueChanged(int)), this, SLOT(julianChanged()));
-	connect(ui->julianDaySpinBox,       SIGNAL(valueChanged(int)), this, SLOT(julianChanged()));
-	connect(ui->gregorianYearSpinBox,   SIGNAL(valueChanged(int)), this, SLOT(gregorianChanged()));
-	connect(ui->gregorianMonthSpinBox,  SIGNAL(valueChanged(int)), this, SLOT(gregorianChanged()));
-	connect(ui->gregorianDaySpinBox,    SIGNAL(valueChanged(int)), this, SLOT(gregorianChanged()));
-	connect(ui->isoYearSpinBox,         SIGNAL(valueChanged(int)), this, SLOT(isoChanged()));
-	connect(ui->isoWeekSpinBox,         SIGNAL(valueChanged(int)), this, SLOT(isoChanged()));
-	connect(ui->isoDaySpinBox,          SIGNAL(valueChanged(int)), this, SLOT(isoChanged()));
-	connect(ui->baktunSpinBox,          SIGNAL(valueChanged(int)), this, SLOT(mayaLongCountChanged()));
-	connect(ui->katunSpinBox,           SIGNAL(valueChanged(int)), this, SLOT(mayaLongCountChanged()));
-	connect(ui->tunSpinBox,             SIGNAL(valueChanged(int)), this, SLOT(mayaLongCountChanged()));
-	connect(ui->uinalSpinBox,           SIGNAL(valueChanged(int)), this, SLOT(mayaLongCountChanged()));
-	connect(ui->kinSpinBox,             SIGNAL(valueChanged(int)), this, SLOT(mayaLongCountChanged()));
+	connect(ui->julianYearSpinBox,		SIGNAL(valueChanged(int)), this, SLOT(julianChanged()));
+	connect(ui->julianMonthSpinBox,		SIGNAL(valueChanged(int)), this, SLOT(julianChanged()));
+	connect(ui->julianDaySpinBox,		SIGNAL(valueChanged(int)), this, SLOT(julianChanged()));
+	connect(ui->revisedJulianYearSpinBox,	SIGNAL(valueChanged(int)), this, SLOT(revisedJulianChanged()));
+	connect(ui->revisedJulianMonthSpinBox,	SIGNAL(valueChanged(int)), this, SLOT(revisedJulianChanged()));
+	connect(ui->revisedJulianDaySpinBox,	SIGNAL(valueChanged(int)), this, SLOT(revisedJulianChanged()));
+	connect(ui->gregorianYearSpinBox,	SIGNAL(valueChanged(int)), this, SLOT(gregorianChanged()));
+	connect(ui->gregorianMonthSpinBox,	SIGNAL(valueChanged(int)), this, SLOT(gregorianChanged()));
+	connect(ui->gregorianDaySpinBox,	SIGNAL(valueChanged(int)), this, SLOT(gregorianChanged()));
+	connect(ui->isoYearSpinBox,		SIGNAL(valueChanged(int)), this, SLOT(isoChanged()));
+	connect(ui->isoWeekSpinBox,		SIGNAL(valueChanged(int)), this, SLOT(isoChanged()));
+	connect(ui->isoDaySpinBox,		SIGNAL(valueChanged(int)), this, SLOT(isoChanged()));
+	connect(ui->baktunSpinBox,		SIGNAL(valueChanged(int)), this, SLOT(mayaLongCountChanged()));
+	connect(ui->katunSpinBox,		SIGNAL(valueChanged(int)), this, SLOT(mayaLongCountChanged()));
+	connect(ui->tunSpinBox,			SIGNAL(valueChanged(int)), this, SLOT(mayaLongCountChanged()));
+	connect(ui->uinalSpinBox,		SIGNAL(valueChanged(int)), this, SLOT(mayaLongCountChanged()));
+	connect(ui->kinSpinBox,			SIGNAL(valueChanged(int)), this, SLOT(mayaLongCountChanged()));
 	// TODO: Indirect handling of Haab/Tzolkin and Xihuitl/Tonalpohualli, with going back and forth to dates set in the GUI elements.
 	//connect(ui->haabMonthSpinBox, SIGNAL(valueChanged(int)), this, SLOT(mayaHaabChanged()));
 	//connect(ui->haabDaySpinBox,   SIGNAL(valueChanged(int)), this, SLOT(mayaHaabChanged()));
@@ -250,6 +255,18 @@ void CalendarsDialog::populateJulianParts(QVector<int> parts)
 		ui->julianWeekdayLineEdit->setText(jul->weekday(jul->getJD()));
 }
 
+void CalendarsDialog::populateRevisedJulianParts(QVector<int> parts)
+{
+	ui->revisedJulianYearSpinBox->setValue(parts.at(0));
+	ui->revisedJulianMonthSpinBox->setValue(parts.at(1));
+	ui->revisedJulianDaySpinBox->setValue(parts.at(2));
+
+	// If the GUI wants to show other related data, we can find the sender. (nullptr when this slot is called directly!)
+	RevisedJulianCalendar *rjul=dynamic_cast<RevisedJulianCalendar*>(sender());
+	if (rjul)
+		ui->revisedJulianWeekdayLineEdit->setText(rjul->weekday(rjul->getJD()));
+}
+
 void CalendarsDialog::populateGregorianParts(QVector<int> parts)
 {
 	ui->gregorianYearSpinBox->setValue(parts.at(0));
@@ -320,23 +337,30 @@ void CalendarsDialog::populateAztecTonalpohualliParts(QVector<int> parts)
 void CalendarsDialog::julianChanged()
 {
 	cal->getCal("Julian")->setDate({ui->julianYearSpinBox->value(),
-					 ui->julianMonthSpinBox->value(),
-					 ui->julianDaySpinBox->value()});
+					ui->julianMonthSpinBox->value(),
+					ui->julianDaySpinBox->value()});
+}
+
+void CalendarsDialog::revisedJulianChanged()
+{
+	cal->getCal("RevisedJulian")->setDate({ui->revisedJulianYearSpinBox->value(),
+					       ui->revisedJulianMonthSpinBox->value(),
+					       ui->revisedJulianDaySpinBox->value()});
 }
 
 void CalendarsDialog::gregorianChanged()
 {
 	cal->getCal("Gregorian")->setDate({ui->gregorianYearSpinBox->value(),
-					    ui->gregorianMonthSpinBox->value(),
-					    ui->gregorianDaySpinBox->value()});
+					   ui->gregorianMonthSpinBox->value(),
+					   ui->gregorianDaySpinBox->value()});
 }
 
 void CalendarsDialog::isoChanged()
 {
 	// TODO proper handling of ISO weekday combo box.
 	cal->getCal("ISO")->setDate({ui->isoYearSpinBox->value(),
-					ui->isoWeekSpinBox->value(),
-					ui->isoDaySpinBox->value()});
+				     ui->isoWeekSpinBox->value(),
+				     ui->isoDaySpinBox->value()});
 }
 
 void CalendarsDialog::mayaLongCountChanged()
@@ -351,23 +375,23 @@ void CalendarsDialog::mayaLongCountChanged()
 void CalendarsDialog::mayaHaabChanged()
 {
 	cal->getCal("MayaHaab")->setDate({ui->haabMonthSpinBox->value(),
-					   ui->haabDaySpinBox->value()});
+					  ui->haabDaySpinBox->value()});
 }
 
 void CalendarsDialog::mayaTzolkinChanged()
 {
 	cal->getCal("MayaTzolkin")->setDate({ui->tzolkinNumberSpinBox->value(),
-					      ui->tzolkinNameSpinBox->value()});
+					     ui->tzolkinNameSpinBox->value()});
 }
 
 void CalendarsDialog::aztecXihuitlChanged()
 {
 	cal->getCal("AztecXihuitl")->setDate({ui->xihuitlMonthSpinBox->value(),
-					   ui->xihuitlDaySpinBox->value()});
+					      ui->xihuitlDaySpinBox->value()});
 }
 
 void CalendarsDialog::aztecTonalpohualliChanged()
 {
 	cal->getCal("AztecTonalpohualli")->setDate({ui->tonalpohualliNumberSpinBox->value(),
-					      ui->tonalpohualliNameSpinBox->value()});
+						    ui->tonalpohualliNameSpinBox->value()});
 }
diff --git a/plugins/Calendars/src/gui/CalendarsDialog.hpp b/plugins/Calendars/src/gui/CalendarsDialog.hpp
index 391cff83f4..2c588b2c19 100644
--- a/plugins/Calendars/src/gui/CalendarsDialog.hpp
+++ b/plugins/Calendars/src/gui/CalendarsDialog.hpp
@@ -55,6 +55,7 @@ private slots:
 	// populate the respective GUI elements when calendars change. It is possible to even retrieve sender address (?) to possibly call particular other functions.
 	void populateGregorianParts(QVector<int> parts);
 	void populateJulianParts(QVector<int> parts);
+	void populateRevisedJulianParts(QVector<int> parts);
 	void populateISOParts(QVector<int> parts);
 	void populateMayaLongCountParts(QVector<int> parts);
 	void populateMayaHaabParts(QVector<int> parts);
@@ -64,6 +65,7 @@ private slots:
 
 	// handle changes in the editable fields. One method per calendar.
 	void julianChanged();
+	void revisedJulianChanged();
 	void gregorianChanged();
 	void isoChanged();
 	void mayaLongCountChanged();
diff --git a/plugins/Calendars/src/gui/calendarsDialog.ui b/plugins/Calendars/src/gui/calendarsDialog.ui
index d118e5cc7a..25e19e8129 100644
--- a/plugins/Calendars/src/gui/calendarsDialog.ui
+++ b/plugins/Calendars/src/gui/calendarsDialog.ui
@@ -377,29 +377,36 @@
       <layout class="QVBoxLayout" name="lunisolarVerticalLayout">
        <item>
         <layout class="QGridLayout" name="lunisolarGridLayout">
-         <item row="0" column="1">
-          <widget class="QLabel" name="labelYear">
-           <property name="text">
-            <string>Year</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1">
-          <widget class="QSpinBox" name="julianYearSpinBox">
-           <property name="toolTip">
-            <string>Negative years here mark years B.C.</string>
-           </property>
+         <item row="4" column="1">
+          <widget class="QSpinBox" name="isoYearSpinBox">
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="minimum">
-            <number>-100000</number>
+            <number>-1000000</number>
            </property>
            <property name="maximum">
             <number>100000</number>
            </property>
-           <property name="value">
-            <number>2000</number>
+          </widget>
+         </item>
+         <item row="0" column="4">
+          <widget class="QLabel" name="labelDOW">
+           <property name="text">
+            <string>Weekday</string>
+           </property>
+          </widget>
+         </item>
+         <item row="3" column="4">
+          <widget class="QLineEdit" name="gregorianWeekdayLineEdit">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+           <property name="acceptDrops">
+            <bool>false</bool>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
           </widget>
          </item>
@@ -410,8 +417,8 @@
            </property>
           </widget>
          </item>
-         <item row="3" column="2">
-          <widget class="QSpinBox" name="isoWeekSpinBox">
+         <item row="1" column="2">
+          <widget class="QSpinBox" name="julianMonthSpinBox">
            <property name="wrapping">
             <bool>true</bool>
            </property>
@@ -422,25 +429,50 @@
             <number>0</number>
            </property>
            <property name="maximum">
-            <number>54</number>
+            <number>13</number>
            </property>
           </widget>
          </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="labelJulianCalendar">
-           <property name="text">
-            <string comment="calendar">Julian</string>
+         <item row="3" column="3">
+          <widget class="QSpinBox" name="gregorianDaySpinBox">
+           <property name="wrapping">
+            <bool>true</bool>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           </property>
+           <property name="minimum">
+            <number>0</number>
+           </property>
+           <property name="maximum">
+            <number>32</number>
            </property>
           </widget>
          </item>
-         <item row="0" column="3">
-          <widget class="QLabel" name="labelDay">
+         <item row="5" column="0">
+          <widget class="QLabel" name="labelRD">
            <property name="text">
-            <string>Day</string>
+            <string notr="true">Rata Die</string>
            </property>
           </widget>
          </item>
-         <item row="2" column="2">
+         <item row="4" column="2">
+          <widget class="QSpinBox" name="isoWeekSpinBox">
+           <property name="wrapping">
+            <bool>true</bool>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           </property>
+           <property name="minimum">
+            <number>0</number>
+           </property>
+           <property name="maximum">
+            <number>54</number>
+           </property>
+          </widget>
+         </item>
+         <item row="3" column="2">
           <widget class="QSpinBox" name="gregorianMonthSpinBox">
            <property name="wrapping">
             <bool>true</bool>
@@ -456,7 +488,23 @@
            </property>
           </widget>
          </item>
-         <item row="2" column="1">
+         <item row="1" column="3">
+          <widget class="QSpinBox" name="julianDaySpinBox">
+           <property name="wrapping">
+            <bool>true</bool>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           </property>
+           <property name="minimum">
+            <number>0</number>
+           </property>
+           <property name="maximum">
+            <number>32</number>
+           </property>
+          </widget>
+         </item>
+         <item row="3" column="1">
           <widget class="QSpinBox" name="gregorianYearSpinBox">
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -472,6 +520,20 @@
            </property>
           </widget>
          </item>
+         <item row="5" column="4">
+          <widget class="QLabel" name="labelRDvalue">
+           <property name="text">
+            <string notr="true">RD number</string>
+           </property>
+          </widget>
+         </item>
+         <item row="4" column="0">
+          <widget class="QLabel" name="labelISOWeekCalendar">
+           <property name="text">
+            <string comment="calendar">ISO Week</string>
+           </property>
+          </widget>
+         </item>
          <item row="1" column="4">
           <widget class="QLineEdit" name="julianWeekdayLineEdit">
            <property name="enabled">
@@ -485,30 +547,14 @@
            </property>
           </widget>
          </item>
-         <item row="0" column="4">
-          <widget class="QLabel" name="labelDOW">
+         <item row="0" column="1">
+          <widget class="QLabel" name="labelYear">
            <property name="text">
-            <string>Weekday</string>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="3">
-          <widget class="QSpinBox" name="gregorianDaySpinBox">
-           <property name="wrapping">
-            <bool>true</bool>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-           </property>
-           <property name="minimum">
-            <number>0</number>
-           </property>
-           <property name="maximum">
-            <number>32</number>
+            <string>Year</string>
            </property>
           </widget>
          </item>
-         <item row="3" column="3">
+         <item row="4" column="3">
           <widget class="QSpinBox" name="isoDaySpinBox">
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -524,89 +570,99 @@
            </property>
           </widget>
          </item>
-         <item row="1" column="2">
-          <widget class="QSpinBox" name="julianMonthSpinBox">
-           <property name="wrapping">
-            <bool>true</bool>
+         <item row="0" column="3">
+          <widget class="QLabel" name="labelDay">
+           <property name="text">
+            <string>Day</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QSpinBox" name="julianYearSpinBox">
+           <property name="toolTip">
+            <string>Negative years here mark years B.C.</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="minimum">
-            <number>0</number>
+            <number>-100000</number>
            </property>
            <property name="maximum">
-            <number>13</number>
+            <number>100000</number>
+           </property>
+           <property name="value">
+            <number>2000</number>
            </property>
           </widget>
          </item>
          <item row="3" column="0">
-          <widget class="QLabel" name="labelISOWeekCalendar">
+          <widget class="QLabel" name="labelGregorianCalendar">
            <property name="text">
-            <string comment="calendar">ISO Week</string>
+            <string comment="calendar">Gregorian</string>
            </property>
           </widget>
          </item>
-         <item row="2" column="0">
-          <widget class="QLabel" name="labelGregorianCalendar">
+         <item row="1" column="0">
+          <widget class="QLabel" name="labelJulianCalendar">
            <property name="text">
-            <string comment="calendar">Gregorian</string>
+            <string comment="calendar">Julian</string>
            </property>
           </widget>
          </item>
-         <item row="2" column="4">
-          <widget class="QLineEdit" name="gregorianWeekdayLineEdit">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="acceptDrops">
-            <bool>false</bool>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         <item row="2" column="0">
+          <widget class="QLabel" name="labelRevisedJulianCalendar">
+           <property name="text">
+            <string>Revised Julian</string>
            </property>
           </widget>
          </item>
-         <item row="1" column="3">
-          <widget class="QSpinBox" name="julianDaySpinBox">
-           <property name="wrapping">
-            <bool>true</bool>
-           </property>
+         <item row="2" column="1">
+          <widget class="QSpinBox" name="revisedJulianYearSpinBox">
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
            <property name="minimum">
-            <number>0</number>
+            <number>-100000</number>
            </property>
            <property name="maximum">
-            <number>32</number>
+            <number>100000</number>
+           </property>
+           <property name="value">
+            <number>2000</number>
            </property>
           </widget>
          </item>
-         <item row="3" column="1">
-          <widget class="QSpinBox" name="isoYearSpinBox">
+         <item row="2" column="2">
+          <widget class="QSpinBox" name="revisedJulianMonthSpinBox">
            <property name="alignment">
             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
-           <property name="minimum">
-            <number>-1000000</number>
-           </property>
            <property name="maximum">
-            <number>100000</number>
+            <number>13</number>
            </property>
           </widget>
          </item>
-         <item row="4" column="0">
-          <widget class="QLabel" name="labelRD">
-           <property name="text">
-            <string>Rata Die</string>
+         <item row="2" column="3">
+          <widget class="QSpinBox" name="revisedJulianDaySpinBox">
+           <property name="alignment">
+            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           </property>
+           <property name="maximum">
+            <number>32</number>
            </property>
           </widget>
          </item>
-         <item row="4" column="4">
-          <widget class="QLabel" name="labelRDvalue">
-           <property name="text">
-            <string>RD number</string>
+         <item row="2" column="4">
+          <widget class="QLineEdit" name="revisedJulianWeekdayLineEdit">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+           <property name="acceptDrops">
+            <bool>false</bool>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
            </property>
           </widget>
          </item>