Merge from trunk

setup/installer/windows/freeze.py

@@ -13,7 +13,7 @@ from setup import Command, modules, functions, basenames, __version__, \
 from setup.build_environment import msvc, MT, RC
 from setup.installer.windows.wix import WixMixIn
 
-QT_DIR = 'C:\\Qt\\4.6.0'
+QT_DIR = 'C:\\Qt\\4.6.3'
 QT_DLLS = ['Core', 'Gui', 'Network', 'Svg', 'WebKit', 'Xml', 'XmlPatterns']
 LIBUSB_DIR       = 'C:\\libusb'
 LIBUNRAR         = 'C:\\Program Files\\UnrarDLL\\unrar.dll'

src/calibre/gui2/dialogs/config/add_save.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>953</width>
+    <width>671</width>
     <height>516</height>
    </rect>
   </property>
@@ -178,8 +178,14 @@ Title match ignores leading indefinite articles (&quot;the&quot;, &quot;a&quot;,
     <string>Sending to &amp;device</string>
    </attribute>
    <layout class="QGridLayout" name="gridLayout_2">
-    <item row="0" column="0" colspan="2">
+    <item row="0" column="0">
      <widget class="QLabel" name="label_4">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
       <property name="text">
        <string>Metadata &amp;management:</string>
       </property>
@@ -188,6 +194,44 @@ Title match ignores leading indefinite articles (&quot;the&quot;, &quot;a&quot;,
       </property>
      </widget>
     </item>
+    <item row="0" column="1">
+     <widget class="QComboBox" name="manage_device_metadata">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <item>
+       <property name="text">
+        <string extracomment="foobar">Manual management</string>
+       </property>
+      </item>
+      <item>
+       <property name="text">
+        <string>Only on send</string>
+       </property>
+      </item>
+      <item>
+       <property name="text">
+        <string>Automatic management</string>
+       </property>
+      </item>
+     </widget>
+    </item>
+    <item row="0" column="2">
+     <spacer name="horizontalSpacer">
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+      <property name="sizeHint" stdset="0">
+       <size>
+        <width>313</width>
+        <height>20</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
     <item row="1" column="0" colspan="3">
      <widget class="QLabel" name="label_41">
       <property name="text">
@@ -220,25 +264,6 @@ Title match ignores leading indefinite articles (&quot;the&quot;, &quot;a&quot;,
     <item row="4" column="0" colspan="3">
      <widget class="SaveTemplate" name="send_template" native="true"/>
     </item>
-    <item row="0" column="2">
-     <widget class="QComboBox" name="manage_device_metadata">
-      <item>
-       <property name="text">
-        <string extracomment="foobar">Manual management</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>Only on send</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>Automatic management</string>
-       </property>
-      </item>
-     </widget>
-    </item>
    </layout>
   </widget>
  </widget>