parent
ac5498990b
commit
241bec54ad
17
main.cpp
17
main.cpp
@ -14,6 +14,7 @@
|
|||||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
|
#include <QCommandLineParser>
|
||||||
#include <QFuture>
|
#include <QFuture>
|
||||||
#include <QFutureWatcher>
|
#include <QFutureWatcher>
|
||||||
#include <QtConcurrent/QtConcurrentRun>
|
#include <QtConcurrent/QtConcurrentRun>
|
||||||
@ -32,7 +33,14 @@ int main(int argc, char *argv[])
|
|||||||
QDir dir;
|
QDir dir;
|
||||||
if(argc >= 2)
|
if(argc >= 2)
|
||||||
{
|
{
|
||||||
configDirectoryPath = QCoreApplication::arguments().at(1);
|
QCommandLineParser parser;
|
||||||
|
parser.addOptions({
|
||||||
|
{"new-instance", "Launch a new instance, ignoring any running ones"},
|
||||||
|
{"config", "Use supplied config dir instead of default"},
|
||||||
|
});
|
||||||
|
parser.addHelpOption();
|
||||||
|
parser.process(app.arguments());
|
||||||
|
configDirectoryPath = parser.value("config");
|
||||||
if(!dir.exists(configDirectoryPath))
|
if(!dir.exists(configDirectoryPath))
|
||||||
{
|
{
|
||||||
QMessageBox::warning(nullptr, "Directory not found", configDirectoryPath + " was not found");
|
QMessageBox::warning(nullptr, "Directory not found", configDirectoryPath + " was not found");
|
||||||
@ -45,12 +53,12 @@ int main(int argc, char *argv[])
|
|||||||
}
|
}
|
||||||
qRegisterMetaType<QVector<QString>>("QVector<QString>");
|
qRegisterMetaType<QVector<QString>>("QVector<QString>");
|
||||||
|
|
||||||
|
|
||||||
if(!dir.exists(configDirectoryPath))
|
if(!dir.exists(configDirectoryPath))
|
||||||
{
|
{
|
||||||
if(!dir.mkdir(configDirectoryPath))
|
if(!dir.mkdir(configDirectoryPath))
|
||||||
{
|
{
|
||||||
QMessageBox::warning(nullptr, "Failed to create dir", configDirectoryPath + " was not found and could not be created!");
|
QMessageBox::warning(nullptr, "Failed to create dir",
|
||||||
|
configDirectoryPath + " was not found and could not be created!");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -91,10 +99,7 @@ int main(int argc, char *argv[])
|
|||||||
});
|
});
|
||||||
w->showMaximized();
|
w->showMaximized();
|
||||||
w->focusInput();
|
w->focusInput();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return app.exec();
|
return app.exec();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user