Merge lp:~komar007/qpdfview/unique_instances into lp:qpdfview

[Michał Trybus]

Hi,
I've recently found out about this program and got to like it.
I implemented a feature which I really needed - named instances.
Everything works as before, but there's an extra parameter, --instance.
When you're using --unique, you can specify instance name with --instance, and open multiple named windows.
Later you can choose in which window to open a tab remotely again by specifying the instance name.
I also implemented tab restore on a per-instance basis.
I assumed that "v1" in "tabs_v1" means version and, since I needed to change the db schema, I also changed the name of this table to eliminate compatibility problems.

[Adam Reichold (adamreichold)]

Hello Michał,

Tanks for your contribution! It seems a useful feature and I am very much for merging the branch. I hope I'll have some time tonight for a thorough review. Just some first remarks:

* Could you leave out the translation updates? I'll run "lupdate" when this is inside trunk. It just makes the diff larger.

* Your interpretation of the database table name is correct, at least what you described was my plan. :-) But since there has been no release using the "v1" table as of now, you can leave out the reimport of the "v1" table. This is all happing in trunk and so we do not have to give guarantees to the outside world yet. (But the new name is still correct, so we do not try to use the old table.)

* If you don't mind, I would add a copyright notice for you to the modified source files after merge and maybe make some smaller style changes. (Or you add the copyright notice yourself using your preferred mail address.)

Best regards, Adam.

[Michał Trybus (komar007)]

Hi,
thanks for your feedback.
I removed the translation fixes, db import and added myself to CONTRIBUTORS.
I rewrote the history a bit and made another branch: lp:~komar007/qpdfview/unique_instances_v2

Cheers,
Michał

[Adam Reichold (adamreichold)]

One thing, I am wondering: Is the check whether the instance name is empty necessary? Could it be possible, that the argument list contains an empty string?

[Michał Trybus (komar007)]

Yes, it's possible, you can do it with two quotation marks.
Since I'm using empty string to represent stored tabs if the program is run without --instance, I didn't want to allow the same with --instance, for clarity.

[Adam Reichold (adamreichold)]

Sounds sensible, thanks for clarifying that.

[Adam Reichold (adamreichold)]

Thanks again for the good work and contributing it to qpdfview's users! I merged your changes with some smaller modifications that I hope you can agree with.

Best regards, Adam.

review: Approve

[Michał Trybus (komar007)]

Thanks!

=== modified file 'miscellaneous/qpdfview.1'
--- miscellaneous/qpdfview.1	2012-10-07 11:51:13 +0000
+++ miscellaneous/qpdfview.1	2012-11-26 20:32:20 +0000
@@ -33,6 +33,8 @@
 .SH OPTIONS
 .IP --unique
 If an instance of qpdfview is started with this option, any files that are opened using this option afterwards, are opened as tabs in the original window. If a file is already opened in a tab of the original window, it is merely reloaded.
+.IP --instance name
+Sets the name of the current instance opened with --unique. This allows to run multiple instances and remotely open and refresh tabs in any of them by passing the instance name each time.
 .IP [file[#page]]
 .I file
 specifies the file to open. The optional parameter

=== modified file 'sources/main.cpp'
--- sources/main.cpp	2012-11-25 07:18:09 +0000
+++ sources/main.cpp	2012-11-26 20:32:20 +0000
@@ -21,6 +21,8 @@
 
 #include "mainwindow.h"
 
+QString appOrgName = "local.qpdfview";
+
 struct File
 {
     QString filePath;
@@ -42,7 +44,7 @@
 
     QApplication application(argc, argv);
 
-    QApplication::setOrganizationDomain("local.qpdfview");
+    QApplication::setOrganizationDomain(appOrgName);
     QApplication::setOrganizationName("qpdfview");
     QApplication::setApplicationName("qpdfview");
 
@@ -65,6 +67,8 @@
 #endif // QT_VERSION
 
     bool unique = false;
+    bool nextInstance = false;
+    QString instance = "";
     QList< File > files;
 
     {
@@ -82,10 +86,24 @@
 
         foreach(QString argument, arguments)
         {
-            if(argument == "--unique")
+            if (nextInstance)
+            {
+                nextInstance = false;
+                if (argument.length() < 1)
+                {
+                    qDebug() << "empty instance name not allowed";
+                    return 1;
+                }
+                instance = argument;
+            }
+            else if(argument == "--unique")
             {
                 unique = true;
             }
+            else if(argument == "--instance")
+            {
+                nextInstance = true;
+            }
             else
             {
                 File file;
@@ -110,6 +128,16 @@
                 files.append(file);
             }
         }
+        if (nextInstance)
+        {
+            qDebug() << "Option --instance requires a string argument";
+            return 1;
+        }
+        if (!unique && instance != "")
+        {
+            qDebug() << "Option --instance not allowed without --unique";
+            return 1;
+        }
     }
 
     MainWindow* mainWindow = 0;
@@ -164,10 +192,10 @@
 
     {
         // D-Bus
-
+        QString service = appOrgName + ".i" + instance;
         if(unique)
         {
-            QDBusInterface* interface = new QDBusInterface("local.qpdfview", "/MainWindow", "local.qpdfview.MainWindow", QDBusConnection::sessionBus());
+            QDBusInterface* interface = new QDBusInterface(service, "/MainWindow", "local.qpdfview.MainWindow", QDBusConnection::sessionBus());
 
             if(interface->isValid())
             {
@@ -191,11 +219,11 @@
             }
             else
             {
-                mainWindow = new MainWindow();
+                mainWindow = new MainWindow(instance);
 
                 new MainWindowAdaptor(mainWindow);
 
-                if(!QDBusConnection::sessionBus().registerService("local.qpdfview"))
+                if(!QDBusConnection::sessionBus().registerService(service))
                 {
                     qDebug() << QDBusConnection::sessionBus().lastError().message();
 
@@ -214,13 +242,13 @@
         }
         else
         {
-            mainWindow = new MainWindow();
+            mainWindow = new MainWindow("");
         }
     }
 
 #else
 
-    mainWindow = new MainWindow();
+    mainWindow = new MainWindow("");
 
 #endif // WITH_DBUS
 

=== modified file 'sources/mainwindow.cpp'
--- sources/mainwindow.cpp	2012-11-26 16:48:29 +0000
+++ sources/mainwindow.cpp	2012-11-26 20:32:20 +0000
@@ -21,7 +21,7 @@
 
 #include "mainwindow.h"
 
-MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent)
+MainWindow::MainWindow(QString instanceName, QWidget* parent) : QMainWindow(parent), m_instanceName(instanceName)
 {
     {
         // settings
@@ -2112,10 +2112,11 @@
 
         // tabs
 
-        if(!tables.contains("tabs_v1"))
+        if(!tables.contains("tabs_v2"))
         {
-            query.exec("CREATE TABLE tabs_v1 "
+            query.exec("CREATE TABLE tabs_v2 "
                        "(filePath TEXT"
+                       ",instanceName TEXT"
                        ",currentPage INTEGER"
                        ",continuousMode INTEGER"
                        ",layoutMode INTEGER"
@@ -2127,6 +2128,19 @@
             {
                 qDebug() << query.lastError();
             }
+            // import stored tabs from old version into current instance
+            if(tables.contains("tabs_v1"))
+            {
+                query.prepare("INSERT INTO tabs_v2 "
+                              "SELECT filePath,?,currentPage,continuousMode,layoutMode,scaleMode,scaleFactor,rotation "
+                              "FROM tabs_v1");
+                query.bindValue(0, m_instanceName);
+                query.exec();
+                if(!query.isActive())
+                {
+                    qDebug() << query.lastError();
+                }
+            }
         }
 
         // bookmarks
@@ -2196,7 +2210,10 @@
         m_database.transaction();
 
         QSqlQuery query(m_database);
-        query.exec("SELECT filePath,currentPage,continuousMode,layoutMode,scaleMode,scaleFactor,rotation FROM tabs_v1");
+        query.prepare("SELECT filePath,currentPage,continuousMode,layoutMode,scaleMode,scaleFactor,rotation "
+                      "FROM tabs_v2 WHERE instanceName=?");
+        query.bindValue(0, m_instanceName);
+        query.exec();
 
         while(query.next())
         {
@@ -2279,7 +2296,9 @@
         m_database.transaction();
 
         QSqlQuery query(m_database);
-        query.exec("DELETE FROM tabs_v1");
+        query.prepare("DELETE FROM tabs_v2 WHERE instanceName = ?");
+        query.bindValue(0, m_instanceName);
+        query.exec();
 
         if(!query.isActive())
         {
@@ -2288,22 +2307,23 @@
 
         if(m_settings->value("mainWindow/restoreTabs", false).toBool())
         {
-            query.prepare("INSERT INTO tabs_v1 "
-                          "(filePath,currentPage,continuousMode,layoutMode,scaleMode,scaleFactor,rotation)"
-                          " VALUES (?,?,?,?,?,?,?)");
+            query.prepare("INSERT INTO tabs_v2 "
+                          "(filePath,instanceName,currentPage,continuousMode,layoutMode,scaleMode,scaleFactor,rotation)"
+                          " VALUES (?,?,?,?,?,?,?,?)");
 
             for(int index = 0; index < m_tabWidget->count(); ++index)
             {
                 query.bindValue(0, QFileInfo(tab(index)->filePath()).absoluteFilePath());
-                query.bindValue(1, tab(index)->currentPage());
-
-                query.bindValue(2, static_cast< uint >(tab(index)->continousMode()));
-                query.bindValue(3, static_cast< uint >(tab(index)->layoutMode()));
-
-                query.bindValue(4, static_cast< uint >(tab(index)->scaleMode()));
-                query.bindValue(5, tab(index)->scaleFactor());
-
-                query.bindValue(6, static_cast< uint >(tab(index)->rotation()));
+                query.bindValue(1, m_instanceName);
+                query.bindValue(2, tab(index)->currentPage());
+
+                query.bindValue(3, static_cast< uint >(tab(index)->continousMode()));
+                query.bindValue(4, static_cast< uint >(tab(index)->layoutMode()));
+
+                query.bindValue(5, static_cast< uint >(tab(index)->scaleMode()));
+                query.bindValue(6, tab(index)->scaleFactor());
+
+                query.bindValue(7, static_cast< uint >(tab(index)->rotation()));
 
                 query.exec();
 

=== modified file 'sources/mainwindow.h'
--- sources/mainwindow.h	2012-11-25 07:24:50 +0000
+++ sources/mainwindow.h	2012-11-26 20:32:20 +0000
@@ -53,7 +53,7 @@
     Q_OBJECT
     
 public:
-    explicit MainWindow(QWidget* parent = 0);
+    explicit MainWindow(QString instanceName, QWidget* parent = 0);
 
     QSize sizeHint() const;
     QMenu* createPopupMenu();
@@ -291,6 +291,8 @@
 
 #endif // WITH_SQL
 
+    QString m_instanceName;
+
     void createDatabase();
 
     void restoreTabs();

=== modified file 'translations/qpdfview_ast.ts'
--- translations/qpdfview_ast.ts	2012-11-26 07:22:27 +0000
+++ translations/qpdfview_ast.ts	2012-11-26 20:32:20 +0000
@@ -729,7 +729,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../sources/main.cpp" line="155"/>
+        <location filename="../sources/main.cpp" line="173"/>
         <source>SyncTeX data for &apos;%1&apos; could not be found.</source>
         <translation type="unfinished">Nun s&apos;alcontraron datos SyncTeX pa «%1».</translation>
     </message>

=== modified file 'translations/qpdfview_ca.ts'
--- translations/qpdfview_ca.ts	2012-11-25 09:09:10 +0000
+++ translations/qpdfview_ca.ts	2012-11-26 20:32:20 +0000
@@ -729,7 +729,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../sources/main.cpp" line="155"/>
+        <location filename="../sources/main.cpp" line="173"/>
         <source>SyncTeX data for &apos;%1&apos; could not be found.</source>
         <translation type="unfinished">No s&apos;han trobat les dades SyncText per «%1».</translation>
     </message>

=== modified file 'translations/qpdfview_cs.ts'
--- translations/qpdfview_cs.ts	2012-11-26 14:50:34 +0000
+++ translations/qpdfview_cs.ts	2012-11-26 20:32:20 +0000
@@ -732,7 +732,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../sources/main.cpp" line="155"/>
+        <location filename="../sources/main.cpp" line="173"/>
         <source>SyncTeX data for &apos;%1&apos; could not be found.</source>
         <translation type="unfinished">Nepodařilo se najít SyncTeX data pro &apos;%1&apos;.</translation>
     </message>

=== modified file 'translations/qpdfview_da.ts'
--- translations/qpdfview_da.ts	2012-11-25 09:27:13 +0000
+++ translations/qpdfview_da.ts	2012-11-26 20:32:20 +0000
@@ -729,7 +729,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../sources/main.cpp" line="155"/>
+        <location filename="../sources/main.cpp" line="173"/>
         <source>SyncTeX data for &apos;%1&apos; could not be found.</source>
         <translation type="unfinished">SyncTeX-data for &apos;%1&apos; kunne ikke findes.</translation>
     </message>

=== modified file 'translations/qpdfview_de.ts'
--- translations/qpdfview_de.ts	2012-11-25 08:26:35 +0000
+++ translations/qpdfview_de.ts	2012-11-26 20:32:20 +0000
@@ -729,7 +729,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../sources/main.cpp" line="155"/>
+        <location filename="../sources/main.cpp" line="173"/>
         <source>SyncTeX data for &apos;%1&apos; could not be found.</source>
         <translation type="unfinished">Keine SyncTeX-Daten für &quot;%1&quot; gefunden.</translation>
     </message>

=== modified file 'translations/qpdfview_el.ts'
--- translations/qpdfview_el.ts	2012-11-25 07:24:50 +0000
+++ translations/qpdfview_el.ts	2012-11-26 20:32:20 +0000
@@ -729,7 +729,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../sources/main.cpp" line="155"/>
+        <location filename="../sources/main.cpp" line="173"/>
         <source>SyncTeX data for &apos;%1&apos; could not be found.</source>
         <translation type="unfinished">Τα δεδομένα SyncTeX για το &apos;%1&apos; δεν μπορούν να βρεθούν.</translation>
     </message>

=== modified file 'translations/qpdfview_en_GB.ts'
--- translations/qpdfview_en_GB.ts	2012-11-25 09:27:13 +0000
+++ translations/qpdfview_en_GB.ts	2012-11-26 20:32:20 +0000
@@ -729,7 +729,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../sources/main.cpp" line="155"/>
+        <location filename="../sources/main.cpp" line="173"/>
         <source>SyncTeX data for &apos;%1&apos; could not be found.</source>
         <translation type="unfinished">SyncTeX data for &apos;%1&apos; could not be found.</translation>
     </message>

=== modified file 'translations/qpdfview_es.ts'
--- translations/qpdfview_es.ts	2012-11-25 07:24:50 +0000
+++ translations/qpdfview_es.ts	2012-11-26 20:32:20 +0000
@@ -729,7 +729,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../sources/main.cpp" line="155"/>
+        <location filename="../sources/main.cpp" line="173"/>
         <source>SyncTeX data for &apos;%1&apos; could not be found.</source>
         <translation type="unfinished">No se encontraron los datos SyncText para «%1».</translation>
     </message>

=== modified file 'translations/qpdfview_fi.ts'
--- translations/qpdfview_fi.ts	2012-11-25 07:24:50 +0000
+++ translations/qpdfview_fi.ts	2012-11-26 20:32:20 +0000
@@ -729,7 +729,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../sources/main.cpp" line="155"/>
+        <location filename="../sources/main.cpp" line="173"/>
         <source>SyncTeX data for &apos;%1&apos; could not be found.</source>
         <translation type="unfinished"></translation>
     </message>

=== modified file 'translations/qpdfview_fr.ts'
--- translations/qpdfview_fr.ts	2012-11-25 07:24:50 +0000
+++ translations/qpdfview_fr.ts	2012-11-26 20:32:20 +0000
@@ -729,7 +729,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../sources/main.cpp" line="155"/>
+        <location filename="../sources/main.cpp" line="173"/>
         <source>SyncTeX data for &apos;%1&apos; could not be found.</source>
         <translation type="unfinished">Impossible de trouver les données SyncTeX pour &apos;%1&apos;.</translation>
     </message>

=== modified file 'translations/qpdfview_he.ts'
--- translations/qpdfview_he.ts	2012-11-25 08:26:35 +0000
+++ translations/qpdfview_he.ts	2012-11-26 20:32:20 +0000
@@ -729,7 +729,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../sources/main.cpp" line="155"/>
+        <location filename="../sources/main.cpp" line="173"/>
         <source>SyncTeX data for &apos;%1&apos; could not be found.</source>
         <translation type="unfinished">לא ניתן למצוא את נתוני ה־SyncTeX עבור &apos;%1&apos;.</translation>
     </message>

=== modified file 'translations/qpdfview_hr.ts'
--- translations/qpdfview_hr.ts	2012-11-25 07:24:50 +0000
+++ translations/qpdfview_hr.ts	2012-11-26 20:32:20 +0000
@@ -729,7 +729,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../sources/main.cpp" line="155"/>
+        <location filename="../sources/main.cpp" line="173"/>
         <source>SyncTeX data for &apos;%1&apos; could not be found.</source>
         <translation type="unfinished">SyncTeX podaci za &apos;%1&apos; nije pronađen.</translation>
     </message>

=== modified file 'translations/qpdfview_it.ts'
--- translations/qpdfview_it.ts	2012-11-25 08:26:35 +0000
+++ translations/qpdfview_it.ts	2012-11-26 20:32:20 +0000
@@ -729,7 +729,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../sources/main.cpp" line="155"/>
+        <location filename="../sources/main.cpp" line="173"/>
         <source>SyncTeX data for &apos;%1&apos; could not be found.</source>
         <translation type="unfinished">Impossibile trovare i dati SyncTeX per «%1».</translation>
     </message>

=== modified file 'translations/qpdfview_my.ts'
--- translations/qpdfview_my.ts	2012-11-25 07:24:50 +0000
+++ translations/qpdfview_my.ts	2012-11-26 20:32:20 +0000
@@ -729,7 +729,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../sources/main.cpp" line="155"/>
+        <location filename="../sources/main.cpp" line="173"/>
         <source>SyncTeX data for &apos;%1&apos; could not be found.</source>
         <translation type="unfinished">SyncTeX data for &apos;%1&apos; could not be found.</translation>
     </message>

=== modified file 'translations/qpdfview_pt_BR.ts'
--- translations/qpdfview_pt_BR.ts	2012-11-26 07:22:27 +0000
+++ translations/qpdfview_pt_BR.ts	2012-11-26 20:32:20 +0000
@@ -729,7 +729,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../sources/main.cpp" line="155"/>
+        <location filename="../sources/main.cpp" line="173"/>
         <source>SyncTeX data for &apos;%1&apos; could not be found.</source>
         <translation type="unfinished">SyncTeX dados para &apos;%1&apos; não pôde ser encontrado.</translation>
     </message>

=== modified file 'translations/qpdfview_ro.ts'
--- translations/qpdfview_ro.ts	2012-11-25 07:24:50 +0000
+++ translations/qpdfview_ro.ts	2012-11-26 20:32:20 +0000
@@ -729,7 +729,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../sources/main.cpp" line="155"/>
+        <location filename="../sources/main.cpp" line="173"/>
         <source>SyncTeX data for &apos;%1&apos; could not be found.</source>
         <translation type="unfinished">Nu s-au găsit datele SyncTeX pentru „%1”.</translation>
     </message>

=== modified file 'translations/qpdfview_ru.ts'
--- translations/qpdfview_ru.ts	2012-11-25 07:24:50 +0000
+++ translations/qpdfview_ru.ts	2012-11-26 20:32:20 +0000
@@ -729,7 +729,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../sources/main.cpp" line="155"/>
+        <location filename="../sources/main.cpp" line="173"/>
         <source>SyncTeX data for &apos;%1&apos; could not be found.</source>
         <translation type="unfinished">Не найдены данные SyncTeX для &apos;%1&apos;.</translation>
     </message>

=== modified file 'translations/qpdfview_sk.ts'
--- translations/qpdfview_sk.ts	2012-11-25 10:12:59 +0000
+++ translations/qpdfview_sk.ts	2012-11-26 20:32:20 +0000
@@ -729,7 +729,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../sources/main.cpp" line="155"/>
+        <location filename="../sources/main.cpp" line="173"/>
         <source>SyncTeX data for &apos;%1&apos; could not be found.</source>
         <translation type="unfinished">SyncTeX dáta pre &apos;%1&apos; sa nedali nájsť.</translation>
     </message>

=== modified file 'translations/qpdfview_tr.ts'
--- translations/qpdfview_tr.ts	2012-11-25 07:24:50 +0000
+++ translations/qpdfview_tr.ts	2012-11-26 20:32:20 +0000
@@ -729,7 +729,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../sources/main.cpp" line="155"/>
+        <location filename="../sources/main.cpp" line="173"/>
         <source>SyncTeX data for &apos;%1&apos; could not be found.</source>
         <translation type="unfinished">&apos;%1&apos; belgesi için SyncTeX verisi bulunamadı.</translation>
     </message>

=== modified file 'translations/qpdfview_ug.ts'
--- translations/qpdfview_ug.ts	2012-11-25 07:24:50 +0000
+++ translations/qpdfview_ug.ts	2012-11-26 20:32:20 +0000
@@ -729,7 +729,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../sources/main.cpp" line="155"/>
+        <location filename="../sources/main.cpp" line="173"/>
         <source>SyncTeX data for &apos;%1&apos; could not be found.</source>
         <translation type="unfinished"></translation>
     </message>

=== modified file 'translations/qpdfview_uk.ts'
--- translations/qpdfview_uk.ts	2012-11-25 07:24:50 +0000
+++ translations/qpdfview_uk.ts	2012-11-26 20:32:20 +0000
@@ -729,7 +729,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../sources/main.cpp" line="155"/>
+        <location filename="../sources/main.cpp" line="173"/>
         <source>SyncTeX data for &apos;%1&apos; could not be found.</source>
         <translation type="unfinished">Не знайдено даних SyncTeX для &apos;%1&apos;.</translation>
     </message>

=== modified file 'translations/qpdfview_zh_CN.ts'
--- translations/qpdfview_zh_CN.ts	2012-11-25 09:27:13 +0000
+++ translations/qpdfview_zh_CN.ts	2012-11-26 20:32:20 +0000
@@ -729,7 +729,7 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../sources/main.cpp" line="155"/>
+        <location filename="../sources/main.cpp" line="173"/>
         <source>SyncTeX data for &apos;%1&apos; could not be found.</source>
         <translation type="unfinished"></translation>
     </message>