From 8907ae1601fac19f7eda09c67c8e307b30dce9cb Mon Sep 17 00:00:00 2001
From: aquiles <none@none>
Date: Sun, 12 Dec 2010 23:28:03 +0100
Subject: [PATCH] Changed: #1206 icon location; reinit timer on visible

---
 .../src/object_viewer_widget.cpp                    |   8 ++++++++
 .../object_viewer_widget/src/object_viewer_widget.h |   1 +
 .../{data => src/images}/georges_logo.icns          | Bin
 .../{data => src/images}/georges_logo.png           | Bin
 .../georges_editor_qt/src/main_window.cpp           |   4 ++--
 5 files changed, 11 insertions(+), 2 deletions(-)
 rename code/ryzom/tools/leveldesign/georges_editor_qt/{data => src/images}/georges_logo.icns (100%)
 rename code/ryzom/tools/leveldesign/georges_editor_qt/{data => src/images}/georges_logo.png (100%)

diff --git a/code/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.cpp b/code/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.cpp
index 430728cea..cf71ed01b 100644
--- a/code/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.cpp
+++ b/code/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.cpp
@@ -78,6 +78,14 @@ namespace NLQT
 
 	}
 
+	void CObjectViewerWidget::showEvent ( QShowEvent * event )
+	{
+		if (!_mainTimer->isActive()) 
+		{
+			_mainTimer->start(25);
+		}
+	}
+
 	void CObjectViewerWidget::setNelContext(NLMISC::INelContext &nelContext) 
 	{
 		_LibContext = new CLibraryContext(nelContext);
diff --git a/code/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.h b/code/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.h
index 8e3fb8be6..fd358f482 100644
--- a/code/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.h
+++ b/code/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.h
@@ -64,6 +64,7 @@ namespace NLQT
 		virtual ~CObjectViewerWidget();
 
 		virtual QPaintEngine* paintEngine() const { return NULL; }
+		virtual void showEvent ( QShowEvent * event );
 
 		void setNelContext(NLMISC::INelContext &nelContext);
 
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/data/georges_logo.icns b/code/ryzom/tools/leveldesign/georges_editor_qt/src/images/georges_logo.icns
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/data/georges_logo.icns
rename to code/ryzom/tools/leveldesign/georges_editor_qt/src/images/georges_logo.icns
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/data/georges_logo.png b/code/ryzom/tools/leveldesign/georges_editor_qt/src/images/georges_logo.png
similarity index 100%
rename from code/ryzom/tools/leveldesign/georges_editor_qt/data/georges_logo.png
rename to code/ryzom/tools/leveldesign/georges_editor_qt/src/images/georges_logo.png
diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/main_window.cpp b/code/ryzom/tools/leveldesign/georges_editor_qt/src/main_window.cpp
index e28948050..318272e01 100644
--- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/main_window.cpp
+++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/main_window.cpp
@@ -44,7 +44,7 @@ namespace NLQT
 		: QMainWindow(parent), _GeorgesLogDialog(0), _ObjectViewerDialog(0), 
 		_GeorgesDirTreeDialog(0),_emptyView(0)
 	{
-		setWindowTitle("Qt Georges Editor");
+		setWindowTitle("Georges Editor Qt");
 
 		setDockNestingEnabled(true);
 		setCentralWidget(0);
@@ -95,7 +95,7 @@ namespace NLQT
 		restoreGeometry(settings.value("QtWindowGeometry").toByteArray());
 		settings.endGroup();
 
-		setWindowIcon(QIcon(":/images/khead.png"));
+		setWindowIcon(QIcon(":/images/georges_logo.png"));
 
 		_statusBarTimer = new QTimer(this);
 		connect(_statusBarTimer, SIGNAL(timeout()), this, SLOT(updateStatusBar()));