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

List:       kde-commits
Subject:    kdewebdev/quanta
From:       Andras Mantia <amantia () kde ! org>
Date:       2005-04-21 8:32:46
Message-ID: 20050421083246.157A6496 () office ! kde ! org
[Download RAW message or body]

CVS commit by amantia: 

Show the relative paths correctly in the autocompletion for url-like attributes.


  M +2 -0      ChangeLog   1.370
  M +9 -7      quanta.kdevelop   1.327
  M +7 -7      src/document.cpp   1.370


--- kdewebdev/quanta/ChangeLog  #1.369:1.370
@@ -9,4 +9,6 @@
         - don't crash when Smart Tag Insertion is enabled and some tags are inserted to an
           emty document
+        - don't crash when Selected is pressed and nothing is selected (in the CSS editor) [#101919]
+        - show the correct relative paths in URL autocompletion
 
  - improvements:

--- kdewebdev/quanta/quanta.kdevelop  #1.326:1.327
@@ -12,5 +12,7 @@
     <version>3.2-CVS-1</version>
     <description>Quanta Plus Web Development Environment</description>
-    <ignoreparts/>
+    <ignoreparts>
+      <part>kdevvalgrind</part>
+    </ignoreparts>
     <projectdirectory>.</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
@@ -187,6 +189,6 @@
   <kdevdebugger>
     <general>
-      <dbgshell/>
-      <programargs/>
+      <dbgshell></dbgshell>
+      <programargs></programargs>
       <gdbpath>/usr/bin/</gdbpath>
       <breakonloadinglibs>true</breakonloadinglibs>
@@ -194,7 +196,7 @@
       <floatingtoolbar>false</floatingtoolbar>
       <runappinappdirectory>true</runappinappdirectory>
-      <configGdbScript/>
-      <runShellScript/>
-      <runGdbScript/>
+      <configGdbScript></configGdbScript>
+      <runShellScript></runShellScript>
+      <runGdbScript></runGdbScript>
     </general>
     <display>
@@ -266,5 +268,5 @@
     </references>
     <creategettersetter>
-      <prefixGet/>
+      <prefixGet></prefixGet>
       <prefixSet>set</prefixSet>
       <prefixVariable>m_,_</prefixVariable>

--- kdewebdev/quanta/src/document.cpp  #1.369:1.370
@@ -2310,11 +2310,11 @@ QStringList* Document::tagAttributeValue
     QString searchForAttr = (dtd->caseSensitive) ? attribute : attribute.upper();
     AttributeList* attrs = QuantaCommon::tagAttributes(dtdName, tag);
+    if (attrs)
+    {
     Attribute *attr;
     KURL u;
-    KURL base = QExtFileInfo::toRelative(url(), Project::ref()->projectBaseURL());
-    base.setPath("/"+base.directory(false, false));
+      KURL base = url();
+      base.setPath(base.directory(false,false));
     QString s;
-    if (attrs)
-    {
       for ( attr = attrs->first(); attr; attr = attrs->next() )
       {
@@ -2330,8 +2330,8 @@ QStringList* Document::tagAttributeValue
               {
                 u = (*values)[i];
-                u.setPath("/"+u.path());
                 u = QExtFileInfo::toRelative(u, base);
                 (*values)[i] = u.path();
               }
+              values->remove(values->at(0));
               values->append("mailto:" + project->email());
             } else


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