Changeset 790


Ignore:
Timestamp:
Apr 6, 2013, 10:54:26 PM (12 years ago)
Author:
s10k
Message:

Some updates in 0.8 version related with Mac OS. They should improve the application on Mac.

Location:
Vago/trunk/Vago
Files:
2 added
22 edited

Legend:

Unmodified
Added
Removed
  • Vago/trunk/Vago/Vago.pro

    r771 r790  
    1313INCLUDEPATH += ./soundWizard
    1414
     15macx {
     16LIBS += -lz # for mac support zipping (thanks edt!)
     17ICON = vago_icon.icns # mac os icon
     18}
     19
     20win32 {
     21RC_FILE = icon_resource.rc #for windows explorer icon
     22}
     23
    1524TARGET = Vago
    1625TEMPLATE = app
    17 RC_FILE = icon_resource.rc #for windows explorer icon
    1826
    1927SOURCES += \
  • Vago/trunk/Vago/Vago.pro.user

    r789 r790  
    11<?xml version="1.0" encoding="UTF-8"?>
    22<!DOCTYPE QtCreatorProject>
    3 <!-- Written by Qt Creator 2.4.1, 2013-04-03T22:20:09. -->
     3<!-- Written by Qt Creator 2.4.1, 2013-04-06T21:29:29. -->
    44<qtcreator>
    55 <data>
     
    5757   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    5858   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
    59     <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Mingw:C:/MinGW/bin/g++.exe.x86-windows-msys-pe-32bit.C:/QtSDK/pythongdb/python_2.7based/gdb-i686-pc-mingw32.exe</value>
     59    <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit./usr/bin/gdb</value>
    6060    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
    6161     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
     
    9898    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
    9999    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
    100     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 4.8.1 for Desktop - MinGW (Qt SDK) Debug</value>
     100    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 4.8.4 in PATH (System) Debug</value>
    101101    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
    102102    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
    103103    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
    104     <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">C:/Users/home/qtWorkspace/Vago-build-desktop-Qt_4_8_1_for_Desktop_-_MinGW__Qt_SDK__Debug</value>
    105     <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">5</value>
     104    <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/Users/home/Documents/Vago-build-desktop-Qt_4_8_4_in_PATH__System__Debug</value>
     105    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value>
    106106    <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
    107107   </valuemap>
    108108   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
    109     <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Mingw:C:/MinGW/bin/g++.exe.x86-windows-msys-pe-32bit.C:/QtSDK/pythongdb/python_2.7based/gdb-i686-pc-mingw32.exe</value>
     109    <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit./usr/bin/gdb</value>
    110110    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
    111111     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
     
    148148    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
    149149    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
    150     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 4.8.1 for Desktop - MinGW (Qt SDK) Release</value>
     150    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 4.8.4 in PATH (System) Release</value>
    151151    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
    152152    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
    153153    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
    154     <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">C:/Users/home/qtWorkspace/Vago-build-desktop-Qt_4_8_1_for_Desktop_-_MinGW__Qt_SDK__Release</value>
    155     <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">5</value>
     154    <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/Users/home/Documents/Vago-build-desktop-Qt_4_8_4_in_PATH__System__Release</value>
     155    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value>
    156156    <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
    157157   </valuemap>
    158    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
    159     <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value>
    160     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
    161      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
    162       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
    163       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
    164       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
    165       <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
    166       <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
    167       <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
    168       <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
    169      </valuemap>
    170      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
    171       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
    172       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
    173       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
    174       <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
    175       <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
    176       <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
    177      </valuemap>
    178      <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
    179      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
    180      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
    181      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
    182     </valuemap>
    183     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
    184      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
    185       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
    186       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
    187       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
    188       <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
    189       <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
    190       <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
    191      </valuemap>
    192      <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
    193      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
    194      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
    195      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
    196     </valuemap>
    197     <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
    198     <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
    199     <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
    200     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 4.8.0 for Desktop - MinGW (Qt SDK) Debug</value>
    201     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
    202     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
    203     <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
    204     <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">C:/Users/home/qtWorkspace/Vago-build-desktop-Qt_4_8_0_for_Desktop_-_MinGW__Qt_SDK__Debug</value>
    205     <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value>
    206     <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
    207    </valuemap>
    208    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.3">
    209     <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value>
    210     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
    211      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
    212       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
    213       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
    214       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
    215       <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
    216       <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
    217       <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
    218       <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
    219      </valuemap>
    220      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
    221       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
    222       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
    223       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
    224       <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
    225       <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
    226       <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
    227      </valuemap>
    228      <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
    229      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
    230      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
    231      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
    232     </valuemap>
    233     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
    234      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
    235       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
    236       <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
    237       <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
    238       <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
    239       <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
    240       <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
    241      </valuemap>
    242      <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
    243      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
    244      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
    245      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
    246     </valuemap>
    247     <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
    248     <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
    249     <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
    250     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 4.8.0 for Desktop - MinGW (Qt SDK) Release</value>
    251     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
    252     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
    253     <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
    254     <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">C:/Users/home/qtWorkspace/Vago-build-desktop-Qt_4_8_0_for_Desktop_-_MinGW__Qt_SDK__Release</value>
    255     <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value>
    256     <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
    257    </valuemap>
    258    <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">4</value>
     158   <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value>
    259159   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
    260160    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
     
    342242    <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value>
    343243    <valuelist type="QVariantList" key="Qt4ProjectManager.Qt4RunConfiguration.UserEnvironmentChanges"/>
    344     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
     244    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory">/Users/home/Documents/Vago-build-desktop-Qt_4_8_4_in_PATH__System__Debug/</value>
    345245    <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
    346246    <value type="bool" key="RunConfiguration.UseCppDebugger">true</value>
     
    357257 <data>
    358258  <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
    359   <value type="QString">{d1d804e5-7180-479f-b853-a9ffac018cf5}</value>
     259  <value type="QString">{c927f4d0-f522-4805-a789-6ae5ac6f06ca}</value>
    360260 </data>
    361261 <data>
  • Vago/trunk/Vago/about.cpp

    r771 r790  
    1010    this->layout()->setSizeConstraint( QLayout::SetFixedSize ); //fixed size
    1111    ui->lbAbout->setOpenExternalLinks(true); //allow navigate to oni central
    12     ui->lbAbout->setText(ui->lbAbout->text().replace("Vago GUI","Vago GUI "+GlobalVars::AppVersion));
     12    ui->lbAbout->setText("<html>"
     13                         "<b>Vago GUI "+GlobalVars::AppVersion+"</b>"
     14                         "<p style='font-size:small;'>"
     15                         "Written by s10k<br /><br/>"
     16                         "Thanks to:<br/>"
     17                         "Neo for OniSplit<br />"
     18                         "EdT for testing, suggestions and icon<br />"
     19                         "demos_kratos for original OniSplit GUI<br />"
     20                         "Samer/Mukade/EdT for allow me to use Jubei as icon<br />"
     21                         "Alloc for AIE2 and support<br />"
     22                         "Paradox for Sound excel plugin and documentation<br />"
     23                         "Wiki contributors for the documentation<br />"
     24                         "AE contributors<br />"
     25                         "and in general to all OniCentral Community<br /><br/>"
     26                         "Also thanks to: <br />"
     27                         "StackOverflow Community<br />"
     28                         "Fabrizio Angius for PKZIP 2.0 for zip handling<br />"
     29                         "smashingmagazine for the folder icon :)<br />"
     30                         "<center>"
     31                         "Visit us at:<br />"
     32                         "<a href='http://oni.bungie.org'>"
     33                         "oni.bungie.org"
     34                         "</center>"
     35                         "</a>"
     36                         "</p>"
     37                         "</html>"); // Don't use rich text in qtdesigner because it generates platform dependent code
    1338}
    1439
  • Vago/trunk/Vago/about.ui

    r771 r790  
    77    <x>0</x>
    88    <y>0</y>
    9     <width>515</width>
    10     <height>369</height>
     9    <width>600</width>
     10    <height>400</height>
    1111   </rect>
    1212  </property>
     
    5353         </property>
    5454         <property name="text">
    55           <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
    56 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
    57 p, li { white-space: pre-wrap; }
    58 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
    59 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:9pt; font-weight:600;&quot;&gt;Vago GUI&lt;/span&gt;&lt;/p&gt;
    60 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;&lt;br /&gt;Written by s10k&lt;/span&gt;&lt;/p&gt;
    61 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;&lt;br /&gt;Thanks to:&lt;/span&gt;&lt;/p&gt;
    62 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Neo for OniSplit&lt;br /&gt;EdT for testing, suggestions and icon &lt;/span&gt;&lt;/p&gt;
    63 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;demos_kratos for original OniSplit GUI&lt;/span&gt;&lt;/p&gt;
    64 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Samer/Mukade/EdT for allow me to use Jubei as icon&lt;/span&gt;&lt;/p&gt;
    65 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Alloc for AIE2 and support&lt;/span&gt;&lt;/p&gt;
    66 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Paradox for Sound excel plugin and documentation&lt;br /&gt;Wiki&lt;/span&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;contributors for the documentation &lt;br /&gt;AE&lt;/span&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;contributors&lt;br /&gt;and in general to&lt;/span&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;all OniCentral Community&lt;/span&gt;&lt;/p&gt;
    67 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;&lt;br /&gt;Also thanks to: &lt;br /&gt;StackOverflow&lt;/span&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Community&lt;/span&gt;&lt;/p&gt;
    68 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Fabrizio&lt;/span&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; &lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Angius for PKZIP 2.0 for zip handling&lt;br /&gt;smashingmagazine for the folder icon :)&lt;br /&gt;&lt;br /&gt;&lt;/span&gt;&lt;/p&gt;
    69 &lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Visit us at:&lt;br /&gt;&lt;/span&gt;&lt;a href=&quot;http://oni.bungie.org&quot;&gt;&lt;span style=&quot; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;oni.bungie.org&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     55          <string>&lt;html&gt;
     56&lt;b&gt;Vago GUI&lt;/b&gt;
     57&lt;p style=&quot;font-size:small;&quot;&gt;
     58Written by s10k&lt;br /&gt;&lt;br/&gt;
     59Thanks to:&lt;br/&gt;
     60Neo for OniSplit&lt;br /&gt;
     61EdT for testing, suggestions and icon&lt;br /&gt;
     62demos_kratos for original OniSplit GUI&lt;br /&gt;
     63Samer/Mukade/EdT for allow me to use Jubei as icon&lt;br /&gt;
     64Alloc for AIE2 and support&lt;br /&gt;
     65Paradox for Sound excel plugin and documentation&lt;br /&gt;
     66Wiki contributors for the documentation&lt;br /&gt;
     67AE contributors&lt;br /&gt;
     68and in general to all OniCentral Community&lt;br /&gt;&lt;br/&gt;
     69Also thanks to: &lt;br /&gt;
     70StackOverflow Community&lt;br /&gt;
     71Fabrizio Angius for PKZIP 2.0 for zip handling&lt;br /&gt;
     72smashingmagazine for the folder icon :)&lt;br /&gt;
     73&lt;center&gt;
     74Visit us at:&lt;br /&gt;
     75&lt;a href=&quot;http://oni.bungie.org&quot;&gt;
     76oni.bungie.org
     77&lt;/center&gt;
     78&lt;/a&gt;
     79&lt;/p&gt;
     80&lt;/html&gt;</string>
    7081         </property>
    7182        </widget>
  • Vago/trunk/Vago/main.cpp

    r771 r790  
     1#define USING_VM_TABLET_WARNING_FIX // Comment this line if not using a mac vm
     2
     3#ifdef USING_VM_TABLET_WARNING_FIX
     4#include <qapplication.h>
     5void myMessageOutput(QtMsgType type, const char *msg);
     6#endif
     7
    18#include <QtGui/QApplication>
    29#include "mainwindow.h"
     
    411int main(int argc, char *argv[])
    512{
     13
     14#ifdef USING_VM_TABLET_WARNING_FIX
     15    qInstallMsgHandler(myMessageOutput);
     16#endif
     17
    618    QApplication a(argc, argv);
    719    MainWindow w;
     
    1123    return a.exec();
    1224}
     25
     26#ifdef USING_VM_TABLET_WARNING_FIX
     27void myMessageOutput(QtMsgType type, const char *msg)
     28{
     29    switch (type) {
     30    case QtWarningMsg:
     31        if(QString(msg)=="QCocoaView handleTabletEvent: This tablet device is unknown (received no proximity event for it). Discarding event."){ // ignore this message
     32            return;
     33        }
     34        else{
     35            fprintf(stderr, "%s\n", msg);
     36            break;
     37        }
     38    case QtFatalMsg:
     39        fprintf(stderr, "%s\n", msg);
     40        abort();
     41    default:
     42        fprintf(stderr, "%s\n", msg);
     43        break;
     44    }
     45}
     46#endif
  • Vago/trunk/Vago/mainwindow.cpp

    r771 r790  
    1010    ui->setupUi(this);
    1111
     12    ui->pbConvertGeneral->setMinimumSize(ui->pbConvertGeneral->minimumSizeHint());
     13    ui->pbConvertGeneral->setMinimumWidth(50);
     14    ui->pbConvertGeneral->setMinimumHeight(ui->pbConvertGeneral->minimumHeight()*1.4);
     15
     16
     17
     18    qDebug() << ui->pbConvertGeneral->minimumHeight() << ui->pbConvertGeneral->minimumHeight();
     19
    1220    this->setWindowTitle("Vago v"+GlobalVars::AppVersion);
    1321
    14     // QTextCodec::setCodecForCStrings(QTextCodec::codecForLocale ());
    15 
    16     if(!QFile::exists(QDir::currentPath()+"/"+GlobalVars::OniSplitExeName)){
     22    if(!QFile::exists(QDir::currentPath()+"/"+GlobalVars::OniSplitString)){
    1723        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.");
    1824        exit(1);
    1925    }
    2026
    21     if(!QFile::exists(QDir::currentPath()+"/"+GlobalVars::XmlToolsExeName)){
     27    if(!QFile::exists(QDir::currentPath()+"/"+GlobalVars::XmlToolsString)){
    2228        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.");
    2329        exit(1);
     
    4248
    4349        if(aefolder.isEmpty()){
    44             Util::showErrorPopUp("AE folder is mandatory. Application will exit.");
     50            Util::showErrorPopUp("AE folder is mandatory. Application will now exit.");
    4551            exit(1);
    4652        }
     
    99105    this->myConverter = new Converter(this->myLogger,this->listToProccess);
    100106
     107    // User interface
    101108    ui->mainToolBar->addWidget(ui->tbAE); //add ae installer launch button
    102109    ui->mainToolBar->addWidget(ui->emptySpacerLabel); //trick, we can't add directly a space so we add an empty
     
    109116    ui->mainToolBar->setLayoutDirection(Qt::RightToLeft);
    110117
     118#ifdef Q_WS_MAC
     119    // 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
     120    ui->tbOni->setIcon(QIcon(":/new/icons/oni_icon_mac.png")); // Oni executable on mac have a different icon than windows
     121    // Set mac platform the first one in the menu, and also make it checkable by default
     122    ui->menuTarget_Platform->removeAction(ui->actionWindows);
     123    ui->menuTarget_Platform->addAction(ui->actionWindows);
     124    ui->actionWindows->setChecked(false);
     125    ui->actionMac_Windows_demo->setChecked(true);
     126    // Hide file menu on mac (not needed)
     127    ui->menuFile->hide();
     128    ui->menuFile->close();
     129    //ui->menuBar->macMenu();
     130#endif
     131
    111132    connectSlots();
    112133
     
    154175    QStringList arguments;
    155176
    156     if(this->vagoSettings->value("OniWindow").toBool()){ //Run in a window?
     177    if(this->vagoSettings->value("OniWindow").toBool()){ // Run in a window?
    157178        arguments << "-noswitch";
    158179    }
     180#ifdef Q_WS_WIN
    159181    else{
    160         arguments << "-switch";
    161     }
    162 
    163     arguments << " -debugfiles";
    164 
    165     if(!QProcess::startDetached(this->AeLocation+"/Oni.exe",arguments,this->AeLocation)){
     182        arguments << "-switch"; // only supported on windows. Was added by daodan dll.
     183    }
     184#endif
     185
     186    arguments << "-debugfiles";
     187
     188    if(!QProcess::startDetached(this->AeLocation+"/"+GlobalVars::OniExe,arguments,this->AeLocation)){
    166189        showErrStatusMessage("Oni could not be started!");
    167190    }
     
    172195    // If the app turn out someday to a native app use QProcess::startDetached instead...
    173196
    174     if(!QDesktopServices::openUrl(this->AeLocation+"/AEInstaller/bin/AEInstaller2.jar")){
     197    if(!QDesktopServices::openUrl("file:///"+this->AeLocation+"/AEInstaller/bin/AEInstaller2.jar")){
    175198        showErrStatusMessage("Could not start AE Installer!");
    176199    }
  • Vago/trunk/Vago/mainwindow.ui

    r771 r790  
    88    <y>0</y>
    99    <width>640</width>
    10     <height>480</height>
     10    <height>543</height>
    1111   </rect>
    1212  </property>
     
    360360           <size>
    361361            <width>0</width>
    362             <height>30</height>
     362            <height>0</height>
    363363           </size>
    364364          </property>
     
    14871487     <y>0</y>
    14881488     <width>640</width>
    1489      <height>21</height>
     1489     <height>22</height>
    14901490    </rect>
    14911491   </property>
     
    15071507    <addaction name="actionAbout"/>
    15081508   </widget>
    1509    <widget class="QMenu" name="menuTarget_Plataform">
     1509   <widget class="QMenu" name="menuTarget_Platform">
    15101510    <property name="title">
    1511      <string>Target Plataform</string>
     1511     <string>Target Platform</string>
    15121512    </property>
    15131513    <addaction name="actionWindows"/>
     
    15371537   </widget>
    15381538   <addaction name="menuFile"/>
    1539    <addaction name="menuTarget_Plataform"/>
     1539   <addaction name="menuTarget_Platform"/>
    15401540   <addaction name="menuOptions"/>
    15411541   <addaction name="menuTools"/>
  • Vago/trunk/Vago/packageWizard/packagepage2.cpp

    r771 r790  
    2121    registerField("lePackageNumber", ui->lePackageNumber);
    2222    registerField("rbReplace", ui->rbReplace);
     23
     24    ui->lbFieldsReadOnly->setText("<html><span style='color:#0000ff;'>* Fields read only  by AEI2 when the package "
     25            "isn't at the mod depot.</span></html>"); // Don't use rich text in qtdesigner because it generates platform dependent code
     26    QString htmlAsterisk="<html><span style='color:#0000ff;'>*</span></html>";
     27    ui->lbAsteriscAuthors->setText(htmlAsterisk);
     28    ui->lbAsteriscModName->setText(htmlAsterisk);
     29    ui->lbAsteriscVersion->setText(htmlAsterisk);
     30    ui->lbAsteriscDescription->setText(htmlAsterisk);
    2331}
    2432
  • Vago/trunk/Vago/packageWizard/packagepage2.ui

    r771 r790  
    88    <y>0</y>
    99    <width>400</width>
    10     <height>353</height>
     10    <height>408</height>
    1111   </rect>
    1212  </property>
     
    4040     </item>
    4141     <item>
    42       <widget class="QLabel" name="label_8">
    43        <property name="text">
    44         <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
    45 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
    46 p, li { white-space: pre-wrap; }
    47 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
    48 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; color:#0000ff;&quot;&gt;*&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     42      <widget class="QLabel" name="lbAsteriscModName">
     43       <property name="text">
     44        <string>&lt;html&gt;&lt;span style=&quot;color:#0000ff;&quot;&gt;*&lt;/span&gt;&lt;/html&gt;</string>
    4945       </property>
    5046      </widget>
     
    7167     </item>
    7268     <item>
    73       <widget class="QLabel" name="label_10">
    74        <property name="text">
    75         <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
    76 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
    77 p, li { white-space: pre-wrap; }
    78 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
    79 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; color:#0000ff;&quot;&gt;*&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     69      <widget class="QLabel" name="lbAsteriscAuthors">
     70       <property name="text">
     71        <string>&lt;html&gt;&lt;span style=&quot;color:#0000ff;&quot;&gt;*&lt;/span&gt;&lt;/html&gt;</string>
    8072       </property>
    8173      </widget>
     
    10294     </item>
    10395     <item>
    104       <widget class="QLabel" name="label_9">
    105        <property name="text">
    106         <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
    107 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
    108 p, li { white-space: pre-wrap; }
    109 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
    110 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; color:#0000ff;&quot;&gt;*&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     96      <widget class="QLabel" name="lbAsteriscVersion">
     97       <property name="text">
     98        <string>&lt;html&gt;&lt;span style=&quot;color:#0000ff;&quot;&gt;*&lt;/span&gt;&lt;/html&gt;</string>
    11199       </property>
    112100      </widget>
     
    140128     </item>
    141129     <item>
    142       <widget class="QLabel" name="label_11">
    143        <property name="text">
    144         <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
    145 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
    146 p, li { white-space: pre-wrap; }
    147 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
    148 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; color:#0000ff;&quot;&gt;*&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     130      <widget class="QLabel" name="lbAsteriscDescription">
     131       <property name="text">
     132        <string>&lt;html&gt;&lt;span style=&quot;color:#0000ff;&quot;&gt;*&lt;/span&gt;&lt;/html&gt;</string>
    149133       </property>
    150134      </widget>
     
    320304   </item>
    321305   <item>
    322     <widget class="QLabel" name="label_12">
     306    <widget class="QLabel" name="lbFieldsReadOnly">
    323307     <property name="text">
    324       <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
    325 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
    326 p, li { white-space: pre-wrap; }
    327 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
    328 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; color:#0000ff;&quot;&gt;* Fields read &lt;/span&gt;&lt;span style=&quot; font-size:8pt; color:#0000ff;&quot;&gt;only&lt;/span&gt;&lt;span style=&quot; font-size:8pt; color:#0000ff;&quot;&gt; by AEI2 when the package isn't at the mod depot.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     308      <string>&lt;html&gt;&lt;span style=&quot; color:#0000ff;&quot;&gt;* Fields read only  by AEI2 when the package isn't at the mod depot.&lt;/span&gt;&lt;/html&gt;</string>
    329309     </property>
    330310    </widget>
  • Vago/trunk/Vago/packageWizard/packagepage4.cpp

    r771 r790  
    3030    ui->tbWindowsMinus->setToolTip("Remove the selected Windows OS folders");
    3131    ui->tbMacMinus->setToolTip("Remove the selected Mac OS folders");
     32
     33    ui->lbCommon->setText("<html><b>Common</b></html>"); // Don't use rich text in qtdesigner because it generates platform dependent code
     34    ui->lbWindowsOnly->setText("<html><b>Windows Only</b></html>");
     35    ui->lbMacOnly->setText("<html><b>Mac OS Only</b></html>");
     36
     37
    3238
    3339    connectSlots();
  • Vago/trunk/Vago/packageWizard/packagepage4.ui

    r771 r790  
    77    <x>0</x>
    88    <y>0</y>
    9     <width>408</width>
     9    <width>413</width>
    1010    <height>300</height>
    1111   </rect>
     
    2020      <layout class="QHBoxLayout" name="horizontalLayout_5">
    2121       <item>
    22         <widget class="QLabel" name="label">
     22        <widget class="QLabel" name="lbCommon">
    2323         <property name="minimumSize">
    2424          <size>
     
    2828         </property>
    2929         <property name="text">
    30           <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
    31 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
    32 p, li { white-space: pre-wrap; }
    33 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
    34 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Common&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     30          <string>&lt;html&gt;&lt;b&gt;Common&lt;/b&gt;&lt;/html&gt;</string>
    3531         </property>
    3632        </widget>
     
    9288      <layout class="QVBoxLayout" name="verticalLayout_3">
    9389       <item>
    94         <widget class="QLabel" name="label_2">
     90        <widget class="QLabel" name="lbWindowsOnly">
    9591         <property name="text">
    96           <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
    97 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
    98 p, li { white-space: pre-wrap; }
    99 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
    100 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Windows Only&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     92          <string>&lt;html&gt;&lt;b&gt;Windows Only&lt;/b&gt;&lt;/html&gt;</string>
    10193         </property>
    10294        </widget>
     
    140132      <layout class="QVBoxLayout" name="verticalLayout_5">
    141133       <item>
    142         <widget class="QLabel" name="label_3">
     134        <widget class="QLabel" name="lbMacOnly">
    143135         <property name="text">
    144           <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
    145 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
    146 p, li { white-space: pre-wrap; }
    147 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
    148 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Mac OS Only&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     136          <string>&lt;html&gt;&lt;b&gt;Mac OS Only&lt;/b&gt;&lt;/html&gt;
     137</string>
    149138         </property>
    150139        </widget>
  • Vago/trunk/Vago/packageWizard/packagepagefinal.cpp

    r771 r790  
    99    this->setTitle("Finished");
    1010
    11     //Use the global var for the depot domain so it's easier to change in the code if the domain changes
    12     ui->lbComplete->setText(ui->lbComplete->text().replace("mods.oni2.net",GlobalVars::ModsDomain));
     11    ui->lbComplete->setText("<html>"
     12                            "The wizard is now complete. The package will be created when you click in finish.<br/>"
     13                            "After that you can upload the package to <a href='http://"+GlobalVars::ModsDomain+"'>"
     14                            +GlobalVars::ModsDomain+"</a> to get your mod listed in the AEI."
     15                            "</html>"); // Don't use rich text in qtdesigner because it generates platform dependent code
    1316
    1417    ui->lbComplete->setOpenExternalLinks(true); //allow navigate to mod depot
  • Vago/trunk/Vago/packageWizard/packagepagefinal.ui

    r771 r790  
    77    <x>0</x>
    88    <y>0</y>
    9     <width>400</width>
     9    <width>427</width>
    1010    <height>300</height>
    1111   </rect>
     
    1818    <widget class="QLabel" name="lbComplete">
    1919     <property name="text">
    20       <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
    21 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
    22 p, li { white-space: pre-wrap; }
    23 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
    24 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;The wizard is now complete. The package will be created when you click in finish.&lt;/span&gt;&lt;/p&gt;
    25 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;After that you can upload the package to &lt;/span&gt;&lt;a href=&quot;www.mods.oni2.net&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;mods.oni2.net&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; to get your mod listed in the AEI.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     20      <string>&lt;html&gt;
     21The wizard is now complete. The package will be created when you click in finish.&lt;br/&gt;
     22After that you can upload the package to &lt;a href=&quot;www.mods.oni2.net&quot;&gt;mods.oni2.net&lt;/a&gt; to get your mod listed in the AEI.
     23&lt;/html&gt;</string>
    2624     </property>
    2725    </widget>
  • Vago/trunk/Vago/preferences.ui

    r771 r790  
    2020      <string>Preferences</string>
    2121     </property>
    22      <layout class="QVBoxLayout" name="verticalLayout_2">
    23       <item>
     22     <layout class="QFormLayout" name="formLayout">
     23      <item row="0" column="0">
     24       <widget class="QLabel" name="label">
     25        <property name="minimumSize">
     26         <size>
     27          <width>130</width>
     28          <height>0</height>
     29         </size>
     30        </property>
     31        <property name="text">
     32         <string>Vago Workspace Folder:</string>
     33        </property>
     34       </widget>
     35      </item>
     36      <item row="0" column="1">
    2437       <layout class="QHBoxLayout" name="horizontalLayout">
    25         <item>
    26          <widget class="QLabel" name="label">
    27           <property name="minimumSize">
    28            <size>
    29             <width>130</width>
    30             <height>0</height>
    31            </size>
    32           </property>
    33           <property name="text">
    34            <string>Vago Workspace Folder:</string>
    35           </property>
    36          </widget>
    37         </item>
    3838        <item>
    3939         <widget class="QLineEdit" name="leWorkspace"/>
     
    4848       </layout>
    4949      </item>
    50       <item>
     50      <item row="1" column="0">
     51       <widget class="QLabel" name="label_2">
     52        <property name="text">
     53         <string>Anniversary Edition Folder:</string>
     54        </property>
     55       </widget>
     56      </item>
     57      <item row="1" column="1">
    5158       <layout class="QHBoxLayout" name="horizontalLayout_2">
    52         <item>
    53          <widget class="QLabel" name="label_2">
    54           <property name="text">
    55            <string>Anniversary Edition Folder:</string>
    56           </property>
    57          </widget>
    58         </item>
    5959        <item>
    6060         <widget class="QLineEdit" name="leAEfolder"/>
     
    6969       </layout>
    7070      </item>
    71       <item>
    72        <widget class="QCheckBox" name="cbOniWindow">
    73         <property name="text">
    74          <string>Launch Oni in a window</string>
    75         </property>
    76        </widget>
    77       </item>
    78       <item>
     71      <item row="3" column="0" colspan="2">
    7972       <widget class="QCheckBox" name="cbSeparate">
    8073        <property name="toolTip">
     
    9083       </widget>
    9184      </item>
    92       <item>
     85      <item row="4" column="0" colspan="2">
    9386       <widget class="QCheckBox" name="cbVagoExit">
    9487        <property name="text">
    9588         <string>Always confirm Vago exit</string>
     89        </property>
     90       </widget>
     91      </item>
     92      <item row="2" column="0" colspan="2">
     93       <widget class="QCheckBox" name="cbOniWindow">
     94        <property name="text">
     95         <string>Launch Oni in a window</string>
    9696        </property>
    9797       </widget>
  • Vago/trunk/Vago/resources.qrc

    r771 r790  
    1313        <file>toolPackage.png</file>
    1414        <file>sound.png</file>
     15        <file>oni_icon_mac.png</file>
    1516    </qresource>
    1617    <qresource prefix="/new/about">
  • Vago/trunk/Vago/soundWizard/soundpage2.cpp

    r771 r790  
    1212    this->soundTable=ui->twSoundFiles;
    1313    ui->twSoundFiles->removeColumn(2); // Only two columns
     14
     15    ui->label->setText("<html>Add here the files you want to convert. "
     16                       "All the files will have the same properties applied.<br/>"
     17                       "Don't forget to first convert the files to an oni compatible codec. "
     18                       "More information <a href=' '>here.</a></html>"); // Don't use rich text in qtdesigner because it generates platform dependent code
    1419
    1520    // Drop signal for Packages table
  • Vago/trunk/Vago/soundWizard/soundpage2.ui

    r771 r790  
    2121    <widget class="QLabel" name="label">
    2222     <property name="text">
    23       <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
    24 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
    25 p, li { white-space: pre-wrap; }
    26 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
    27 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Add here the files you want to convert. All the files will have the same properties applied. &lt;/span&gt;&lt;/p&gt;
    28 &lt;p style=&quot;-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;&quot;&gt;&lt;/p&gt;
    29 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Don't forget to first convert the files to an oni compatible codec&lt;/span&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;. More information &lt;/span&gt;&lt;a href=&quot; &quot;&gt;&lt;span style=&quot; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     23      <string>&lt;html&gt;Add here the files you want to convert. All the files will have the same properties applied.&lt;br/&gt;Don't forget to first convert the files to an oni compatible codec. More information &lt;a href=&quot; &quot;&gt;here.&lt;/a&gt;&lt;/html&gt;</string>
    3024     </property>
    3125     <property name="wordWrap">
     
    127121      <string>Output converted files to:</string>
    128122     </property>
    129      <layout class="QVBoxLayout" name="verticalLayout_3">
     123     <layout class="QVBoxLayout" name="verticalLayout_2">
    130124      <item>
    131        <layout class="QVBoxLayout" name="verticalLayout_2">
     125       <widget class="QRadioButton" name="rbWorkspace">
     126        <property name="text">
     127         <string>Workspace</string>
     128        </property>
     129        <property name="checked">
     130         <bool>true</bool>
     131        </property>
     132       </widget>
     133      </item>
     134      <item>
     135       <layout class="QHBoxLayout" name="horizontalLayout_2">
    132136        <item>
    133          <widget class="QRadioButton" name="rbWorkspace">
     137         <widget class="QRadioButton" name="rbOther">
     138          <property name="enabled">
     139           <bool>true</bool>
     140          </property>
    134141          <property name="text">
    135            <string>Workspace</string>
    136           </property>
    137           <property name="checked">
    138            <bool>true</bool>
     142           <string>Other</string>
    139143          </property>
    140144         </widget>
    141145        </item>
    142146        <item>
    143          <layout class="QHBoxLayout" name="horizontalLayout_2">
    144           <item>
    145            <widget class="QRadioButton" name="rbOther">
    146             <property name="enabled">
    147              <bool>true</bool>
    148             </property>
    149             <property name="text">
    150              <string>Other</string>
    151             </property>
    152            </widget>
    153           </item>
    154           <item>
    155            <widget class="QLineEdit" name="leOtherLocation">
    156             <property name="enabled">
    157              <bool>false</bool>
    158             </property>
    159            </widget>
    160           </item>
    161           <item>
    162            <widget class="QPushButton" name="pbBrowserOtherLocation">
    163             <property name="enabled">
    164              <bool>false</bool>
    165             </property>
    166             <property name="text">
    167              <string>Browse...</string>
    168             </property>
    169            </widget>
    170           </item>
    171          </layout>
     147         <widget class="QLineEdit" name="leOtherLocation">
     148          <property name="enabled">
     149           <bool>false</bool>
     150          </property>
     151         </widget>
     152        </item>
     153        <item>
     154         <widget class="QPushButton" name="pbBrowserOtherLocation">
     155          <property name="enabled">
     156           <bool>false</bool>
     157          </property>
     158          <property name="text">
     159           <string>Browse...</string>
     160          </property>
     161         </widget>
    172162        </item>
    173163       </layout>
  • Vago/trunk/Vago/soundWizard/soundpage3.ui

    r771 r790  
    100100      <string>Properties</string>
    101101     </property>
    102      <layout class="QVBoxLayout" name="verticalLayout_3">
    103       <item>
    104        <layout class="QHBoxLayout" name="horizontalLayout_2">
    105         <item>
    106          <widget class="QLabel" name="label">
    107           <property name="minimumSize">
    108            <size>
    109             <width>115</width>
    110             <height>0</height>
    111            </size>
    112           </property>
    113           <property name="text">
    114            <string>Sphere radious:</string>
    115           </property>
    116          </widget>
    117         </item>
    118         <item>
    119          <widget class="QLineEdit" name="leSphereRadious">
    120           <property name="text">
    121            <string>10</string>
    122           </property>
    123          </widget>
    124         </item>
    125        </layout>
    126       </item>
    127       <item>
    128        <layout class="QHBoxLayout" name="horizontalLayout_3">
    129         <item>
    130          <widget class="QLabel" name="label_2">
    131           <property name="minimumSize">
    132            <size>
    133             <width>115</width>
    134             <height>0</height>
    135            </size>
    136           </property>
    137           <property name="text">
    138            <string>Min elapsed time:</string>
    139           </property>
    140          </widget>
    141         </item>
    142         <item>
    143          <widget class="QLineEdit" name="leMinElapsedTime">
    144           <property name="text">
    145            <string>1</string>
    146           </property>
    147          </widget>
    148         </item>
    149        </layout>
    150       </item>
    151       <item>
    152        <layout class="QHBoxLayout" name="horizontalLayout_4">
    153         <item>
    154          <widget class="QLabel" name="label_3">
    155           <property name="minimumSize">
    156            <size>
    157             <width>115</width>
    158             <height>0</height>
    159            </size>
    160           </property>
    161           <property name="text">
    162            <string>Max elapsed time:</string>
    163           </property>
    164          </widget>
    165         </item>
    166         <item>
    167          <widget class="QLineEdit" name="leMaxElapsedTime">
    168           <property name="text">
    169            <string>1</string>
    170           </property>
    171          </widget>
    172         </item>
    173        </layout>
    174       </item>
    175       <item>
    176        <layout class="QHBoxLayout" name="horizontalLayout_5">
    177         <item>
    178          <widget class="QLabel" name="label_4">
    179           <property name="minimumSize">
    180            <size>
    181             <width>115</width>
    182             <height>0</height>
    183            </size>
    184           </property>
    185           <property name="text">
    186            <string>Min volume distance:</string>
    187           </property>
    188          </widget>
    189         </item>
    190         <item>
    191          <widget class="QLineEdit" name="leMinVolumeDistance">
    192           <property name="text">
    193            <string>10</string>
    194           </property>
    195          </widget>
    196         </item>
    197        </layout>
    198       </item>
    199       <item>
    200        <layout class="QHBoxLayout" name="horizontalLayout_6">
    201         <item>
    202          <widget class="QLabel" name="label_5">
    203           <property name="minimumSize">
    204            <size>
    205             <width>115</width>
    206             <height>0</height>
    207            </size>
    208           </property>
    209           <property name="text">
    210            <string>Max volume distance:</string>
    211           </property>
    212          </widget>
    213         </item>
    214         <item>
    215          <widget class="QLineEdit" name="leMaxVolumeDistance">
    216           <property name="text">
    217            <string>50</string>
    218           </property>
    219          </widget>
    220         </item>
    221        </layout>
    222       </item>
    223       <item>
    224        <layout class="QHBoxLayout" name="horizontalLayout_7">
    225         <item>
    226          <widget class="QLabel" name="label_6">
    227           <property name="minimumSize">
    228            <size>
    229             <width>115</width>
    230             <height>0</height>
    231            </size>
    232           </property>
    233           <property name="text">
    234            <string>Min occlusion:</string>
    235           </property>
    236          </widget>
    237         </item>
    238         <item>
    239          <widget class="QLineEdit" name="leMinOcclusion">
    240           <property name="text">
    241            <string>3</string>
    242           </property>
    243          </widget>
    244         </item>
    245        </layout>
    246       </item>
    247       <item>
    248        <layout class="QHBoxLayout" name="horizontalLayout_8">
    249         <item>
    250          <widget class="QLabel" name="label_7">
    251           <property name="minimumSize">
    252            <size>
    253             <width>115</width>
    254             <height>0</height>
    255            </size>
    256           </property>
    257           <property name="text">
    258            <string>Treshold:</string>
    259           </property>
    260          </widget>
    261         </item>
    262         <item>
    263          <widget class="QLineEdit" name="leTreshold">
    264           <property name="text">
    265            <string>0</string>
    266           </property>
    267          </widget>
    268         </item>
    269        </layout>
     102     <layout class="QFormLayout" name="formLayout">
     103      <item row="0" column="0">
     104       <widget class="QLabel" name="label">
     105        <property name="text">
     106         <string>Sphere radious:</string>
     107        </property>
     108       </widget>
     109      </item>
     110      <item row="0" column="1">
     111       <widget class="QLineEdit" name="leSphereRadious">
     112        <property name="text">
     113         <string>10</string>
     114        </property>
     115       </widget>
     116      </item>
     117      <item row="1" column="0">
     118       <widget class="QLabel" name="label_2">
     119        <property name="text">
     120         <string>Min elapsed time:</string>
     121        </property>
     122       </widget>
     123      </item>
     124      <item row="1" column="1">
     125       <widget class="QLineEdit" name="leMinElapsedTime">
     126        <property name="text">
     127         <string>1</string>
     128        </property>
     129       </widget>
     130      </item>
     131      <item row="2" column="0">
     132       <widget class="QLabel" name="label_3">
     133        <property name="text">
     134         <string>Max elapsed time:</string>
     135        </property>
     136       </widget>
     137      </item>
     138      <item row="2" column="1">
     139       <widget class="QLineEdit" name="leMaxElapsedTime">
     140        <property name="text">
     141         <string>1</string>
     142        </property>
     143       </widget>
     144      </item>
     145      <item row="3" column="0">
     146       <widget class="QLabel" name="label_4">
     147        <property name="text">
     148         <string>Min volume distance:</string>
     149        </property>
     150       </widget>
     151      </item>
     152      <item row="3" column="1">
     153       <widget class="QLineEdit" name="leMinVolumeDistance">
     154        <property name="text">
     155         <string>10</string>
     156        </property>
     157       </widget>
     158      </item>
     159      <item row="4" column="0">
     160       <widget class="QLabel" name="label_5">
     161        <property name="text">
     162         <string>Max volume distance:</string>
     163        </property>
     164       </widget>
     165      </item>
     166      <item row="4" column="1">
     167       <widget class="QLineEdit" name="leMaxVolumeDistance">
     168        <property name="text">
     169         <string>50</string>
     170        </property>
     171       </widget>
     172      </item>
     173      <item row="5" column="0">
     174       <widget class="QLabel" name="label_6">
     175        <property name="text">
     176         <string>Min occlusion:</string>
     177        </property>
     178       </widget>
     179      </item>
     180      <item row="5" column="1">
     181       <widget class="QLineEdit" name="leMinOcclusion">
     182        <property name="text">
     183         <string>3</string>
     184        </property>
     185       </widget>
     186      </item>
     187      <item row="6" column="0">
     188       <widget class="QLabel" name="label_7">
     189        <property name="text">
     190         <string>Treshold:</string>
     191        </property>
     192       </widget>
     193      </item>
     194      <item row="6" column="1">
     195       <widget class="QLineEdit" name="leTreshold">
     196        <property name="text">
     197         <string>0</string>
     198        </property>
     199       </widget>
    270200      </item>
    271201     </layout>
  • Vago/trunk/Vago/soundWizard/soundpage4.ui

    r771 r790  
    2323      <string>Properties</string>
    2424     </property>
    25      <layout class="QVBoxLayout" name="verticalLayout">
    26       <item>
    27        <layout class="QHBoxLayout" name="horizontalLayout_2">
    28         <item>
    29          <widget class="QLabel" name="label">
    30           <property name="minimumSize">
    31            <size>
    32             <width>115</width>
    33             <height>0</height>
    34            </size>
    35           </property>
    36           <property name="text">
    37            <string>Volume:</string>
    38           </property>
    39          </widget>
    40         </item>
    41         <item>
    42          <widget class="QLineEdit" name="leVolume">
    43           <property name="text">
    44            <string>1</string>
    45           </property>
    46          </widget>
    47         </item>
    48        </layout>
     25     <layout class="QFormLayout" name="formLayout">
     26      <property name="fieldGrowthPolicy">
     27       <enum>QFormLayout::FieldsStayAtSizeHint</enum>
     28      </property>
     29      <item row="0" column="0">
     30       <widget class="QLabel" name="label">
     31        <property name="text">
     32         <string>Volume:</string>
     33        </property>
     34       </widget>
    4935      </item>
    50       <item>
    51        <layout class="QHBoxLayout" name="horizontalLayout_3">
    52         <item>
    53          <widget class="QLabel" name="label_2">
    54           <property name="minimumSize">
    55            <size>
    56             <width>115</width>
    57             <height>0</height>
    58            </size>
    59           </property>
    60           <property name="text">
    61            <string>Min volume:</string>
    62           </property>
    63          </widget>
    64         </item>
    65         <item>
    66          <widget class="QLineEdit" name="leMinVolume">
    67           <property name="text">
    68            <string>1</string>
    69           </property>
    70          </widget>
    71         </item>
    72        </layout>
     36      <item row="0" column="1">
     37       <widget class="QLineEdit" name="leVolume">
     38        <property name="text">
     39         <string>1</string>
     40        </property>
     41       </widget>
    7342      </item>
    74       <item>
    75        <layout class="QHBoxLayout" name="horizontalLayout_4">
    76         <item>
    77          <widget class="QLabel" name="label_3">
    78           <property name="minimumSize">
    79            <size>
    80             <width>115</width>
    81             <height>0</height>
    82            </size>
    83           </property>
    84           <property name="text">
    85            <string>Max volume:</string>
    86           </property>
    87          </widget>
    88         </item>
    89         <item>
    90          <widget class="QLineEdit" name="leMaxVolume">
    91           <property name="text">
    92            <string>1</string>
    93           </property>
    94          </widget>
    95         </item>
    96        </layout>
     43      <item row="1" column="0">
     44       <widget class="QLabel" name="label_2">
     45        <property name="text">
     46         <string>Min volume:</string>
     47        </property>
     48       </widget>
    9749      </item>
    98       <item>
    99        <layout class="QHBoxLayout" name="horizontalLayout_5">
    100         <item>
    101          <widget class="QLabel" name="label_4">
    102           <property name="minimumSize">
    103            <size>
    104             <width>115</width>
    105             <height>0</height>
    106            </size>
    107           </property>
    108           <property name="text">
    109            <string>Pitch:</string>
    110           </property>
    111          </widget>
    112         </item>
    113         <item>
    114          <widget class="QLineEdit" name="lePitch">
    115           <property name="text">
    116            <string>1</string>
    117           </property>
    118          </widget>
    119         </item>
    120        </layout>
     50      <item row="1" column="1">
     51       <widget class="QLineEdit" name="leMinVolume">
     52        <property name="text">
     53         <string>1</string>
     54        </property>
     55       </widget>
    12156      </item>
    122       <item>
    123        <layout class="QHBoxLayout" name="horizontalLayout_6">
    124         <item>
    125          <widget class="QLabel" name="label_5">
    126           <property name="minimumSize">
    127            <size>
    128             <width>115</width>
    129             <height>0</height>
    130            </size>
    131           </property>
    132           <property name="text">
    133            <string>Min pitch:</string>
    134           </property>
    135          </widget>
    136         </item>
    137         <item>
    138          <widget class="QLineEdit" name="leMinPitch">
    139           <property name="text">
    140            <string>1</string>
    141           </property>
    142          </widget>
    143         </item>
    144        </layout>
     57      <item row="2" column="0">
     58       <widget class="QLabel" name="label_3">
     59        <property name="text">
     60         <string>Max volume:</string>
     61        </property>
     62       </widget>
    14563      </item>
    146       <item>
    147        <layout class="QHBoxLayout" name="horizontalLayout_7">
    148         <item>
    149          <widget class="QLabel" name="label_6">
    150           <property name="minimumSize">
    151            <size>
    152             <width>115</width>
    153             <height>0</height>
    154            </size>
    155           </property>
    156           <property name="text">
    157            <string>Max pitch:</string>
    158           </property>
    159          </widget>
    160         </item>
    161         <item>
    162          <widget class="QLineEdit" name="leMaxPitch">
    163           <property name="text">
    164            <string>1</string>
    165           </property>
    166          </widget>
    167         </item>
    168        </layout>
     64      <item row="2" column="1">
     65       <widget class="QLineEdit" name="leMaxVolume">
     66        <property name="text">
     67         <string>1</string>
     68        </property>
     69       </widget>
    16970      </item>
    170       <item>
    171        <layout class="QHBoxLayout" name="horizontalLayout_8">
    172         <item>
    173          <widget class="QLabel" name="label_7">
    174           <property name="minimumSize">
    175            <size>
    176             <width>115</width>
    177             <height>0</height>
    178            </size>
    179           </property>
    180           <property name="text">
    181            <string>Weight:</string>
    182           </property>
    183          </widget>
    184         </item>
    185         <item>
    186          <widget class="QLineEdit" name="leWeight">
    187           <property name="text">
    188            <string>10</string>
    189           </property>
    190          </widget>
    191         </item>
    192        </layout>
     71      <item row="3" column="0">
     72       <widget class="QLabel" name="label_4">
     73        <property name="text">
     74         <string>Pitch:</string>
     75        </property>
     76       </widget>
    19377      </item>
    194       <item>
     78      <item row="3" column="1">
     79       <widget class="QLineEdit" name="lePitch">
     80        <property name="text">
     81         <string>1</string>
     82        </property>
     83       </widget>
     84      </item>
     85      <item row="4" column="0">
     86       <widget class="QLabel" name="label_5">
     87        <property name="text">
     88         <string>Min pitch:</string>
     89        </property>
     90       </widget>
     91      </item>
     92      <item row="4" column="1">
     93       <widget class="QLineEdit" name="leMinPitch">
     94        <property name="text">
     95         <string>1</string>
     96        </property>
     97       </widget>
     98      </item>
     99      <item row="5" column="0">
     100       <widget class="QLabel" name="label_6">
     101        <property name="text">
     102         <string>Max pitch:</string>
     103        </property>
     104       </widget>
     105      </item>
     106      <item row="5" column="1">
     107       <widget class="QLineEdit" name="leMaxPitch">
     108        <property name="text">
     109         <string>1</string>
     110        </property>
     111       </widget>
     112      </item>
     113      <item row="6" column="0">
     114       <widget class="QLabel" name="label_7">
     115        <property name="text">
     116         <string>Weight:</string>
     117        </property>
     118       </widget>
     119      </item>
     120      <item row="6" column="1">
     121       <widget class="QLineEdit" name="leWeight">
     122        <property name="text">
     123         <string>10</string>
     124        </property>
     125       </widget>
     126      </item>
     127      <item row="7" column="0" colspan="2">
    195128       <widget class="QCheckBox" name="cbPreventRepeat">
    196129        <property name="toolTip">
  • Vago/trunk/Vago/soundWizard/soundpagefinal.cpp

    r771 r790  
    1616    this->myXmlProcessor = new XmlProcessor(this->myLogger,this->xmlCommands);
    1717    this->myConverter = new Converter(this->myLogger,this->oniSplitCommands);
     18
     19    ui->lbComplete->setText("<html>The wizard is now complete. The sounds have been converted. "
     20                            "You can view all converted files clicking <a href=' '>here.</a><br />"
     21                            "<br />Click restart to create more sounds from the wizard beggining,"
     22                            "otherwise click finish.</html>"); // Don't use rich text in qtdesigner because it generates platform dependent code
    1823
    1924    connectSlots();
  • Vago/trunk/Vago/soundWizard/soundpagefinal.ui

    r771 r790  
    1818    <widget class="QLabel" name="lbComplete">
    1919     <property name="text">
    20       <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
    21 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
    22 p, li { white-space: pre-wrap; }
    23 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
    24 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;The wizard is now complete. The sounds have been converted. You can view all converted files clicking &lt;/span&gt;&lt;a href=&quot; &quot;&gt;&lt;span style=&quot; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;
    25 &lt;p style=&quot;-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;&quot;&gt;&lt;/p&gt;
    26 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Click restart to create more sounds from the wizard beggining, otherwise click finish.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     20      <string>&lt;html&gt;The wizard is now complete. The sounds have been converted. You can view all converted files clicking &lt;a href=&quot; &quot;&gt;here.&lt;/a&gt;&lt;br /&gt;&lt;br /&gt;Click restart to create more sounds from the wizard beggining, otherwise click finish.&lt;/html&gt;</string>
     21     </property>
     22     <property name="wordWrap">
     23      <bool>true</bool>
    2724     </property>
    2825    </widget>
  • Vago/trunk/Vago/util.h

    r771 r790  
    1212
    1313namespace GlobalVars{
    14     const QString AppVersion="0.8";
    15     const QString OniSplitExeName="OniSplit.exe";
    16     const QString XmlToolsExeName="xmlTools.exe";
    17     const QString AppLogName="logVago.txt";
    18     const QString BuiltOniSplitVersion="0.9.86.0";
    19     const QString BuiltXmlToolsVersion="0.8d";
    20     const QString ModsDomain="www.mods.oni2.net";
    21     const QString VagoNode = "247";
    22     const QString VagoCheckUpdatesUrl="http://"+ModsDomain+"/?q=api/node/"+VagoNode+".json";
    23     const QString VagoWebUrl="http://"+ModsDomain+"/node/"+VagoNode;
    24     const QString VagoTemporaryDir=QDir::tempPath()+"/VagoTemp";
    25     const QString HelpLocation=QDir::currentPath() + "/help";
    26     const char OniSplitProcSeparator=';';
     14const QString AppVersion="0.8";
     15const QString OniSplitString="OniSplit.exe";
     16const QString XmlToolsString="xmlTools.exe";
     17
     18#ifdef Q_WS_WIN
     19const QString OniExe="Oni.exe";
     20const QString OniSplitExeName=OniSplitString;
     21const QString XmlToolsExeName=XmlToolsString;
     22#else
     23const QString OniExe="Oni.app/Contents/MacOS/Oni";
     24const QString OniSplitExeName="mono "+OniSplitString; // Mac uses mono to run .net applications
     25const QString XmlToolsExeName="mono "+XmlToolsString;
     26#endif
     27
     28const QString AppLogName="logVago.txt";
     29const QString BuiltOniSplitVersion="0.9.86.0";
     30const QString BuiltXmlToolsVersion="0.8d";
     31const QString ModsDomain="www.mods.oni2.net";
     32const QString VagoNode = "247";
     33const QString VagoCheckUpdatesUrl="http://"+ModsDomain+"/?q=api/node/"+VagoNode+".json";
     34const QString VagoWebUrl="http://"+ModsDomain+"/node/"+VagoNode;
     35const QString VagoTemporaryDir=QDir::tempPath()+"/VagoTemp";
     36const QString HelpLocation=QDir::currentPath() + "/help";
     37const char OniSplitProcSeparator=';';
    2738}
    2839
     
    3142  **/
    3243namespace Util{
    33     QString normalizePath(QString path);
    34     QString cutName(QString path);
    35     QString insertQuotes(QString path);
    36     QString normalizeAndQuote(QString path);
    37     QString fullTrim(QString str);
    38     QString normalizeDecimalSeparator(QString value);
    39     QStringList multipleDirDialog(QString title);
    40     QStringList substring(QString myString,QString separator,Qt::CaseSensitivity cs = Qt::CaseSensitive);
    41     int indexOfBackward(QString myString, QString toSearch, int from = -1);
    42     bool showQuestionPopUp(QWidget * parent, QString message);
    43     bool checkEmptySpaces(QStringList toCheck);
    44     bool checkIfDoubles(QStringList toCheck);
    45     bool isStringInteger(QString myString);
    46     bool isStringDouble(QString myString);
    47     bool cpDir(const QString &srcPath, const QString &dstPath);
    48     bool rmDir(const QString &dirPath);
    49     bool removeDir(const QString &dirName);
    50     void showPopUp(QString message);
    51     void showRichPopUp(QString message);
    52     void showWarningPopUp(QString message);
    53     void showErrorPopUp(QString message);
    54     void showErrorLogPopUp(QString message);
    55     void showRichErrorPopUp(QString message);
    56     void openLogFile();
     44QString normalizePath(QString path);
     45QString cutName(QString path);
     46QString insertQuotes(QString path);
     47QString normalizeAndQuote(QString path);
     48QString fullTrim(QString str);
     49QString normalizeDecimalSeparator(QString value);
     50QStringList multipleDirDialog(QString title);
     51QStringList substring(QString myString,QString separator,Qt::CaseSensitivity cs = Qt::CaseSensitive);
     52int indexOfBackward(QString myString, QString toSearch, int from = -1);
     53bool showQuestionPopUp(QWidget * parent, QString message);
     54bool checkEmptySpaces(QStringList toCheck);
     55bool checkIfDoubles(QStringList toCheck);
     56bool isStringInteger(QString myString);
     57bool isStringDouble(QString myString);
     58bool cpDir(const QString &srcPath, const QString &dstPath);
     59bool rmDir(const QString &dirPath);
     60bool removeDir(const QString &dirName);
     61void showPopUp(QString message);
     62void showRichPopUp(QString message);
     63void showWarningPopUp(QString message);
     64void showErrorPopUp(QString message);
     65void showErrorLogPopUp(QString message);
     66void showRichErrorPopUp(QString message);
     67void openLogFile();
    5768
    5869}
Note: See TracChangeset for help on using the changeset viewer.