mirror of
https://github.com/qbittorrent/qBittorrent
synced 2025-07-14 01:03:08 -07:00
- Edited project file in order not to compile UI classes when DISABLE_GUI is defined
- Added #ifndef directives to main.cpp in order to fix compilation when DISABLE_GUI is defined
This commit is contained in:
parent
0b7ca15c4f
commit
e2aaf5d1de
2 changed files with 123 additions and 88 deletions
51
src/main.cpp
51
src/main.cpp
|
@ -32,21 +32,27 @@
|
|||
#include <QLocale>
|
||||
#include <QTranslator>
|
||||
#include <QFile>
|
||||
#include <QSplashScreen>
|
||||
|
||||
#ifndef DIABLE_GUI
|
||||
#include <QSplashScreen>
|
||||
#include <QPlastiqueStyle>
|
||||
#include "qgnomelook.h"
|
||||
#include <QMotifStyle>
|
||||
#include <QCDEStyle>
|
||||
#ifdef Q_WS_WIN
|
||||
#include <QWindowsXPStyle>
|
||||
#endif
|
||||
#ifdef Q_WS_MAC
|
||||
#include <QMacStyle>
|
||||
#endif
|
||||
#include "GUI.h"
|
||||
#include "ico.h"
|
||||
#endif
|
||||
|
||||
#include <QSettings>
|
||||
#include <QLocalSocket>
|
||||
#include <unistd.h>
|
||||
#include <sys/types.h>
|
||||
#include <QPlastiqueStyle>
|
||||
#include "qgnomelook.h"
|
||||
#include <QMotifStyle>
|
||||
#include <QCDEStyle>
|
||||
#ifdef Q_WS_WIN
|
||||
#include <QWindowsXPStyle>
|
||||
#endif
|
||||
#ifdef Q_WS_MAC
|
||||
#include <QMacStyle>
|
||||
#endif
|
||||
#ifndef Q_WS_WIN
|
||||
#include <signal.h>
|
||||
#include <execinfo.h>
|
||||
|
@ -54,9 +60,7 @@
|
|||
#endif
|
||||
|
||||
#include <stdlib.h>
|
||||
#include "GUI.h"
|
||||
#include "misc.h"
|
||||
#include "ico.h"
|
||||
|
||||
QApplication *app;
|
||||
|
||||
|
@ -81,6 +85,7 @@ void sigabrtHandler(int) {
|
|||
}
|
||||
#endif
|
||||
|
||||
#ifndef DISABLE_GUI
|
||||
void useStyle(QApplication *app, int style){
|
||||
switch(style) {
|
||||
case 1:
|
||||
|
@ -113,13 +118,16 @@ void useStyle(QApplication *app, int style){
|
|||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
// Main
|
||||
int main(int argc, char *argv[]){
|
||||
QFile file;
|
||||
QString locale;
|
||||
QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
|
||||
#ifndef DISABLE_GUI
|
||||
bool no_splash = false;
|
||||
#endif
|
||||
if(argc > 1){
|
||||
if(QString::fromUtf8(argv[1]) == QString::fromUtf8("--version")){
|
||||
std::cout << "qBittorrent " << VERSION << '\n';
|
||||
|
@ -128,18 +136,24 @@ int main(int argc, char *argv[]){
|
|||
if(QString::fromUtf8(argv[1]) == QString::fromUtf8("--help")){
|
||||
std::cout << "Usage: \n";
|
||||
std::cout << '\t' << argv[0] << " --version : displays program version\n";
|
||||
#ifndef DISABLE_GUI
|
||||
std::cout << '\t' << argv[0] << " --no-splash : disable splash screen\n";
|
||||
#endif
|
||||
std::cout << '\t' << argv[0] << " --help : displays this help message\n";
|
||||
std::cout << '\t' << argv[0] << " [files or urls] : starts program and download given parameters (optional)\n";
|
||||
return 0;
|
||||
}
|
||||
#ifndef DISABLE_GUI
|
||||
if(QString::fromUtf8(argv[1]) == QString::fromUtf8("--no-splash")){
|
||||
no_splash = true;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
#ifndef DISABLE_GUI
|
||||
if(settings.value(QString::fromUtf8("Preferences/General/NoSplashScreen"), false).toBool()) {
|
||||
no_splash = true;
|
||||
}
|
||||
#endif
|
||||
// Set environment variable
|
||||
if(putenv((char*)"QBITTORRENT="VERSION)) {
|
||||
std::cerr << "Couldn't set environment variable...\n";
|
||||
|
@ -173,6 +187,7 @@ int main(int argc, char *argv[]){
|
|||
return 0;
|
||||
}
|
||||
app = new QApplication(argc, argv);
|
||||
#ifndef DISABLE_GUI
|
||||
useStyle(app, settings.value("Preferences/General/Style", 0).toInt());
|
||||
app->setStyleSheet("QStatusBar::item { border-width: 0; }");
|
||||
QSplashScreen *splash = 0;
|
||||
|
@ -180,6 +195,7 @@ int main(int argc, char *argv[]){
|
|||
splash = new QSplashScreen(QPixmap(QString::fromUtf8(":/Icons/skin/splash.png")));
|
||||
splash->show();
|
||||
}
|
||||
#endif
|
||||
// Open options file to read locale
|
||||
locale = settings.value(QString::fromUtf8("Preferences/General/Locale"), QString()).toString();
|
||||
QTranslator translator;
|
||||
|
@ -194,7 +210,9 @@ int main(int argc, char *argv[]){
|
|||
}
|
||||
app->installTranslator(&translator);
|
||||
app->setApplicationName(QString::fromUtf8("qBittorrent"));
|
||||
#ifndef DISABLE_GUI
|
||||
app->setQuitOnLastWindowClosed(false);
|
||||
#endif
|
||||
#ifndef Q_WS_WIN
|
||||
signal(SIGABRT, sigabrtHandler);
|
||||
signal(SIGTERM, sigtermHandler);
|
||||
|
@ -204,14 +222,21 @@ int main(int argc, char *argv[]){
|
|||
QStringList torrentCmdLine = app->arguments();
|
||||
// Remove first argument (program name)
|
||||
torrentCmdLine.removeFirst();
|
||||
#ifndef DISABLE_GUI
|
||||
GUI *window = new GUI(0, torrentCmdLine);
|
||||
if(!no_splash) {
|
||||
splash->finish(window);
|
||||
delete splash;
|
||||
}
|
||||
#else
|
||||
// Load Headless class
|
||||
// TODO: by Frederic Lassabe
|
||||
#endif
|
||||
int ret = app->exec();
|
||||
#ifndef DISABLE_GUI
|
||||
delete window;
|
||||
qDebug("GUI was deleted!");
|
||||
#endif
|
||||
qDebug("Deleting app...");
|
||||
delete app;
|
||||
qDebug("App was deleted! All good.");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue