--- Vago/trunk/Vago/mainwindow.cpp	2013/03/31 19:02:16	771
+++ Vago/trunk/Vago/mainwindow.cpp	2013/04/06 20:54:26	790
@@ -9,16 +9,22 @@ MainWindow::MainWindow(QWidget *parent)
 {
     ui->setupUi(this);
 
-    this->setWindowTitle("Vago v"+GlobalVars::AppVersion);
+    ui->pbConvertGeneral->setMinimumSize(ui->pbConvertGeneral->minimumSizeHint());
+    ui->pbConvertGeneral->setMinimumWidth(50);
+    ui->pbConvertGeneral->setMinimumHeight(ui->pbConvertGeneral->minimumHeight()*1.4);
+
+
 
-    // QTextCodec::setCodecForCStrings(QTextCodec::codecForLocale ());
+    qDebug() << ui->pbConvertGeneral->minimumHeight() << ui->pbConvertGeneral->minimumHeight();
 
-    if(!QFile::exists(QDir::currentPath()+"/"+GlobalVars::OniSplitExeName)){
+    this->setWindowTitle("Vago v"+GlobalVars::AppVersion);
+
+    if(!QFile::exists(QDir::currentPath()+"/"+GlobalVars::OniSplitString)){
         Util::showErrorPopUp("OniSplit not found. Please download it at "+GlobalVars::ModsDomain+" and put it in the same folder of Vago. \n\nProgram will now exit.");
         exit(1);
     }
 
-    if(!QFile::exists(QDir::currentPath()+"/"+GlobalVars::XmlToolsExeName)){
+    if(!QFile::exists(QDir::currentPath()+"/"+GlobalVars::XmlToolsString)){
         Util::showErrorPopUp("xmlTools not found. Please download it at "+GlobalVars::ModsDomain+" and put it in the same folder of Vago. \n\nProgram will now exit.");
         exit(1);
     }
@@ -41,7 +47,7 @@ MainWindow::MainWindow(QWidget *parent)
         QString aefolder=Util::normalizePath(QFileDialog::getExistingDirectory(this,"Choose Anniversary Edition (AE) folder..."));
 
         if(aefolder.isEmpty()){
-            Util::showErrorPopUp("AE folder is mandatory. Application will exit.");
+            Util::showErrorPopUp("AE folder is mandatory. Application will now exit.");
             exit(1);
         }
 
@@ -98,6 +104,7 @@ MainWindow::MainWindow(QWidget *parent)
     //Create a thread for do the conversion in background
     this->myConverter = new Converter(this->myLogger,this->listToProccess);
 
+    // User interface
     ui->mainToolBar->addWidget(ui->tbAE); //add ae installer launch button
     ui->mainToolBar->addWidget(ui->emptySpacerLabel); //trick, we can't add directly a space so we add an empty
     ui->mainToolBar->addWidget(ui->tbOni); //add oni launch buttonlabel
@@ -108,6 +115,20 @@ MainWindow::MainWindow(QWidget *parent)
 
     ui->mainToolBar->setLayoutDirection(Qt::RightToLeft);
 
+#ifdef Q_WS_MAC
+    // setUnifiedTitleAndToolBarOnMac(true); // Qt suggests to use it on mac | http://www.slideshare.net/qtbynokia/how-to-make-your-qt-app-look-native // align on left doesn't work if active
+    ui->tbOni->setIcon(QIcon(":/new/icons/oni_icon_mac.png")); // Oni executable on mac have a different icon than windows
+    // Set mac platform the first one in the menu, and also make it checkable by default
+    ui->menuTarget_Platform->removeAction(ui->actionWindows);
+    ui->menuTarget_Platform->addAction(ui->actionWindows);
+    ui->actionWindows->setChecked(false);
+    ui->actionMac_Windows_demo->setChecked(true);
+    // Hide file menu on mac (not needed)
+    ui->menuFile->hide();
+    ui->menuFile->close();
+    //ui->menuBar->macMenu();
+#endif
+
     connectSlots();
 
     //Commands Mapping
@@ -153,16 +174,18 @@ void MainWindow::on_tbOni_clicked()
 {
     QStringList arguments;
 
-    if(this->vagoSettings->value("OniWindow").toBool()){ //Run in a window?
+    if(this->vagoSettings->value("OniWindow").toBool()){ // Run in a window?
         arguments << "-noswitch";
     }
+#ifdef Q_WS_WIN
     else{
-        arguments << "-switch";
+        arguments << "-switch"; // only supported on windows. Was added by daodan dll.
     }
+#endif
 
-    arguments << " -debugfiles";
+    arguments << "-debugfiles";
 
-    if(!QProcess::startDetached(this->AeLocation+"/Oni.exe",arguments,this->AeLocation)){
+    if(!QProcess::startDetached(this->AeLocation+"/"+GlobalVars::OniExe,arguments,this->AeLocation)){
         showErrStatusMessage("Oni could not be started!");
     }
 }
@@ -171,7 +194,7 @@ void MainWindow::on_tbAE_clicked()
 {
     // If the app turn out someday to a native app use QProcess::startDetached instead...
 
-    if(!QDesktopServices::openUrl(this->AeLocation+"/AEInstaller/bin/AEInstaller2.jar")){
+    if(!QDesktopServices::openUrl("file:///"+this->AeLocation+"/AEInstaller/bin/AEInstaller2.jar")){
         showErrStatusMessage("Could not start AE Installer!");
     }
 }