TDE
/
kiosktool
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kiosktool
0
0
Fork 0
Code Issues Releases Wiki Activity

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

Browse Source
pull/1/head
Darrell Anderson 11 years ago committed by Slávek Banko
parent 09e0654dc4
commit 11e4122ec3
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File

2
TODO
Unescape View File

@ -11,7 +11,7 @@ instead of copying the profile.
kmenuedit: kmenuedit:
* Add config option that starts kicker->configure panel->menus * 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: General:
* Sidebar configuration isn't kiosk friendly * Sidebar configuration isn't kiosk friendly

12
kiosktool/menueditComponent.cpp
Unescape View File

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

Write Preview
Loading…
Cancel
Save