Changeset 797


Ignore:
Timestamp:
Apr 7, 2013, 3:02:07 AM (12 years ago)
Author:
s10k
Message:

fixed some really small tooltips at mac and also fixed at sound wizard
not recognizing *.aif.aif files (thanks Iritscen!)

Location:
Vago/trunk/Vago
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • Vago/trunk/Vago/mainwindow.cpp

    r793 r797  
    120120    resize(800,600); // Mac OS pcs should be able to render this resolution without any problem. It's also better
    121121    // because the components on mac use more space
     122#else
     123    resize(640,480);
    122124#endif
    123125
  • Vago/trunk/Vago/packageWizard/packagepage2.ui

    r793 r797  
    88    <y>0</y>
    99    <width>451</width>
    10     <height>478</height>
     10    <height>494</height>
    1111   </rect>
    1212  </property>
     
    186186      <widget class="QPushButton" name="pbCheck">
    187187       <property name="toolTip">
    188         <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;
    189 &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;
    190 p, li { white-space: pre-wrap; }
    191 &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;
    192 &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;Check if the current number is available using a online database&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     188        <string>Check if the current number is available using a online database</string>
    193189       </property>
    194190       <property name="text">
     
    211207      <widget class="QRadioButton" name="rbReplace">
    212208       <property name="toolTip">
    213         <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;
    214 &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;
    215 p, li { white-space: pre-wrap; }
    216 &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;
    217 &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;The Installer considers your mod a scenario and takes steps to exclude other BSL scenario mods from being installed for the same level&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     209        <string>The Installer considers your mod a scenario and takes steps to exclude other BSL scenario mods from being installed for the same level</string>
    218210       </property>
    219211       <property name="text">
     
    228220      <widget class="QRadioButton" name="rbAdd">
    229221       <property name="toolTip">
    230         <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;
    231 &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;
    232 p, li { white-space: pre-wrap; }
    233 &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;
    234 &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;The Installer allows your mod to be installed to any level without restriction (allows multiple BSLs from different mods to co-exist in the same level)&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     222        <string>The Installer allows your mod to be installed to any level without restriction (allows multiple BSLs from different mods to co-exist in the same level)</string>
    235223       </property>
    236224       <property name="text">
  • Vago/trunk/Vago/packageWizard/packagepage3.ui

    r792 r797  
    2121    <widget class="QLabel" name="label_3">
    2222     <property name="toolTip">
    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-weight:600;&quot;&gt;If this package use new levels, specify its number to get them unlocked automatically&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     23      <string>If this package use new levels, specify its number to get them unlocked automatically</string>
    2824     </property>
    2925     <property name="text">
     
    3531    <widget class="QLineEdit" name="leUnlockLevels">
    3632     <property name="toolTip">
    37       <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;
    38 &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;
    39 p, li { white-space: pre-wrap; }
    40 &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;
    41 &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-weight:600;&quot;&gt;If this package use new levels, specify its number to get them unlocked automatically&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     33      <string>If this package use new levels, specify its number to get them unlocked automatically</string>
    4234     </property>
    4335    </widget>
     
    4638    <widget class="QLabel" name="label">
    4739     <property name="toolTip">
    48       <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;
    49 &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;
    50 p, li { white-space: pre-wrap; }
    51 &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;
    52 &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;Fill with the packages number which this package will depend&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     40      <string>Fill with the packages number which this package will depend</string>
    5341     </property>
    5442     <property name="text">
     
    6048    <widget class="QLineEdit" name="leDependent">
    6149     <property name="toolTip">
    62       <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;
    63 &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;
    64 p, li { white-space: pre-wrap; }
    65 &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;
    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; font-weight:600;&quot;&gt;Fill with the packages number which this package will depend&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     50      <string>Fill with the packages number which this package will depend</string>
    6751     </property>
    6852    </widget>
     
    7155    <widget class="QLabel" name="label_2">
    7256     <property name="toolTip">
    73       <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;
    74 &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;
    75 p, li { white-space: pre-wrap; }
    76 &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;
    77 &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;Fill with the packages number that will conflict with this package&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     57      <string>Fill with the packages number that will conflict with this package</string>
    7858     </property>
    7959     <property name="text">
  • Vago/trunk/Vago/soundWizard/soundpage2.cpp

    r790 r797  
    1616                       "All the files will have the same properties applied.<br/>"
    1717                       "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
     18                       "More information <a href='file:///"+this->codecLocalHelpFile+"'>here.</a></html>"); // Don't use rich text in qtdesigner because it generates platform dependent code
    1919
    2020    // Drop signal for Packages table
     
    7272    //Pre-processing (check if received only folders)
    7373    foreach(QString myFile, resources){
    74         QString currFileExt=QFileInfo(myFile).completeSuffix();
     74        QString currFileExt="."+QFileInfo(myFile).completeSuffix();
    7575        if(QDir(myFile).exists()){
    7676            Util::showErrorPopUp("Only files are allowed for this operation.");
     
    7979
    8080        foreach(QString vext, this->allowedFiles){
    81             vext.remove("*.");
    82             if(vext==currFileExt){
     81            vext.remove("*");
     82            if(currFileExt.endsWith(vext)){
    8383                fileExtValid=true;
    8484                break;
Note: See TracChangeset for help on using the changeset viewer.