Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #1206 icon location; reinit timer on visible

Browse source
This commit is contained in:
aquiles 2010-12-19 16:50:38 +01:00
parent cd381d6bf5
commit 3ce6514c26
5 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
code/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.cpp
View file

@ -78,6 +78,14 @@ namespace NLQT
} }
void CObjectViewerWidget::showEvent ( QShowEvent * event )
{
if (!_mainTimer->isActive())
{
_mainTimer->start(25);
}
}
void CObjectViewerWidget::setNelContext(NLMISC::INelContext &nelContext) void CObjectViewerWidget::setNelContext(NLMISC::INelContext &nelContext)
{ {
_LibContext = new CLibraryContext(nelContext); _LibContext = new CLibraryContext(nelContext);

1
code/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.h
View file

@ -64,6 +64,7 @@ namespace NLQT
virtual ~CObjectViewerWidget(); virtual ~CObjectViewerWidget();
virtual QPaintEngine* paintEngine() const { return NULL; } virtual QPaintEngine* paintEngine() const { return NULL; }
virtual void showEvent ( QShowEvent * event );
void setNelContext(NLMISC::INelContext &nelContext); void setNelContext(NLMISC::INelContext &nelContext);

BIN
code/ryzom/tools/leveldesign/georges_editor_qt/src/images/georges_logo.icns.orig Normal file
View file

Binary file not shown.

BIN
code/ryzom/tools/leveldesign/georges_editor_qt/src/images/georges_logo.png.orig Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 779 KiB

4
code/ryzom/tools/leveldesign/georges_editor_qt/src/main_window.cpp
View file

@ -44,7 +44,7 @@ namespace NLQT
: QMainWindow(parent), _GeorgesLogDialog(0), _ObjectViewerDialog(0), : QMainWindow(parent), _GeorgesLogDialog(0), _ObjectViewerDialog(0),
_GeorgesDirTreeDialog(0),_emptyView(0) _GeorgesDirTreeDialog(0),_emptyView(0)
{ {
setWindowTitle("Qt Georges Editor"); setWindowTitle("Georges Editor Qt");
setDockNestingEnabled(true); setDockNestingEnabled(true);
setCentralWidget(0); setCentralWidget(0);
@ -95,7 +95,7 @@ namespace NLQT
restoreGeometry(settings.value("QtWindowGeometry").toByteArray()); restoreGeometry(settings.value("QtWindowGeometry").toByteArray());
settings.endGroup(); settings.endGroup();
setWindowIcon(QIcon(":/images/khead.png")); setWindowIcon(QIcon(":/images/georges_logo.png"));
_statusBarTimer = new QTimer(this); _statusBarTimer = new QTimer(this);
connect(_statusBarTimer, SIGNAL(timeout()), this, SLOT(updateStatusBar())); connect(_statusBarTimer, SIGNAL(timeout()), this, SLOT(updateStatusBar()));