mirror/konsole
1
0
Fork 0
mirror of https://github.com/KDE/konsole.git synced 2026-05-06 13:43:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

merge back from bleedingedge

Browse Source 
svn path=/trunk/KDE/kdebase/apps/konsole/; revision=558070
This commit is contained in:
Stephan Kulow
2006-07-04 16:34:13 +00:00
parent ed411de987
commit 3cfbe3d053
6 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
settings/sessioneditor.cpp
View File

@@ -125,10 +125,10 @@ void SessionEditor::loadAllKeytab()
QString SessionEditor::readKeymapTitle(const QString & file)
{
QString fPath = locate("data", "konsole/" + file);
QString fPath = KStandardDirs::locate("data", "konsole/" + file);
if (fPath.isNull())
fPath = locate("data", file);
fPath = KStandardDirs::locate("data", file);
removeButton->setEnabled( QFileInfo (fPath).isWritable () );
if (fPath.isNull())
@@ -358,7 +358,7 @@ void SessionEditor::removeCurrent()
QString base = ((SessionListBoxText *)sessionList->item( sessionList->currentItem() ))->filename();
// Query if system sessions should be removed
if (locateLocal("data", "konsole/" + base.section('/', -1)) != base) {
if (KStandardDirs::locateLocal("data", "konsole/" + base.section('/', -1)) != base) {
int code = KMessageBox::warningContinueCancel(this,
i18n("You are trying to remove a system session. Are you sure?"),
i18n("Removing System Session"),