Changed location of import button (#1018).

Also updated help link in same window to point to a valid anchor.
ankitects · Feb 22, 2014 · 068a632 · 068a632
1 parent 980c9d7
commit 068a632
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 22 deletions.
diff --git a/aqt/importing.py b/aqt/importing.py
@@ -79,6 +79,9 @@ def __init__(self, mw, importer):
         self.updateDelimiterButtonText()
         self.frm.allowHTML.setChecked(self.mw.pm.profile.get('allowHTML', True))
         self.frm.importMode.setCurrentIndex(self.mw.pm.profile.get('importMode', 1))
+        # import button
+        b = QPushButton(_("Import"))
+        self.frm.buttonBox.addButton(b, QDialogButtonBox.AcceptRole)
         self.exec_()
 
     def setupOptions(self):
@@ -87,8 +90,6 @@ def setupOptions(self):
             self.mw, self.frm.modelArea, label=False)
         self.deck = aqt.deckchooser.DeckChooser(
             self.mw, self.frm.deckArea, label=False)
-        self.connect(self.frm.importButton, SIGNAL("clicked()"),
-                     self.doImport)
 
     def modelChanged(self):
         self.importer.model = self.mw.col.models.current()
@@ -138,8 +139,8 @@ def updateDelimiterButtonText(self):
             d = `d`
         txt = _("Fields separated by: %s") % d
         self.frm.autoDetect.setText(txt)
-
-    def doImport(self, update=False):
+        
+    def accept(self):
         self.importer.mapping = self.mapping
         if not self.importer.mappingOk():
             showWarning(
@@ -249,7 +250,7 @@ def reject(self):
         QDialog.reject(self)
 
     def helpRequested(self):
-        openHelp("FileImport")
+        openHelp("importing")
 
 
 def showUnicodeWarning():

diff --git a/designer/importing.ui b/designer/importing.ui
@@ -94,20 +94,6 @@
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
        <layout class="QGridLayout" name="gridLayout">
-        <item row="0" column="1">
-         <layout class="QVBoxLayout" name="verticalLayout">
-          <item>
-           <widget class="QPushButton" name="importButton">
-            <property name="text">
-             <string>&amp;Import</string>
-            </property>
-            <property name="default">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
         <item row="0" column="0">
          <widget class="QScrollArea" name="mappingArea">
           <property name="sizePolicy">
@@ -133,8 +119,8 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>402</width>
-             <height>206</height>
+             <width>529</width>
+             <height>251</height>
             </rect>
            </property>
           </widget>
@@ -158,7 +144,6 @@
   </layout>
  </widget>
  <tabstops>
-  <tabstop>importButton</tabstop>
   <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources/>