recoll / Code / Diff of /src/qtgui/viewaction

Diff of /src/qtgui/viewaction_w.cpp [35196e] .. [de1656]

Switch to unified view

-a/src/qtgui/viewaction_w.cpp
+b/src/qtgui/viewaction_w.cpp
 ...
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the
  *   Free Software Foundation, Inc.,
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
+#include <stdio.h>
 #include <vector>
 #include <utility>
 #include <string>
 using namespace std;
 ...
 #include "viewaction_w.h"
 void ViewAction::init()
+{
     connect(closePB, SIGNAL(clicked()), this, SLOT(close()));
-    connect(chgActPB, SIGNAL(clicked()),
+    connect(chgActPB, SIGNAL(clicked()), this, SLOT(editActions()));
-      this, SLOT(editActions()));
     connect(actionsLV,SIGNAL(itemDoubleClicked(QTableWidgetItem *)),
         this, SLOT(onItemDoubleClicked(QTableWidgetItem *)));
+    useDesktopCB->setChecked(prefs.useDesktopOpen);
+    onUseDesktopCBToggled(prefs.useDesktopOpen);
+    connect(useDesktopCB, SIGNAL(stateChanged(int)),
+      this, SLOT(onUseDesktopCBToggled(int)));
+    connect(setExceptCB, SIGNAL(stateChanged(int)),
+      this, SLOT(onSetExceptCBToggled(int)));
+    resize(QSize(640, 480).expandedTo(minimumSizeHint()));
+}
+void ViewAction::onUseDesktopCBToggled(int onoff)
+{
+    prefs.useDesktopOpen = onoff != 0;
     fillLists();
-    resize(QSize(640, 250).expandedTo(minimumSizeHint()));
+    setExceptCB->setEnabled(prefs.useDesktopOpen);
+}
+void ViewAction::onSetExceptCBToggled(int onoff)
+{
+    newActionLE->setEnabled(onoff != 0);
+}
 void ViewAction::fillLists()
+{
     actionsLV->clear();
     actionsLV->verticalHeader()->setDefaultSectionSize(20);
     vector<pair<string, string> > defs;
     theconfig->getMimeViewerDefs(defs);
     actionsLV->setRowCount(defs.size());
     int row = 0;
+    set<string> viewerXs;
+    if (prefs.useDesktopOpen) {
+  string s = theconfig->getMimeViewerAllEx();
+  stringToStrings(s, viewerXs);
+    }
     for (vector<pair<string, string> >::const_iterator it = defs.begin();
      it != defs.end(); it++) {
     actionsLV->setItem(row, 0,
        new QTableWidgetItem(QString::fromAscii(it->first.c_str())));
+  if (!prefs.useDesktopOpen ||
+      viewerXs.find(it->first) != viewerXs.end()) {
-    actionsLV->setItem(row, 1,
+        actionsLV->setItem(
+      row, 1,
-       new QTableWidgetItem(QString::fromAscii(it->second.c_str())));
+      new QTableWidgetItem(QString::fromAscii(it->second.c_str())));
+  } else {
+      actionsLV->setItem(
+      row, 1, new QTableWidgetItem(tr("Desktop Default")));
+  }
     row++;
+    }
     QStringList labels(tr("MIME type"));
     labels.push_back(tr("Command"));
     actionsLV->setHorizontalHeaderLabels(labels);
 ...
      it != items.end(); it++) {
     (*it)->setSelected(true);
     actionsLV->setCurrentItem(*it, QItemSelectionModel::Columns);
+    }
+}
 void ViewAction::onItemDoubleClicked(QTableWidgetItem * item)
+{
     actionsLV->clearSelection();
     item->setSelected(true);
     QTableWidgetItem *item0 = actionsLV->item(item->row(), 0);
 ...
+}
 void ViewAction::editActions()
+{
     QString action0;
+    int except0 = -1;
+    set<string> viewerXs;
+    string s = theconfig->getMimeViewerAllEx();
+    stringToStrings(s, viewerXs);
     list<string> mtypes;
     bool dowarnmultiple = true;
     for (int row = 0; row < actionsLV->rowCount(); row++) {
     QTableWidgetItem *item0 = actionsLV->item(row, 0);
     if (!item0->isSelected())
         continue;
-    mtypes.push_back((const char *)item0->text().toLocal8Bit());
+    string mtype = (const char *)item0->text().toLocal8Bit();
+  mtypes.push_back(mtype);
     QTableWidgetItem *item1 = actionsLV->item(row, 1);
     QString action = item1->text();
+  int except = viewerXs.find(mtype) != viewerXs.end();
     if (action0.isEmpty()) {
         action0 = action;
+      except0 = except;
     } else {
-        if (action != action0 && dowarnmultiple) {
+        if ((action != action0 || except != except0) && dowarnmultiple) {
         switch (QMessageBox::warning(0, "Recoll",
-                         tr("Changing actions with "
+                         tr("Changing entries with "
                         "different current values"),
                          "Continue",
                          "Cancel",
 , 0, 1)) {
         case 0: dowarnmultiple = false;break;
 ...
+    }
+    }
     if (action0.isEmpty())
     return;
-    bool ok;
+    string sact = (const char *)newActionLE->text().toLocal8Bit();
-    QString newaction = QInputDialog::getText(this, "Recoll", "Edit action:",
+    trimstring(sact);
-                   QLineEdit::Normal,
+    for (list<string>::const_iterator mit = mtypes.begin();
-                   action0, &ok);
+   mit != mtypes.end(); mit++) {
-    if (!ok || newaction.isEmpty() )
+  set<string>::iterator xit = viewerXs.find(*mit);
-  return;
+  if (setExceptCB->isChecked()) {
+      if (xit == viewerXs.end()) {
+      viewerXs.insert(*mit);
+      }
+  } else {
+      if (xit != viewerXs.end()) {
+      viewerXs.erase(xit);
+      }
+  }
+  // An empty action will restore the default (erase from
+  // topmost conftree)
+  theconfig->setMimeViewerDef(*mit, sact);
+    }
-    string sact = (const char *)newaction.toLocal8Bit();
+    s = stringsToString(viewerXs);
-    for (list<string>::const_iterator it = mtypes.begin();
+    theconfig->setMimeViewerAllEx(s);
-   it != mtypes.end(); it++) {
-  theconfig->setMimeViewerDef(*it, sact);
     fillLists();
+}