diff --git a/cchapter.cpp b/cchapter.cpp index 1b2e3a5..1347c33 100644 --- a/cchapter.cpp +++ b/cchapter.cpp @@ -119,6 +119,9 @@ cChapter* cChapterList::add(const qint32& iID) cChapter* cChapterList::find(const qint32& iID) { + if(iID == -1) + return(0); + for(int x = 0;x < count();x++) { if(at(x)->id() == iID) diff --git a/fonts/Tahu!.ttf b/fonts/Tahu!.ttf new file mode 100644 index 0000000..2b3dc31 Binary files /dev/null and b/fonts/Tahu!.ttf differ diff --git a/images/splash.png b/images/splash.png index 379e681..c973cf2 100644 Binary files a/images/splash.png and b/images/splash.png differ diff --git a/main.cpp b/main.cpp index 959b5d7..a3ca75d 100644 --- a/main.cpp +++ b/main.cpp @@ -16,13 +16,14 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); -// QPixmap pixmap(":/images/splash.png"); - QPixmap pixmap(":/images/splashEmpty.png"); + QPixmap pixmap(":/images/splash.png"); +// QPixmap pixmap(":/images/splashEmpty.png"); cSplashScreen* lpSplash = new cSplashScreen(pixmap); // int id = QFontDatabase::addApplicationFont(":/fonts/Stingray.otf"); // int id = QFontDatabase::addApplicationFont(":/fonts/Luna.ttf"); // int id = QFontDatabase::addApplicationFont(":/fonts/Tomatoes.ttf"); - int id = QFontDatabase::addApplicationFont(":/fonts/BiggerLove.ttf"); +// int id = QFontDatabase::addApplicationFont(":/fonts/BiggerLove.ttf"); + int id = QFontDatabase::addApplicationFont(":/fonts/Tahu!.ttf"); QString family = QFontDatabase::applicationFontFamilies(id).at(0); QFont splashFont(family); diff --git a/resources/splash.png b/resources/splash.png new file mode 100644 index 0000000..379e681 Binary files /dev/null and b/resources/splash.png differ diff --git a/resources/splash.psd b/resources/splash.psd new file mode 100644 index 0000000..c3f8d09 Binary files /dev/null and b/resources/splash.psd differ diff --git a/storyWriter.pro b/storyWriter.pro index 8826d9d..132353d 100644 --- a/storyWriter.pro +++ b/storyWriter.pro @@ -130,7 +130,9 @@ FORMS += \ ccharacterselectdialog.ui DISTFILES += \ - Doxyfile + Doxyfile \ + resources/splash.png \ + resources/splash.psd RESOURCES += \ storywriter.qrc diff --git a/storywriter.qrc b/storywriter.qrc index fd575b0..ad63616 100644 --- a/storywriter.qrc +++ b/storywriter.qrc @@ -44,5 +44,6 @@ fonts/Luna.ttf fonts/Tomatoes.ttf images/splashEmpty.png + fonts/Tahu!.ttf