From e3d01f1451c77692ae58a5c808ac85e723cee769 Mon Sep 17 00:00:00 2001
From: Arin Alexander <arin_a@bk.ru>
Date: Thu, 29 Jun 2017 02:32:42 +0300
Subject: [PATCH] Band names translation has been added

---
 limereport/lrbanddesignintf.cpp     | 34 +++++++++++++--
 limereport/lrbanddesignintf.h       |  2 +
 limereport/lrreportdesignwindow.cpp |  2 +
 translations/limereport_ru.ts       | 68 +++++++++++++++++++++++++++++
 4 files changed, 102 insertions(+), 4 deletions(-)

diff --git a/limereport/lrbanddesignintf.cpp b/limereport/lrbanddesignintf.cpp
index 05412cb..61bb5cf 100644
--- a/limereport/lrbanddesignintf.cpp
+++ b/limereport/lrbanddesignintf.cpp
@@ -159,6 +159,16 @@ BandDesignIntf::~BandDesignIntf()
     delete m_bandNameLabel;
 }
 
+int extractItemIndex(const BaseDesignIntf* item){
+    QString objectName = extractClassName(item->metaObject()->className());
+    QString value = item->objectName().right(item->objectName().size() - objectName.size());
+    return value.toInt();
+}
+
+QString BandDesignIntf::translateBandName(const BaseDesignIntf* item) const{
+    return tr(extractClassName(item->metaObject()->className()).toLatin1())+QString::number(extractItemIndex(item));
+}
+
 void BandDesignIntf::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
 {
 
@@ -170,8 +180,7 @@ void BandDesignIntf::paint(QPainter *painter, const QStyleOptionGraphicsItem *op
 
     if (itemMode() & DesignMode){
         painter->save();
-        QString bandText = objectName();
-        if (parentBand()) bandText+=tr(" connected to ")+parentBand()->objectName();
+        QString bandText = bandTitle();
         QFont font("Arial", 7 * Const::fontFACTOR, -1, true);
         QFontMetrics fontMetrics(font);
 
@@ -202,6 +211,23 @@ void BandDesignIntf::paint(QPainter *painter, const QStyleOptionGraphicsItem *op
     BaseDesignIntf::paint(painter,option,widget);
 }
 
+void BandDesignIntf::translateBandsName()
+{
+    tr("DataBand");
+    tr("DataHeaderBand");
+    tr("DataFooterBand");
+    tr("ReportHeader");
+    tr("ReportFooter");
+    tr("PageHeader");
+    tr("PageFooter");
+    tr("SubDetailBand");
+    tr("SubDetailHeaderBand");
+    tr("SubDetailFooterBand");
+    tr("GroupBandHeader");
+    tr("GroupBandFooter");
+    tr("TearOffBand");
+}
+
 BandDesignIntf::BandsType  BandDesignIntf::bandType() const
 {
     return m_bandType;
@@ -209,8 +235,8 @@ BandDesignIntf::BandsType  BandDesignIntf::bandType() const
 
 QString  BandDesignIntf::bandTitle() const
 {
-    QString result = objectName();
-    if (parentBand()) result +=tr(" connected to ")+parentBand()->objectName();
+    QString result = translateBandName(this);
+    if (parentBand()) result +=tr(" connected to ") + translateBandName(parentBand());
     return result;
 }
 
diff --git a/limereport/lrbanddesignintf.h b/limereport/lrbanddesignintf.h
index eab3d90..e306742 100644
--- a/limereport/lrbanddesignintf.h
+++ b/limereport/lrbanddesignintf.h
@@ -121,6 +121,7 @@ public:
     ~BandDesignIntf();
 
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    void translateBandsName();
     virtual BandsType bandType() const;
     virtual QString bandTitle() const;
     virtual QIcon bandIcon() const;
@@ -241,6 +242,7 @@ protected:
     void moveItemsDown(qreal startPos, qreal offset);
     void preparePopUpMenu(QMenu &menu);
     void processPopUpAction(QAction *action);
+    QString translateBandName(const BaseDesignIntf *item) const;
 private slots:
     void childBandDeleted(QObject* band);
 private:
diff --git a/limereport/lrreportdesignwindow.cpp b/limereport/lrreportdesignwindow.cpp
index 68e44fd..b2c882b 100644
--- a/limereport/lrreportdesignwindow.cpp
+++ b/limereport/lrreportdesignwindow.cpp
@@ -1058,8 +1058,10 @@ void ReportDesignWindow::slotBandAdded(PageDesignIntf *, BandDesignIntf * band)
             break;
         case BandDesignIntf::ReportFooter:
             m_newReportFooter->setDisabled(true);
+            break;
         case BandDesignIntf::TearOffBand:
             m_newTearOffBand->setDisabled(true);
+            break;
         default:
             break;
         }
diff --git a/translations/limereport_ru.ts b/translations/limereport_ru.ts
index 96d6602..d2bd7e0 100644
--- a/translations/limereport_ru.ts
+++ b/translations/limereport_ru.ts
@@ -255,6 +255,74 @@ p, li { white-space: pre-wrap; }
         <source>Splittable</source>
         <translation>Разбивать содержимое на части</translation>
     </message>
+    <message>
+        <source>DataBand</source>
+        <translation>Данные</translation>
+    </message>
+    <message>
+        <source>ReportHeader</source>
+        <translation>Заголовок отчета</translation>
+    </message>
+    <message>
+        <source>ReportFooter</source>
+        <translation>Завершение отчета</translation>
+    </message>
+    <message>
+        <source>PageHeader</source>
+        <translation>Верхний колонтитул</translation>
+    </message>
+    <message>
+        <source>PageFooter</source>
+        <translation>Нижний колонтитул</translation>
+    </message>
+    <message>
+        <source>Subdetail</source>
+        <translation type="obsolete">Подчиненный</translation>
+    </message>
+    <message>
+        <source>DataHeaderBand</source>
+        <translation>Заголовок данных</translation>
+    </message>
+    <message>
+        <source>DataFooterBand</source>
+        <translation>Завершение данных</translation>
+    </message>
+    <message>
+        <source>SubdetailBand</source>
+        <translation type="vanished">Подчиненные данные</translation>
+    </message>
+    <message>
+        <source>SubdetailHeaderBand</source>
+        <translation type="vanished">Заголовок подчиненных данных</translation>
+    </message>
+    <message>
+        <source>SubdetailFooterBand</source>
+        <translation type="vanished">Завершение подчиненных данных</translation>
+    </message>
+    <message>
+        <source>GroupBandHeader</source>
+        <translation>Заголовок группы</translation>
+    </message>
+    <message>
+        <source>GroupBandFooter</source>
+        <translation>Завершение группы</translation>
+    </message>
+    <message>
+        <source>TearOffBand</source>
+        <translation>Полоса для отрывания</translation>
+    </message>
+    <message>
+        <source>SubDetailBand</source>
+        <translation>Подчиненные данные</translation>
+    </message>
+    <message>
+        <source>SubDetailHeaderBand</source>
+        <translation>Заголовок подчиненных данных</translation>
+    </message>
+    <message>
+        <source>SubDetailFooterBand</source>
+        <translation>Завершение подчиненных данных</translation>
+    </message>
 </context>
 <context>
     <name>LimeReport::BaseDesignIntf</name>