kiwix/kiwix-desktop
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-desktop.git synced 2025-09-22 03:26:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make the KiwixApp responsible to create the MainWindow.

Browse Source
This commit is contained in:
Matthieu Gautier 2018-07-17 11:34:06 +02:00
parent 4c8996d95b
commit 12a2a3c036
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kiwixapp.cpp
View File

@ -5,10 +5,14 @@ KiwixApp::KiwixApp(int& argc, char *argv[])
: QApplication(argc, argv), : QApplication(argc, argv),
reader(nullptr) reader(nullptr)
{ {
mainWindow = new MainWindow;
setApplicationName("kiwix-desktop");
mainWindow->show();
} }
KiwixApp::~KiwixApp() KiwixApp::~KiwixApp()
{ {
delete mainWindow;
if (reader) if (reader)
delete reader; delete reader;
} }

2
kiwixapp.h
View File

@ -6,6 +6,7 @@
#include <QApplication> #include <QApplication>
#include <kiwix/reader.h> #include <kiwix/reader.h>
#include "mainwindow.h"
class KiwixApp : public QApplication class KiwixApp : public QApplication
@ -20,6 +21,7 @@ public:
private: private:
kiwix::Reader* reader; kiwix::Reader* reader;
MainWindow* mainWindow;
}; };
#endif // KIWIXAPP_H #endif // KIWIXAPP_H

4
main.cpp
View File

@ -1,5 +1,4 @@
#include "kiwixapp.h" #include "kiwixapp.h"
#include "mainwindow.h"
#include <QCommandLineParser> #include <QCommandLineParser>
#include <QFileDialog> #include <QFileDialog>
@ -8,7 +7,6 @@
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KiwixApp a(argc, argv); KiwixApp a(argc, argv);
KiwixApp::setApplicationName("kiwix-desktop");
QCommandLineParser parser; QCommandLineParser parser;
parser.addPositionalArgument("zimfile", "The zim file"); parser.addPositionalArgument("zimfile", "The zim file");
@ -27,8 +25,6 @@ int main(int argc, char *argv[])
std::string f = zimfile.toUtf8().constData(); std::string f = zimfile.toUtf8().constData();
std::cout << f << std::endl; std::cout << f << std::endl;
MainWindow w;
w.show();
a.openZimFile(zimfile); a.openZimFile(zimfile);
return a.exec(); return a.exec();