[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdewebdev/quanta
From:       Andras Mantia <amantia () kde ! org>
Date:       2005-09-16 19:16:45
Message-ID: 1126898205.766625.30662.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 461187 by amantia:

Fix namespace editing in the attribute editor tree.

 M  +2 -0      ChangeLog  
 M  +9 -7      src/document.cpp  
 M  +0 -2      treeviews/tagattributetree.cpp  


--- branches/KDE/3.5/kdewebdev/quanta/ChangeLog #461186:461187
@@ -27,6 +27,8 @@
         - fix loading order of the project view files
         - save the content entered in a new file in the VPL editor [#111278]
         - do not allow invocation of the CSS editor in an empty non-CSS document [#109815]
+        - fix many cell-merging related errors in the table editor [#112243]
+        - fix namespace editing in the attribute editor tree
 
  - improvements:
         - md5sum based file changed detection
--- branches/KDE/3.5/kdewebdev/quanta/src/document.cpp #461186:461187
@@ -287,22 +287,24 @@
   if (!tag->nameSpace.isEmpty())
   {
     tag->beginPos(bl, bc);
+    if (tag->type == Tag::XmlTagEnd)
+      bc++;
     tag->namePos(nl, nc);
     reparseEnabled = false;
-    editIf->removeText(bl, bc+1, nl, nc);
+    editIf->removeText(bl, bc + 1, nl, nc);
     reparseEnabled = true;
   } else
   {
     tag->beginPos(bl, bc);
+    if (tag->type == Tag::XmlTagEnd)
+      bc++;
   }
-  if (nameSpace.isEmpty())
+  if (!nameSpace.isEmpty())
   {
-    slotDelayedTextChanged();
-  } else
-  {
-    viewCursorIf->setCursorPositionReal((uint)bl, (uint)(bc+1));
-    insertText(nameSpace+":");
+    viewCursorIf->setCursorPositionReal((uint)bl, (uint)(bc + 1));
+    insertText(nameSpace + ":", true, false);
   }
+  slotDelayedTextChanged(true);
   quantaApp->slotNewLineColumn();
 }
 
--- branches/KDE/3.5/kdewebdev/quanta/treeviews/tagattributetree.cpp #461186:461187
@@ -380,8 +380,6 @@
     if (dynamic_cast<AttributeNameSpaceItem*>(item))
     {
       QString nameSpace = item->editorText();
-      if (!nameSpace.isEmpty() && m_node->tag->type == Tag::XmlTagEnd)
-        nameSpace.prepend('/');
       m_node->tag->write()->changeTagNamespace(m_node->tag, nameSpace);
     } else
     {
[prev in list] [next in list] [prev in thread] [next in thread]