Parcourir la source

change map_lanetoxodr, change some language show.

yuchuli il y a 5 mois
Parent
commit
3be4eccb11
29 fichiers modifiés avec 458 ajouts et 150 suppressions
  1. 7 0
      src/tool/map_lanetoxodr/main.cpp
  2. 2 0
      src/tool/map_lanetoxodr/mainwindow.cpp
  3. 11 1
      src/tool/map_lanetoxodr/mainwindow.ui
  4. 401 133
      src/tool/map_lanetoxodr/map_lanetoxodr.ts
  5. 1 1
      src/tool/map_lanetoxodr/ui/dialogparkingspacefromrtk.cpp
  6. 1 1
      src/tool/map_lanetoxodr/ui/dialogroadborrow.cpp
  7. 2 0
      src/tool/map_lanetoxodr/ui/dialogroadmerge.cpp
  8. 2 0
      src/tool/map_lanetoxodr/ui/dialogroadmirror.cpp
  9. 2 0
      src/tool/map_lanetoxodr/ui/dialogroadmove.cpp
  10. 1 1
      src/tool/map_lanetoxodr/ui/dialogroadnoavoid.cpp
  11. 1 1
      src/tool/map_lanetoxodr/ui/dialogroadobject.cpp
  12. 1 1
      src/tool/map_lanetoxodr/ui/dialogroadobject_marking.cpp
  13. 1 1
      src/tool/map_lanetoxodr/ui/dialogroadobject_markingcornerreference.cpp
  14. 1 1
      src/tool/map_lanetoxodr/ui/dialogroadobject_material.cpp
  15. 1 1
      src/tool/map_lanetoxodr/ui/dialogroadobject_outline.cpp
  16. 2 2
      src/tool/map_lanetoxodr/ui/dialogroadobject_outline_cornerroad.cpp
  17. 1 1
      src/tool/map_lanetoxodr/ui/dialogroadobject_outlines.cpp
  18. 2 0
      src/tool/map_lanetoxodr/ui/dialogroadobject_parkingspace.cpp
  19. 1 1
      src/tool/map_lanetoxodr/ui/dialogroadobject_repeat.cpp
  20. 1 1
      src/tool/map_lanetoxodr/ui/dialogroadoptimize.cpp
  21. 1 1
      src/tool/map_lanetoxodr/ui/dialogroadpriority.cpp
  22. 2 0
      src/tool/map_lanetoxodr/ui/dialogroadsplit.cpp
  23. 2 0
      src/tool/map_lanetoxodr/ui/dialogroadtype.cpp
  24. 3 0
      src/tool/map_lanetoxodr/ui/dialogturndirection.cpp
  25. 1 1
      src/tool/map_lanetoxodr/ui/roadeditdialog.cpp
  26. 2 0
      src/tool/map_lanetoxodr/ui/speeddialog.cpp
  27. 1 1
      src/tool/map_lanetoxodr/ui/trafficlightdialog.cpp
  28. 2 0
      src/tool/map_lanetoxodr/ui/trafficlightlanevaliditydialog.cpp
  29. 2 0
      src/tool/map_lanetoxodr/ui/trafficlightpositiondialog.cpp

+ 7 - 0
src/tool/map_lanetoxodr/main.cpp

@@ -19,6 +19,7 @@
 #endif
 
 #include <QApplication>
+#include <QTranslator>
 
 #include "adclicensewithwin.h"
 
@@ -76,6 +77,12 @@ int main(int argc, char *argv[])
 #endif
     QApplication a(argc, argv);
 
+    QTranslator ts;
+    if(ts.load("./map_lanetoxodr.qm"))
+    {
+        a.installTranslator(&ts);
+    }
+
 #ifdef ANDROID
 
     requestPermission();

+ 2 - 0
src/tool/map_lanetoxodr/mainwindow.cpp

@@ -6234,3 +6234,5 @@ void MainWindow::on_actionAdd_ParkSpace_triggered()
     }
 }
 
+
+

+ 11 - 1
src/tool/map_lanetoxodr/mainwindow.ui

@@ -151,7 +151,7 @@
   </action>
   <action name="actionBack">
    <property name="text">
-    <string>回退</string>
+    <string>Back</string>
    </property>
    <property name="toolTip">
     <string>回退</string>
@@ -248,6 +248,16 @@
     <string>Add ParkSpace</string>
    </property>
   </action>
+  <action name="actionEnglish">
+   <property name="text">
+    <string>English</string>
+   </property>
+  </action>
+  <action name="actionNational">
+   <property name="text">
+    <string>National</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>

Fichier diff supprimé car celui-ci est trop grand
+ 401 - 133
src/tool/map_lanetoxodr/map_lanetoxodr.ts


+ 1 - 1
src/tool/map_lanetoxodr/ui/dialogparkingspacefromrtk.cpp

@@ -22,7 +22,7 @@ DialogParkingSpaceFromRTK::DialogParkingSpaceFromRTK(Road * pRoad,QWidget *paren
     mLat0 = glat0;
     mLon0 = glon0;
 
-    setWindowTitle("ParkingSpace From RTK");
+    setWindowTitle(tr("ParkingSpace From RTK"));
 }
 
 DialogParkingSpaceFromRTK::~DialogParkingSpaceFromRTK()

+ 1 - 1
src/tool/map_lanetoxodr/ui/dialogroadborrow.cpp

@@ -28,7 +28,7 @@ DialogRoadBorrow::DialogRoadBorrow(OpenDrive * pxodr,std::string strdefroad,QWid
 
     MainWindow::ComboToString(strdefroad,ui->comboBox_Road);
 
-    setWindowTitle("Road Borrow");
+    setWindowTitle(tr("Road Borrow"));
 }
 
 DialogRoadBorrow::~DialogRoadBorrow()

+ 2 - 0
src/tool/map_lanetoxodr/ui/dialogroadmerge.cpp

@@ -12,6 +12,8 @@ DialogRoadMerge::DialogRoadMerge(OpenDrive * pxodr,QWidget *parent) :
     ui->setupUi(this);
 
     mpxodr = pxodr;
+
+    setWindowTitle(tr("Road Merge"));
 }
 
 DialogRoadMerge::~DialogRoadMerge()

+ 2 - 0
src/tool/map_lanetoxodr/ui/dialogroadmirror.cpp

@@ -24,6 +24,8 @@ DialogRoadMirror::DialogRoadMirror(OpenDrive * pxodr,Road * pRoad,QWidget *paren
     {
         setWindowTitle(QString(pRoad->GetRoadId().data()));
     }
+
+    setWindowTitle(tr("Road Mirror"));
 }
 
 DialogRoadMirror::~DialogRoadMirror()

+ 2 - 0
src/tool/map_lanetoxodr/ui/dialogroadmove.cpp

@@ -28,6 +28,8 @@ DialogRoadMove::DialogRoadMove(OpenDrive * pxodr,Road * pRoad, QWidget *parent)
     ui->comboBox_dirmode->addItem("Road Start");
 
     ui->comboBox_dirmode->setCurrentIndex(0);
+
+    setWindowTitle(tr("Road Move"));
 }
 
 DialogRoadMove::~DialogRoadMove()

+ 1 - 1
src/tool/map_lanetoxodr/ui/dialogroadnoavoid.cpp

@@ -24,7 +24,7 @@ DialogRoadNoavoid::DialogRoadNoavoid(OpenDrive * pxodr,std::string strdefroad,QW
 
     MainWindow::ComboToString(strdefroad,ui->comboBox_Road);
 
-    setWindowTitle("Road Noavoid");
+    setWindowTitle(tr("Road Noavoid"));
 }
 
 DialogRoadNoavoid::~DialogRoadNoavoid()

+ 1 - 1
src/tool/map_lanetoxodr/ui/dialogroadobject.cpp

@@ -62,7 +62,7 @@ DialogRoadObject::DialogRoadObject(Road * pRoad,QWidget *parent) :
 
     }
 
-    setWindowTitle("Edit Road Object");
+    setWindowTitle(tr("Edit Road Object"));
 }
 
 DialogRoadObject::~DialogRoadObject()

+ 1 - 1
src/tool/map_lanetoxodr/ui/dialogroadobject_marking.cpp

@@ -46,7 +46,7 @@ DialogRoadObject_Marking::DialogRoadObject_Marking(Object * pObject,QWidget *par
 
     UpdateCB();
 
-    setWindowTitle("Edit Marking");
+    setWindowTitle(tr("Edit Marking"));
 
 
 }

+ 1 - 1
src/tool/map_lanetoxodr/ui/dialogroadobject_markingcornerreference.cpp

@@ -14,7 +14,7 @@ DialogRoadObject_MarkingcornerReference::DialogRoadObject_MarkingcornerReference
 
     UpdateCB();
 
-    setWindowTitle("Edit Marking cornerReference");
+    setWindowTitle(tr("Edit Marking cornerReference"));
 }
 
 DialogRoadObject_MarkingcornerReference::~DialogRoadObject_MarkingcornerReference()

+ 1 - 1
src/tool/map_lanetoxodr/ui/dialogroadobject_material.cpp

@@ -13,7 +13,7 @@ DialogRoadObject_material::DialogRoadObject_material(Object * pObject,QWidget *p
 
     UpdateList();
 
-    setWindowTitle("Edit Object Material");
+    setWindowTitle(tr("Edit Object Material"));
 
 
 }

+ 1 - 1
src/tool/map_lanetoxodr/ui/dialogroadobject_outline.cpp

@@ -46,7 +46,7 @@ DialogRoadObject_outline::DialogRoadObject_outline(Object * pObject,QWidget *par
     mpCBclosed->addItem("NO");
 
     UpdateCB();
-    setWindowTitle("Edit Road Object Outline");
+    setWindowTitle(tr("Edit Road Object Outline"));
 }
 
 DialogRoadObject_outline::~DialogRoadObject_outline()

+ 2 - 2
src/tool/map_lanetoxodr/ui/dialogroadobject_outline_cornerroad.cpp

@@ -21,9 +21,9 @@ DialogRoadObject_Outline_cornerRoad::DialogRoadObject_Outline_cornerRoad(Object_
     UpdateCB();
 
     if(ntype == 0)
-        setWindowTitle("Edit Road Object Outline cornerRoad");
+        setWindowTitle(tr("Edit Road Object Outline cornerRoad"));
     else
-        setWindowTitle("Edit Road Object Outline cornerLocal");
+        setWindowTitle(tr("Edit Road Object Outline cornerLocal"));
 }
 
 DialogRoadObject_Outline_cornerRoad::~DialogRoadObject_Outline_cornerRoad()

+ 1 - 1
src/tool/map_lanetoxodr/ui/dialogroadobject_outlines.cpp

@@ -51,7 +51,7 @@ DialogRoadObject_Outlines::DialogRoadObject_Outlines(Object * pObject,QWidget *p
     UpdateStatus();
 
 
-    setWindowTitle("Edit Road Object Outlines");
+    setWindowTitle(tr("Edit Road Object Outlines"));
 }
 
 DialogRoadObject_Outlines::~DialogRoadObject_Outlines()

+ 2 - 0
src/tool/map_lanetoxodr/ui/dialogroadobject_parkingspace.cpp

@@ -20,6 +20,8 @@ DialogRoadObject_parkingSpace::DialogRoadObject_parkingSpace(Object * pObject,QW
     }
 
     UpdateState();
+
+    setWindowTitle(tr("Edit Road Object ParkingSpace"));
 }
 
 DialogRoadObject_parkingSpace::~DialogRoadObject_parkingSpace()

+ 1 - 1
src/tool/map_lanetoxodr/ui/dialogroadobject_repeat.cpp

@@ -16,7 +16,7 @@ DialogRoadObject_repeat::DialogRoadObject_repeat(Object * pObject,QWidget *paren
 
     UpdateList();
 
-    setWindowTitle("Edit Road Object Repeat");
+    setWindowTitle(tr("Edit Road Object Repeat"));
 }
 
 DialogRoadObject_repeat::~DialogRoadObject_repeat()

+ 1 - 1
src/tool/map_lanetoxodr/ui/dialogroadoptimize.cpp

@@ -42,7 +42,7 @@ DialogRoadOptimize::DialogRoadOptimize(Road * pRoad,OpenDrive * pxodr,QWidget *p
 
     ui->plainTextEdit->setPlainText(pstrout_ptr.get());
 
-    setWindowTitle("Road Optimize");
+    setWindowTitle(tr("Road Optimize"));
 }
 
 DialogRoadOptimize::~DialogRoadOptimize()

+ 1 - 1
src/tool/map_lanetoxodr/ui/dialogroadpriority.cpp

@@ -22,7 +22,7 @@ DialogRoadPriority::DialogRoadPriority(OpenDrive * pxodr,std::string strdefroad,
 
     MainWindow::ComboToString(strdefroad,ui->comboBox_Road);
 
-    setWindowTitle("Road Priority");
+    setWindowTitle(tr("Road Priority"));
 
 }
 

+ 2 - 0
src/tool/map_lanetoxodr/ui/dialogroadsplit.cpp

@@ -16,6 +16,8 @@ DialogRoadSplit::DialogRoadSplit(Road * pRoad,OpenDrive * pxodr,QWidget *parent)
     ui->setupUi(this);
     mpRoad = pRoad;
     mpxodr = pxodr;
+
+    setWindowTitle(tr("Road Split"));
 }
 
 DialogRoadSplit::~DialogRoadSplit()

+ 2 - 0
src/tool/map_lanetoxodr/ui/dialogroadtype.cpp

@@ -21,6 +21,8 @@ DialogRoadType::DialogRoadType(Road * pCurRoad,QWidget *parent) :
 
     UpdateCombo();
 
+    setWindowTitle(tr("Set Road Type"));
+
 }
 
 DialogRoadType::~DialogRoadType()

+ 3 - 0
src/tool/map_lanetoxodr/ui/dialogturndirection.cpp

@@ -27,6 +27,9 @@ DialogTurnDirection::DialogTurnDirection(Road * pRoad,QWidget *parent) :
         if(xturn == RoadTurnDirection::RIGHT)ui->comboBox->setCurrentIndex(2);
         if(xturn == RoadTurnDirection::STRAIGHT)ui->comboBox->setCurrentIndex(3);
     }
+
+    setWindowTitle(tr("Set Turn Direction"));
+
 }
 
 DialogTurnDirection::~DialogTurnDirection()

+ 1 - 1
src/tool/map_lanetoxodr/ui/roadeditdialog.cpp

@@ -62,7 +62,7 @@ RoadEditDialog::RoadEditDialog(OpenDrive * pxodr,std::string strdefroad,QWidget
 
     MainWindow::ComboToString(strdefroad,ui->comboBox_Road);
 
-    setWindowTitle("Edit Road");
+    setWindowTitle(tr("Edit Road"));
 
 }
 

+ 2 - 0
src/tool/map_lanetoxodr/ui/speeddialog.cpp

@@ -21,6 +21,8 @@ SpeedDialog::SpeedDialog(OpenDrive * pxodr,std::string strdefroad,QWidget *paren
     }
 
     MainWindow::ComboToString(strdefroad,ui->comboBox_Road);
+
+    setWindowTitle(tr("Edit Speed"));
 }
 
 SpeedDialog::~SpeedDialog()

+ 1 - 1
src/tool/map_lanetoxodr/ui/trafficlightdialog.cpp

@@ -32,7 +32,7 @@ TrafficLightDialog::TrafficLightDialog(OpenDrive * pxodr,std::string strdefroad,
     MainWindow::ComboToString(strdefroad,ui->comboBox_Road);
 
 
-    setWindowTitle("Edit Traffic Light");
+    setWindowTitle(tr("Edit Traffic Light"));
 
 }
 

+ 2 - 0
src/tool/map_lanetoxodr/ui/trafficlightlanevaliditydialog.cpp

@@ -20,6 +20,8 @@ TrafficLightlaneValidityDialog::TrafficLightlaneValidityDialog(Signal * pSignal,
         ui->lineEdit_toLane->setText(QString::number(psignal_laneValidity->GettoLane()));
     }
 
+    setWindowTitle(tr("Edit Traffic Light Lane Validity"));
+
 }
 
 TrafficLightlaneValidityDialog::~TrafficLightlaneValidityDialog()

+ 2 - 0
src/tool/map_lanetoxodr/ui/trafficlightpositiondialog.cpp

@@ -44,6 +44,8 @@ TrafficLightpositionDialog::TrafficLightpositionDialog(Signal * pSignal,double l
         else ui->lineEdit_roll->setText(QString::number(roll));
     }
 
+    setWindowTitle(tr("Traffic Light Position"));
+
 }
 
 TrafficLightpositionDialog::~TrafficLightpositionDialog()

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff