--- Vago/trunk/Vago/mainwindow.cpp 2013/04/06 20:54:26 790 +++ Vago/trunk/Vago/mainwindow.cpp 2013/04/06 23:10:19 792 @@ -9,14 +9,6 @@ MainWindow::MainWindow(QWidget *parent) { ui->setupUi(this); - ui->pbConvertGeneral->setMinimumSize(ui->pbConvertGeneral->minimumSizeHint()); - ui->pbConvertGeneral->setMinimumWidth(50); - ui->pbConvertGeneral->setMinimumHeight(ui->pbConvertGeneral->minimumHeight()*1.4); - - - - qDebug() << ui->pbConvertGeneral->minimumHeight() << ui->pbConvertGeneral->minimumHeight(); - this->setWindowTitle("Vago v"+GlobalVars::AppVersion); if(!QFile::exists(QDir::currentPath()+"/"+GlobalVars::OniSplitString)){ @@ -115,6 +107,8 @@ MainWindow::MainWindow(QWidget *parent) ui->mainToolBar->setLayoutDirection(Qt::RightToLeft); + setConverterButtonsSize(); + #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 @@ -123,10 +117,6 @@ MainWindow::MainWindow(QWidget *parent) 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(); @@ -1492,6 +1482,19 @@ QString MainWindow::getCommand(DropTable } +/** + This is OS indepented. It maintain size ratio over the Windows and Mac. + **/ +void MainWindow::setConverterButtonsSize(){ + int height=ui->pbConvertGeneral->sizeHint().height()*1.3; + ui->pbConvertGeneral->setMinimumHeight(height); + ui->pbConvertTextures->setMinimumHeight(height); + ui->pbConvertModels->setMinimumHeight(height); + ui->pbConvertAnimations->setMinimumHeight(height); + ui->pbConvertLevels->setMinimumHeight(height); + ui->pbConvertMisc->setMinimumHeight(height); +} + void MainWindow::connectSlots(){ //This signal is for thread that is working setup the progress bar (make it visible and set it's min-max)