Changeset 811


Ignore:
Timestamp:
Apr 13, 2013, 2:15:20 PM (12 years ago)
Author:
s10k
Message:

Vago: some layout fixes on windows, removed debug includes

Location:
Vago/trunk/Vago
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • Vago/trunk/Vago/about.h

    r771 r811  
    33
    44#include <QDialog>
    5 #include <util.h>
     5
     6#include "util.h"
    67
    78namespace Ui {

  • Vago/trunk/Vago/converter.h

    r771 r811  
    22#define CONVERTER_H
    33#include <QProcess>
    4 #include <logger.h>
    54#include <QProgressBar>
    65#include <QThread>
    7 #include <util.h>
    8 #include <QDebug>
     6
     7#include "logger.h"
     8#include "util.h"
     9//#include <QDebug>
    910
    1011class Converter : public QThread

  • Vago/trunk/Vago/droptablewidget.cpp

    r771 r811  
    1 #include <QtGui>
    21#include "droptablewidget.h"
    32

  • Vago/trunk/Vago/droptablewidget.h

    r771 r811  
    33
    44#include <QTableWidget>
    5 #include <util.h>
     5#include <QtGui>
     6
     7#include "util.h"
    68
    79

  • Vago/trunk/Vago/logger.h

    r803 r811  
    55#include <QMutex>
    66#include <QDateTime>
    7 #include <util.h>
     7
     8#include "util.h"
    89
    910class Logger

  • Vago/trunk/Vago/mainwindow.h

    r801 r811  
    88#include "packagewizard.h"
    99#include "soundwizard.h"
     10#include "converter.h"
     11#include "droptablewidget.h"
    1012
    1113#include <QMainWindow>
    … …  
    2022#include <QErrorMessage>
    2123#include <QTextCodec>
    22 #include <converter.h>
    2324#include <QProgressBar>
    24 #include <droptablewidget.h>
    2525#include <QComboBox>
    2626#include <QtNetwork/QNetworkAccessManager>
    2727#include <QtNetwork/QNetworkRequest>
    2828#include <QtNetwork/QNetworkReply>
    29 #include <QDebug>
    3029#include <QCloseEvent>
    3130#include <QScriptEngine>
    3231#include <QScriptValueIterator>
     32//#include <QDebug>
    3333
    3434namespace Ui {

  • Vago/trunk/Vago/manualcommands.h

    r771 r811  
    66#include <QProcess>
    77#include <QScrollBar>
    8 #include <util.h>
     8
     9#include "util.h"
    910
    1011

  • Vago/trunk/Vago/packageWizard/packagepage2.h

    r771 r811  
    55#include "logger.h"
    66#include "unzip.h"
     7
    78#include <QWizardPage>
    89#include <QtNetwork/QNetworkAccessManager>

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

    r797 r811  
    88    <y>0</y>
    99    <width>451</width>
    10     <height>494</height>
     10    <height>390</height>
    1111   </rect>
    1212  </property>
    … …  
    2121  </property>
    2222  <layout class="QFormLayout" name="formLayout">
    23    <property name="fieldGrowthPolicy">
    24     <enum>QFormLayout::FieldsStayAtSizeHint</enum>
    25    </property>
    2623   <item row="0" column="0">
    2724    <widget class="QLabel" name="label">
    … …  
    4542    </layout>
    4643   </item>
     44   <item row="1" column="0">
     45    <widget class="QLabel" name="label_2">
     46     <property name="text">
     47      <string>Author(s):</string>
     48     </property>
     49    </widget>
     50   </item>
     51   <item row="1" column="1">
     52    <layout class="QHBoxLayout" name="horizontalLayout_2">
     53     <item>
     54      <widget class="QLineEdit" name="leAuthors"/>
     55     </item>
     56     <item>
     57      <widget class="QLabel" name="lbAsteriscAuthors">
     58       <property name="text">
     59        <string>&lt;html&gt;&lt;span style=&quot;color:#0000ff;&quot;&gt;*&lt;/span&gt;&lt;/html&gt;</string>
     60       </property>
     61      </widget>
     62     </item>
     63    </layout>
     64   </item>
    4765   <item row="2" column="0">
    48     <widget class="QLabel" name="label_2">
    49      <property name="text">
    50       <string>Author(s):</string>
     66    <widget class="QLabel" name="label_3">
     67     <property name="text">
     68      <string>Version:</string>
    5169     </property>
    5270    </widget>
    5371   </item>
    5472   <item row="2" column="1">
    55     <layout class="QHBoxLayout" name="horizontalLayout_2">
    56      <item>
    57       <widget class="QLineEdit" name="leAuthors"/>
    58      </item>
    59      <item>
    60       <widget class="QLabel" name="lbAsteriscAuthors">
    61        <property name="text">
    62         <string>&lt;html&gt;&lt;span style=&quot;color:#0000ff;&quot;&gt;*&lt;/span&gt;&lt;/html&gt;</string>
    63        </property>
    64       </widget>
    65      </item>
    66     </layout>
    67    </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">
    7673    <layout class="QHBoxLayout" name="horizontalLayout_3">
    7774     <item>
    … …  
    8784    </layout>
    8885   </item>
    89    <item row="6" column="0">
     86   <item row="3" column="0">
    9087    <widget class="QLabel" name="label_4">
    9188     <property name="text">
    … …  
    9491    </widget>
    9592   </item>
    96    <item row="6" column="1">
     93   <item row="3" column="1">
    9794    <layout class="QHBoxLayout" name="horizontalLayout_4">
    9895     <item>
    … …  
    115112    </layout>
    116113   </item>
    117    <item row="8" column="0">
     114   <item row="4" column="0">
    118115    <widget class="QLabel" name="label_5">
    119116     <property name="text">
    … …  
    122119    </widget>
    123120   </item>
    124    <item row="8" column="1">
     121   <item row="4" column="1">
    125122    <widget class="QComboBox" name="cbType">
    126123     <item>
    … …  
    171168    </widget>
    172169   </item>
    173    <item row="10" column="0">
     170   <item row="5" column="0">
    174171    <widget class="QLabel" name="label_6">
    175172     <property name="text">
    … …  
    178175    </widget>
    179176   </item>
    180    <item row="10" column="1">
     177   <item row="5" column="1">
    181178    <layout class="QHBoxLayout" name="horizontalLayout_5">
    182179     <item>
    … …  
    195192    </layout>
    196193   </item>
    197    <item row="12" column="0">
     194   <item row="6" column="0">
    198195    <widget class="QLabel" name="label_7">
    199196     <property name="text">
    … …  
    202199    </widget>
    203200   </item>
    204    <item row="12" column="1">
     201   <item row="6" column="1">
    205202    <layout class="QHBoxLayout" name="horizontalLayout_6">
    206203     <item>
    … …  
    229226    </layout>
    230227   </item>
    231    <item row="15" column="0" colspan="2">
    232     <widget class="QLabel" name="lbFieldsReadOnly">
    233      <property name="text">
    234       <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>
    235      </property>
    236      <property name="wordWrap">
    237       <bool>true</bool>
    238      </property>
    239     </widget>
    240    </item>
    241    <item row="14" column="0" colspan="2">
     228   <item row="7" column="0">
    242229    <spacer name="verticalSpacer">
    243230     <property name="orientation">
    … …  
    255242    </spacer>
    256243   </item>
     244   <item row="8" column="0" colspan="2">
     245    <widget class="QLabel" name="lbFieldsReadOnly">
     246     <property name="text">
     247      <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>
     248     </property>
     249     <property name="wordWrap">
     250      <bool>true</bool>
     251     </property>
     252    </widget>
     253   </item>
    257254  </layout>
    258255 </widget>

  • Vago/trunk/Vago/packageWizard/packagepage3.h

    r771 r811  
    33
    44#include <QWizardPage>
     5
    56#include "util.h"
    67

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

    r799 r811  
    88    <y>0</y>
    99    <width>364</width>
    10     <height>203</height>
     10    <height>113</height>
    1111   </rect>
    1212  </property>
    … …  
    1515  </property>
    1616  <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>If this package use new levels, specify its number to get them unlocked automatically</string>
    24      </property>
    25      <property name="text">
    26       <string>Unlock Levels:</string>
    27      </property>
    28     </widget>
    29    </item>
    30    <item row="6" column="1">
    31     <widget class="QLineEdit" name="leUnlockLevels">
    32      <property name="toolTip">
    33       <string>If this package use new levels, specify its number to get them unlocked automatically</string>
    34      </property>
    35     </widget>
    36    </item>
    3717   <item row="0" column="0">
    3818    <widget class="QLabel" name="label">
    … …  
    5232    </widget>
    5333   </item>
    54    <item row="3" column="0">
     34   <item row="1" column="0">
    5535    <widget class="QLabel" name="label_2">
    5636     <property name="toolTip">
    … …  
    6242    </widget>
    6343   </item>
    64    <item row="3" column="1">
     44   <item row="1" column="1">
    6545    <widget class="QLineEdit" name="leIncompatible">
    6646     <property name="toolTip">
    6747      <string>Fill with the packages number that will conflict with this package</string>
     48     </property>
     49    </widget>
     50   </item>
     51   <item row="2" column="0">
     52    <widget class="QLabel" name="label_3">
     53     <property name="toolTip">
     54      <string>If this package use new levels, specify its number to get them unlocked automatically</string>
     55     </property>
     56     <property name="text">
     57      <string>Unlock Levels:</string>
     58     </property>
     59    </widget>
     60   </item>
     61   <item row="2" column="1">
     62    <widget class="QLineEdit" name="leUnlockLevels">
     63     <property name="toolTip">
     64      <string>If this package use new levels, specify its number to get them unlocked automatically</string>
    6865     </property>
    6966    </widget>

  • Vago/trunk/Vago/packageWizard/packagewizard.h

    r771 r811  
    88#include "packagepagefinal.h"
    99#include "zip.h"
     10
    1011#include <QLabel>
    1112#include <QVBoxLayout>

  • Vago/trunk/Vago/preferences.h

    r771 r811  
    66#include <QSettings>
    77#include <QMessageBox>
    8 #include <util.h>
     8
     9#include "util.h"
    910
    1011namespace Ui {

  • Vago/trunk/Vago/preferences.ui

    r790 r811  
    6969       </layout>
    7070      </item>
     71      <item row="2" column="0">
     72       <widget class="QCheckBox" name="cbOniWindow">
     73        <property name="text">
     74         <string>Launch Oni in a window</string>
     75        </property>
     76       </widget>
     77      </item>
    7178      <item row="3" column="0" colspan="2">
    7279       <widget class="QCheckBox" name="cbSeparate">
    … …  
    8794        <property name="text">
    8895         <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/soundWizard/soundpage4.ui

    r793 r811  
    2424     </property>
    2525     <layout class="QFormLayout" name="formLayout">
    26       <property name="fieldGrowthPolicy">
    27        <enum>QFormLayout::FieldsStayAtSizeHint</enum>
    28       </property>
    2926      <item row="0" column="0">
    3027       <widget class="QLabel" name="label">

  • Vago/trunk/Vago/xmlprocessor.h

    r771 r811  
    22#define XMLCOMMAND_H
    33#include <QProcess>
    4 #include <logger.h>
    54#include <QThread>
    6 #include <util.h>
     5
     6#include "logger.h"
     7#include "util.h"
    78
    89class XmlProcessor : public QThread
Note: See TracChangeset for help on using the changeset viewer.