Rename applications-kmenuedit.menu -> applications-tdemenuedit.menu

pull/1/head
Darrell Anderson 10 years ago committed by Slávek Banko
parent 09e0654dc4
commit 11e4122ec3

@ -11,7 +11,7 @@ instead of copying the profile.
kmenuedit:
* Add config option that starts kicker->configure panel->menus
* Use <MergeFile type="parent"> in applications.menu instead of applications-kmenuedit.menu
* Use <MergeFile type="parent"> in tde-applications.menu instead of applications-tdemenuedit.menu
General:
* Sidebar configuration isn't kiosk friendly

@ -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();

Loading…
Cancel
Save