Command option: copy item to tab; ignore same clipboard data; bugs

Mic92 · Mar 24, 2012 · ba2d2d6 · ba2d2d6
1 parent 4c901de
commit ba2d2d6
Show file tree

Hide file tree

Showing 24 changed files with 465 additions and 233 deletions.
diff --git a/src/client_server.cpp b/src/client_server.cpp
@@ -127,6 +127,18 @@ QString serverName(const QString &name)
     return name + sessionID;
 }
 
+uint hash(const QMimeData &data, const QStringList &formats)
+{
+    QByteArray bytes;
+    foreach( QString mime, formats ) {
+        bytes = data.data(mime);
+        if ( !bytes.isEmpty() )
+            return qHash(bytes);
+    }
+
+    return 0;
+}
+
 QMimeData *cloneData(const QMimeData &data, const QStringList *formats)
 {
     QMimeData *newdata = new QMimeData;

diff --git a/src/client_server.h b/src/client_server.h
@@ -27,6 +27,7 @@ bool readMessage(QIODevice *socket, QByteArray *msg);
 void writeMessage(QIODevice *socket, const QByteArray &msg);
 QLocalServer *newServer(const QString &name, QObject *parent=NULL);
 QString serverName(const QString &name);
+uint hash(const QMimeData &data, const QStringList &formats);
 QMimeData *cloneData(const QMimeData &data, const QStringList *formats=NULL);
 void raiseWindow(WId wid);
 

diff --git a/src/clipboardbrowser.cpp b/src/clipboardbrowser.cpp
@@ -218,12 +218,6 @@ void ClipboardBrowser::contextMenuEvent(QContextMenuEvent *event)
         m_menu->exec( event->globalPos() );
 }
 
-void ClipboardBrowser::selectionChanged(const QItemSelection &a,
-                                        const QItemSelection &b)
-{
-    QListView::selectionChanged(a, b);
-}
-
 void ClipboardBrowser::paintEvent(QPaintEvent *event)
 {
     d->setDryPaint(true);
@@ -465,33 +459,30 @@ bool ClipboardBrowser::add(QMimeData *data, bool force)
 {
     if (!force) {
         // don't add if new data is same as first item
-        if ( m->rowCount() ) {
-            QStringList formats = data->formats();
-            QMimeData *olddata = m->mimeData(0);
-            QStringList oldformats = olddata->formats();
-            if ( formats.isEmpty() || (oldformats == formats &&
-                 olddata->data(oldformats.at(0)) == data->data(formats.at(0)))
-                 ) {
-                delete data;
-                return false;
-            }
+        if ( *m->at(0) == *data ) {
+            delete data;
+            return false;
         }
 
         // commands
         bool ignore = false;
-        foreach(const Command &command, commands) {
-            if (command.automatic || command.ignore) {
+        foreach(const Command &c, commands) {
+            if (c.automatic || c.ignore || !c.tab.isEmpty()) {
                 QString text = data->text();
-                if (command.re.indexIn(text) != -1) {
-                    if (command.automatic)
-                        emit requestActionDialog(text, &command);
-                    if (command.ignore)
+                if (c.re.indexIn(text) != -1) {
+                    if (c.automatic)
+                        emit requestActionDialog(text, &c);
+                    if (c.ignore)
                         ignore = true;
+                    if (!c.tab.isEmpty())
+                        emit addToTab(data, c.tab);
                 }
             }
         }
-        if (ignore)
+        if (ignore) {
+            delete data;
             return false;
+        }
     }
 
     // create new item
@@ -513,9 +504,9 @@ bool ClipboardBrowser::add(QMimeData *data, bool force)
     return true;
 }
 
-bool ClipboardBrowser::add(ClipboardItem *item, bool force)
+bool ClipboardBrowser::add(const ClipboardItem &item, bool force)
 {
-    return add( cloneData(*item->data()), force );
+    return add( cloneData(*item.data()), force );
 }
 
 void ClipboardBrowser::loadSettings()
@@ -543,10 +534,6 @@ void ClipboardBrowser::loadSettings()
 void ClipboardBrowser::loadItems()
 {
     timer_save.stop();
-
-    // restore items
-    m->clear();
-
     ConfigurationManager::instance()->loadItems(*m, m_id);
     setCurrentIndex( QModelIndex() );
 }
@@ -562,6 +549,12 @@ void ClipboardBrowser::saveItems(int msec)
     ConfigurationManager::instance()->saveItems(*m, m_id);
 }
 
+void ClipboardBrowser::purgeItems()
+{
+    ConfigurationManager::instance()->removeItems(m_id);
+    timer_save.stop();
+}
+
 const QString ClipboardBrowser::selectedText() const
 {
     QString result;

diff --git a/src/clipboardbrowser.h b/src/clipboardbrowser.h
@@ -57,7 +57,7 @@ class ClipboardBrowser : public QListView
          */
         bool add(const QString &txt, bool force = false);
         bool add(QMimeData *item, bool force = false);
-        bool add(ClipboardItem *item, bool force = false);
+        bool add(const ClipboardItem &item, bool force = false);
 
         void remove();
 
@@ -101,8 +101,6 @@ class ClipboardBrowser : public QListView
     protected:
         void keyPressEvent(QKeyEvent *event);
         void contextMenuEvent(QContextMenuEvent *);
-        void selectionChanged ( const QItemSelection & selected,
-                                const QItemSelection & deselected );
         void paintEvent(QPaintEvent *event);
 
     signals:
@@ -115,6 +113,8 @@ class ClipboardBrowser : public QListView
         void closeAllEditors();
         void changeClipboard(const ClipboardItem *item);
 
+        void addToTab(QMimeData *data, const QString &tabName);
+
     private slots:
         void realDataChanged(const QModelIndex &a, const QModelIndex &b);
         void sizeHintChanged();
@@ -132,6 +132,7 @@ class ClipboardBrowser : public QListView
 
         void loadItems();
         void saveItems(int msec=0);
+        void purgeItems();
 
         void contextMenuAction(QAction *act);
         void updateContextMenu();

diff --git a/src/clipboarditem.cpp b/src/clipboarditem.cpp
@@ -23,7 +23,7 @@
 #include <QImage>
 
 ClipboardItem::ClipboardItem(const ClipboardModel *parent) :
-    m_parent(parent), m_filtered(false)
+    m_parent(parent), m_filtered(false), m_hash(0)
 {
     m_data = new QMimeData;
 }
@@ -33,17 +33,29 @@ ClipboardItem::~ClipboardItem()
     delete m_data;
 }
 
+bool ClipboardItem::operator ==(const ClipboardItem &item) const
+{
+    return m_hash == item.m_hash;
+}
+
+bool ClipboardItem::operator ==(const QMimeData &data) const
+{
+    return m_hash == hash(data, data.formats());
+}
+
 void ClipboardItem::clear()
 {
     //m_data->clear();
     delete m_data;
     m_data = new QMimeData;
+    m_hash = hash(*m_data, m_data->formats());
 }
 
 void ClipboardItem::setData(QMimeData *data)
 {
     delete m_data;
     m_data = data;
+    m_hash = hash(*m_data, m_data->formats());
 
     setPreferredFormat();
 }
@@ -59,11 +71,13 @@ void ClipboardItem::setData(const QVariant &value)
     m_data->clear();
     m_data->setText( value.toString() );
     m_mimeType = QString("text/plain");
+    m_hash = hash(*m_data, m_data->formats());
 }
 
 void ClipboardItem::setData(const QString &mimeType, const QByteArray &data)
 {
     m_data->setData(mimeType, data);
+    m_hash = hash(*m_data, m_data->formats());
     setPreferredFormat();
 }
 
@@ -79,7 +93,9 @@ QVariant ClipboardItem::data(int role) const
             QPixmap pix;
             pixmap(&pix);
             return pix;
-        } else {
+        } else if ( m_mimeType.endsWith("html") ||
+                    (m_parent && !m_parent->search()->isEmpty()) )
+        {
             return highlightedHtml();
         }
     } else if (role == Qt::EditRole) {
@@ -99,13 +115,14 @@ QString ClipboardItem::highlightedHtml() const
     re = m_parent ? m_parent->search() : NULL;
     if ( !re || re->isEmpty() ) {
         // show html if not searching or the text is not too large
-        if ( m_mimeType.endsWith("html") )
+        if ( m_mimeType.endsWith("html") ) {
             return m_data->html()
                     .replace("<body>", "<body><span id=\"item\">")
                     .replace("<!--StartFragment-->",
                              "<!--StartFragment--><span id=\"item\">");
-        else
-            return "<div id=\"item\">" + escape( text() );
+        } else {
+            return escape( text() );
+        }
     }
 
     const QString str = text();

diff --git a/src/clipboarditem.h b/src/clipboarditem.h
@@ -35,6 +35,9 @@ class ClipboardItem
     ClipboardItem(const ClipboardModel *parent=NULL);
     ~ClipboardItem();
 
+    bool operator ==(const ClipboardItem &item) const;
+    bool operator ==(const QMimeData &data) const;
+
     QString text() const;
 
     // highlight matched text
@@ -56,6 +59,8 @@ class ClipboardItem
     const QString &format() const { return m_mimeType; }
     void setPreferredFormat();
 
+    uint dataHash() const { return m_hash; }
+
     bool isFiltered() const { return m_filtered; }
     void setFiltered(bool filtered) { m_filtered = filtered; }
 
@@ -66,6 +71,7 @@ class ClipboardItem
     QMimeData *m_data;
     QString m_mimeType;
     bool m_filtered;
+    uint m_hash;
 };
 
 QDataStream &operator<<(QDataStream &stream, const ClipboardItem &item);

diff --git a/src/clipboardmodel.cpp b/src/clipboardmodel.cpp
@@ -361,6 +361,7 @@ QDataStream &operator>>(QDataStream &stream, ClipboardModel &model)
 {
     int length;
     stream >> length;
+    length = qMin( length, model.maxItems() ) - model.rowCount();
 
     ClipboardItem *item;
     for(int i = 0; i < length; ++i) {

diff --git a/src/clipboardmodel.h b/src/clipboardmodel.h
@@ -54,14 +54,12 @@ class ClipboardModel : public QAbstractListModel
                   int role = Qt::EditRole);
     bool insertRows(int position, int rows, const QModelIndex &index = QModelIndex());
     bool removeRows(int position, int rows, const QModelIndex &index = QModelIndex());
-    void clear() {
-        m_clipboardList.clear();
-    }
 
     bool setData(const QModelIndex &index, QMimeData *value);
     bool append(ClipboardItem *item);
 
     void setMaxItems(int max);
+    int maxItems() const { return m_max; }
 
     bool move(int pos, int newpos);
     bool moveItems(QModelIndexList list, int key);

diff --git a/src/clipboardmonitor.cpp b/src/clipboardmonitor.cpp
@@ -11,7 +11,7 @@
 #endif
 
 ClipboardMonitor::ClipboardMonitor(int &argc, char **argv) :
-    App(argc, argv), m_newdata(NULL), m_lastHash(0)
+    App(argc, argv), m_newdata(NULL)
 {
     m_socket = new QLocalSocket(this);
     connect( m_socket, SIGNAL(readyRead()),
@@ -28,6 +28,11 @@ ClipboardMonitor::ClipboardMonitor(int &argc, char **argv) :
     setFormats( cm->value("formats").toString() );
     setCheckClipboard( cm->value("check_clipboard").toBool() );
 
+    bool ok;
+    m_lastHash = cm->value("_last_hash").toUInt(&ok);
+    if (!ok)
+        m_lastHash = 0;
+
 #ifdef Q_WS_X11
     setCopyClipboard( cm->value("copy_clipboard").toBool() );
     setCheckSelection( cm->value("check_selection").toBool() );
@@ -59,18 +64,6 @@ void ClipboardMonitor::setFormats(const QString &list)
     m_formats = list.split( QRegExp("[;,\\s]+") );
 }
 
-uint ClipboardMonitor::hash(const QMimeData &data)
-{
-    QByteArray bytes;
-    foreach( QString mime, m_formats ) {
-        bytes = data.data(mime);
-        if ( !bytes.isEmpty() )
-            return qHash(bytes);
-    }
-
-    return 0;
-}
-
 #ifdef Q_WS_X11
 bool ClipboardMonitor::updateSelection(bool check)
 {
@@ -124,7 +117,7 @@ void ClipboardMonitor::checkClipboard(QClipboard::Mode mode)
     }
 
     // same data as last time?
-    newHash = hash(*data);
+    newHash = hash(*data, m_formats);
     if (m_lastHash == newHash)
         return;
 
@@ -242,7 +235,7 @@ void ClipboardMonitor::updateClipboard(QMimeData *data, bool force)
     if ( !force && m_updatetimer.isActive() )
         return;
 
-    m_lastHash = hash(*data);
+    m_lastHash = hash(*data, data->formats());
     setClipboardData(data, QClipboard::Clipboard);
 #ifdef Q_WS_X11
     setClipboardData(cloneData(*data), QClipboard::Selection);

diff --git a/src/clipboardmonitor.h b/src/clipboardmonitor.h
@@ -26,7 +26,6 @@ class ClipboardMonitor : public App
     void setFormats(const QString &list);
 
     void updateClipboard(QMimeData *data, bool force = false);
-    uint hash(const QMimeData &data);
 
     void setCheckClipboard(bool enable) {m_checkclip = enable;}
     void setCheckSelection(bool enable) {m_checksel  = enable;}