Changeset 176 for smplayer/trunk/src/actionseditor.cpp

Timestamp:

May 3, 2016, 5:25:45 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update trunk to version 16.4

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/actionseditor.cpp (modified) (15 diffs)

smplayer/trunk/src/actionseditor.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -37 +37 @@
 #include <QApplication>
 #include <QAction>
+#include <QDebug>
 
 #include "images.h"
@@ -103 +104 @@
         }
 
+        //qDebug("ActionsEditor::shortcutsToString: accelText: '%s'", accelText.toUtf8().constData());
+
         return accelText;
 }
@@ -109 +112 @@
         QList <QKeySequence> shortcuts_list;
 
-        QStringList l = shortcuts.split(',');
+        QStringList l = shortcuts.split(", ");
 
         for (int n=0; n < l.count(); n++) {
@@ -121 +124 @@
                 QString s = QKeySequence( l[n].simplified() );
 #endif
-                
+
                 //Work-around for Simplified-Chinese
                 s.replace( QString::fromUtf8("å·Š"), "Left");
@@ -147 +150 @@
         latest_dir = Paths::shortcutsPath();
 
-    actionsTable = new QTableWidget(0, COL_NAME +1, this);
+        actionsTable = new QTableWidget(0, COL_NAME +1, this);
         actionsTable->setSelectionMode( QAbstractItemView::SingleSelection );
         actionsTable->verticalHeader()->hide();
@@ -154 +157 @@
         actionsTable->horizontalHeader()->setSectionResizeMode(COL_DESC, QHeaderView::Stretch);
         actionsTable->horizontalHeader()->setSectionResizeMode(COL_NAME, QHeaderView::Stretch);
+        actionsTable->horizontalHeader()->setSectionResizeMode(COL_CONFLICTS, QHeaderView::ResizeToContents);
 #else
         actionsTable->horizontalHeader()->setResizeMode(COL_DESC, QHeaderView::Stretch);
         actionsTable->horizontalHeader()->setResizeMode(COL_NAME, QHeaderView::Stretch);
+        actionsTable->horizontalHeader()->setResizeMode(COL_CONFLICTS, QHeaderView::ResizeToContents);
 #endif
 
@@ -254 +259 @@
         actionsTable->setRowCount( actionsList.count() );
 
-    QAction *action;
+        QAction *action;
         QString accelText;
 
@@ -283 +288 @@
                 // Shortcut column
                 QTableWidgetItem * i_shortcut = new QTableWidgetItem(accelText);
+                int column_height = i_shortcut->sizeHint().height();
+                i_shortcut->setSizeHint(QSize(150, column_height));
 
                 // Set flags
@@ -372 +379 @@
 
                 if (!result.isNull()) {
-                    QString accelText = QKeySequence(result).toString(QKeySequence::PortableText);
+                        //qDebug("ActionsEditor::editShortcut: result: '%s'", result.toUtf8().constData());
+                        QString accelText = QKeySequence(result).toString(QKeySequence::PortableText);
                         i->setText(accelText);
                         if (hasConflicts()) qApp->beep();
@@ -387 +395 @@
 }
 
+bool ActionsEditor::containsShortcut(const QString & accel, const QString & shortcut) {
+        QStringList shortcut_list = accel.split(", ");
+        QString s;
+        foreach(s, shortcut_list) {
+                s = s.trimmed();
+                //qDebug("ActionsEditor::containsShortcut: comparing '%s' with '%s'", s.toUtf8().constData(), shortcut.toUtf8().constData());
+                if (s == shortcut) return true;
+        }
+        return false;
+}
+
 int ActionsEditor::findActionAccel(const QString & accel, int ignoreRow) {
-        for (int row=0; row < actionsTable->rowCount(); row++) {
+        QStringList shortcuts = accel.split(", ");
+        QString shortcut;
+
+        for (int row = 0; row < actionsTable->rowCount(); row++) {
                 QTableWidgetItem * i = actionsTable->item(row, COL_SHORTCUT);
-                if ( (i) && (i->text() == accel) ) {
-                        if (ignoreRow == -1) return row;
-                        else
-                        if (ignoreRow != row) return row;
+                if (i && row != ignoreRow) {
+                        if (!i->text().isEmpty()) {
+                                foreach(shortcut, shortcuts) {
+                                        if (containsShortcut(i->text(), shortcut.trimmed())) {
+                                                return row;
+                                        }
+                                }
+                        }
                 }
         }
@@ -406 +432 @@
         QTableWidgetItem *i;
 
-        for (int n=0; n < actionsTable->rowCount(); n++) {
+        for (int n = 0; n < actionsTable->rowCount(); n++) {
                 //actionsTable->setText( n, COL_CONFLICTS, " ");
                 i = actionsTable->item( n, COL_CONFLICTS );
@@ -416 +442 @@
                         if (!accelText.isEmpty()) {
                                 found = findActionAccel( accelText, n );
-                                if ( (found != -1) && (found != n) ) {
+                                if ( (found != -1) /*&& (found != n)*/ ) {
                                         conflict = true;
                                         //actionsTable->setText( n, COL_CONFLICTS, "!");
@@ -497 +523 @@
 
 bool ActionsEditor::loadActionsTable(const QString & filename) {
-        qDebug("ActionsEditor::loadActions: '%s'", filename.toUtf8().data());
-
-        QRegExp rx("^(.*)\\t(.*)");
+        qDebug() << "ActionsEditor::loadActions:" <<  filename;
+
         int row;
 
-    QFile f( filename );
-    if ( f.open( QIODevice::ReadOnly ) ) {
+        QFile f( filename );
+        if ( f.open( QIODevice::ReadOnly ) ) {
 
 #if !USE_SHORTCUTGETTER
@@ -509 +534 @@
 #endif
 
-        QTextStream stream( &f );
+                QTextStream stream( &f );
                 stream.setCodec("UTF-8");
 
-        QString line;
-        while ( !stream.atEnd() ) {
-            line = stream.readLine();
-                        qDebug("line: '%s'", line.toUtf8().data());
-                        if (rx.indexIn(line) > -1) {
-                                QString name = rx.cap(1);
-                                QString accelText = rx.cap(2);
-                                qDebug(" name: '%s' accel: '%s'", name.toUtf8().data(), accelText.toUtf8().data());
+                QString line;
+                while ( !stream.atEnd() ) {
+                        line = stream.readLine().trimmed();
+                        qDebug() << "ActionsEditor::loadActions: line:" << line;
+                        QString name;
+                        QString accelText;
+                        int pos = line.indexOf(QRegExp("\\t|\\s"));
+                        //qDebug() << "ActionsEditor::loadActions: pos:" << pos;
+                        if (pos == -1) {
+                                name = line;
+                        } else {
+                                name = line.left(pos);
+                                accelText = line.mid(pos+1).trimmed();
+                        }
+                        qDebug() << "ActionsEditor::loadActions: name:" << name << "accel:" << accelText;
+                        if (!name.isEmpty()) {
                                 row = findActionName(name);
                                 if (row > -1) {
-                                        qDebug("Action found!");
+                                        qDebug() << "ActionsEditor::loadActions: action found!";
                                         actionsTable->item(row, COL_SHORTCUT)->setText(accelText);
-                                }                               
+                                }
                         } else {
-                                qDebug(" wrong line");
+                                qDebug() << "ActionsEditor::loadActions: error in line";
                         }
                 }