Improved internal API for version info.

[x264-launcher/x264-launcher.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 35b324a..839dda4 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -21,6 +21,7 @@
 
 #include "global.h"
 #include "win_main.h"
+#include "taskbar7.h"
 
 //Qt includes
 #include <QCoreApplication>
@@ -37,7 +38,7 @@ static int x264_main(int argc, char* argv[])
        x264_init_console(argc, argv);
 
        //Print version info
-       qDebug("Simple x264 Launcher v%u.%02u - use 64-Bit x264 with 32-Bit Avisynth", x264_version_major(), x264_version_minor());
+       qDebug("Simple x264 Launcher v%u.%02u.%u - use 64-Bit x264 with 32-Bit Avisynth", x264_version_major(), x264_version_minor(), x264_version_build());
        qDebug("Copyright (c) 2004-%04d LoRd_MuldeR <mulder2@gmx.de>. Some rights reserved.", qMax(x264_version_date().year(),QDate::currentDate().year()));
        qDebug("Built on %s at %s with %s for Win-%s.\n", x264_version_date().toString(Qt::ISODate).toLatin1().constData(), x264_version_time(), x264_version_compiler(), x264_version_arch());
        
@@ -67,9 +68,21 @@ static int x264_main(int argc, char* argv[])
        {
                return -1;
        }
+       
+       //Running in portable mode?
+       if(x264_portable())
+       {
+               qDebug("Application is running in portable mode!\n");
+       }
+
+       //Taskbar init
+       WinSevenTaskbar::init();
 
        //Set style
-       qApp->setStyle(new QPlastiqueStyle());
+       if(!qApp->arguments().contains("--no-style", Qt::CaseInsensitive))
+       {
+               qApp->setStyle(new QPlastiqueStyle());
+       }
 
        //Create Main Window
        MainWindow *mainWin = new MainWindow(&cpuFeatures);
@@ -77,6 +90,9 @@ static int x264_main(int argc, char* argv[])
 
        //Run application
        int ret = qApp->exec();
+
+       //Taskbar uninit
+       WinSevenTaskbar::init();
        
        X264_DELETE(mainWin);
        return ret;