Merge branch 'master' of git@host.fluxility.com:optimg

This commit is contained in:
Paul 2010-01-14 15:31:54 +00:00
commit 0e4c7f1034

View file

@ -6,22 +6,19 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>700</width> <width>495</width>
<height>250</height> <height>158</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>MainWindow</string> <string>optimg</string>
</property> </property>
<widget class="QWidget" name="centralwidget"> <widget class="QWidget" name="centralwidget">
<widget class="QFrame" name=""> <layout class="QGridLayout" name="gridLayout_2">
<property name="geometry"> <item row="0" column="0">
<rect> <widget class="QWidget" name="widget" native="true">
<x>10</x> <property name="enabled">
<y>10</y> <bool>true</bool>
<width>680</width>
<height>230</height>
</rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@ -32,17 +29,20 @@
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="spacing"> <property name="horizontalSpacing">
<number>0</number>
</property>
<property name="verticalSpacing">
<number>10</number> <number>10</number>
</property> </property>
<item row="1" column="0"> <item row="2" column="0">
<widget class="QPushButton" name="addfiles"> <widget class="QPushButton" name="addfiles">
<property name="text"> <property name="text">
<string>Add files</string> <string>Add files</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="2" column="1">
<spacer name="horizontalSpacer"> <spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -55,7 +55,7 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="1" column="2"> <item row="2" column="2">
<widget class="QPushButton" name="recompress"> <widget class="QPushButton" name="recompress">
<property name="text"> <property name="text">
<string>Recompress</string> <string>Recompress</string>
@ -67,12 +67,20 @@
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="toolTip">
<string>Drag files in here</string>
</property>
<property name="whatsThis">
<string>Drag files in here</string>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </item>
</layout> </layout>
</widget> </widget>
</item>
</layout>
</widget> </widget>
</widget> </widget>
<resources/> <resources/>