Merge branch 'master' into prices_table

Author: JanisV

OpenNumismat/Collection/Collection.py

@@ -1822,6 +1822,7 @@ def isNeedBackup(self):
 
     @waitCursorDecorator
     def vacuum(self):
+        QSqlQuery("PRAGMA page_size=4096", self.db)
         QSqlQuery("VACUUM", self.db)
 
     @staticmethod

OpenNumismat/SettingsDialog.py

@@ -58,18 +58,24 @@ class MainSettingsPage(QWidget):
                  ("Український", 'uk'),
                  )
     Currencies = (
+        ('ARS', QT_TRANSLATE_NOOP("Currency", "ARS - Argentine peso")),
+        ('AUD', QT_TRANSLATE_NOOP("Currency", "AUD - Australian dollar")),
         ('BRL', QT_TRANSLATE_NOOP("Currency", "BRL - Brazilian real")),
         ('BYN', QT_TRANSLATE_NOOP("Currency", "BYN - Belarusian ruble")),
+        ('CAD', QT_TRANSLATE_NOOP("Currency", "CAD - Canadian dollar")),
+        ('CHF', QT_TRANSLATE_NOOP("Currency", "CHF - Swiss franc")),
         ('CZK', QT_TRANSLATE_NOOP("Currency", "CZK - Czech koruna")),
         ('EUR', QT_TRANSLATE_NOOP("Currency", "EUR - Euro")),
         ('GBP', QT_TRANSLATE_NOOP("Currency", "GBP - Pound sterling")),
         ('HUF', QT_TRANSLATE_NOOP("Currency", "HUF - Hungarian forint")),
+        ('INR', QT_TRANSLATE_NOOP("Currency", "INR - Indian rupee")),
+        ('NOK', QT_TRANSLATE_NOOP("Currency", "NOK - Norwegian krone")),
         ('PLN', QT_TRANSLATE_NOOP("Currency", "PLN - Polish złoty")),
         ('RUB', QT_TRANSLATE_NOOP("Currency", "RUB - Russian ruble")),
         ('SEK', QT_TRANSLATE_NOOP("Currency", "SEK - Swedish krona")),
         ('TRY', QT_TRANSLATE_NOOP("Currency", "TRY - Turkish lira")),
         ('UAH', QT_TRANSLATE_NOOP("Currency", "UAH - Ukrainian hryvnia")),
-        ('USD', QT_TRANSLATE_NOOP("Currency", "USD - United States dollar"))
+        ('USD', QT_TRANSLATE_NOOP("Currency", "USD - United States dollar")),
     )
 
     def __init__(self, collection, parent=None):

OpenNumismat/SummaryDialog.py

@@ -70,8 +70,9 @@ def fillSummary(self, model, filter_=None):
         sql = self.makeSql(sql, filter_)
         query = QSqlQuery(sql, model.database())
         while query.next():
-            quantity = query.record().value('quantity')
-            if not isinstance(quantity, int):
+            try:
+                quantity = int(query.record().value('quantity'))
+            except (ValueError, TypeError):
                 quantity = 1
             quantity_owned += quantity
             count_owned += 1
@@ -194,7 +195,10 @@ def fillSummary(self, model, filter_=None):
             price2 = record.value(2)
             price3 = record.value(3)
             price4 = record.value(4)
-            quantity = int(record.value(5) or 1)
+            try:
+                quantity = int(record.value('quantity'))
+            except (ValueError, TypeError):
+                quantity = 1
 
             try:
                 if grade[:2] in ('UN', 'MS'):

OpenNumismat/TabView.py

@@ -30,6 +30,8 @@ class TabView(QTabWidget):
     def __init__(self, parent):
         super().__init__(parent)
 
+        self.collection = None
+
         tabBar = TabBar(self)
         self.setTabBar(tabBar)
 
@@ -47,7 +49,8 @@ def __init__(self, parent):
         self.__createActions()
 
     def mouseDoubleClickEvent(self, _event):
-        self.newList()
+        if self.collection and self.collection.isOpen():
+            self.newList()
 
     def tabDClicked(self, index):
         self.renamePage(index)
@@ -337,18 +340,19 @@ def openPageEvent(self):
     def updateOpenPageMenu(self):
         menu = self.__actions['open']
         menu.clear()
-        closedPages = self.collection.pages().closedPages()
-        hasClosedPages = len(closedPages)
-        menu.setEnabled(hasClosedPages)
-        if hasClosedPages:
-            for pageParam in closedPages:
-                act = QAction(pageParam.title, self)
-                act.setData(pageParam)
-                act.triggered.connect(self.openPageEvent)
-                menu.addAction(act)
-
-            menu.addSeparator()
-            menu.addAction(self.__actions['removeAll'])
+        if self.collection:
+            closedPages = self.collection.pages().closedPages()
+            hasClosedPages = len(closedPages)
+            menu.setEnabled(hasClosedPages)
+            if hasClosedPages:
+                for pageParam in closedPages:
+                    act = QAction(pageParam.title, self)
+                    act.setData(pageParam)
+                    act.triggered.connect(self.openPageEvent)
+                    menu.addAction(act)
+
+                menu.addSeparator()
+                menu.addAction(self.__actions['removeAll'])
 
     def currentListView(self):
         return self.currentWidget().listView