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/src/images/georges_logo.icns.orig b/code/ryzom/tools/leveldesign/georges_editor_qt/src/images/georges_logo.icns.orig new file mode 100644 index 000000000..1417688db Binary files /dev/null and b/code/ryzom/tools/leveldesign/georges_editor_qt/src/images/georges_logo.icns.orig differ diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/images/georges_logo.png.orig b/code/ryzom/tools/leveldesign/georges_editor_qt/src/images/georges_logo.png.orig new file mode 100644 index 000000000..292941342 Binary files /dev/null and b/code/ryzom/tools/leveldesign/georges_editor_qt/src/images/georges_logo.png.orig differ 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()));