From ed3314473a4bfd8301a17e55b49a42c1ad6b5a98 Mon Sep 17 00:00:00 2001
From: goldenhawking <goldenhawking@163.com>
Date: Thu, 15 Sep 2016 16:40:41 +0800
Subject: [PATCH] Solved a problem that in lite mod, OSM page will lost.

---
 qtviewer_planetosm/osm_frame_widget.cpp          |  2 +-
 qtviewer_planetosm/qtviewer_planetosm_zh_CN.ts   |  2 +-
 qtvplugin_geomarker/qtvplugin_geomarker_zh_CN.ts | 12 ++++--------
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/qtviewer_planetosm/osm_frame_widget.cpp b/qtviewer_planetosm/osm_frame_widget.cpp
index 0f6b8aa..c2b6fa2 100644
--- a/qtviewer_planetosm/osm_frame_widget.cpp
+++ b/qtviewer_planetosm/osm_frame_widget.cpp
@@ -432,9 +432,9 @@ void osm_frame_widget::enableLiteMode(bool bEnabled)
 			return;
 		ui->tabWidget_main->hide();
 		int idx = ui->tabWidget_main->indexOf(ui->tab_map);
-		ui->tab_map->setParent(this);
 		if (idx>=0)
 			ui->tabWidget_main->removeTab(idx);
+		ui->tab_map->setParent(this);
 		//remove topmost flag
 		Qt::WindowFlags flg = ui->tab_map->windowFlags();
 		flg &= ~(Qt::WindowMinMaxButtonsHint|Qt::WindowStaysOnTopHint|Qt::Window );
diff --git a/qtviewer_planetosm/qtviewer_planetosm_zh_CN.ts b/qtviewer_planetosm/qtviewer_planetosm_zh_CN.ts
index d4b68b9..cf3c1c0 100644
--- a/qtviewer_planetosm/qtviewer_planetosm_zh_CN.ts
+++ b/qtviewer_planetosm/qtviewer_planetosm_zh_CN.ts
@@ -189,7 +189,7 @@
         <translation>可见</translation>
     </message>
     <message>
-        <location filename="osm_frame_widget.cpp" line="414"/>
+        <location filename="osm_frame_widget.cpp" line="408"/>
         <source>save to image</source>
         <translation>保存到图像</translation>
     </message>
diff --git a/qtvplugin_geomarker/qtvplugin_geomarker_zh_CN.ts b/qtvplugin_geomarker/qtvplugin_geomarker_zh_CN.ts
index 5838655..3cd9bc8 100644
--- a/qtvplugin_geomarker/qtvplugin_geomarker_zh_CN.ts
+++ b/qtvplugin_geomarker/qtvplugin_geomarker_zh_CN.ts
@@ -310,10 +310,6 @@
         <source>Level Re-Coord %1 %%</source>
         <translation>正在重新计算坐标，完成 %1 %%</translation>
     </message>
-    <message>
-        <source>name, lat, lon must  exist in paraments.</source>
-        <translation></translation>
-    </message>
     <message>
         <source>name could not be empty.</source>
         <translation></translation>
@@ -322,10 +318,6 @@
         <source>can not create graphical object, the pointer is zero.</source>
         <translation></translation>
     </message>
-    <message>
-        <source>name, lat0, lon0,lat1,lon1 must  exist in paraments.</source>
-        <translation></translation>
-    </message>
     <message>
         <source>name must  exist in paraments.</source>
         <translation></translation>
@@ -442,5 +434,9 @@
         <source>mod is not valid in paraments. 0=display, 1=rect selection</source>
         <translation></translation>
     </message>
+    <message>
+        <source>Accept &quot;Hover&quot; Event(Slow!)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
-- 
GitLab