Merge lp:~caswiddershoven/openteacher/experimental into lp:~openteachermaintainers/openteacher/3.x-prototype

[Marten de Vries]

See the commit details

[Marten de Vries (marten-de-vries)]

And after browsing the code, I mark this approved.

review: Approve

=== modified file 'openteacher.py'
--- openteacher.py	2010-09-13 15:50:48 +0000
+++ openteacher.py	2010-09-14 14:17:41 +0000
@@ -561,38 +561,42 @@
 
     def remove(self):
         """This method removes all the selected rows."""
+	#Check if something is selected
         #Get the selectionmodel of the tableView
         selectionModel = self.ui.wordsTable.selectionModel()
-        #Get the indexes of all the selected columns
-        indexes = selectionModel.selectedIndexes()
-        #Create list for the indexes of the selected rows.
-        rows = []
-        #Loop over all indexes
-        for index in indexes:
-            #Get the row out of every index, that's the only important part.
-            row = index.row()
-            #If that rownumber isn't already in the rows-list:
-            if not row in rows:
-                #Add it to it
-                rows.append(row)
-
-        #Now we have an unsorted list of the rownumbers which should be deleted. It are simple integers.
-
-        #Sort the row-list (mostly it is already, but to be sure.)
-        rows = sorted(rows)
-        #Reverse the list, so the last row is deleted first. (Then the rownumbers don't shift)
-        rows.reverse()
-        #Delete every row, one by one
-        for row in rows:
-            self.wordListTableModel.removeWord(row)
-
-        #Adjust the GUI
-        self.setUnsaved()
-        self.checkEmpty()
-
-        #Tell the user everything went fine (well, it didn't crash :p)
-        self.statusBar().showMessage(QtCore.QCoreApplication.translate("OpenTeacher", "The word(s) are succesfully removed."))
-
+        if selectionModel.hasSelection():
+            #Get the indexes of all the selected columns
+            indexes = selectionModel.selectedIndexes()
+            #Create list for the indexes of the selected rows.
+            rows = []
+            #Loop over all indexes
+            for index in indexes:
+                #Get the row out of every index, that's the only important part.
+                row = index.row()
+                #If that rownumber isn't already in the rows-list:
+                if not row in rows:
+                    #Add it to it
+                    rows.append(row)
+
+            #Now we have an unsorted list of the rownumbers which should be deleted. It are simple integers.
+
+            #Sort the row-list (mostly it is already, but to be sure.)
+            rows = sorted(rows)
+            #Reverse the list, so the last row is deleted first. (Then the rownumbers don't shift)
+            rows.reverse()
+            #Delete every row, one by one
+            for row in rows:
+                self.wordListTableModel.removeWord(row)
+
+            #Adjust the GUI
+            self.setUnsaved()
+            self.checkEmpty()
+
+            #Tell the user everything went fine (well, it didn't crash :p)
+            self.statusBar().showMessage(QtCore.QCoreApplication.translate("OpenTeacher", "The word(s) are succesfully removed."))
+
+        else:
+            self.statusBar().showMessage(QtCore.QCoreApplication.translate("OpenTeacher", "No selection was detected."))
 ################### END Methods about entering words
 ################### Methods about change-checking
     def setUnsaved(self):
@@ -1286,7 +1290,7 @@
             #Get the current wordList
             wordList = self.currentWordList
             #Create a plain text document, because that's what we're doing: printing == printing the wordList exported as .txt.
-            textContent = fileTypes.TextFile()
+            textContent = fileTypes.TextFile(None)
 
             #Set the wordList
             textContent.wordList = wordList