Edit book header items

source/fb2head.cpp

@@ -66,22 +66,24 @@ void FbScheme::items(QStringList &list) const
     }
 }
 
-bool FbScheme::hasItems() const
+bool FbScheme::canEdit() const
 {
-    FbScheme child = typeScheme().firstChildElement();
+    if (type() == "sequenceType") return true;
+    FbScheme scheme = typeScheme();
+    FbScheme child = scheme.firstChildElement();
     while (!child.isNull()) {
         switch (toKeyword(child.tagName())) {
             case XsElement:
-                return true;
+                return false;
             case XsChoice:
             case XsComplexType:
             case XsSequence:
-                if (child.hasItems()) return true;
+                if (!child.canEdit()) return false;
             default: ;
         }
         child = child.nextSiblingElement();
     }
-    return false;
+    return true;
 }
 
 FbScheme FbScheme::typeScheme() const
@@ -202,9 +204,11 @@ FbHeadItem::HintHash::HintHash()
 }
 
 FB2_BEGIN_KEYHASH(FbHeadItem)
+    FB2_KEY( Genr   , "genre"     );
     FB2_KEY( Auth   , "author"    );
+    FB2_KEY( Date   , "date"      );
     FB2_KEY( Cover  , "coverpage" );
-    FB2_KEY( Image  , "image"       );
+    FB2_KEY( Image  , "image"     );
     FB2_KEY( Seqn   , "sequence"  );
 FB2_END_KEYHASH
 
@@ -272,20 +276,29 @@ FbHeadItem * FbHeadItem::item(int row) const
     return m_list[row];
 }
 
-QString FbHeadItem::text(int col) const
+QString FbHeadItem::data(int col) const
 {
     switch (col) {
         case 0: return QString("<%1> %2").arg(m_name).arg(hint());
         case 1: return value();
-        case 2: return scheme().hasItems() ? "Yes" : "No";
+        case 2: return extra();
         case 3: return scheme().info();
         case 4: return scheme().type();
-        case 5: return scheme().attribute("minOccurs");
-        case 6: return scheme().attribute("maxOccurs");
+        case 5: return scheme().canEdit() ? "Yes" : "No";
+        case 6: return scheme().attribute("minOccurs");
+        case 7: return scheme().attribute("maxOccurs");
     }
     return QString();
 }
 
+void FbHeadItem::setData(const QString &text, int col)
+{
+    switch (col) {
+        case 1: return setValue(text);
+        case 2: return setExtra(text);
+    }
+}
+
 QString FbHeadItem::hint() const
 {
     static HintHash hints;
@@ -297,13 +310,13 @@ QString FbHeadItem::hint() const
 QString FbHeadItem::value() const
 {
     switch (toKeyword(m_name)) {
-        case Auth : {
+        case Auth: {
             QString result = sub("last-name");
             result += " " + sub("first-name");
             result += " " + sub("middle-name");
             return result.simplified();
         } break;
-        case Cover : {
+        case Cover: {
             QString text;
             foreach (FbHeadItem * item, m_list) {
                 if (item->m_name == "image") {
@@ -313,14 +326,11 @@ QString FbHeadItem::value() const
             }
             return text;
         } break;
-        case Image : {
+        case Image: {
             return m_element.attribute("src");
         } break;
-        case Seqn : {
-            QString text = m_element.attribute("name");
-            QString numb = m_element.attribute("number");
-            if (numb.isEmpty() || numb == "0") return text;
-            return text + ", " + tr("#") + numb;
+        case Seqn: {
+            return m_element.attribute("name");
         } break;
         default: ;
     }
@@ -328,6 +338,46 @@ QString FbHeadItem::value() const
     return m_element.toPlainText().simplified();
 }
 
+QString FbHeadItem::extra() const
+{
+    switch (toKeyword(m_name)) {
+        case Genr: return m_element.attribute("match");
+        case Seqn: return m_element.attribute("number");
+        case Date: return m_element.attribute("value");
+        default: return QString();
+    }
+}
+
+void FbHeadItem::setValue(const QString &text)
+{
+    switch (toKeyword(m_name)) {
+        case Seqn: m_element.setAttribute("name", text); break;
+        default: m_element.setPlainText(text);
+    }
+}
+
+void FbHeadItem::setExtra(const QString &text)
+{
+    switch (toKeyword(m_name)) {
+        case Date: m_element.setAttribute("value", text); break;
+        case Genr: m_element.setAttribute("match", text); break;
+        case Seqn: m_element.setAttribute("number", text); break;
+        default: ;
+    }
+}
+
+bool FbHeadItem::canEditExtra() const
+{
+    switch (toKeyword(m_name)) {
+        case Date:
+        case Genr:
+        case Seqn:
+            return true;
+        default:
+            return false;
+    }
+}
+
 QString FbHeadItem::sub(const QString &key) const
 {
     foreach (FbHeadItem * item, m_list) {
@@ -400,9 +450,9 @@ int FbHeadModel::columnCount(const QModelIndex &parent) const
 {
     Q_UNUSED(parent);
 #ifdef QT_DEBUG
-    return 7;
+    return 8;
 #else
-    return 2;
+    return 3;
 #endif
 }
 
@@ -449,7 +499,7 @@ QVariant FbHeadModel::data(const QModelIndex &index, int role) const
 {
     if (role != Qt::DisplayRole && role != Qt::EditRole) return QVariant();
     FbHeadItem * i = item(index);
-    return i ? i->text(index.column()) : QVariant();
+    return i ? i->data(index.column()) : QVariant();
 }
 
 QVariant FbHeadModel::headerData(int section, Qt::Orientation orientation, int role) const
@@ -458,30 +508,27 @@ QVariant FbHeadModel::headerData(int section, Qt::Orientation orientation, int r
         switch (section) {
             case 0: return tr("Key");
             case 1: return tr("Value");
+            case 2: return tr("Extra");
         #ifdef QT_DEBUG
-            case 2: return tr("Has items");
             case 3: return tr("Info");
             case 4: return tr("Type");
-            case 5: return tr("Min");
-            case 6: return tr("Max");
+            case 5: return tr("Can edit");
+            case 6: return tr("Min");
+            case 7: return tr("Max");
         #endif
         }
     }
     return QVariant();
 }
 
-void FbHeadItem::setText(const QString &text)
-{
-    m_element.setPlainText(text);
-}
-
 bool FbHeadModel::setData(const QModelIndex &index, const QVariant &value, int role)
 {
     if (role != Qt::EditRole) return false;
-    FbHeadItem * i = item(index);
-    if (!i) return false;
-    i->setText(value.toString());
-    emit dataChanged(index, index);
+    if (FbHeadItem * i = item(index)) {
+        i->setData(value.toString(), index.column());
+        emit dataChanged(index, index);
+        return true;
+    }
     return true;
 }
 
@@ -489,16 +536,19 @@ Qt::ItemFlags FbHeadModel::flags(const QModelIndex &index) const
 {
     if (!index.isValid()) return 0;
     Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable;
-    if (index.column() == 1) {
-        if (FbHeadItem * i = item(index)) {
-            if (!i->scheme().hasItems()) {
-                flags |= Qt::ItemIsEditable;
-            }
-        }
-    }
+    if (canEdit(index)) flags |= Qt::ItemIsEditable;
     return flags;
 }
 
+bool FbHeadModel::canEdit(const QModelIndex &index) const
+{
+    switch (index.column()) {
+        case 1: if (FbHeadItem * i = item(index)) return i->canEdit(); break;
+        case 2: if (FbHeadItem * i = item(index)) return i->canEditExtra(); break;
+    }
+    return false;
+}
+
 //---------------------------------------------------------------------------
 //  FbTreeView
 //---------------------------------------------------------------------------
@@ -576,13 +626,7 @@ void FbHeadView::editCurrent(const QModelIndex &index)
 
 void FbHeadView::activated(const QModelIndex &index)
 {
-    if (index.isValid() && index.column() == 1) {
-        if (FbHeadItem * i = model()->item(index)) {
-            if (!i->scheme().hasItems()) {
-                edit(index);
-            }
-        }
-    }
+    if (model()->canEdit(index)) edit(index);
     showStatus(index);
 }
 
@@ -597,7 +641,7 @@ void FbHeadView::showStatus(const QModelIndex &current)
     if (!model()) return;
     if (!current.isValid()) return;
     QModelIndex parent = model()->parent(current);
-    QModelIndex index = model()->index(current.row(), 2, parent);
+    QModelIndex index = model()->index(current.row(), 3, parent);
     emit status(model()->data(index).toString());
 }
 

source/fb2head.hpp

@@ -44,7 +44,7 @@ public:
     static const QDomDocument & fb2();
     FbScheme element(const QString &name) const;
     void items(QStringList &list) const;
-    bool hasItems() const;
+    bool canEdit() const;
     QString info() const;
     QString type() const;
 
@@ -58,7 +58,9 @@ class FbHeadItem: public QObject
     Q_OBJECT
 
     FB2_BEGIN_KEYLIST
+        Genr,
         Auth,
+        Date,
         Cover,
         Image,
         Seqn,
@@ -93,9 +95,9 @@ public:
         return m_element;
     }
 
-    QString text(int col = 0) const;
+    QString data(int col = 0) const;
 
-    void setText(const QString &text);
+    void setData(const QString &text, int col = 0);
 
     const QString & name() const {
         return m_name;
@@ -105,6 +107,12 @@ public:
 
     FbScheme scheme() const;
 
+    bool canEdit() const {
+        return scheme().canEdit();
+    }
+
+    bool canEditExtra() const;
+
 private:
     class HintHash : public QHash<QString, QString>
     {
@@ -114,7 +122,10 @@ private:
 
 private:
     void addChildren(QWebElement &parent);
+    void setValue(const QString &text);
+    void setExtra(const QString &text);
     QString value() const;
+    QString extra() const;
     QString hint() const;
 
 private:
@@ -134,6 +145,7 @@ public:
     void expand(QTreeView *view);
     FbHeadItem * item(const QModelIndex &index) const;
     QModelIndex append(const QModelIndex &parent, const QString &name);
+    bool canEdit(const QModelIndex &index) const;
     void remove(const QModelIndex &index);
 
 public: