[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdevplatform] 69a7615: Really load (and use as a replace source) the
From:       Mantia Andras <amantia () kde ! org>
Date:       2010-07-08 21:15:02
Message-ID: 201007082115.o68LF2K1000438 () kore ! kollide ! net
[Download RAW message or body]

commit 69a7615cc5a706cd31aeef1f36cd33b4f2c5bee9
Author: Mantia Andras <amantia@kde.org>
Date:   Fri Jul 9 00:02:49 2010 +0300

    Really load (and use as a replace source) the global ui.rc file, not the local one.

diff --git a/shell/textdocument.cpp b/shell/textdocument.cpp
index 963efaf..b7f2835 100644
--- a/shell/textdocument.cpp
+++ b/shell/textdocument.cpp
@@ -298,7 +298,8 @@ QWidget *TextDocument::createViewWidget(QWidget *parent)
         #if KDE_VERSION >= KDE_MAKE_VERSION(4, 4, 0)
         //in KDE >= 4.4 we can use KXMLGuiClient::replaceXMLFile to provide
         //katepart with out own restructured UI configuration
-        const QString katePartUI = KStandardDirs::locate("data", "kdevelop/katepartui.rc");
+        QStringList katePartUIs = KGlobal::mainComponent().dirs()->findAllResources("data", "kdevelop/katepartui.rc");
+        const QString katePartUI = katePartUIs.last();
         const QString katePartLocalUI = KStandardDirs::locateLocal("data", "kdevelop/katepartui.rc");
         view->replaceXMLFile(katePartUI, katePartLocalUI);
         #endif
[prev in list] [next in list] [prev in thread] [next in thread]