Mercurial Repositories > Django Project / file diff

diff -r 5c925935cbb9 -r d280acf98fb5 ProjectDjango/DjangoSquashMigrationSelectionDialog.ui
--- a/ProjectDjango/DjangoSquashMigrationSelectionDialog.ui	Sat Jan 27 11:46:33 2018 +0100
+++ b/ProjectDjango/DjangoSquashMigrationSelectionDialog.ui	Sat Mar 24 19:11:39 2018 +0100
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>561</width>
-    <height>172</height>
+    <height>202</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -53,7 +53,7 @@
       </sizepolicy>
      </property>
      <property name="toolTip">
-      <string>Select a migration</string>
+      <string>Select the start migration (1.9.0+ only)</string>
      </property>
     </widget>
    </item>
@@ -77,7 +77,21 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="0" colspan="2">
+   <item row="3" column="0">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>Migration Name:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1">
+    <widget class="QLineEdit" name="nameEdit">
+     <property name="toolTip">
+      <string>Enter an optional name for the migration (2.0.0+ only)</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="2">
     <widget class="QCheckBox" name="noOptimizeCheckBox">
      <property name="toolTip">
       <string>Select to not optimize the squashed migration</string>
@@ -87,7 +101,7 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="0" colspan="2">
+   <item row="5" column="0" colspan="2">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -103,6 +117,7 @@
   <tabstop>applicationComboBox</tabstop>
   <tabstop>startMigrationComboBox</tabstop>
   <tabstop>endMigrationComboBox</tabstop>
+  <tabstop>nameEdit</tabstop>
   <tabstop>noOptimizeCheckBox</tabstop>
  </tabstops>
  <resources/>