Changeset 792


Ignore:
Timestamp:
Apr 7, 2013, 1:10:19 AM (12 years ago)
Author:
s10k
Message:

Some more mac fixes

Location:
Vago/trunk/Vago
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • Vago/trunk/Vago/Vago.pro.user

    r791 r792  
    11<?xml version="1.0" encoding="UTF-8"?>
    22<!DOCTYPE QtCreatorProject>
    3 <!-- Written by Qt Creator 2.4.1, 2013-04-06T22:07:35. -->
     3<!-- Written by Qt Creator 2.4.1, 2013-04-07T00:10:12. -->
    44<qtcreator>
    55 <data>

  • Vago/trunk/Vago/main.cpp

    r790 r792  
    1 #define USING_VM_TABLET_WARNING_FIX // Comment this line if not using a mac vm
     1//#define USING_VM_TABLET_WARNING_FIX // Comment this line if not using a mac vm
    22
    33#ifdef USING_VM_TABLET_WARNING_FIX

  • Vago/trunk/Vago/mainwindow.cpp

    r791 r792  
    99{
    1010    ui->setupUi(this);
    11 
    12     ui->pbConvertGeneral->setMinimumSize(ui->pbConvertGeneral->minimumSizeHint());
    13     ui->pbConvertGeneral->setMinimumWidth(50);
    14     ui->pbConvertGeneral->setMinimumHeight(ui->pbConvertGeneral->minimumHeight()*1.4);
    15 
    16     qDebug() << ui->pbConvertGeneral->minimumHeight() << ui->pbConvertGeneral->minimumHeight();
    1711
    1812    this->setWindowTitle("Vago v"+GlobalVars::AppVersion);
    … …  
    114108    ui->mainToolBar->setLayoutDirection(Qt::RightToLeft);
    115109
     110    setConverterButtonsSize();
     111
    116112#ifdef Q_WS_MAC
    117113    // 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
    … …  
    122118    ui->actionWindows->setChecked(false);
    123119    ui->actionMac_Windows_demo->setChecked(true);
    124     // Hide file menu on mac (not needed)
    125     ui->menuFile->hide();
    126     ui->menuFile->close();
    127     //ui->menuBar->macMenu();
    128120#endif
    129121
    … …  
    14911483}
    14921484
     1485/**
     1486  This is OS indepented. It maintain size ratio over the Windows and Mac.
     1487  **/
     1488void MainWindow::setConverterButtonsSize(){
     1489    int height=ui->pbConvertGeneral->sizeHint().height()*1.3;
     1490    ui->pbConvertGeneral->setMinimumHeight(height);
     1491    ui->pbConvertTextures->setMinimumHeight(height);
     1492    ui->pbConvertModels->setMinimumHeight(height);
     1493    ui->pbConvertAnimations->setMinimumHeight(height);
     1494    ui->pbConvertLevels->setMinimumHeight(height);
     1495    ui->pbConvertMisc->setMinimumHeight(height);
     1496}
     1497
    14931498void MainWindow::connectSlots(){
    14941499

  • Vago/trunk/Vago/mainwindow.h

    r771 r792  
    210210    void changeToCurrentSettings(QList<int> rows, DropTableWidget* myTable); //change some rows to the current settings
    211211    void changeItemsOutput(DropTableWidget* myTable, QList<int> rows, QString newOutput);
     212    void setConverterButtonsSize();
    212213    QString getFileOutputFolder(QString fromTo, QString myOutputFolder="");
    213214    QString fileParsingGeneral(QString myOutputFolder, QString from, QString to , QString file);

  • Vago/trunk/Vago/mainwindow.ui

    r790 r792  
    333333             </property>
    334334             <property name="toolTip">
    335               <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;
    336 &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;
    337 p, li { white-space: pre-wrap; }
    338 &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;
    339 &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;Extract an ONCC with another character's TRAM&lt;/span&gt;&lt;/p&gt;
    340 &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;For example extract Konoko's ONCC with Muro's TRAM&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     335              <string>Extract an ONCC with another character's TRAM
     336For example extract Konoko's ONCC with Muro's TRAM</string>
    341337             </property>
    342338             <property name="placeholderText">
    … …  
    357353        <item>
    358354         <widget class="QPushButton" name="pbConvertGeneral">
    359           <property name="minimumSize">
    360            <size>
    361             <width>0</width>
    362             <height>0</height>
    363            </size>
    364           </property>
    365355          <property name="text">
    366356           <string>Convert</string>
    … …  
    590580                <widget class="QCheckBox" name="cbEnvMap">
    591581                 <property name="toolTip">
    592                   <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;
    593 &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;
    594 p, li { white-space: pre-wrap; }
    595 &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;
    596 &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;Used for reflection in armors. The armor texture has an alpha channel which is transparent and the envmap texture is shown.&lt;/span&gt;&lt;/p&gt;
    597 &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;It's the name of a TXMP.oni file, don't include the extension.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     582                  <string>Used for reflection in armors. The armor texture has an alpha channel which is transparent and the envmap texture is shown.
     583It's the name of a TXMP.oni file, don't include the extension.</string>
    598584                 </property>
    599585                 <property name="text">
    … …  
    608594                 </property>
    609595                 <property name="toolTip">
    610                   <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;
    611 &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;
    612 p, li { white-space: pre-wrap; }
    613 &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;
    614 &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;Used for reflection in armors. The armor texture has an alpha channel which is transparent and the envmap texture is shown.&lt;/span&gt;&lt;/p&gt;
    615 &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;It's the name of a TXMP.oni file, don't include the extension.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     596                  <string>Used for reflection in armors. The armor texture has an alpha channel which is transparent and the envmap texture is shown.
     597It's the name of a TXMP.oni file, don't include the extension.</string>
    616598                 </property>
    617599                 <property name="placeholderText">
    … …  
    804786                 </property>
    805787                 <property name="toolTip">
    806                   <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;
    807 &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;
    808 p, li { white-space: pre-wrap; }
    809 &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;
    810 &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;Extract the model with a specific animation.  &lt;/span&gt;&lt;/p&gt;
    811 &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;If none inputted (and checkbox is selected) it will search for one at ONCC&amp;gt;TRAC.&lt;/span&gt;&lt;/p&gt;
    812 &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;It's the name of a TRAM.oni file, don't include the extension.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     788                  <string>Extract the model with a specific animation. 
     789If none inputted (and checkbox is selected) it will search for one at ONCC&gt;TRAC.
     790It's the name of a TRAM.oni file, don't include the extension.</string>
    813791                 </property>
    814792                 <property name="text">
    … …  
    823801                 </property>
    824802                 <property name="toolTip">
    825                   <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;
    826 &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;
    827 p, li { white-space: pre-wrap; }
    828 &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;
    829 &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;Extract the model with a specific animation.  &lt;/span&gt;&lt;/p&gt;
    830 &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;If none inputted (and checkbox is selected) it will search for one at &lt;/span&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;ONCC&amp;gt;TRAC.&lt;/span&gt;&lt;/p&gt;
    831 &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;It's the name of a TRAM.oni file, don't include the extension.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     803                  <string>Extract the model with a specific animation. 
     804If none inputted (and checkbox is selected) it will search for one at ONCC&gt;TRAC.
     805It's the name of a TRAM.oni file, don't include the extension.</string>
    832806                 </property>
    833807                 <property name="placeholderText">
    … …  
    842816                 </property>
    843817                 <property name="toolTip">
    844                   <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;
    845 &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;
    846 p, li { white-space: pre-wrap; }
    847 &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;
    848 &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;Give model a texture.&lt;/span&gt;&lt;/p&gt;
    849 &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;It's the name of a TXMP.oni file, don't include the extension.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     818                  <string>Give model a texture.
     819It's the name of a TXMP.oni file, don't include the extension.</string>
    850820                 </property>
    851821                 <property name="text">
    … …  
    860830                 </property>
    861831                 <property name="toolTip">
    862                   <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;
    863 &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;
    864 p, li { white-space: pre-wrap; }
    865 &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;
    866 &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;Give model a texture. &lt;/span&gt;&lt;/p&gt;
    867 &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;It's the name of a TXMP.oni file, don't include the extension.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     832                  <string>Give model a texture.
     833It's the name of a TXMP.oni file, don't include the extension.</string>
    868834                 </property>
    869835                 <property name="placeholderText">
    … …  
    12761242               </property>
    12771243               <property name="toolTip">
    1278                 <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;
    1279 &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;
    1280 p, li { white-space: pre-wrap; }
    1281 &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;
    1282 &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;Use &amp;quot;space&amp;quot; as separator for each file&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     1244                <string>Use &quot;space&quot; as separator for each file</string>
    12831245               </property>
    12841246               <property name="placeholderText">
    … …  
    12931255               </property>
    12941256               <property name="toolTip">
    1295                 <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;
    1296 &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;
    1297 p, li { white-space: pre-wrap; }
    1298 &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;
    1299 &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;Generate pathfinding grids (master xml generates them automatically). Needs Bnv source.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     1257                <string>Generate pathfinding grids (master xml generates them automatically). Needs Bnv source.</string>
    13001258               </property>
    13011259               <property name="text">

  • Vago/trunk/Vago/packageWizard/packagepage2.ui

    r790 r792  
    77    <x>0</x>
    88    <y>0</y>
    9     <width>400</width>
    10     <height>408</height>
     9    <width>451</width>
     10    <height>478</height>
    1111   </rect>
    1212  </property>
    … …  
    2020   <string>WizardPage</string>
    2121  </property>
    22   <layout class="QVBoxLayout" name="verticalLayout">
    23    <item>
     22  <layout class="QFormLayout" name="formLayout">
     23   <property name="fieldGrowthPolicy">
     24    <enum>QFormLayout::FieldsStayAtSizeHint</enum>
     25   </property>
     26   <item row="0" column="0">
     27    <widget class="QLabel" name="label">
     28     <property name="text">
     29      <string>Mod Name:</string>
     30     </property>
     31    </widget>
     32   </item>
     33   <item row="0" column="1">
    2434    <layout class="QHBoxLayout" name="horizontalLayout">
    2535     <item>
    26       <widget class="QLabel" name="label">
    27        <property name="minimumSize">
    28         <size>
    29          <width>84</width>
    30          <height>0</height>
    31         </size>
    32        </property>
    33        <property name="text">
    34         <string>Mod Name:</string>
    35        </property>
    36       </widget>
    37      </item>
    38      <item>
    3936      <widget class="QLineEdit" name="leModName"/>
    4037     </item>
    … …  
    4845    </layout>
    4946   </item>
    50    <item>
     47   <item row="2" column="0">
     48    <widget class="QLabel" name="label_2">
     49     <property name="text">
     50      <string>Author(s):</string>
     51     </property>
     52    </widget>
     53   </item>
     54   <item row="2" column="1">
    5155    <layout class="QHBoxLayout" name="horizontalLayout_2">
    5256     <item>
    53       <widget class="QLabel" name="label_2">
    54        <property name="minimumSize">
    55         <size>
    56          <width>84</width>
    57          <height>0</height>
    58         </size>
    59        </property>
    60        <property name="text">
    61         <string>Author(s):</string>
    62        </property>
    63       </widget>
    64      </item>
    65      <item>
    6657      <widget class="QLineEdit" name="leAuthors"/>
    6758     </item>
    … …  
    7566    </layout>
    7667   </item>
    77    <item>
     68   <item row="4" column="0">
     69    <widget class="QLabel" name="label_3">
     70     <property name="text">
     71      <string>Version:</string>
     72     </property>
     73    </widget>
     74   </item>
     75   <item row="4" column="1">
    7876    <layout class="QHBoxLayout" name="horizontalLayout_3">
    7977     <item>
    80       <widget class="QLabel" name="label_3">
    81        <property name="minimumSize">
    82         <size>
    83          <width>84</width>
    84          <height>0</height>
    85         </size>
    86        </property>
    87        <property name="text">
    88         <string>Version:</string>
    89        </property>
    90       </widget>
    91      </item>
    92      <item>
    9378      <widget class="QLineEdit" name="leVersion"/>
    9479     </item>
    … …  
    10287    </layout>
    10388   </item>
    104    <item>
    105     <layout class="QHBoxLayout" name="horizontalLayout_7">
    106      <item>
    107       <widget class="QLabel" name="label_4">
    108        <property name="minimumSize">
    109         <size>
    110          <width>84</width>
    111          <height>0</height>
    112         </size>
    113        </property>
    114        <property name="text">
    115         <string>Description:</string>
    116        </property>
    117       </widget>
    118      </item>
     89   <item row="6" column="0">
     90    <widget class="QLabel" name="label_4">
     91     <property name="text">
     92      <string>Description:</string>
     93     </property>
     94    </widget>
     95   </item>
     96   <item row="6" column="1">
     97    <layout class="QHBoxLayout" name="horizontalLayout_4">
    11998     <item>
    12099      <widget class="QPlainTextEdit" name="ptDescription">
    … …  
    136115    </layout>
    137116   </item>
    138    <item>
    139     <layout class="QHBoxLayout" name="horizontalLayout_4">
    140      <item>
    141       <widget class="QLabel" name="label_5">
    142        <property name="sizePolicy">
    143         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
    144          <horstretch>0</horstretch>
    145          <verstretch>0</verstretch>
    146         </sizepolicy>
    147        </property>
    148        <property name="minimumSize">
    149         <size>
    150          <width>84</width>
    151          <height>0</height>
    152         </size>
    153        </property>
    154        <property name="text">
    155         <string>Type:</string>
    156        </property>
    157       </widget>
    158      </item>
    159      <item>
    160       <widget class="QComboBox" name="cbType">
    161        <item>
    162         <property name="text">
    163          <string>Weapons</string>
    164         </property>
    165        </item>
    166        <item>
    167         <property name="text">
    168          <string>Characters</string>
    169         </property>
    170        </item>
    171        <item>
    172         <property name="text">
    173          <string>Particles</string>
    174         </property>
    175        </item>
    176        <item>
    177         <property name="text">
    178          <string>Animations (non-combat)</string>
    179         </property>
    180        </item>
    181        <item>
    182         <property name="text">
    183          <string>Animations (combat)</string>
    184         </property>
    185        </item>
    186        <item>
    187         <property name="text">
    188          <string>Sounds</string>
    189         </property>
    190        </item>
    191        <item>
    192         <property name="text">
    193          <string>User Interface</string>
    194         </property>
    195        </item>
    196        <item>
    197         <property name="text">
    198          <string>New Levels</string>
    199         </property>
    200        </item>
    201        <item>
    202         <property name="text">
    203          <string>Scenarios</string>
    204         </property>
    205        </item>
    206       </widget>
    207      </item>
    208     </layout>
    209    </item>
    210    <item>
     117   <item row="8" column="0">
     118    <widget class="QLabel" name="label_5">
     119     <property name="text">
     120      <string>Type:</string>
     121     </property>
     122    </widget>
     123   </item>
     124   <item row="8" column="1">
     125    <widget class="QComboBox" name="cbType">
     126     <item>
     127      <property name="text">
     128       <string>Weapons</string>
     129      </property>
     130     </item>
     131     <item>
     132      <property name="text">
     133       <string>Characters</string>
     134      </property>
     135     </item>
     136     <item>
     137      <property name="text">
     138       <string>Particles</string>
     139      </property>
     140     </item>
     141     <item>
     142      <property name="text">
     143       <string>Animations (non-combat)</string>
     144      </property>
     145     </item>
     146     <item>
     147      <property name="text">
     148       <string>Animations (combat)</string>
     149      </property>
     150     </item>
     151     <item>
     152      <property name="text">
     153       <string>Sounds</string>
     154      </property>
     155     </item>
     156     <item>
     157      <property name="text">
     158       <string>User Interface</string>
     159      </property>
     160     </item>
     161     <item>
     162      <property name="text">
     163       <string>New Levels</string>
     164      </property>
     165     </item>
     166     <item>
     167      <property name="text">
     168       <string>Scenarios</string>
     169      </property>
     170     </item>
     171    </widget>
     172   </item>
     173   <item row="10" column="0">
     174    <widget class="QLabel" name="label_6">
     175     <property name="text">
     176      <string>Package Number:</string>
     177     </property>
     178    </widget>
     179   </item>
     180   <item row="10" column="1">
    211181    <layout class="QHBoxLayout" name="horizontalLayout_5">
    212      <item>
    213       <widget class="QLabel" name="label_6">
    214        <property name="text">
    215         <string>Package Number:</string>
    216        </property>
    217       </widget>
    218      </item>
    219182     <item>
    220183      <widget class="QLineEdit" name="lePackageNumber"/>
    … …  
    236199    </layout>
    237200   </item>
    238    <item>
     201   <item row="12" column="0">
     202    <widget class="QLabel" name="label_7">
     203     <property name="text">
     204      <string>Scripts:</string>
     205     </property>
     206    </widget>
     207   </item>
     208   <item row="12" column="1">
    239209    <layout class="QHBoxLayout" name="horizontalLayout_6">
    240      <item>
    241       <widget class="QLabel" name="label_7">
    242        <property name="sizePolicy">
    243         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
    244          <horstretch>0</horstretch>
    245          <verstretch>0</verstretch>
    246         </sizepolicy>
    247        </property>
    248        <property name="minimumSize">
    249         <size>
    250          <width>84</width>
    251          <height>0</height>
    252         </size>
    253        </property>
    254        <property name="text">
    255         <string>Scripts:</string>
    256        </property>
    257       </widget>
    258      </item>
    259210     <item>
    260211      <widget class="QRadioButton" name="rbReplace">
    … …  
    290241    </layout>
    291242   </item>
    292    <item>
     243   <item row="15" column="0" colspan="2">
     244    <widget class="QLabel" name="lbFieldsReadOnly">
     245     <property name="text">
     246      <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>
     247     </property>
     248     <property name="wordWrap">
     249      <bool>true</bool>
     250     </property>
     251    </widget>
     252   </item>
     253   <item row="14" column="0" colspan="2">
    293254    <spacer name="verticalSpacer">
    294255     <property name="orientation">
    295256      <enum>Qt::Vertical</enum>
    296257     </property>
     258     <property name="sizeType">
     259      <enum>QSizePolicy::Expanding</enum>
     260     </property>
    297261     <property name="sizeHint" stdset="0">
    298262      <size>
    299263       <width>20</width>
    300        <height>40</height>
     264       <height>10</height>
    301265      </size>
    302266     </property>
    303267    </spacer>
    304    </item>
    305    <item>
    306     <widget class="QLabel" name="lbFieldsReadOnly">
    307      <property name="text">
    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>
    309      </property>
    310     </widget>
    311268   </item>
    312269  </layout>

  • Vago/trunk/Vago/packageWizard/packagepage3.ui

    r771 r792  
    88    <y>0</y>
    99    <width>364</width>
    10     <height>290</height>
     10    <height>203</height>
    1111   </rect>
    1212  </property>
    … …  
    1414   <string>WizardPage</string>
    1515  </property>
    16   <layout class="QVBoxLayout" name="verticalLayout">
    17    <item>
    18     <layout class="QHBoxLayout" name="horizontalLayout_2">
    19      <item>
    20       <widget class="QLabel" name="label">
    21        <property name="minimumSize">
    22         <size>
    23          <width>113</width>
    24          <height>0</height>
    25         </size>
    26        </property>
    27        <property name="toolTip">
    28         <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;
     16  <layout class="QFormLayout" name="formLayout">
     17   <property name="fieldGrowthPolicy">
     18    <enum>QFormLayout::FieldsStayAtSizeHint</enum>
     19   </property>
     20   <item row="6" column="0">
     21    <widget class="QLabel" name="label_3">
     22     <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;
     25p, 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>
     28     </property>
     29     <property name="text">
     30      <string>Unlock Levels:</string>
     31     </property>
     32    </widget>
     33   </item>
     34   <item row="6" column="1">
     35    <widget class="QLineEdit" name="leUnlockLevels">
     36     <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;
     39p, 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>
     42     </property>
     43    </widget>
     44   </item>
     45   <item row="0" column="0">
     46    <widget class="QLabel" name="label">
     47     <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;
    2949&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;
    3050p, li { white-space: pre-wrap; }
    3151&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;
    3252&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>
    33        </property>
    34        <property name="text">
    35         <string>Dependent Packages:</string>
    36        </property>
    37       </widget>
    38      </item>
    39      <item>
    40       <widget class="QLineEdit" name="leDependent">
    41        <property name="toolTip">
    42         <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;
     53     </property>
     54     <property name="text">
     55      <string>Dependent Packages:</string>
     56     </property>
     57    </widget>
     58   </item>
     59   <item row="0" column="1">
     60    <widget class="QLineEdit" name="leDependent">
     61     <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;
    4363&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;
    4464p, li { white-space: pre-wrap; }
    4565&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;
    4666&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>
    47        </property>
    48       </widget>
    49      </item>
    50     </layout>
     67     </property>
     68    </widget>
    5169   </item>
    52    <item>
    53     <layout class="QHBoxLayout" name="horizontalLayout">
    54      <item>
    55       <widget class="QLabel" name="label_2">
    56        <property name="toolTip">
    57         <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;
     70   <item row="3" column="0">
     71    <widget class="QLabel" name="label_2">
     72     <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;
    5874&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;
    5975p, li { white-space: pre-wrap; }
    6076&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;
    6177&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>
    62        </property>
    63        <property name="text">
    64         <string>Incompatible Packages:</string>
    65        </property>
    66       </widget>
    67      </item>
    68      <item>
    69       <widget class="QLineEdit" name="leIncompatible">
    70        <property name="toolTip">
    71         <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;
     78     </property>
     79     <property name="text">
     80      <string>Incompatible Packages:</string>
     81     </property>
     82    </widget>
     83   </item>
     84   <item row="3" column="1">
     85    <widget class="QLineEdit" name="leIncompatible">
     86     <property name="toolTip">
     87      <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;
    7288&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;
    7389p, li { white-space: pre-wrap; }
    7490&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;
    7591&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>
    76        </property>
    77       </widget>
    78      </item>
    79     </layout>
    80    </item>
    81    <item>
    82     <layout class="QHBoxLayout" name="horizontalLayout_3">
    83      <item>
    84       <widget class="QLabel" name="label_3">
    85        <property name="minimumSize">
    86         <size>
    87          <width>113</width>
    88          <height>0</height>
    89         </size>
    90        </property>
    91        <property name="toolTip">
    92         <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;
    93 &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;
    94 p, li { white-space: pre-wrap; }
    95 &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;
    96 &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>
    97        </property>
    98        <property name="text">
    99         <string>Unlock Levels:</string>
    100        </property>
    101       </widget>
    102      </item>
    103      <item>
    104       <widget class="QLineEdit" name="leUnlockLevels">
    105        <property name="toolTip">
    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-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>
    111        </property>
    112       </widget>
    113      </item>
    114     </layout>
     92     </property>
     93    </widget>
    11594   </item>
    11695  </layout>

  • Vago/trunk/Vago/packageWizard/packagepagefinal.ui

    r790 r792  
    77    <x>0</x>
    88    <y>0</y>
    9     <width>427</width>
     9    <width>595</width>
    1010    <height>300</height>
    1111   </rect>
    … …  
    2222After 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.
    2323&lt;/html&gt;</string>
     24     </property>
     25     <property name="wordWrap">
     26      <bool>true</bool>
    2427     </property>
    2528    </widget>

  • Vago/trunk/Vago/soundWizard/soundpage4.ui

    r790 r792  
    1717   <string>OSBD.grp file properties</string>
    1818  </property>
    19   <layout class="QVBoxLayout" name="verticalLayout_2">
     19  <layout class="QVBoxLayout" name="verticalLayout">
    2020   <item>
    2121    <widget class="QGroupBox" name="groupBox_3">
    … …  
    143143      <string>Audio Channels</string>
    144144     </property>
    145      <layout class="QHBoxLayout" name="horizontalLayout">
     145     <layout class="QVBoxLayout" name="verticalLayout_2">
    146146      <item>
    147147       <widget class="QRadioButton" name="rbStereo22">
Note: See TracChangeset for help on using the changeset viewer.