packages: kdesdk/kdesdk-branch.diff, kdewebdev/kdewebdev-branch.diff - upda...
glen
glen at pld-linux.org
Fri May 8 13:05:06 CEST 2009
Author: glen Date: Fri May 8 11:05:06 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- update branch diff
---- Files affected:
packages/kdesdk:
kdesdk-branch.diff (1.8 -> 1.9)
packages/kdewebdev:
kdewebdev-branch.diff (1.5 -> 1.6)
---- Diffs:
================================================================
Index: packages/kdesdk/kdesdk-branch.diff
diff -u packages/kdesdk/kdesdk-branch.diff:1.8 packages/kdesdk/kdesdk-branch.diff:1.9
--- packages/kdesdk/kdesdk-branch.diff:1.8 Thu Apr 23 12:14:18 2009
+++ packages/kdesdk/kdesdk-branch.diff Fri May 8 13:05:00 2009
@@ -1,7 +1,19 @@
+Index: poxml/antlr/antlr/CharScanner.hpp
+===================================================================
+--- poxml/antlr/antlr/CharScanner.hpp (.../tags/KDE/3.5.10/kdesdk) (revision 965170)
++++ poxml/antlr/antlr/CharScanner.hpp (.../branches/KDE/3.5/kdesdk) (revision 965170)
+@@ -42,6 +42,7 @@
+ #include "antlr/BitSet.hpp"
+ #include "antlr/LexerSharedInputState.hpp"
+ #include <map>
++#include <cstdio>
+
+ ANTLR_BEGIN_NAMESPACE(antlr)
+
Index: kcachegrind/kcachegrind/callgraphview.cpp
===================================================================
---- kcachegrind/kcachegrind/callgraphview.cpp (.../tags/KDE/3.5.10/kdesdk) (revision 958029)
-+++ kcachegrind/kcachegrind/callgraphview.cpp (.../branches/KDE/3.5/kdesdk) (revision 958029)
+--- kcachegrind/kcachegrind/callgraphview.cpp (.../tags/KDE/3.5.10/kdesdk) (revision 965170)
++++ kcachegrind/kcachegrind/callgraphview.cpp (.../branches/KDE/3.5/kdesdk) (revision 965170)
@@ -2073,13 +2073,12 @@
continue;
}
@@ -24,8 +36,8 @@
e->setCanvasEdge(sItem);
Index: cervisia/repositories.cpp
===================================================================
---- cervisia/repositories.cpp (.../tags/KDE/3.5.10/kdesdk) (revision 958029)
-+++ cervisia/repositories.cpp (.../branches/KDE/3.5/kdesdk) (revision 958029)
+--- cervisia/repositories.cpp (.../tags/KDE/3.5.10/kdesdk) (revision 965170)
++++ cervisia/repositories.cpp (.../branches/KDE/3.5/kdesdk) (revision 965170)
@@ -29,17 +29,29 @@
#include "cervisiapart.h"
@@ -109,8 +121,8 @@
QStringList list;
Index: cervisia/ChangeLog
===================================================================
---- cervisia/ChangeLog (.../tags/KDE/3.5.10/kdesdk) (revision 958029)
-+++ cervisia/ChangeLog (.../branches/KDE/3.5/kdesdk) (revision 958029)
+--- cervisia/ChangeLog (.../tags/KDE/3.5.10/kdesdk) (revision 965170)
++++ cervisia/ChangeLog (.../branches/KDE/3.5/kdesdk) (revision 965170)
@@ -1,3 +1,8 @@
+2008-08-15 André Wöbbeking <Woebbeking at kde.org>
+
@@ -122,8 +134,8 @@
* Fix BR #164216:
Index: cervisia/cvsservice/cvsloginjob.cpp
===================================================================
---- cervisia/cvsservice/cvsloginjob.cpp (.../tags/KDE/3.5.10/kdesdk) (revision 958029)
-+++ cervisia/cvsservice/cvsloginjob.cpp (.../branches/KDE/3.5/kdesdk) (revision 958029)
+--- cervisia/cvsservice/cvsloginjob.cpp (.../tags/KDE/3.5.10/kdesdk) (revision 965170)
++++ cervisia/cvsservice/cvsloginjob.cpp (.../branches/KDE/3.5/kdesdk) (revision 965170)
@@ -104,7 +104,8 @@
}
================================================================
Index: packages/kdewebdev/kdewebdev-branch.diff
diff -u packages/kdewebdev/kdewebdev-branch.diff:1.5 packages/kdewebdev/kdewebdev-branch.diff:1.6
--- packages/kdewebdev/kdewebdev-branch.diff:1.5 Thu Apr 23 12:14:20 2009
+++ packages/kdewebdev/kdewebdev-branch.diff Fri May 8 13:05:01 2009
@@ -1,7 +1,7 @@
Index: AUTHORS
===================================================================
---- AUTHORS (.../tags/KDE/3.5.10/kdewebdev) (revision 958029)
-+++ AUTHORS (.../branches/KDE/3.5/kdewebdev) (revision 958029)
+--- AUTHORS (.../tags/KDE/3.5.10/kdewebdev) (revision 965170)
++++ AUTHORS (.../branches/KDE/3.5/kdewebdev) (revision 965170)
@@ -12,8 +12,7 @@
Nicolas Deschildre <ndeschildre at kdewebdev.org>
Paulo Moura Guedes <moura at kdewebdev.org>
@@ -14,8 +14,8 @@
Kommander (kommander):
Index: quanta/project/projectupload.cpp
===================================================================
---- quanta/project/projectupload.cpp (.../tags/KDE/3.5.10/kdewebdev) (revision 958029)
-+++ quanta/project/projectupload.cpp (.../branches/KDE/3.5/kdewebdev) (revision 958029)
+--- quanta/project/projectupload.cpp (.../tags/KDE/3.5.10/kdewebdev) (revision 965170)
++++ quanta/project/projectupload.cpp (.../branches/KDE/3.5/kdewebdev) (revision 965170)
@@ -375,7 +375,7 @@
buttonUpload->setEnabled(false);
KURL u = *baseUrl;
@@ -27,8 +27,8 @@
return;
Index: lib/qextfileinfo.cpp
===================================================================
---- lib/qextfileinfo.cpp (.../tags/KDE/3.5.10/kdewebdev) (revision 958029)
-+++ lib/qextfileinfo.cpp (.../branches/KDE/3.5/kdewebdev) (revision 958029)
+--- lib/qextfileinfo.cpp (.../tags/KDE/3.5.10/kdewebdev) (revision 965170)
++++ lib/qextfileinfo.cpp (.../branches/KDE/3.5/kdewebdev) (revision 965170)
@@ -192,11 +192,11 @@
{
int i = 0;
@@ -54,8 +54,8 @@
if (!dirListItems.contains(u) && u.url() != m_listStartURL && !u.isParentOf(item->url()))
Index: klinkstatus/src/engine/linkchecker.cpp
===================================================================
---- klinkstatus/src/engine/linkchecker.cpp (.../tags/KDE/3.5.10/kdewebdev) (revision 958029)
-+++ klinkstatus/src/engine/linkchecker.cpp (.../branches/KDE/3.5/kdewebdev) (revision 958029)
+--- klinkstatus/src/engine/linkchecker.cpp (.../tags/KDE/3.5.10/kdewebdev) (revision 965170)
++++ klinkstatus/src/engine/linkchecker.cpp (.../branches/KDE/3.5/kdewebdev) (revision 965170)
@@ -72,41 +72,43 @@
KURL url(linkStatus()->absoluteUrl());
Q_ASSERT(url.isValid());
@@ -132,8 +132,8 @@
void LinkChecker::slotTimeOut()
Index: kommander/widget/functionlib.cpp
===================================================================
---- kommander/widget/functionlib.cpp (.../tags/KDE/3.5.10/kdewebdev) (revision 958029)
-+++ kommander/widget/functionlib.cpp (.../branches/KDE/3.5/kdewebdev) (revision 958029)
+--- kommander/widget/functionlib.cpp (.../tags/KDE/3.5.10/kdewebdev) (revision 965170)
++++ kommander/widget/functionlib.cpp (.../branches/KDE/3.5/kdewebdev) (revision 965170)
@@ -120,6 +120,44 @@
return params[0].toString().isEmpty();
}
@@ -192,8 +192,8 @@
registerFunction("echo", Function(&f_echo, ValueNone, ValueString, 1, 100));
Index: kommander/widget/parsenode.h
===================================================================
---- kommander/widget/parsenode.h (.../tags/KDE/3.5.10/kdewebdev) (revision 958029)
-+++ kommander/widget/parsenode.h (.../branches/KDE/3.5/kdewebdev) (revision 958029)
+--- kommander/widget/parsenode.h (.../tags/KDE/3.5.10/kdewebdev) (revision 965170)
++++ kommander/widget/parsenode.h (.../branches/KDE/3.5/kdewebdev) (revision 965170)
@@ -23,7 +23,7 @@
{
enum Keyword {For, To, Step, End, While, Do, Foreach, In, If, Then, Else, Elseif, Endif, Switch, Case,
@@ -205,8 +205,8 @@
enum KeywordGroup {GroupComparison, GroupAdd, GroupMultiply, GroupMisc};
Index: kommander/widget/parserdata.cpp
===================================================================
---- kommander/widget/parserdata.cpp (.../tags/KDE/3.5.10/kdewebdev) (revision 958029)
-+++ kommander/widget/parserdata.cpp (.../branches/KDE/3.5/kdewebdev) (revision 958029)
+--- kommander/widget/parserdata.cpp (.../tags/KDE/3.5.10/kdewebdev) (revision 965170)
++++ kommander/widget/parserdata.cpp (.../branches/KDE/3.5/kdewebdev) (revision 965170)
@@ -59,6 +59,8 @@
m_keywords["else"] = Else;
m_keywords["elseif"] = Elseif;
@@ -226,8 +226,8 @@
m_groups[Less] = GroupComparison;
Index: kommander/widget/parser.cpp
===================================================================
---- kommander/widget/parser.cpp (.../tags/KDE/3.5.10/kdewebdev) (revision 958029)
-+++ kommander/widget/parser.cpp (.../branches/KDE/3.5/kdewebdev) (revision 958029)
+--- kommander/widget/parser.cpp (.../tags/KDE/3.5.10/kdewebdev) (revision 965170)
++++ kommander/widget/parser.cpp (.../branches/KDE/3.5/kdewebdev) (revision 965170)
@@ -499,6 +499,21 @@
if (mode == Execute)
setVariable(var, p);
@@ -315,7 +315,7 @@
return FlowStandard;
}
else
-@@ -593,7 +623,10 @@
+@@ -593,10 +623,13 @@
int step = 1;
if (tryKeyword(Step, CheckOnly))
step = parseExpression(mode).toInt();
@@ -326,8 +326,26 @@
+ tryKeyword(LeftCurlyBrace);
int block = m_start;
Parse::Flow flow = FlowStandard;
- if (end >= start)
-@@ -610,7 +643,10 @@
+- if (end >= start)
++ if (end >= start && step > 0)
+ {
+ for (int i = start; i <= end; i+=step)
+ {
+@@ -606,11 +639,24 @@
+ if (flow == FlowBreak || flow == FlowExit)
+ break;
+ }
++ } else if (end <= start && step < 0)
++ {
++ for (int i = start; i >= end; i+=step)
++ {
++ m_start = block;
++ setVariable(var, ParseNode(i));
++ flow = parseBlock(mode);
++ if (flow == FlowBreak || flow == FlowExit)
++ break;
++ }
+ } else
parseBlock(Parse::CheckOnly);
if (flow != FlowExit)
{
@@ -339,7 +357,7 @@
return FlowStandard;
}
else
-@@ -623,7 +659,9 @@
+@@ -623,7 +669,9 @@
QString var = nextVariable();
tryKeyword(In);
QString arr = nextVariable();
@@ -350,7 +368,7 @@
int start = m_start;
Parse::Flow flow = FlowStandard;
if (isArray(arr) && array(arr).count())
-@@ -642,7 +680,10 @@
+@@ -642,7 +690,10 @@
parseBlock(CheckOnly);
if (flow != FlowExit)
{
@@ -362,7 +380,7 @@
return FlowStandard;
}
else
-@@ -655,6 +696,8 @@
+@@ -655,6 +706,8 @@
QString var = nextVariable();
ParseNode caseValue = variable(var);
bool executed = false;
@@ -371,7 +389,7 @@
tryKeyword(Semicolon, CheckOnly);
while (tryKeyword(Case, CheckOnly))
{
-@@ -666,7 +709,10 @@
+@@ -666,7 +719,10 @@
}
if (tryKeyword(Else, CheckOnly))
parseBlock(executed ? CheckOnly : mode);
@@ -383,7 +401,7 @@
}
Flow Parser::parseCommand(Mode mode)
-@@ -740,7 +786,7 @@
+@@ -740,7 +796,7 @@
if (k == Dot)
setError(i18n("Expected '%1'<br><br>Possible cause of the error is having a variable with the same name as a widget").arg(m_data->keywordToString(k)));
else
@@ -394,8 +412,8 @@
}
Index: kommander/editor/mainwindow.cpp
===================================================================
---- kommander/editor/mainwindow.cpp (.../tags/KDE/3.5.10/kdewebdev) (revision 958029)
-+++ kommander/editor/mainwindow.cpp (.../branches/KDE/3.5/kdewebdev) (revision 958029)
+--- kommander/editor/mainwindow.cpp (.../tags/KDE/3.5.10/kdewebdev) (revision 965170)
++++ kommander/editor/mainwindow.cpp (.../branches/KDE/3.5/kdewebdev) (revision 965170)
@@ -463,6 +463,70 @@
}
@@ -469,8 +487,8 @@
previewing = false;
Index: kommander/editor/mainwindow.h
===================================================================
---- kommander/editor/mainwindow.h (.../tags/KDE/3.5.10/kdewebdev) (revision 958029)
-+++ kommander/editor/mainwindow.h (.../branches/KDE/3.5/kdewebdev) (revision 958029)
+--- kommander/editor/mainwindow.h (.../tags/KDE/3.5.10/kdewebdev) (revision 965170)
++++ kommander/editor/mainwindow.h (.../branches/KDE/3.5/kdewebdev) (revision 965170)
@@ -191,6 +191,7 @@
void configureEditor();
@@ -481,8 +499,8 @@
void activeWindowChanged( QWidget *w );
Index: kommander/editor/kommander-new.xml
===================================================================
---- kommander/editor/kommander-new.xml (.../tags/KDE/3.5.10/kdewebdev) (revision 958029)
-+++ kommander/editor/kommander-new.xml (.../branches/KDE/3.5/kdewebdev) (revision 958029)
+--- kommander/editor/kommander-new.xml (.../tags/KDE/3.5.10/kdewebdev) (revision 965170)
++++ kommander/editor/kommander-new.xml (.../branches/KDE/3.5/kdewebdev) (revision 965170)
@@ -138,6 +138,10 @@
<item>str_toint</item>
<item>str_todouble</item>
@@ -521,8 +539,8 @@
Index: kommander/editor/mainwindowactions.cpp
===================================================================
---- kommander/editor/mainwindowactions.cpp (.../tags/KDE/3.5.10/kdewebdev) (revision 958029)
-+++ kommander/editor/mainwindowactions.cpp (.../branches/KDE/3.5/kdewebdev) (revision 958029)
+--- kommander/editor/mainwindowactions.cpp (.../tags/KDE/3.5.10/kdewebdev) (revision 965170)
++++ kommander/editor/mainwindowactions.cpp (.../branches/KDE/3.5/kdewebdev) (revision 965170)
@@ -476,6 +476,14 @@
connect(this, SIGNAL(hasActiveForm(bool)), a, SLOT(setEnabled(bool)));
a->plug(fileTb);
@@ -540,8 +558,8 @@
void MainWindow::setupWindowActions()
Index: kommander/plugin/specialinformation.cpp
===================================================================
---- kommander/plugin/specialinformation.cpp (.../tags/KDE/3.5.10/kdewebdev) (revision 958029)
-+++ kommander/plugin/specialinformation.cpp (.../branches/KDE/3.5/kdewebdev) (revision 958029)
+--- kommander/plugin/specialinformation.cpp (.../tags/KDE/3.5.10/kdewebdev) (revision 965170)
++++ kommander/plugin/specialinformation.cpp (.../branches/KDE/3.5/kdewebdev) (revision 965170)
@@ -379,6 +379,10 @@
i18n("Return the widget's geometry as <i>x y w h</i>. This is useful for positioning a created widget."), 1);
insertInternal(DCOP::hasFocus, "hasFocus(QString widget)",
@@ -579,8 +597,8 @@
insert(Input::savefile, "savefile(QString startdir, QString filter, QString caption)",
Index: kommander/plugin/specials.h
===================================================================
---- kommander/plugin/specials.h (.../tags/KDE/3.5.10/kdewebdev) (revision 958029)
-+++ kommander/plugin/specials.h (.../branches/KDE/3.5/kdewebdev) (revision 958029)
+--- kommander/plugin/specials.h (.../tags/KDE/3.5.10/kdewebdev) (revision 965170)
++++ kommander/plugin/specials.h (.../branches/KDE/3.5/kdewebdev) (revision 965170)
@@ -32,7 +32,7 @@
currentItem, currentRow, execute, findItem, global, insertColumn, insertItem, insertItems, insertRow,
item, itemDepth, itemPath, removeColumn, removeItem, removeRow, selection, setAssociatedText, setChecked,
@@ -610,9 +628,38 @@
namespace File
Index: kommander/widgets/treewidget.cpp
===================================================================
---- kommander/widgets/treewidget.cpp (.../tags/KDE/3.5.10/kdewebdev) (revision 958029)
-+++ kommander/widgets/treewidget.cpp (.../branches/KDE/3.5/kdewebdev) (revision 958029)
-@@ -286,7 +286,7 @@
+--- kommander/widgets/treewidget.cpp (.../tags/KDE/3.5.10/kdewebdev) (revision 965170)
++++ kommander/widgets/treewidget.cpp (.../branches/KDE/3.5/kdewebdev) (revision 965170)
+@@ -143,6 +143,8 @@
+
+ int TreeWidget::itemToIndex(QListViewItem* item)
+ {
++ if (!item->isSelected())
++ return -1;
+ QListViewItemIterator it(this);
+ int index = 0;
+ while (it.current()) {
+@@ -154,6 +156,19 @@
+ return -1;
+ }
+
++int TreeWidget::itemToIndexSafe(QListViewItem* item)
++{
++ QListViewItemIterator it(this);
++ int index = 0;
++ while (it.current()) {
++ if (it.current() == item)
++ return index;
++ ++it;
++ ++index;
++ }
++ return -1;
++}
++
+ QListViewItem* TreeWidget::indexToItem(int item)
+ {
+ QListViewItemIterator it(this);
+@@ -286,7 +301,7 @@
return f == DCOP::insertItem || f == DCOP::text || f == DCOP::setText || f == DCOP::insertItems ||
f == DCOP::selection || f == DCOP::setSelection || f == DCOP::clear || f == DCOP::removeItem ||
f == DCOP::currentItem || f == DCOP::setCurrentItem || f == DCOP::findItem || f == DCOP::item ||
@@ -621,7 +668,39 @@
}
QString TreeWidget::handleDCOP(int function, const QStringList& args)
-@@ -415,6 +415,16 @@
+@@ -315,7 +330,7 @@
+ {
+ if (it.current()->isSelected())
+ {
+- selection.append(QString("%1\n").arg(itemToIndex(it.current())));
++ selection.append(QString("%1\n").arg(itemToIndexSafe(it.current())));
+ }
+ ++it;
+ }
+@@ -373,17 +388,17 @@
+ break;
+ case DCOP::findItem:
+ if (!args[1])
+- return QString::number(itemToIndex(findItem(args[0], 0)));
++ return QString::number(itemToIndexSafe(findItem(args[0], 0)));
+ else
+ {
+ if (args[2].toUInt() && args[3].toUInt())
+- return QString::number(itemToIndex(findItem(args[0], args[1].toInt())));
++ return QString::number(itemToIndexSafe(findItem(args[0], args[1].toInt())));
+ else if (args[2].toUInt())
+- return QString::number(itemToIndex(findItem(args[0], args[1].toInt(), Qt::CaseSensitive | Qt::Contains)));
++ return QString::number(itemToIndexSafe(findItem(args[0], args[1].toInt(), Qt::CaseSensitive | Qt::Contains)));
+ else if (args[3].toUInt())
+- return QString::number(itemToIndex(findItem(args[0], args[1].toInt(), Qt::ExactMatch)));
++ return QString::number(itemToIndexSafe(findItem(args[0], args[1].toInt(), Qt::ExactMatch)));
+ else
+- return QString::number(itemToIndex(findItem(args[0], args[1].toInt(), Qt::Contains)));
++ return QString::number(itemToIndexSafe(findItem(args[0], args[1].toInt(), Qt::Contains)));
+ }
+ break;
+ case DCOP::item:
+@@ -415,6 +430,16 @@
if (columns() >= args[0].toInt())
setColumnText(args[0].toInt(), args[1]);
break;
@@ -640,8 +719,8 @@
break;
Index: kommander/widgets/execbutton.cpp
===================================================================
---- kommander/widgets/execbutton.cpp (.../tags/KDE/3.5.10/kdewebdev) (revision 958029)
-+++ kommander/widgets/execbutton.cpp (.../branches/KDE/3.5/kdewebdev) (revision 958029)
+--- kommander/widgets/execbutton.cpp (.../tags/KDE/3.5.10/kdewebdev) (revision 965170)
++++ kommander/widgets/execbutton.cpp (.../branches/KDE/3.5/kdewebdev) (revision 965170)
@@ -154,9 +154,16 @@
emit widgetOpened();
}
@@ -679,8 +758,8 @@
}
Index: kommander/widgets/textbrowser.cpp
===================================================================
---- kommander/widgets/textbrowser.cpp (.../tags/KDE/3.5.10/kdewebdev) (revision 958029)
-+++ kommander/widgets/textbrowser.cpp (.../branches/KDE/3.5/kdewebdev) (revision 958029)
+--- kommander/widgets/textbrowser.cpp (.../tags/KDE/3.5.10/kdewebdev) (revision 965170)
++++ kommander/widgets/textbrowser.cpp (.../branches/KDE/3.5/kdewebdev) (revision 965170)
@@ -14,14 +14,25 @@
* *
***************************************************************************/
@@ -736,8 +815,8 @@
break;
Index: kommander/widgets/aboutdialog.cpp
===================================================================
---- kommander/widgets/aboutdialog.cpp (.../tags/KDE/3.5.10/kdewebdev) (revision 958029)
-+++ kommander/widgets/aboutdialog.cpp (.../branches/KDE/3.5/kdewebdev) (revision 958029)
+--- kommander/widgets/aboutdialog.cpp (.../tags/KDE/3.5.10/kdewebdev) (revision 965170)
++++ kommander/widgets/aboutdialog.cpp (.../branches/KDE/3.5/kdewebdev) (revision 965170)
@@ -224,6 +224,15 @@
setAssociatedText(KommanderWidget::evalAssociatedText( populationText()));
}
@@ -756,8 +835,8 @@
switch (function) {
Index: kommander/widgets/textedit.cpp
===================================================================
---- kommander/widgets/textedit.cpp (.../tags/KDE/3.5.10/kdewebdev) (revision 958029)
-+++ kommander/widgets/textedit.cpp (.../branches/KDE/3.5/kdewebdev) (revision 958029)
+--- kommander/widgets/textedit.cpp (.../tags/KDE/3.5.10/kdewebdev) (revision 965170)
++++ kommander/widgets/textedit.cpp (.../branches/KDE/3.5/kdewebdev) (revision 965170)
@@ -30,6 +30,15 @@
enum Functions {
FirstFunction = 450, //CHANGE THIS NUMBER TO AN UNIQUE ONE!!!
@@ -849,10 +928,116 @@
case DCOP::geometry:
{
QString geo = QString::number(this->x())+" "+QString::number(this->y())+" "+QString::number(this->width())+" "+QString::number(this->height());
+Index: kommander/widgets/dialog.cpp
+===================================================================
+--- kommander/widgets/dialog.cpp (.../tags/KDE/3.5.10/kdewebdev) (revision 965170)
++++ kommander/widgets/dialog.cpp (.../branches/KDE/3.5/kdewebdev) (revision 965170)
+@@ -14,6 +14,7 @@
+ * *
+ ***************************************************************************/
+ /* KDE INCLUDES */
++#include <klocale.h>
+
+ /* QT INCLUDES */
+ #include <qstring.h>
+@@ -22,12 +23,23 @@
+ #include <qevent.h>
+ #include <qdialog.h>
+ #include <qpoint.h>
++#include <qcursor.h>
++#include <qapplication.h>
+
+ /* OTHER INCLUDES */
+ #include <specials.h>
+ #include "dialog.h"
+ #include <myprocess.h>
++#include "kommanderplugin.h"
+
++enum Functions {
++ FirstFunction = 185,
++ D_focusWidget,
++ D_waitCursor,
++ D_restoreCursor,
++ LastFunction
++};
++
+ Dialog::Dialog(QWidget *a_parent, const char *a_name, bool a_modal, int a_flags)
+ : QDialog(a_parent, a_name, a_modal, a_flags), KommanderWindow(this)
+ {
+@@ -40,6 +52,10 @@
+ m_useShebang = false;
+ m_shebang = "#!/usr/bin/kmdr-executor";
+ m_firstShow = true;
++ KommanderPlugin::setDefaultGroup(Group::DCOP);
++ KommanderPlugin::registerFunction(D_focusWidget, "focusWidget(QString widget)", i18n("The name of the widget having focus"), 1);
++ KommanderPlugin::registerFunction(D_waitCursor, "waitCursor(QString widget)", i18n("Set a wait cursor. CAUTION: if set more than once an equal number of calls to restore must be made to clear it."), 1);
++ KommanderPlugin::registerFunction(D_restoreCursor, "restoreCursor(QString widget)", i18n("Restore normal curser. NOTE: must be called as many times as wait was."), 1);
+ }
+
+ Dialog::~Dialog()
+@@ -177,7 +193,7 @@
+
+ bool Dialog::isFunctionSupported(int f)
+ {
+- return f == DCOP::text || f == DCOP::setText || f == DCOP::geometry;
++ return f == DCOP::text || f == DCOP::setText || f == DCOP::geometry || (f > FirstFunction && f < LastFunction);
+ }
+
+ QString Dialog::handleDCOP(int function, const QStringList& args)
+@@ -191,6 +207,15 @@
+ case DCOP::geometry:
+ return QString::number(this->x())+" "+QString::number(this->y())+" "+QString::number(this->width())+" "+QString::number(this->height());
+ break;
++ case D_focusWidget:
++ return focusWidget()->name();
++ break;
++ case D_waitCursor:
++ QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
++ break;
++ case D_restoreCursor:
++ QApplication::restoreOverrideCursor();
++ break;
+ default:
+ return KommanderWidget::handleDCOP(function, args);
+ }
+Index: kommander/widgets/spinboxint.h
+===================================================================
+--- kommander/widgets/spinboxint.h (.../tags/KDE/3.5.10/kdewebdev) (revision 965170)
++++ kommander/widgets/spinboxint.h (.../branches/KDE/3.5/kdewebdev) (revision 965170)
+@@ -56,8 +56,12 @@
+ signals:
+ void widgetOpened();
+ void widgetTextChanged(const QString&);
++ void lostFocus();
++ void gotFocus();
+ protected:
+ void showEvent(QShowEvent *e);
++ void focusOutEvent( QFocusEvent* e);
++ void focusInEvent( QFocusEvent* e);
+ private:
+ };
+
+Index: kommander/widgets/lineedit.h
+===================================================================
+--- kommander/widgets/lineedit.h (.../tags/KDE/3.5.10/kdewebdev) (revision 965170)
++++ kommander/widgets/lineedit.h (.../branches/KDE/3.5/kdewebdev) (revision 965170)
+@@ -60,10 +60,12 @@
+ void widgetTextChanged(const QString &);
+ void contextMenuRequested(int xpos, int ypos);
+ void gotFocus();
++ void lostFocus();
+ protected:
+ virtual void showEvent( QShowEvent *e );
+ void contextMenuEvent( QContextMenuEvent * e );
+ void focusInEvent( QFocusEvent* e);
++ void focusOutEvent( QFocusEvent* e);
+ private:
+ };
+
Index: kommander/widgets/execbutton.h
===================================================================
---- kommander/widgets/execbutton.h (.../tags/KDE/3.5.10/kdewebdev) (revision 958029)
-+++ kommander/widgets/execbutton.h (.../branches/KDE/3.5/kdewebdev) (revision 958029)
+--- kommander/widgets/execbutton.h (.../tags/KDE/3.5.10/kdewebdev) (revision 965170)
++++ kommander/widgets/execbutton.h (.../branches/KDE/3.5/kdewebdev) (revision 965170)
@@ -77,8 +77,10 @@
signals:
void widgetOpened();
@@ -867,8 +1052,8 @@
// Whether pressing execubtton should block GUI until process ends
Index: kommander/widgets/table.h
===================================================================
---- kommander/widgets/table.h (.../tags/KDE/3.5.10/kdewebdev) (revision 958029)
-+++ kommander/widgets/table.h (.../branches/KDE/3.5/kdewebdev) (revision 958029)
+--- kommander/widgets/table.h (.../tags/KDE/3.5.10/kdewebdev) (revision 965170)
++++ kommander/widgets/table.h (.../branches/KDE/3.5/kdewebdev) (revision 965170)
@@ -52,12 +52,14 @@
virtual QString handleDCOP(int function, const QStringList& args);
virtual bool isFunctionSupported(int function);
@@ -886,10 +1071,24 @@
private:
Index: kommander/widgets/spinboxint.cpp
===================================================================
---- kommander/widgets/spinboxint.cpp (.../tags/KDE/3.5.10/kdewebdev) (revision 958029)
-+++ kommander/widgets/spinboxint.cpp (.../branches/KDE/3.5/kdewebdev) (revision 958029)
-@@ -89,7 +89,7 @@
+--- kommander/widgets/spinboxint.cpp (.../tags/KDE/3.5.10/kdewebdev) (revision 965170)
++++ kommander/widgets/spinboxint.cpp (.../branches/KDE/3.5/kdewebdev) (revision 965170)
+@@ -87,9 +87,21 @@
+ emit widgetOpened();
+ }
++void SpinBoxInt::focusOutEvent( QFocusEvent * e)
++{
++ QSpinBox::focusOutEvent(e);
++ emit lostFocus();
++}
++
++void SpinBoxInt::focusInEvent( QFocusEvent * e)
++{
++ QSpinBox::focusInEvent(e);
++ emit gotFocus();
++}
++
bool SpinBoxInt::isFunctionSupported(int f)
{
- return f == DCOP::text || f == DCOP::setText || f == DCOP::setMaximum;
@@ -897,7 +1096,7 @@
}
QString SpinBoxInt::handleDCOP(int function, const QStringList& args)
-@@ -103,6 +103,16 @@
+@@ -103,6 +115,16 @@
case DCOP::setMaximum:
setMaxValue(args[0].toUInt());
break;
@@ -916,9 +1115,22 @@
}
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdesdk/kdesdk-branch.diff?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdewebdev/kdewebdev-branch.diff?r1=1.5&r2=1.6&f=u
More information about the pld-cvs-commit
mailing list