|
|
|
@ -47,7 +47,7 @@ MenuEditComponent::~MenuEditComponent()
|
|
|
|
|
void
|
|
|
|
|
MenuEditComponent::slotSetupPrepare()
|
|
|
|
|
{
|
|
|
|
|
(void) KioskRun::self()->locateLocal("xdgconf-menu", "applications-kmenuedit.menu"); // Create dir
|
|
|
|
|
(void) KioskRun::self()->locateLocal("xdgconf-menu", "applications-tdemenuedit.menu"); // Create dir
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
@ -103,9 +103,9 @@ bool
|
|
|
|
|
MenuEditComponent::setupFinished()
|
|
|
|
|
{
|
|
|
|
|
bool result;
|
|
|
|
|
TQString menuEditFile = KioskRun::self()->locateLocal("xdgconf-menu", "applications-kmenuedit.menu");
|
|
|
|
|
TQString menuFile = KioskRun::self()->locate("xdgconf-menu", "applications.menu");
|
|
|
|
|
TQString menuFileSave = KioskRun::self()->locateSave("xdgconf-menu", "applications.menu");
|
|
|
|
|
TQString menuEditFile = KioskRun::self()->locateLocal("xdgconf-menu", "applications-tdemenuedit.menu");
|
|
|
|
|
TQString menuFile = KioskRun::self()->locate("xdgconf-menu", "tde-applications.menu");
|
|
|
|
|
TQString menuFileSave = KioskRun::self()->locateSave("xdgconf-menu", "tde-applications.menu");
|
|
|
|
|
|
|
|
|
|
kdDebug() << "MenuEditComponent: menuEditFile = " << menuEditFile << endl;
|
|
|
|
|
kdDebug() << "MenuEditComponent: menuFile = " << menuFile << endl;
|
|
|
|
@ -133,13 +133,13 @@ MenuEditComponent::setupFinished()
|
|
|
|
|
TQDomElement e = n.toElement(); // try to convert the node to an element.
|
|
|
|
|
next = n.nextSibling();
|
|
|
|
|
|
|
|
|
|
if ((e.tagName() == "MergeFile") && (e.text() == "applications-kmenuedit.menu"))
|
|
|
|
|
if ((e.tagName() == "MergeFile") && (e.text() == "applications-tdemenuedit.menu"))
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
TQDomNode insertionPoint = n;
|
|
|
|
|
if (insertionPoint.isNull())
|
|
|
|
|
{
|
|
|
|
|
kdWarning() << "Application menu fails to include applications-kmenuedit.menu" << endl;
|
|
|
|
|
kdWarning() << "Application menu fails to include applications-tdemenuedit.menu" << endl;
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
TQDomElement docChangesElem = docChanges.documentElement();
|
|
|
|
|