Browse Source

- Added a command line parameter --no-splash to disable splash screen

adaptive-webui-19844
Christophe Dumez 15 years ago
parent
commit
148d175ab0
  1. 1
      src/GUI.cpp
  2. 12
      src/main.cpp

1
src/GUI.cpp

@ -956,6 +956,7 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis @@ -956,6 +956,7 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
bool useTorrentAdditionDialog = settings.value(QString::fromUtf8("Preferences/Downloads/AdditionDialog"), true).toBool();
foreach(QString param, params) {
param = param.trimmed();
if(param.startsWith("--")) continue;
if(param.startsWith(QString::fromUtf8("http://"), Qt::CaseInsensitive) || param.startsWith(QString::fromUtf8("ftp://"), Qt::CaseInsensitive) || param.startsWith(QString::fromUtf8("https://"), Qt::CaseInsensitive)) {
BTSession->downloadFromUrl(param);
}else{

12
src/main.cpp

@ -116,6 +116,7 @@ void useStyle(QApplication *app, int style){ @@ -116,6 +116,7 @@ void useStyle(QApplication *app, int style){
int main(int argc, char *argv[]){
QFile file;
QString locale;
bool no_splash = false;
if(argc > 1){
if(QString::fromUtf8(argv[1]) == QString::fromUtf8("--version")){
std::cout << "qBittorrent " << VERSION << '\n';
@ -124,10 +125,14 @@ int main(int argc, char *argv[]){ @@ -124,10 +125,14 @@ 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";
std::cout << '\t' << argv[0] << " --no-splash : disable splash screen\n";
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;
}
if(QString::fromUtf8(argv[1]) == QString::fromUtf8("--no-splash")){
no_splash = true;
}
}
// Set environment variable
if(putenv((char*)"QBITTORRENT="VERSION)) {
@ -182,8 +187,11 @@ int main(int argc, char *argv[]){ @@ -182,8 +187,11 @@ int main(int argc, char *argv[]){
app = new QApplication(argc, argv);
useStyle(app, settings.value("Preferences/General/Style", 0).toInt());
app->setStyleSheet("QStatusBar::item { border-width: 0; }");
QSplashScreen *splash = new QSplashScreen(QPixmap(QString::fromUtf8(":/Icons/skin/splash.png")));
QSplashScreen *splash;
if(!no_splash) {
splash = new QSplashScreen(QPixmap(QString::fromUtf8(":/Icons/skin/splash.png")));
splash->show();
}
// Open options file to read locale
locale = settings.value(QString::fromUtf8("Preferences/General/Locale"), QString()).toString();
QTranslator translator;
@ -208,8 +216,10 @@ int main(int argc, char *argv[]){ @@ -208,8 +216,10 @@ int main(int argc, char *argv[]){
// Remove first argument (program name)
torrentCmdLine.removeFirst();
GUI *window = new GUI(0, torrentCmdLine);
if(!no_splash) {
splash->finish(window);
delete splash;
}
int ret = app->exec();
delete window;
delete app;

Loading…
Cancel
Save