-
Notifications
You must be signed in to change notification settings - Fork 235
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #13 from amorilia/release/1.1.3
Preparing 1.1.3 release.
- Loading branch information
Showing
13 changed files
with
305 additions
and
113 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
1.1.2 | ||
1.1.3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule docsys
updated
from 52bbd8 to cf4459
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
#include "about_dialog.h" | ||
|
||
AboutDialog::AboutDialog(QWidget *parent) | ||
: QDialog(parent) { | ||
ui.setupUi(this); | ||
#ifdef NIFSKOPE_REVISION | ||
this->setWindowTitle( tr("About NifSkope %1 (revision %2)").arg(NIFSKOPE_VERSION).arg(NIFSKOPE_REVISION) ); | ||
#else | ||
this->setWindowTitle( tr("About NifSkope %1").arg(NIFSKOPE_VERSION) ); | ||
#endif | ||
QString text = tr( | ||
"<p>NifSkope is a tool for analyzing and editing NetImmerse/Gamebryo '.nif' files.</p>" | ||
"<p>NifSkope is based on NifTool's XML file format specification. " | ||
"For more information visit our site at <a href='http://niftools.sourceforge.net'>http://niftools.sourceforge.net</a></p>" | ||
"<p>NifSkope is free software available under a BSD license. " | ||
"The source is available via <a href='http://niftools.git.sourceforge.net/git/gitweb.cgi?p=niftools/nifskope'>git</a> " | ||
"(<a href='git://niftools.git.sourceforge.net/gitroot/niftools/nifskope'>clone</a>) on <a href='http://sourceforge.net'>SourceForge</a>. " | ||
"Instructions on compiling NifSkope are available on the <a href='http://niftools.sourceforge.net/wiki/NifSkope/Compile'>NifTools wiki</a>.</p>" | ||
"<p>The most recent version of NifSkope can always be downloaded from the <a href='https://sourceforge.net/projects/niftools/files/nifskope/'>" | ||
"NifTools SourceForge Project page</a>.</p>" | ||
// only the windows build uses havok | ||
// (Q_OS_WIN32 is also defined on win64) | ||
#ifdef Q_OS_WIN32 | ||
"<center><img src=':/img/havok_logo' /></center>" | ||
"<p>NifSkope uses Havok(R) for the generation of mopp code. " | ||
"(C)Copyright 1999-2008 Havok.com Inc. (and its Licensors). " | ||
"All Rights Reserved. " | ||
"See <a href='http://www.havok.com'>www.havok.com</a> for details.</p>" | ||
#endif | ||
"<center><img src=':/img/qhull_logo' /></center>" | ||
"<p>NifSkope uses Qhull for the generation of convex hulls. " | ||
"Copyright(c) 1993-2010 C.B. Barber and The Geometry Center. " | ||
"Qhull is free software and may be obtained from <a href='http://www.qhull.org'>www.qhull.org</a>. " | ||
"See Qhull_COPYING.txt for details." | ||
); | ||
ui.text->setText(text); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
#ifndef ABOUT_H | ||
#define ABOUT_H | ||
|
||
#include "ui_about_dialog.h" | ||
|
||
class AboutDialog : public QDialog { | ||
Q_OBJECT | ||
|
||
public: | ||
AboutDialog(QWidget *parent = 0); | ||
|
||
private: | ||
Ui::AboutDialog ui; | ||
}; | ||
|
||
|
||
#endif // ABOUT_H |
Oops, something went wrong.