Index: Vago/trunk/Vago/Vago.pro =================================================================== --- Vago/trunk/Vago/Vago.pro (revision 789) +++ Vago/trunk/Vago/Vago.pro (revision 790) @@ -13,7 +13,15 @@ INCLUDEPATH += ./soundWizard +macx { +LIBS += -lz # for mac support zipping (thanks edt!) +ICON = vago_icon.icns # mac os icon +} + +win32 { +RC_FILE = icon_resource.rc #for windows explorer icon +} + TARGET = Vago TEMPLATE = app -RC_FILE = icon_resource.rc #for windows explorer icon SOURCES += \ Index: Vago/trunk/Vago/Vago.pro.user =================================================================== --- Vago/trunk/Vago/Vago.pro.user (revision 789) +++ Vago/trunk/Vago/Vago.pro.user (revision 790) @@ -1,5 +1,5 @@ - + @@ -57,5 +57,5 @@ 0 - ProjectExplorer.ToolChain.Mingw:C:/MinGW/bin/g++.exe.x86-windows-msys-pe-32bit.C:/QtSDK/pythongdb/python_2.7based/gdb-i686-pc-mingw32.exe + ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit./usr/bin/gdb @@ -98,14 +98,14 @@ false - Qt 4.8.1 for Desktop - MinGW (Qt SDK) Debug + Qt 4.8.4 in PATH (System) Debug Qt4ProjectManager.Qt4BuildConfiguration 2 - C:/Users/home/qtWorkspace/Vago-build-desktop-Qt_4_8_1_for_Desktop_-_MinGW__Qt_SDK__Debug - 5 + /Users/home/Documents/Vago-build-desktop-Qt_4_8_4_in_PATH__System__Debug + 1 true - ProjectExplorer.ToolChain.Mingw:C:/MinGW/bin/g++.exe.x86-windows-msys-pe-32bit.C:/QtSDK/pythongdb/python_2.7based/gdb-i686-pc-mingw32.exe + ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit./usr/bin/gdb @@ -148,113 +148,13 @@ false - Qt 4.8.1 for Desktop - MinGW (Qt SDK) Release + Qt 4.8.4 in PATH (System) Release Qt4ProjectManager.Qt4BuildConfiguration 0 - C:/Users/home/qtWorkspace/Vago-build-desktop-Qt_4_8_1_for_Desktop_-_MinGW__Qt_SDK__Release - 5 + /Users/home/Documents/Vago-build-desktop-Qt_4_8_4_in_PATH__System__Release + 1 true - - INVALID - - - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - - - Make - - Qt4ProjectManager.MakeStep - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - Make - - Qt4ProjectManager.MakeStep - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Qt 4.8.0 for Desktop - MinGW (Qt SDK) Debug - - Qt4ProjectManager.Qt4BuildConfiguration - 2 - C:/Users/home/qtWorkspace/Vago-build-desktop-Qt_4_8_0_for_Desktop_-_MinGW__Qt_SDK__Debug - -1 - true - - - INVALID - - - qmake - - QtProjectManager.QMakeBuildStep - false - true - - false - - - Make - - Qt4ProjectManager.MakeStep - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - Make - - Qt4ProjectManager.MakeStep - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Qt 4.8.0 for Desktop - MinGW (Qt SDK) Release - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - C:/Users/home/qtWorkspace/Vago-build-desktop-Qt_4_8_0_for_Desktop_-_MinGW__Qt_SDK__Release - -1 - true - - 4 + 2 @@ -342,5 +242,5 @@ false - + /Users/home/Documents/Vago-build-desktop-Qt_4_8_4_in_PATH__System__Debug/ 3768 true @@ -357,5 +257,5 @@ ProjectExplorer.Project.Updater.EnvironmentId - {d1d804e5-7180-479f-b853-a9ffac018cf5} + {c927f4d0-f522-4805-a789-6ae5ac6f06ca} Index: Vago/trunk/Vago/about.cpp =================================================================== --- Vago/trunk/Vago/about.cpp (revision 789) +++ Vago/trunk/Vago/about.cpp (revision 790) @@ -10,5 +10,30 @@ this->layout()->setSizeConstraint( QLayout::SetFixedSize ); //fixed size ui->lbAbout->setOpenExternalLinks(true); //allow navigate to oni central - ui->lbAbout->setText(ui->lbAbout->text().replace("Vago GUI","Vago GUI "+GlobalVars::AppVersion)); + ui->lbAbout->setText("" + "Vago GUI "+GlobalVars::AppVersion+"" + "

" + "Written by s10k

" + "Thanks to:
" + "Neo for OniSplit
" + "EdT for testing, suggestions and icon
" + "demos_kratos for original OniSplit GUI
" + "Samer/Mukade/EdT for allow me to use Jubei as icon
" + "Alloc for AIE2 and support
" + "Paradox for Sound excel plugin and documentation
" + "Wiki contributors for the documentation
" + "AE contributors
" + "and in general to all OniCentral Community

" + "Also thanks to:
" + "StackOverflow Community
" + "Fabrizio Angius for PKZIP 2.0 for zip handling
" + "smashingmagazine for the folder icon :)
" + "

" + "Visit us at:
" + "" + "oni.bungie.org" + "
" + "" + "

" + ""); // Don't use rich text in qtdesigner because it generates platform dependent code } Index: Vago/trunk/Vago/about.ui =================================================================== --- Vago/trunk/Vago/about.ui (revision 789) +++ Vago/trunk/Vago/about.ui (revision 790) @@ -7,6 +7,6 @@ 0 0 - 515 - 369 + 600 + 400 @@ -53,19 +53,30 @@ - <!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:9pt; font-weight:600;">Vago GUI</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;"><br />Written by s10k</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;"><br />Thanks to:</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;">Neo for OniSplit<br />EdT for testing, suggestions and icon </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;">demos_kratos for original OniSplit GUI</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;">Samer/Mukade/EdT for allow me to use Jubei as icon</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;">Alloc for AIE2 and support</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;">Paradox for Sound excel plugin and documentation<br />Wiki</span><span style=" font-size:8pt; font-weight:600;"> </span><span style=" font-size:8pt;">contributors for the documentation <br />AE</span><span style=" font-size:8pt; font-weight:600;"> </span><span style=" font-size:8pt;">contributors<br />and in general to</span><span style=" font-size:8pt; font-weight:600;"> </span><span style=" font-size:8pt;">all OniCentral Community</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;"><br />Also thanks to: <br />StackOverflow</span><span style=" font-size:8pt; font-weight:600;"> </span><span style=" font-size:8pt;">Community</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;">Fabrizio</span><span style=" font-size:8pt; font-weight:600;"> </span><span style=" font-size:8pt;">Angius for PKZIP 2.0 for zip handling<br />smashingmagazine for the folder icon :)<br /><br /></span></p> -<p align="center" 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;">Visit us at:<br /></span><a href="http://oni.bungie.org"><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">oni.bungie.org</span></a></p></body></html> + <html> +<b>Vago GUI</b> +<p style="font-size:small;"> +Written by s10k<br /><br/> +Thanks to:<br/> +Neo for OniSplit<br /> +EdT for testing, suggestions and icon<br /> +demos_kratos for original OniSplit GUI<br /> +Samer/Mukade/EdT for allow me to use Jubei as icon<br /> +Alloc for AIE2 and support<br /> +Paradox for Sound excel plugin and documentation<br /> +Wiki contributors for the documentation<br /> +AE contributors<br /> +and in general to all OniCentral Community<br /><br/> +Also thanks to: <br /> +StackOverflow Community<br /> +Fabrizio Angius for PKZIP 2.0 for zip handling<br /> +smashingmagazine for the folder icon :)<br /> +<center> +Visit us at:<br /> +<a href="http://oni.bungie.org"> +oni.bungie.org +</center> +</a> +</p> +</html> Index: Vago/trunk/Vago/main.cpp =================================================================== --- Vago/trunk/Vago/main.cpp (revision 789) +++ Vago/trunk/Vago/main.cpp (revision 790) @@ -1,2 +1,9 @@ +#define USING_VM_TABLET_WARNING_FIX // Comment this line if not using a mac vm + +#ifdef USING_VM_TABLET_WARNING_FIX +#include +void myMessageOutput(QtMsgType type, const char *msg); +#endif + #include #include "mainwindow.h" @@ -4,4 +11,9 @@ int main(int argc, char *argv[]) { + +#ifdef USING_VM_TABLET_WARNING_FIX + qInstallMsgHandler(myMessageOutput); +#endif + QApplication a(argc, argv); MainWindow w; @@ -11,2 +23,24 @@ return a.exec(); } + +#ifdef USING_VM_TABLET_WARNING_FIX +void myMessageOutput(QtMsgType type, const char *msg) +{ + switch (type) { + case QtWarningMsg: + if(QString(msg)=="QCocoaView handleTabletEvent: This tablet device is unknown (received no proximity event for it). Discarding event."){ // ignore this message + return; + } + else{ + fprintf(stderr, "%s\n", msg); + break; + } + case QtFatalMsg: + fprintf(stderr, "%s\n", msg); + abort(); + default: + fprintf(stderr, "%s\n", msg); + break; + } +} +#endif Index: Vago/trunk/Vago/mainwindow.cpp =================================================================== --- Vago/trunk/Vago/mainwindow.cpp (revision 789) +++ Vago/trunk/Vago/mainwindow.cpp (revision 790) @@ -10,14 +10,20 @@ 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); - // QTextCodec::setCodecForCStrings(QTextCodec::codecForLocale ()); - - if(!QFile::exists(QDir::currentPath()+"/"+GlobalVars::OniSplitExeName)){ + 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); @@ -42,5 +48,5 @@ if(aefolder.isEmpty()){ - Util::showErrorPopUp("AE folder is mandatory. Application will exit."); + Util::showErrorPopUp("AE folder is mandatory. Application will now exit."); exit(1); } @@ -99,4 +105,5 @@ 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 @@ -109,4 +116,18 @@ 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(); @@ -154,14 +175,16 @@ 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 << " -debugfiles"; - - if(!QProcess::startDetached(this->AeLocation+"/Oni.exe",arguments,this->AeLocation)){ + arguments << "-switch"; // only supported on windows. Was added by daodan dll. + } +#endif + + arguments << "-debugfiles"; + + if(!QProcess::startDetached(this->AeLocation+"/"+GlobalVars::OniExe,arguments,this->AeLocation)){ showErrStatusMessage("Oni could not be started!"); } @@ -172,5 +195,5 @@ // 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!"); } Index: Vago/trunk/Vago/mainwindow.ui =================================================================== --- Vago/trunk/Vago/mainwindow.ui (revision 789) +++ Vago/trunk/Vago/mainwindow.ui (revision 790) @@ -8,5 +8,5 @@ 0 640 - 480 + 543 @@ -360,5 +360,5 @@ 0 - 30 + 0 @@ -1487,5 +1487,5 @@ 0 640 - 21 + 22 @@ -1507,7 +1507,7 @@ - + - Target Plataform + Target Platform @@ -1537,5 +1537,5 @@ - + Index: Vago/trunk/Vago/packageWizard/packagepage2.cpp =================================================================== --- Vago/trunk/Vago/packageWizard/packagepage2.cpp (revision 789) +++ Vago/trunk/Vago/packageWizard/packagepage2.cpp (revision 790) @@ -21,4 +21,12 @@ registerField("lePackageNumber", ui->lePackageNumber); registerField("rbReplace", ui->rbReplace); + + ui->lbFieldsReadOnly->setText("* Fields read only by AEI2 when the package " + "isn't at the mod depot."); // Don't use rich text in qtdesigner because it generates platform dependent code + QString htmlAsterisk="*"; + ui->lbAsteriscAuthors->setText(htmlAsterisk); + ui->lbAsteriscModName->setText(htmlAsterisk); + ui->lbAsteriscVersion->setText(htmlAsterisk); + ui->lbAsteriscDescription->setText(htmlAsterisk); } Index: Vago/trunk/Vago/packageWizard/packagepage2.ui =================================================================== --- Vago/trunk/Vago/packageWizard/packagepage2.ui (revision 789) +++ Vago/trunk/Vago/packageWizard/packagepage2.ui (revision 790) @@ -8,5 +8,5 @@ 0 400 - 353 + 408 @@ -40,11 +40,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; color:#0000ff;">*</span></p></body></html> + + + <html><span style="color:#0000ff;">*</span></html> @@ -71,11 +67,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; color:#0000ff;">*</span></p></body></html> + + + <html><span style="color:#0000ff;">*</span></html> @@ -102,11 +94,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; color:#0000ff;">*</span></p></body></html> + + + <html><span style="color:#0000ff;">*</span></html> @@ -140,11 +128,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; color:#0000ff;">*</span></p></body></html> + + + <html><span style="color:#0000ff;">*</span></html> @@ -320,11 +304,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; color:#0000ff;">* Fields read </span><span style=" font-size:8pt; color:#0000ff;">only</span><span style=" font-size:8pt; color:#0000ff;"> by AEI2 when the package isn't at the mod depot.</span></p></body></html> + <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/packagepage4.cpp =================================================================== --- Vago/trunk/Vago/packageWizard/packagepage4.cpp (revision 789) +++ Vago/trunk/Vago/packageWizard/packagepage4.cpp (revision 790) @@ -30,4 +30,10 @@ ui->tbWindowsMinus->setToolTip("Remove the selected Windows OS folders"); ui->tbMacMinus->setToolTip("Remove the selected Mac OS folders"); + + ui->lbCommon->setText("Common"); // Don't use rich text in qtdesigner because it generates platform dependent code + ui->lbWindowsOnly->setText("Windows Only"); + ui->lbMacOnly->setText("Mac OS Only"); + + connectSlots(); Index: Vago/trunk/Vago/packageWizard/packagepage4.ui =================================================================== --- Vago/trunk/Vago/packageWizard/packagepage4.ui (revision 789) +++ Vago/trunk/Vago/packageWizard/packagepage4.ui (revision 790) @@ -7,5 +7,5 @@ 0 0 - 408 + 413 300 @@ -20,5 +20,5 @@ - + @@ -28,9 +28,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;">Common</span></p></body></html> + <html><b>Common</b></html> @@ -92,11 +88,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;">Windows Only</span></p></body></html> + <html><b>Windows Only</b></html> @@ -140,11 +132,8 @@ - + - <!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;">Mac OS Only</span></p></body></html> + <html><b>Mac OS Only</b></html> + Index: Vago/trunk/Vago/packageWizard/packagepagefinal.cpp =================================================================== --- Vago/trunk/Vago/packageWizard/packagepagefinal.cpp (revision 789) +++ Vago/trunk/Vago/packageWizard/packagepagefinal.cpp (revision 790) @@ -9,6 +9,9 @@ this->setTitle("Finished"); - //Use the global var for the depot domain so it's easier to change in the code if the domain changes - ui->lbComplete->setText(ui->lbComplete->text().replace("mods.oni2.net",GlobalVars::ModsDomain)); + ui->lbComplete->setText("" + "The wizard is now complete. The package will be created when you click in finish.
" + "After that you can upload the package to " + +GlobalVars::ModsDomain+" to get your mod listed in the AEI." + ""); // Don't use rich text in qtdesigner because it generates platform dependent code ui->lbComplete->setOpenExternalLinks(true); //allow navigate to mod depot Index: Vago/trunk/Vago/packageWizard/packagepagefinal.ui =================================================================== --- Vago/trunk/Vago/packageWizard/packagepagefinal.ui (revision 789) +++ Vago/trunk/Vago/packageWizard/packagepagefinal.ui (revision 790) @@ -7,5 +7,5 @@ 0 0 - 400 + 427 300 @@ -18,10 +18,8 @@ - <!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;">The wizard is now complete. The package will be created when you click in finish.</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;">After that you can upload the package to </span><a href="www.mods.oni2.net"><span style=" text-decoration: underline; color:#0000ff;">mods.oni2.net</span></a><span style=" font-size:8pt;"> to get your mod listed in the AEI.</span></p></body></html> + <html> +The wizard is now complete. The package will be created when you click in finish.<br/> +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> Index: Vago/trunk/Vago/preferences.ui =================================================================== --- Vago/trunk/Vago/preferences.ui (revision 789) +++ Vago/trunk/Vago/preferences.ui (revision 790) @@ -20,20 +20,20 @@ Preferences - - + + + + + + 130 + 0 + + + + Vago Workspace Folder: + + + + - - - - - 130 - 0 - - - - Vago Workspace Folder: - - - @@ -48,13 +48,13 @@ - + + + + Anniversary Edition Folder: + + + + - - - - Anniversary Edition Folder: - - - @@ -69,12 +69,5 @@ - - - - Launch Oni in a window - - - - + @@ -90,8 +83,15 @@ - + Always confirm Vago exit + + + + + + + Launch Oni in a window Index: Vago/trunk/Vago/resources.qrc =================================================================== --- Vago/trunk/Vago/resources.qrc (revision 789) +++ Vago/trunk/Vago/resources.qrc (revision 790) @@ -13,4 +13,5 @@ toolPackage.png sound.png + oni_icon_mac.png Index: Vago/trunk/Vago/soundWizard/soundpage2.cpp =================================================================== --- Vago/trunk/Vago/soundWizard/soundpage2.cpp (revision 789) +++ Vago/trunk/Vago/soundWizard/soundpage2.cpp (revision 790) @@ -12,4 +12,9 @@ this->soundTable=ui->twSoundFiles; ui->twSoundFiles->removeColumn(2); // Only two columns + + ui->label->setText("Add here the files you want to convert. " + "All the files will have the same properties applied.
" + "Don't forget to first convert the files to an oni compatible codec. " + "More information here."); // Don't use rich text in qtdesigner because it generates platform dependent code // Drop signal for Packages table Index: Vago/trunk/Vago/soundWizard/soundpage2.ui =================================================================== --- Vago/trunk/Vago/soundWizard/soundpage2.ui (revision 789) +++ Vago/trunk/Vago/soundWizard/soundpage2.ui (revision 790) @@ -21,11 +21,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;">Add here the files you want to convert. All the files will have the same properties applied. </span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></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;">Don't forget to first convert the files to an oni compatible codec</span><span style=" font-size:8pt;">. More information </span><a href=" "><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">here</span></a><span style=" font-size:8pt;">.</span></p></body></html> + <html>Add here the files you want to convert. All the files will have the same properties applied.<br/>Don't forget to first convert the files to an oni compatible codec. More information <a href=" ">here.</a></html> @@ -127,47 +121,43 @@ Output converted files to: - + - + + + Workspace + + + true + + + + + - + + + true + - Workspace - - - true + Other - - - - - true - - - Other - - - - - - - false - - - - - - - false - - - Browse... - - - - + + + false + + + + + + + false + + + Browse... + + Index: Vago/trunk/Vago/soundWizard/soundpage3.ui =================================================================== --- Vago/trunk/Vago/soundWizard/soundpage3.ui (revision 789) +++ Vago/trunk/Vago/soundWizard/soundpage3.ui (revision 790) @@ -100,172 +100,102 @@ Properties - - - - - - - - 115 - 0 - - - - Sphere radious: - - - - - - - 10 - - - - - - - - - - - - 115 - 0 - - - - Min elapsed time: - - - - - - - 1 - - - - - - - - - - - - 115 - 0 - - - - Max elapsed time: - - - - - - - 1 - - - - - - - - - - - - 115 - 0 - - - - Min volume distance: - - - - - - - 10 - - - - - - - - - - - - 115 - 0 - - - - Max volume distance: - - - - - - - 50 - - - - - - - - - - - - 115 - 0 - - - - Min occlusion: - - - - - - - 3 - - - - - - - - - - - - 115 - 0 - - - - Treshold: - - - - - - - 0 - - - - + + + + + Sphere radious: + + + + + + + 10 + + + + + + + Min elapsed time: + + + + + + + 1 + + + + + + + Max elapsed time: + + + + + + + 1 + + + + + + + Min volume distance: + + + + + + + 10 + + + + + + + Max volume distance: + + + + + + + 50 + + + + + + + Min occlusion: + + + + + + + 3 + + + + + + + Treshold: + + + + + + + 0 + + Index: Vago/trunk/Vago/soundWizard/soundpage4.ui =================================================================== --- Vago/trunk/Vago/soundWizard/soundpage4.ui (revision 789) +++ Vago/trunk/Vago/soundWizard/soundpage4.ui (revision 790) @@ -23,174 +23,107 @@ Properties - - - - - - - - 115 - 0 - - - - Volume: - - - - - - - 1 - - - - + + + QFormLayout::FieldsStayAtSizeHint + + + + + Volume: + + - - - - - - - 115 - 0 - - - - Min volume: - - - - - - - 1 - - - - + + + + 1 + + - - - - - - - 115 - 0 - - - - Max volume: - - - - - - - 1 - - - - + + + + Min volume: + + - - - - - - - 115 - 0 - - - - Pitch: - - - - - - - 1 - - - - + + + + 1 + + - - - - - - - 115 - 0 - - - - Min pitch: - - - - - - - 1 - - - - + + + + Max volume: + + - - - - - - - 115 - 0 - - - - Max pitch: - - - - - - - 1 - - - - + + + + 1 + + - - - - - - - 115 - 0 - - - - Weight: - - - - - - - 10 - - - - + + + + Pitch: + + - + + + + 1 + + + + + + + Min pitch: + + + + + + + 1 + + + + + + + Max pitch: + + + + + + + 1 + + + + + + + Weight: + + + + + + + 10 + + + + Index: Vago/trunk/Vago/soundWizard/soundpagefinal.cpp =================================================================== --- Vago/trunk/Vago/soundWizard/soundpagefinal.cpp (revision 789) +++ Vago/trunk/Vago/soundWizard/soundpagefinal.cpp (revision 790) @@ -16,4 +16,9 @@ this->myXmlProcessor = new XmlProcessor(this->myLogger,this->xmlCommands); this->myConverter = new Converter(this->myLogger,this->oniSplitCommands); + + ui->lbComplete->setText("The wizard is now complete. The sounds have been converted. " + "You can view all converted files clicking here.
" + "
Click restart to create more sounds from the wizard beggining," + "otherwise click finish."); // Don't use rich text in qtdesigner because it generates platform dependent code connectSlots(); Index: Vago/trunk/Vago/soundWizard/soundpagefinal.ui =================================================================== --- Vago/trunk/Vago/soundWizard/soundpagefinal.ui (revision 789) +++ Vago/trunk/Vago/soundWizard/soundpagefinal.ui (revision 790) @@ -18,11 +18,8 @@ - <!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;">The wizard is now complete. The sounds have been converted. You can view all converted files clicking </span><a href=" "><span style=" font-size:8pt; text-decoration: underline; color:#0000ff;">here</span></a><span style=" font-size:8pt;">.</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;"></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;">Click restart to create more sounds from the wizard beggining, otherwise click finish.</span></p></body></html> + <html>The wizard is now complete. The sounds have been converted. You can view all converted files clicking <a href=" ">here.</a><br /><br />Click restart to create more sounds from the wizard beggining, otherwise click finish.</html> + + + true Index: Vago/trunk/Vago/util.h =================================================================== --- Vago/trunk/Vago/util.h (revision 789) +++ Vago/trunk/Vago/util.h (revision 790) @@ -12,17 +12,28 @@ namespace GlobalVars{ - const QString AppVersion="0.8"; - const QString OniSplitExeName="OniSplit.exe"; - const QString XmlToolsExeName="xmlTools.exe"; - const QString AppLogName="logVago.txt"; - const QString BuiltOniSplitVersion="0.9.86.0"; - const QString BuiltXmlToolsVersion="0.8d"; - const QString ModsDomain="www.mods.oni2.net"; - const QString VagoNode = "247"; - const QString VagoCheckUpdatesUrl="http://"+ModsDomain+"/?q=api/node/"+VagoNode+".json"; - const QString VagoWebUrl="http://"+ModsDomain+"/node/"+VagoNode; - const QString VagoTemporaryDir=QDir::tempPath()+"/VagoTemp"; - const QString HelpLocation=QDir::currentPath() + "/help"; - const char OniSplitProcSeparator=';'; +const QString AppVersion="0.8"; +const QString OniSplitString="OniSplit.exe"; +const QString XmlToolsString="xmlTools.exe"; + +#ifdef Q_WS_WIN +const QString OniExe="Oni.exe"; +const QString OniSplitExeName=OniSplitString; +const QString XmlToolsExeName=XmlToolsString; +#else +const QString OniExe="Oni.app/Contents/MacOS/Oni"; +const QString OniSplitExeName="mono "+OniSplitString; // Mac uses mono to run .net applications +const QString XmlToolsExeName="mono "+XmlToolsString; +#endif + +const QString AppLogName="logVago.txt"; +const QString BuiltOniSplitVersion="0.9.86.0"; +const QString BuiltXmlToolsVersion="0.8d"; +const QString ModsDomain="www.mods.oni2.net"; +const QString VagoNode = "247"; +const QString VagoCheckUpdatesUrl="http://"+ModsDomain+"/?q=api/node/"+VagoNode+".json"; +const QString VagoWebUrl="http://"+ModsDomain+"/node/"+VagoNode; +const QString VagoTemporaryDir=QDir::tempPath()+"/VagoTemp"; +const QString HelpLocation=QDir::currentPath() + "/help"; +const char OniSplitProcSeparator=';'; } @@ -31,28 +42,28 @@ **/ namespace Util{ - QString normalizePath(QString path); - QString cutName(QString path); - QString insertQuotes(QString path); - QString normalizeAndQuote(QString path); - QString fullTrim(QString str); - QString normalizeDecimalSeparator(QString value); - QStringList multipleDirDialog(QString title); - QStringList substring(QString myString,QString separator,Qt::CaseSensitivity cs = Qt::CaseSensitive); - int indexOfBackward(QString myString, QString toSearch, int from = -1); - bool showQuestionPopUp(QWidget * parent, QString message); - bool checkEmptySpaces(QStringList toCheck); - bool checkIfDoubles(QStringList toCheck); - bool isStringInteger(QString myString); - bool isStringDouble(QString myString); - bool cpDir(const QString &srcPath, const QString &dstPath); - bool rmDir(const QString &dirPath); - bool removeDir(const QString &dirName); - void showPopUp(QString message); - void showRichPopUp(QString message); - void showWarningPopUp(QString message); - void showErrorPopUp(QString message); - void showErrorLogPopUp(QString message); - void showRichErrorPopUp(QString message); - void openLogFile(); +QString normalizePath(QString path); +QString cutName(QString path); +QString insertQuotes(QString path); +QString normalizeAndQuote(QString path); +QString fullTrim(QString str); +QString normalizeDecimalSeparator(QString value); +QStringList multipleDirDialog(QString title); +QStringList substring(QString myString,QString separator,Qt::CaseSensitivity cs = Qt::CaseSensitive); +int indexOfBackward(QString myString, QString toSearch, int from = -1); +bool showQuestionPopUp(QWidget * parent, QString message); +bool checkEmptySpaces(QStringList toCheck); +bool checkIfDoubles(QStringList toCheck); +bool isStringInteger(QString myString); +bool isStringDouble(QString myString); +bool cpDir(const QString &srcPath, const QString &dstPath); +bool rmDir(const QString &dirPath); +bool removeDir(const QString &dirName); +void showPopUp(QString message); +void showRichPopUp(QString message); +void showWarningPopUp(QString message); +void showErrorPopUp(QString message); +void showErrorLogPopUp(QString message); +void showRichErrorPopUp(QString message); +void openLogFile(); }