From 11e4122ec3b6dc1bc314b64b02f8c79e9d9fcc79 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Mon, 6 Jan 2014 03:14:39 +0100 Subject: [PATCH] Rename applications-kmenuedit.menu -> applications-tdemenuedit.menu --- TODO | 2 +- kiosktool/menueditComponent.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/TODO b/TODO index 3ebcb06..33052e9 100644 --- a/TODO +++ b/TODO @@ -11,7 +11,7 @@ instead of copying the profile. kmenuedit: * Add config option that starts kicker->configure panel->menus -* Use in applications.menu instead of applications-kmenuedit.menu +* Use in tde-applications.menu instead of applications-tdemenuedit.menu General: * Sidebar configuration isn't kiosk friendly diff --git a/kiosktool/menueditComponent.cpp b/kiosktool/menueditComponent.cpp index 3c0ac36..b634610 100644 --- a/kiosktool/menueditComponent.cpp +++ b/kiosktool/menueditComponent.cpp @@ -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();