SVN commit 451717 by amantia:

Implement the rest of nickname support. Fixes the saving of team members that I broke some days ago.

CCMAIL: quanta-devel@kde.org

 M  +5 -2      ChangeLog  
 M  +16 -8     project/project.cpp  
 M  +4 -0      project/projectprivate.cpp  
 M  +1 -1      quanta.kdevelop  


--- branches/KDE/3.5/kdewebdev/quanta/ChangeLog #451716:451717
@@ -32,8 +32,8 @@
         - possibility to change the icon/text layout of the user toolbars from
           inside Quanta added
         - external preview possibility with Firefox added [#106557]
-	- make autoreplacing of accented chars smarter. The characters are replaced only if they cannot 
-	  be encoded in the encoding of the document
+        - make autoreplacing of accented chars smarter. The characters are replaced only if they cannot
+      	  be encoded in the encoding of the document
         - make single file/folder upload really quick [#105612]
         - Paste as HTML Encoded encodes more chars to their corresponding entities [#100547, #100103]
         - Debugger
@@ -43,7 +43,10 @@
           - Renamed 'Run' To 'Trace' and 'Leap' to 'Run'
           - Updated the Gubed plugin to support Gubed version 0.2.x
 
+ - new features:
+        - loading/updating of the entities in a DTEP from a DTD
 
+
 Version 3.4 (Release date: xx-03-2005; Started 20-08-2004):
   - bugfixes:
         - Debugger
--- branches/KDE/3.5/kdewebdev/quanta/project/project.cpp #451716:451717
@@ -740,7 +740,7 @@
     while (it.current())
     {
         item = it.current();
-        QString role = item->text(2);
+        QString role = item->text(3);
         if (role == i18n(teamLeaderStr.utf8()))
         {
            QDomElement leaderEl = d->dom.createElement("leader");
@@ -748,13 +748,16 @@
            el = d->dom.createElement("name");
            leaderEl.appendChild(el);
            el.appendChild(d->dom.createTextNode(item->text(0)));
+           el = d->dom.createElement("nickName");
+           leaderEl.appendChild(el);
+           el.appendChild(d->dom.createTextNode(item->text(1)));
            el = d->dom.createElement("email");
            leaderEl.appendChild(el);
-           el.appendChild(d->dom.createTextNode(item->text(1)));
+           el.appendChild(d->dom.createTextNode(item->text(2)));
         } else
         if (role == i18n(subprojectLeaderStr.utf8()))
         {
-           QString prjName = item->text(4);
+           QString prjName = item->text(5);
            savedSubprojects.append(prjName);
            QDomElement subEl = d->dom.createElement("subproject");
            for (uint i = 0; i < d->m_subprojects.count(); i++)
@@ -769,28 +772,33 @@
            subLeadersNode.appendChild(subEl);
            el = d->dom.createElement("subprojectleader");
            el.setAttribute("name", item->text(0));
-           el.setAttribute("email", item->text(1));
+           el.setAttribute("nickName", item->text(1));
+           el.setAttribute("email", item->text(2));
            subEl.appendChild(el);
         } else
         if (role == i18n(taskLeaderStr.utf8()))
         {
            el = d->dom.createElement("projecttask");
            el.setAttribute("tasklead", item->text(0));
-           el.setAttribute("email", item->text(1));
-           el.setAttribute("task", item->text(3));
+           el.setAttribute("nickName", item->text(1));
+           el.setAttribute("email", item->text(2));
+           el.setAttribute("task", item->text(4));
            taskLeadersNode.appendChild(el);
         } else
         if (role == i18n(simpleMemberStr.utf8()))
         {
            QDomElement memberEl = d->dom.createElement("member");
-           memberEl.setAttribute("task", item->text(3));
+           memberEl.setAttribute("task", item->text(4));
            teamNode.appendChild(memberEl);
            el = d->dom.createElement("name");
            memberEl.appendChild(el);
            el.appendChild(d->dom.createTextNode(item->text(0)));
+           el = d->dom.createElement("nickName");
+           memberEl.appendChild(el);
+           el.appendChild(d->dom.createTextNode(item->text(1)));
            el = d->dom.createElement("email");
            memberEl.appendChild(el);
-           el.appendChild(d->dom.createTextNode(item->text(1)));
+           el.appendChild(d->dom.createTextNode(item->text(2)));
         }
         ++it;
     }
--- branches/KDE/3.5/kdewebdev/quanta/project/projectprivate.cpp #451716:451717
@@ -601,6 +601,7 @@
   if (!no.isNull())
   {
      m_teamLeader.name = no.namedItem("name").toElement().text();
+     m_teamLeader.nickName = no.namedItem("nickName").toElement().text();
      m_teamLeader.email = no.namedItem("email").toElement().text();
   }
 
@@ -614,6 +615,7 @@
      QDomElement el2 = el.namedItem("subprojectleader").toElement();
      TeamMember member;
      member.name = el2.attribute("name");
+     member.nickName = el2.attribute("nickName");
      member.email = el2.attribute("email");
      SubProject subproject;
      subproject.name = el.attribute("name");
@@ -630,6 +632,7 @@
      el = nl.item(i).toElement();
      TeamMember member;
      member.name = el.attribute("tasklead");
+     member.nickName = el.attribute("nickName");
      member.email = el.attribute("email");
      m_taskLeaders[el.attribute("task")] = member;
   }
@@ -641,6 +644,7 @@
      el = nl.item(i).toElement();
      TeamMember member;
      member.name = el.namedItem("name").toElement().text();
+     member.nickName = el.namedItem("nickName").toElement().text();
      member.email = el.namedItem("email").toElement().text();
      member.task = el.attribute("task");
      m_simpleMembers.append(member);
--- branches/KDE/3.5/kdewebdev/quanta/quanta.kdevelop #451716:451717
@@ -167,7 +167,7 @@
     </groups>
     <tree>
       <hidenonprojectfiles>false</hidenonprojectfiles>
-      <hidepatterns/>
+      <hidepatterns></hidepatterns>
       <showvcsfields>true</showvcsfields>
     </tree>
   </kdevfileview>
_______________________________________________
quanta-devel mailing list
quanta-devel@kde.org
https://mail.kde.org/mailman/listinfo/quanta-devel