[pkg-kde-commits] rev 2698 - trunk/packages/kdewebdev/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Wed Dec 21 15:03:08 UTC 2005
Author: chrsmrtn
Date: 2005-12-21 15:03:07 +0000 (Wed, 21 Dec 2005)
New Revision: 2698
Added:
trunk/packages/kdewebdev/debian/patches/01_kdewebdev_branch_r490330.diff
Log:
kdewebdev 3.5 branch pull.
Added: trunk/packages/kdewebdev/debian/patches/01_kdewebdev_branch_r490330.diff
===================================================================
--- trunk/packages/kdewebdev/debian/patches/01_kdewebdev_branch_r490330.diff 2005-12-21 13:43:40 UTC (rev 2697)
+++ trunk/packages/kdewebdev/debian/patches/01_kdewebdev_branch_r490330.diff 2005-12-21 15:03:07 UTC (rev 2698)
@@ -0,0 +1,461 @@
+#DPATCHLEVEL=0
+--- quanta/parsers/parser.h (revision 486078)
++++ quanta/parsers/parser.h (revision 490330)
+@@ -83,9 +83,6 @@
+ * Crash errors of Parser::nodeAt is a good sign of a missing setRootNode
+ */
+ void setRootNode(Node* node) {m_node = node;} //TODO: check if m_saParser should be updated or not!
+- /** Print the doc structure tree to the standard output.
+- Only for debugging purposes. */
+- void coutTree(Node *node, int indent);
+ void synchParseInDetail();
+
+ IncludedGroupElementsMap includedMap;
+--- quanta/parsers/parsercommon.cpp (revision 486078)
++++ quanta/parsers/parsercommon.cpp (revision 490330)
+@@ -15,10 +15,11 @@
+ ***************************************************************************/
+
+ //qt includes
+-#include "qstring.h"
++#include <qstring.h>
+
+ //kde includes
+-#include "klocale.h"
++#include <kdebug.h>
++#include <klocale.h>
+ #include <ktexteditor/editinterface.h>
+
+ //own includes
+@@ -202,4 +203,37 @@
+ return node;
+ }
+
++void coutTree(Node *node, int indent)
++{
++ QString output;
++ int bLine, bCol, eLine, eCol;
++ if (!node)
++ kdDebug(24000)<< "undoRedo::coutTree() - bad node!" << endl;
++ while (node)
++ {
++ output = "";
++ output.fill('.', indent);
++ node->tag->beginPos(bLine, bCol);
++ node->tag->endPos(eLine, eCol);
++ if (node->tag->type != Tag::Text)
++ output += node->tag->name.replace('\n'," ");
++ else
++ output+= node->tag->tagStr().replace('\n'," ");
++ kdDebug(24000) << output <<" (" << node->tag->type << ") at pos " <<
++ bLine << ":" << bCol << " - " << eLine << ":" << eCol << " This: "<< node << " Parent: " << node->parent << " Prev: " << node->prev << " Next: " << node->next << " Child: " << node->child << endl;
++ /* for(j = 0; j < node->tag->attrCount(); j++)
++ {
++ kdDebug(24000)<< " attr" << j << " " <<
++ node->tag->getAttribute(j).nameLine << ":" <<
++ node->tag->getAttribute(j).nameCol << " - " <<
++ node->tag->getAttribute(j).valueLine << ":" <<
++ node->tag->getAttribute(j).valueCol << endl;
++ }
++*/
++ if (node->child)
++ coutTree(node->child, indent + 4);
++ node = node->next;
++ }
+ }
++
++}
+--- quanta/parsers/parsercommon.h (revision 486078)
++++ quanta/parsers/parsercommon.h (revision 490330)
+@@ -49,6 +49,10 @@
+ */
+ Node* createScriptTagNode(Document *write, const AreaStruct &area, const QString &areaName,
+ const DTDStruct *dtd, Node *parentNode, Node *currentNode);
++
++/** Print the doc structure tree to the standard output.
++ Only for debugging purposes. */
++ void coutTree(Node *node, int indent);
+ }
+
+ #endif
+--- quanta/parsers/saparser.cpp (revision 486078)
++++ quanta/parsers/saparser.cpp (revision 490330)
+@@ -900,7 +900,11 @@
+ if (m_currentNode->next->closesPrevious)
+ {
+ m_currentNode->next->removeAll = false;
++ Node *secondNext = m_currentNode->next->next;
++ if (secondNext)
++ secondNext->prev = m_currentNode;
+ delete m_currentNode->next;
++ m_currentNode->next = secondNext;
+ m_useNext = true;
+ }
+ } else
+--- quanta/parsers/parser.cpp (revision 486078)
++++ quanta/parsers/parser.cpp (revision 490330)
+@@ -535,12 +535,12 @@
+ m_node = ParserCommon::createTextNode(w, 0L, maxLines, w->editIf->lineLength(maxLines), 0L);
+ }
+ m_parsingNeeded = false;
+-/*
+- treeSize = 0;
+- kdDebug(24000) << "Basenode : " << m_node << endl;
+- coutTree(m_node, 2);
+- kdDebug(24000) << "Size of tree: " << treeSize << endl;
+-*/
++
++// treeSize = 0;
++// kdDebug(24000) << "Basenode : " << m_node << endl;
++// ParserCommon::coutTree(m_node, 2);
++// kdDebug(24000) << "Size of tree: " << treeSize << endl;
++
+ //FIXME: What is the use of two pointer to the same Node???
+ baseNode = m_node;
+ m_saParser->init(m_node, w);
+@@ -556,41 +556,7 @@
+ return m_node;
+ }
+
+-/** Print the doc structure tree to the standard output.
+- Only for debugging purposes. */
+
+-void Parser::coutTree(Node *node, int indent)
+-{
+- QString output;
+- int bLine, bCol, eLine, eCol;
+- if (!node)
+- kdDebug(24000)<< "undoRedo::coutTree() - bad node!" << endl;
+- while (node)
+- {
+- output = "";
+- output.fill('.', indent);
+- node->tag->beginPos(bLine, bCol);
+- node->tag->endPos(eLine, eCol);
+- if (node->tag->type != Tag::Text)
+- output += node->tag->name.replace('\n'," ");
+- else
+- output+= node->tag->tagStr().replace('\n'," ");
+- kdDebug(24000) << output <<" (" << node->tag->type << ") at pos " <<
+- bLine << ":" << bCol << " - " << eLine << ":" << eCol << " This: "<< node << " Parent: " << node->parent << " Prev: " << node->prev << " Next: " << node->next << " Child: " << node->child << endl;
+- /* for(j = 0; j < node->tag->attrCount(); j++)
+- {
+- kdDebug(24000)<< " attr" << j << " " <<
+- node->tag->getAttribute(j).nameLine << ":" <<
+- node->tag->getAttribute(j).nameCol << " - " <<
+- node->tag->getAttribute(j).valueLine << ":" <<
+- node->tag->getAttribute(j).valueCol << endl;
+- }
+-*/
+- if (node->child)
+- coutTree(node->child, indent + 4);
+- node = node->next;
+- }
+-}
+
+
+ /** No descriptions */
+@@ -976,9 +942,9 @@
+ node = nextNode;
+
+ // kdDebug(24000)<< "Node removed!" << endl;
+-// coutTree(m_node, 2);
++// ParserCommon::coutTree(m_node, 2);
+ }
+-// coutTree(m_node, 2);
++// ParserCommon::coutTree(m_node, 2);
+ }
+
+ Node *Parser::rebuild(Document *w)
+@@ -1001,7 +967,7 @@
+
+ //**kdDebug(24000)<< "************* Begin User Modification *****************" << endl;
+ //debug!
+- //coutTree(m_node, 2);//*/
++ //ParserCommon::coutTree(m_node, 2);//*/
+ if (w != write || !m_node) //the document has changed or the top node does not exists => parse completely
+ {
+ logReparse(modifs, w);
+@@ -1217,17 +1183,16 @@
+ }
+ }
+ /* kdDebug(24000)<< "END"<< endl;
+- coutTree(baseNode, 2);
++ ParserCommon::coutTree(baseNode, 2);
+ kdDebug(24000)<< "************* End User Modification *****************" << endl;*/
+ w->docUndoRedo->addNewModifsSet(modifs, undoRedo::SourceModif);
+ }
+ kdDebug(24000) << "Rebuild: " << t.elapsed() << " ms \n";
+-/*
+- treeSize = 0;
+- coutTree(m_node, 2);
+- kdDebug(24000) << "Size of tree: " << treeSize << endl;
+-// cout << "\n"; */
+
++/* treeSize = 0;
++ ParserCommon::coutTree(m_node, 2);
++ kdDebug(24000) << "Size of tree: " << treeSize << endl;*/
++
+ m_saParser->init(m_node, w);
+ if (saParserEnabled)
+ QTimer::singleShot(0, this, SLOT(slotParseInDetail()));
+--- quanta/components/debugger/variableslistview.cpp (revision 486078)
++++ quanta/components/debugger/variableslistview.cpp (revision 490330)
+@@ -215,7 +215,7 @@
+ item->setText(VariablesListViewColumns::Name, oldvar->name());
+ item->setText(VariablesListViewColumns::Type, oldvar->typeName());
+ item->setText(VariablesListViewColumns::Size, oldvar->sizeName());
+- item->setText(VariablesListViewColumns::Value, (newvar->isScalar() ? oldvar->value() : ""));
++ item->setText(VariablesListViewColumns::Value, (newvar->isScalar() ? oldvar->value() : QString()));
+
+ }
+
+--- quanta/components/debugger/dbgp/quantadebuggerdbgp.desktop (revision 486078)
++++ quanta/components/debugger/dbgp/quantadebuggerdbgp.desktop (revision 490330)
+@@ -14,6 +14,8 @@
+ Comment[fi]=DBGp-debugliitännäinen, katso http://xdebug.org
+ Comment[fr]=Module de débogage DBGp, consultez http://xdebug.org
+ Comment[ga]=Breiseán dífhabhtóra DBGp, féach ar http://xdebug.org
++Comment[hu]=DBGp nyomkövető modul, lásd: http://xdebug.org
++Comment[is]=DBGp aflúsunaríforrit. Sjá http://xdebug.org
+ Comment[it]=Plugin di degub DBGp, vedi http://xdebug.org
+ Comment[lt]=DBGp derintuvės priedas, žr. http://xdebug.org
+ Comment[nl]=DBGp-debugger-plugin, zie http://xdebug.org
+--- quanta/ChangeLog (revision 486078)
++++ quanta/ChangeLog (revision 490330)
+@@ -1,42 +1,19 @@
+-This files contains the changes since Quanta 2.0 until the current 3.4.x series.
++This files contains the changes since Quanta 2.0 until the current 3.5.x series.
+
+ Version 3.5.1 (Release date: 29-11-2005; Started 04-03-2004):
+ - bugfixes:
+ - better handling of quotation marks when editing tags inside a script area
++ - don't show the file changed dialog after using save as and save again
++ - crash fixes in VPL [#118686]
+
+ Version 3.5 (Release date: 29-11-2005; Started 04-03-2004):
+ - bugfixes:
+- - read/write the correct entry from description.rc in the editor
+- - fill only the attributes with source="selection" with the selection in the
+- tag editing dialog
+- - fix matching of excluded files from a project
+ - 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
+- - fix crash when unsetting breakpoints
+- - entity autocompletion fixes
+- - show an upload treeview for profiles that have @ in the username
+- - allow CVS actions to be put on toolbars [#106023]
+- - open the files with the right encoding when restoring the last opened files on startup [#104512]
+ - add missing Romanian characters to the Insert Special Character dialog [#107549]
+- - treat "<" as the end of a tag name. Fixes autoreplacement of opening/closing
+- tags in cases when a PHP area starts directly after a tag name. [#106911]
+- - fix the Kommander XML scripts.
+- - fix crash when deleting a file which is part of a project from the tab
+- context menu [#111134]
+ - fix layout of mailto dialogs
+- - do not autoclose tag starting with <?, like <?xml
+- - create empty description files for scripts that don't have one
+- - 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
+- - replace a leading ~ in an upload profile with the users home folder and avoid a hang
+ - fix lots of VPL related crashes [#112733, #112853, #108501, #115046]
+ - give to the host field more space in the upload profile dialog [#112778]
+- - show DT tags in VPL [#109723]
+ - remember find options between sessions [#97102]
+ - don't hide the password dialogs behind the main window [#114584]
+ - replace < and > typed in VPL with < and > in source [#115528]
+@@ -44,19 +21,12 @@
+
+ - improvements:
+ - md5sum based file changed detection
+- - nicer processing of CVS output
+- - read the image sizes for remote images as well
+- - insert an img tag for remote images as well when using D&D
+- - better context sensitiv documentation (needs updated documentation and DTEP
+- packages)
+ - faster loading of multiple documents at once
+ - 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 single file/folder upload really quick [#105612]
+- - Paste as HTML Encoded encodes more chars to their corresponding entities [#100547, #100103]
+ - escape the quotation marks of the inserted attributes inside a script
+ area if needed
+ - less annoying CSS autocompletion [#109603]
+@@ -70,8 +40,58 @@
+ - new features:
+ - loading/updating of the entities in a DTEP from a DTD
+
++Version 3.4.3 (Release date: 05-10-2005; Started 01-08-2005):
++ - bugfixes:
++ - fix crash when deleting a file which is part of a project from the tab
++ context menu [#111134]
++ - do not autoclose tag starting with <?, like <?xml
++ - create empty description files for scripts that don't have one
++ - 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
++ - fix lots of table editor bugs
++ - restore automatic conversion of accented chars behavior to pre-3.4.2
++ - save the content entered in a new file in the VPL editor [#111278]
++ - fix loading order of the project view files
++ - replace a leading ~ in an upload profile with the users home folder and avoid a hang
++ - fix lots of VPL related crashes
++ - show DT tags in VPL [#109723]
++
++Version 3.4.2 (Release date: 20-07-2005; Started 01-06-2005):
++ - bugfixes:
++ - entity autocompletion fixes
++ - don't show the name twice in the tooltip of treeview items
++ - show an upload treeview for profiles that have @ in the username
++ - allow CVS actions to be put on toolbars [#106023]
++ - open the files with the right encoding when restoring the last opened files on startup [#104512]
++ - fix the Kommander XML scripts
++ - treat "<" as the end of a tag name. Fixes autoreplacement of opening/closing
++ tags in cases when a PHP area starts directly after a tag name. [#106911]
+
+-Version 3.4 (Release date: xx-03-2005; Started 20-08-2004):
++ - improvements:
++ - make single file/folder upload really quick [#105612]
++ - Paste as HTML Encoded encodes more chars to their corresponding entities [#100547, #100103]
++ - improve the automatic conversion of characters. Only those are converted that cannot be
++ encoded in the encoding of the document
++
++Version 3.4.1 (Release date: 31-05-2005; Started 04-03-2004):
++ - bugfixes:
++ - read/write the correct entry from description.rc in the editor
++ - fill only the attributes with source="selection" with the selection in the
++ tag editing dialog
++ - fix matching of excluded files from a project
++ - don't crash when Selected is pressed and nothing is selected (in the CSS editor) [#101919]
++ - show the correct relative paths in URL autocompletion
++ - fix crash when unsetting breakpoints
++
++ - improvements:
++ - nicer processing of CVS output
++ - read the image sizes for remote images as well
++ - insert an img tag for remote images as well when using D&D
++ - better context sensitiv documentation (needs updated documentation and DTEP
++ packages)
++
++Version 3.4 (Release date: 16-03-2005; Started 20-08-2004):
+ - bugfixes:
+ - Debugger
+ - Added full support for Gubeds conditional breakpoints
+@@ -89,7 +109,7 @@
+ a skeleton for VPL
+ - fix "Cannot insert the tag: invalid location" problem [#99340]
+ - restore the correct mouse cursor when the VPL area is left [#98177]
+- - Other bug fixes.
++ - Other bug fixes.
+ - show (again) the full filename in a tooltip
+ - don't crash if the preview widget is closed with a JavaScript command
+ from the code itself [#87533]
+@@ -190,7 +210,7 @@
+ - any action can be assigned to an event, not just the user defined
+ script actions
+ - more than one action can be assigned to events
+- - possibility to disable the event actions added (without the need to
++ - possibility to disable the event actions added (without the need to
+ remove them one by one)
+ - support loading of more than one toolbar at a time
+ - don't ask for toolbar saving if the toolbar names were modified by
+@@ -237,8 +257,7 @@
+ - PHP class autocompletion improved (autocomplete for $this; class methods; for classes from
+ included files)
+ - make CSS autocompletion less intrussive
+-
+-
++
+ Version 3.3.0 (Release date: 18-08-2004; Started 07-05-2004):
+ NOTE: Unfortunately I failed to update the changelog regulary, thus some new features and
+ bugfixes might not be listed here.
+--- quanta/src/quantaview.h (revision 486078)
++++ quanta/src/quantaview.h (revision 490330)
+@@ -19,6 +19,7 @@
+ #define QUANTAVIEW_H
+
+ // include files for Qt
++#include <qguardedptr.h>
+ #include <qwidget.h>
+ #include <qptrlist.h>
+ #include <qvaluelist.h>
+@@ -214,7 +215,7 @@
+ Document *m_document;
+ QuantaPlugin *m_plugin;
+ QWidget *m_customWidget; ///<view holds a custom widget, eg. a documentation
+- KafkaDocument *m_kafkaDocument;
++ QGuardedPtr<KafkaDocument> m_kafkaDocument;
+ QSplitter *m_splitter;
+ QGridLayout *m_viewLayout;
+ int m_currentViewsLayout; ///< holds the current layout, which can be SourceOnly, VPLOnly or SourceAndVPL
+--- quanta/utility/tagaction.cpp (revision 486078)
++++ quanta/utility/tagaction.cpp (revision 490330)
+@@ -1145,7 +1145,7 @@
+ long cursor_offset = selection.cursorOffset();
+ kafkaCommon::splitStartAndEndNodeSubtree(start_node, start_offset, end_node, end_offset, commonParent,
+ commonParentStartChildLocation, commonParentEndChildLocation,
+- selection, false, modifs);
++ selection, 0, modifs);
+
+ Q_ASSERT(start_node != end_node);
+
+@@ -1221,7 +1221,7 @@
+ int cursor_offset = selection.cursorOffset();*/
+ kafkaCommon::splitStartAndEndNodeSubtree(start_node, start_offset, end_node, end_offset, commonParent,
+ commonParentStartChildLocation, commonParentEndChildLocation,
+- selection, /*cursor_node, cursor_offset, */false, modifs);
++ selection, /*cursor_node, cursor_offset, */0, modifs);
+
+ // kafkaCommon::coutTree(baseNode, 3);
+
+--- quanta/project/project.cpp (revision 486078)
++++ quanta/project/project.cpp (revision 490330)
+@@ -240,7 +240,7 @@
+
+ void Project::slotOpenProject(const KURL &url)
+ {
+- kdDebug(24000) << "Open recent project: " << url <<endl;
++ kdDebug(24000) << "Open recent project: " << url <<endl;
+ if ( !url.isEmpty() )
+ {
+ if ( !QExtFileInfo::exists(url, d->m_mainWindow) )
+--- quanta/treeviews/structtreeview.cpp (revision 486078)
++++ quanta/treeviews/structtreeview.cpp (revision 490330)
+@@ -776,7 +776,7 @@
+ m_marker = current_item;
+
+ if(current_item == m_draggedItem ||
+- !(e->provides("text/x-struct_tree_tag_item") || e->source() == this) || !m_marker)
++ !(e->provides("text/x-struct_tree_tag_item") || e->source() == (QWidget *)this) || !m_marker)
+ {
+ e->accept(false);
+ last_accept = false;
+--- quanta/treeviews/projecttreeview.cpp (revision 486078)
++++ quanta/treeviews/projecttreeview.cpp (revision 490330)
+@@ -405,7 +405,7 @@
+ KTempFile *tempFile = new KTempFile(tmpDir);
+ tempFile->setAutoDelete(true);
+ tempFile->close();
+- if (QExtFileInfo::copy(KURL::fromPathOrURL(tempFile->name()), url));
++ if (QExtFileInfo::copy(KURL::fromPathOrURL(tempFile->name()), url))
+ {
+ emit insertToProject(url);
+ emit openFile(url);
+--- kommander/widgets/widgets.desktop (revision 486078)
++++ kommander/widgets/widgets.desktop (revision 490330)
+@@ -6,6 +6,7 @@
+ Name[cs]=Widgety
+ Name[cy]=Celfigion
+ Name[da]=Kontroller
++Name[el]=Γραφικά συστατικά
+ Name[et]=Elemendid
+ Name[fa]=تکهها
+ Name[fi]=Elementit
More information about the pkg-kde-commits
mailing list