Index: /Vago/trunk/Vago/Vago.pro.user =================================================================== --- /Vago/trunk/Vago/Vago.pro.user (revision 791) +++ /Vago/trunk/Vago/Vago.pro.user (revision 792) @@ -1,5 +1,5 @@ - + Index: /Vago/trunk/Vago/main.cpp =================================================================== --- /Vago/trunk/Vago/main.cpp (revision 791) +++ /Vago/trunk/Vago/main.cpp (revision 792) @@ -1,3 +1,3 @@ -#define USING_VM_TABLET_WARNING_FIX // Comment this line if not using a mac vm +//#define USING_VM_TABLET_WARNING_FIX // Comment this line if not using a mac vm #ifdef USING_VM_TABLET_WARNING_FIX Index: /Vago/trunk/Vago/mainwindow.cpp =================================================================== --- /Vago/trunk/Vago/mainwindow.cpp (revision 791) +++ /Vago/trunk/Vago/mainwindow.cpp (revision 792) @@ -9,10 +9,4 @@ { 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); @@ -114,4 +108,6 @@ 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 @@ -122,8 +118,4 @@ 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 @@ -1491,4 +1483,17 @@ } +/** + 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(){ Index: /Vago/trunk/Vago/mainwindow.h =================================================================== --- /Vago/trunk/Vago/mainwindow.h (revision 791) +++ /Vago/trunk/Vago/mainwindow.h (revision 792) @@ -210,4 +210,5 @@ void changeToCurrentSettings(QList rows, DropTableWidget* myTable); //change some rows to the current settings void changeItemsOutput(DropTableWidget* myTable, QList rows, QString newOutput); + void setConverterButtonsSize(); QString getFileOutputFolder(QString fromTo, QString myOutputFolder=""); QString fileParsingGeneral(QString myOutputFolder, QString from, QString to , QString file); Index: /Vago/trunk/Vago/mainwindow.ui =================================================================== --- /Vago/trunk/Vago/mainwindow.ui (revision 791) +++ /Vago/trunk/Vago/mainwindow.ui (revision 792) @@ -333,10 +333,6 @@ - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Extract an ONCC with another character's TRAM</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">For example extract Konoko's ONCC with Muro's TRAM</span></p></body></html> + Extract an ONCC with another character's TRAM +For example extract Konoko's ONCC with Muro's TRAM @@ -357,10 +353,4 @@ - - - 0 - 0 - - Convert @@ -590,10 +580,6 @@ - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Used for reflection in armors. The armor texture has an alpha channel which is transparent and the envmap texture is shown.</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">It's the name of a TXMP.oni file, don't include the extension.</span></p></body></html> + Used for reflection in armors. The armor texture has an alpha channel which is transparent and the envmap texture is shown. +It's the name of a TXMP.oni file, don't include the extension. @@ -608,10 +594,6 @@ - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Used for reflection in armors. The armor texture has an alpha channel which is transparent and the envmap texture is shown.</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">It's the name of a TXMP.oni file, don't include the extension.</span></p></body></html> + Used for reflection in armors. The armor texture has an alpha channel which is transparent and the envmap texture is shown. +It's the name of a TXMP.oni file, don't include the extension. @@ -804,11 +786,7 @@ - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Extract the model with a specific animation. </span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">If none inputted (and checkbox is selected) it will search for one at ONCC&gt;TRAC.</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">It's the name of a TRAM.oni file, don't include the extension.</span></p></body></html> + Extract the model with a specific animation. +If none inputted (and checkbox is selected) it will search for one at ONCC>TRAC. +It's the name of a TRAM.oni file, don't include the extension. @@ -823,11 +801,7 @@ - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Extract the model with a specific animation. </span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">If none inputted (and checkbox is selected) it will search for one at </span><span style=" font-weight:600;">ONCC&gt;TRAC.</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">It's the name of a TRAM.oni file, don't include the extension.</span></p></body></html> + Extract the model with a specific animation. +If none inputted (and checkbox is selected) it will search for one at ONCC>TRAC. +It's the name of a TRAM.oni file, don't include the extension. @@ -842,10 +816,6 @@ - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Give model a texture.</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">It's the name of a TXMP.oni file, don't include the extension.</span></p></body></html> + Give model a texture. +It's the name of a TXMP.oni file, don't include the extension. @@ -860,10 +830,6 @@ - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Give model a texture. </span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">It's the name of a TXMP.oni file, don't include the extension.</span></p></body></html> + Give model a texture. +It's the name of a TXMP.oni file, don't include the extension. @@ -1276,9 +1242,5 @@ - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Use &quot;space&quot; as separator for each file</span></p></body></html> + Use "space" as separator for each file @@ -1293,9 +1255,5 @@ - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Generate pathfinding grids (master xml generates them automatically). Needs Bnv source.</span></p></body></html> + Generate pathfinding grids (master xml generates them automatically). Needs Bnv source. Index: /Vago/trunk/Vago/packageWizard/packagepage2.ui =================================================================== --- /Vago/trunk/Vago/packageWizard/packagepage2.ui (revision 791) +++ /Vago/trunk/Vago/packageWizard/packagepage2.ui (revision 792) @@ -7,6 +7,6 @@ 0 0 - 400 - 408 + 451 + 478 @@ -20,21 +20,18 @@ WizardPage - - + + + QFormLayout::FieldsStayAtSizeHint + + + + + Mod Name: + + + + - - - - 84 - 0 - - - - Mod Name: - - - - @@ -48,20 +45,14 @@ - + + + + Author(s): + + + + - - - - 84 - 0 - - - - Author(s): - - - - @@ -75,20 +66,14 @@ - + + + + Version: + + + + - - - - 84 - 0 - - - - Version: - - - - @@ -102,19 +87,13 @@ - - - - - - - 84 - 0 - - - - Description: - - - + + + + Description: + + + + + @@ -136,85 +115,69 @@ - - - - - - - 0 - 0 - - - - - 84 - 0 - - - - Type: - - - - - - - - Weapons - - - - - Characters - - - - - Particles - - - - - Animations (non-combat) - - - - - Animations (combat) - - - - - Sounds - - - - - User Interface - - - - - New Levels - - - - - Scenarios - - - - - - - + + + + Type: + + + + + + + + Weapons + + + + + Characters + + + + + Particles + + + + + Animations (non-combat) + + + + + Animations (combat) + + + + + Sounds + + + + + User Interface + + + + + New Levels + + + + + Scenarios + + + + + + + + Package Number: + + + + - - - - Package Number: - - - @@ -236,25 +199,13 @@ - + + + + Scripts: + + + + - - - - - 0 - 0 - - - - - 84 - 0 - - - - Scripts: - - - @@ -290,23 +241,29 @@ - + + + + <html><span style=" color:#0000ff;">* Fields read only by AEI2 when the package isn't at the mod depot.</span></html> + + + true + + + + Qt::Vertical + + QSizePolicy::Expanding + 20 - 40 + 10 - - - - - <html><span style=" color:#0000ff;">* Fields read only by AEI2 when the package isn't at the mod depot.</span></html> - - Index: /Vago/trunk/Vago/packageWizard/packagepage3.ui =================================================================== --- /Vago/trunk/Vago/packageWizard/packagepage3.ui (revision 791) +++ /Vago/trunk/Vago/packageWizard/packagepage3.ui (revision 792) @@ -8,5 +8,5 @@ 0 364 - 290 + 203 @@ -14,103 +14,82 @@ WizardPage - - - - - - - - 113 - 0 - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + + + QFormLayout::FieldsStayAtSizeHint + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">If this package use new levels, specify its number to get them unlocked automatically</span></p></body></html> + + + Unlock Levels: + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">If this package use new levels, specify its number to get them unlocked automatically</span></p></body></html> + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Fill with the packages number which this package will depend</span></p></body></html> - - - Dependent Packages: - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + + + Dependent Packages: + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Fill with the packages number which this package will depend</span></p></body></html> - - - - + + - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Fill with the packages number that will conflict with this package</span></p></body></html> - - - Incompatible Packages: - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + + + Incompatible Packages: + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Fill with the packages number that will conflict with this package</span></p></body></html> - - - - - - - - - - - - 113 - 0 - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">If this package use new levels, specify its number to get them unlocked automatically</span></p></body></html> - - - Unlock Levels: - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">If this package use new levels, specify its number to get them unlocked automatically</span></p></body></html> - - - - + + Index: /Vago/trunk/Vago/packageWizard/packagepagefinal.ui =================================================================== --- /Vago/trunk/Vago/packageWizard/packagepagefinal.ui (revision 791) +++ /Vago/trunk/Vago/packageWizard/packagepagefinal.ui (revision 792) @@ -7,5 +7,5 @@ 0 0 - 427 + 595 300 @@ -22,4 +22,7 @@ After that you can upload the package to <a href="www.mods.oni2.net">mods.oni2.net</a> to get your mod listed in the AEI. </html> + + + true Index: /Vago/trunk/Vago/soundWizard/soundpage4.ui =================================================================== --- /Vago/trunk/Vago/soundWizard/soundpage4.ui (revision 791) +++ /Vago/trunk/Vago/soundWizard/soundpage4.ui (revision 792) @@ -17,5 +17,5 @@ OSBD.grp file properties - + @@ -143,5 +143,5 @@ Audio Channels - +