add warning to forget, add scrolling to deck browser, use as much space as possible

ankiqt/ui/main.py

@@ -1059,7 +1059,8 @@ your deck."""))
                 if "QLabel" in repr(obj.widget()):
                     sip.delete(obj.widget())
                 else:
-                    obj.widget().deleteLater()
+                    if obj.widget():
+                        obj.widget().deleteLater()
                 sip.delete(obj)
             sip.delete(self.mainWin.decksFrame.layout())
         # build new layout
@@ -1143,7 +1144,11 @@ your deck."""))
             refresh.setShortcut(_("Ctrl+Shift+r"))
             self.connect(refresh, SIGNAL("clicked()"),
                          self.forceBrowserRefresh)
-            layout.addWidget(refresh, c+2, 4)
+            layout.addWidget(refresh, c+2, 3)
+            # make sure top labels don't expand
+            layout.addItem(QSpacerItem(1,1, QSizePolicy.Expanding,
+                                       QSizePolicy.Expanding),
+                           c+3, 4)
         else:
             l = QLabel(_("""\
 <br>
@@ -1156,7 +1161,6 @@ later by clicking on the left-pointing arrow on the toolbar.
             l.setWordWrap(True)
             layout.addWidget(l, 0, 0)
         self.mainWin.decksFrame.setLayout(layout)
-        self.app.processEvents()
         if focusButton:
             focusButton.setFocus()
 
@@ -1165,13 +1169,14 @@ later by clicking on the left-pointing arrow on the toolbar.
             return
         elif idx == 1:
             # forget
-            self.config['recentDeckPaths'].remove(self.browserDecks[c]['path'])
+            if ui.utils.askUser(_("Forget %s?") % self.browserDecks[c]['name']):
-            del self.browserDecks[c]
+                self.config['recentDeckPaths'].remove(self.browserDecks[c]['path'])
+                del self.browserDecks[c]
             self.showDeckBrowser()
         elif idx == 2:
             # delete
             deck = self.browserDecks[c]['path']
-            if ui.utils.askUser(_("Delete %s?") % os.path.basename(deck)):
+            if ui.utils.askUser(_("Delete %s?") % self.browserDecks[c]['name']):
                 del self.browserDecks[c]
                 os.unlink(deck)
                 self.config['recentDeckPaths'].remove(deck)
@@ -2692,7 +2697,7 @@ Consider backing up your media directory first."""))
             self.setUnifiedTitleAndToolBarOnMac(True)
             self.mainWin.actionMarkCard.setShortcut(_("Alt+m"))
         if sys.platform.startswith("win32"):
-            self.mainWin.frame_3.setFrameStyle(QFrame.Panel)
+            self.mainWin.deckBrowserOuterFrame.setFrameStyle(QFrame.Panel)
             self.mainWin.frame_2.setFrameStyle(QFrame.Panel)
             self.mainWin.studyOptionsFrame.setFrameStyle(QFrame.Panel)
 

designer/main.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>707</width>
+    <width>912</width>
-    <height>646</height>
+    <height>728</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -386,7 +386,7 @@
           </sizepolicy>
          </property>
          <property name="currentIndex">
-          <number>0</number>
+          <number>5</number>
          </property>
          <widget class="QWidget" name="blankPage"/>
          <widget class="QWidget" name="welcomePage">
@@ -1089,10 +1089,13 @@
              <property name="orientation">
               <enum>Qt::Vertical</enum>
              </property>
+             <property name="sizeType">
+              <enum>QSizePolicy::Preferred</enum>
+             </property>
              <property name="sizeHint" stdset="0">
               <size>
                <width>20</width>
-               <height>150</height>
+               <height>20</height>
               </size>
              </property>
             </spacer>
@@ -1113,10 +1116,22 @@
               </spacer>
              </item>
              <item>
-              <widget class="QFrame" name="frame_3">
+              <widget class="QFrame" name="deckBrowserOuterFrame">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+                 <horstretch>0</horstretch>
+                 <verstretch>10</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="minimumSize">
+                <size>
+                 <width>550</width>
+                 <height>350</height>
+                </size>
+               </property>
                <property name="maximumSize">
                 <size>
-                 <width>500</width>
+                 <width>550</width>
                  <height>16777215</height>
                 </size>
                </property>
@@ -1147,13 +1162,50 @@
                    </widget>
                   </item>
                   <item>
-                   <widget class="QFrame" name="decksFrame">
+                   <widget class="QScrollArea" name="decksScrollArea">
+                    <property name="sizePolicy">
+                     <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
+                      <horstretch>0</horstretch>
+                      <verstretch>0</verstretch>
+                     </sizepolicy>
+                    </property>
                     <property name="frameShape">
                      <enum>QFrame::NoFrame</enum>
                     </property>
-                    <property name="frameShadow">
+                    <property name="horizontalScrollBarPolicy">
-                     <enum>QFrame::Raised</enum>
+                     <enum>Qt::ScrollBarAlwaysOff</enum>
                     </property>
+                    <property name="widgetResizable">
+                     <bool>true</bool>
+                    </property>
+                    <widget class="QWidget" name="scrollAreaWidgetContents">
+                     <property name="geometry">
+                      <rect>
+                       <x>0</x>
+                       <y>0</y>
+                       <width>516</width>
+                       <height>412</height>
+                      </rect>
+                     </property>
+                     <layout class="QVBoxLayout" name="verticalLayout_18">
+                      <property name="spacing">
+                       <number>0</number>
+                      </property>
+                      <property name="margin">
+                       <number>0</number>
+                      </property>
+                      <item>
+                       <widget class="QFrame" name="decksFrame">
+                        <property name="frameShape">
+                         <enum>QFrame::NoFrame</enum>
+                        </property>
+                        <property name="frameShadow">
+                         <enum>QFrame::Raised</enum>
+                        </property>
+                       </widget>
+                      </item>
+                     </layout>
+                    </widget>
                    </widget>
                   </item>
                   <item>
@@ -1255,10 +1307,13 @@
              <property name="orientation">
               <enum>Qt::Vertical</enum>
              </property>
+             <property name="sizeType">
+              <enum>QSizePolicy::Preferred</enum>
+             </property>
              <property name="sizeHint" stdset="0">
               <size>
                <width>20</width>
-               <height>150</height>
+               <height>20</height>
               </size>
              </property>
             </spacer>
@@ -1464,7 +1519,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>707</width>
+     <width>912</width>
      <height>23</height>
     </rect>
    </property>