Merge lp:~srazi/qpdfview/page-labels-fixes into lp:qpdfview

[Razi Alavizadeh]

A small fix and an improvement related to page labels.

[Adam Reichold (adamreichold)]

Hello Razi,

thanks for the merge request. However, I am not sure I understand it correctly. Does it address the problem that the backend could always return English-locale page labels and we would prefer our default page label in this case? If so, wouldn't it be better to fix this once in line 395 of documentview.cpp? (I.e. check if "m_pages.at(number - 1)->label().toInt() != number" before setting "label"?)

Best regards, Adam.

review: Needs Information

[Razi Alavizadeh (srazi)]

Hello Adam,

Oh... yes, indeed the correct solution instead of first commit (and a part of second commit) is what you said.

Best Regards,
Razi.

[Adam Reichold (adamreichold)]

Ok, so I'll merge this and make the necessary adjustments...

review: Approve

[Razi Alavizadeh (srazi)]

OK, thanks.

=== modified file 'sources/mainwindow.cpp'
--- sources/mainwindow.cpp	2014-09-21 20:29:25 +0000
+++ sources/mainwindow.cpp	2014-10-02 17:16:12 +0000
@@ -1596,7 +1596,18 @@
     }
 
     *ok = true;
-    return currentTab()->pageLabelFromNumber(val);
+
+    const QString& defaultPageLabel = currentTab()->defaultPageLabelFromNumber(val);
+    const QString& pageLabel = currentTab()->pageLabelFromNumber(val);
+
+    if(defaultPageLabel != pageLabel && pageLabel.toInt() != val)
+    {
+        return pageLabel;
+    }
+    else
+    {
+        return defaultPageLabel;
+    }
 }
 
 int MainWindow::currentPage_valueFromText(QString text, bool* ok) const
@@ -2204,18 +2215,19 @@
     if(m_tabWidget->currentIndex() != -1)
     {
         const int currentPage = currentTab()->currentPage();
-        const int numberOfPages = currentTab()->numberOfPages();
+        const QString& numberOfPagesAsString = currentTab()->defaultPageLabelFromNumber(currentTab()->numberOfPages());
 
         const QString& defaultPageLabel = currentTab()->defaultPageLabelFromNumber(currentPage);
         const QString& pageLabel = currentTab()->pageLabelFromNumber(currentPage);
 
-        if((s_settings->mainWindow().usePageLabel() || currentTab()->hasFrontMatter()) && defaultPageLabel != pageLabel)
+        if((s_settings->mainWindow().usePageLabel() || currentTab()->hasFrontMatter()) &&
+                (defaultPageLabel != pageLabel && pageLabel.toInt() != currentPage))
         {
-            suffix = QString(" (%1 / %2)").arg(currentPage).arg(numberOfPages);
+            suffix = QString(" (%1 / %2)").arg(defaultPageLabel).arg(numberOfPagesAsString);
         }
         else
         {
-            suffix = QString(" / %1").arg(numberOfPages);
+            suffix = QString(" / %1").arg(numberOfPagesAsString);
         }
     }
     else