File desktop-translations.diff of Package kdebase4

Overview Repositories Revisions Requests Users Attributes Meta

File desktop-translations.diff of Package kdebase4

Subject: Read .desktop file translations from .mo files if not present
From: Lubos Lunak
Fate: #300461
Patch-upstream: no
Relates: kdelibs4/desktop-translations.diff

--- apps/konqueror/sidebar/sidebar_widget.cpp.sav	2009-10-08 18:45:35.000000000 +0200
+++ apps/konqueror/sidebar/sidebar_widget.cpp	2009-10-08 18:45:48.000000000 +0200
@@ -34,6 +34,7 @@
 #include <kconfig.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
+#include <kdesktopfile.h>
 #include <kiconloader.h>
 #include <kicondialog.h>
 #include <kmessagebox.h>
@@ -730,21 +731,15 @@ bool Sidebar_Widget::addButton(const QSt
 {
 	int lastbtn = m_buttons.count();
 
-  	KConfigGroup *confFile;
-
 	kDebug() << "addButton:" << (m_path+desktoppath);
 
-	confFile = new KConfigGroup(
-	    KSharedConfig::openConfig(m_path+desktoppath, KConfig::SimpleConfig),
-	    "Desktop Entry");
-
-    	QString icon = confFile->readEntry("Icon");
-	QString name = confFile->readEntry("Name");
-	QString comment = confFile->readEntry("Comment");
-	QString url = confFile->readPathEntry("URL",QString());
-	QString lib = confFile->readEntry("X-KDE-KonqSidebarModule");
+	KDesktopFile df(m_path+desktoppath);
 
-        delete confFile;
+    	QString icon = df.readIcon();
+	QString name = df.readName();
+	QString comment = df.readComment();
+	QString url = df.desktopGroup().readPathEntry("URL",QString());
+	QString lib = df.desktopGroup().readEntry("X-KDE-KonqSidebarModule");
 
 	if (pos == -1)
 	{
@@ -848,11 +843,6 @@ KParts::BrowserExtension *Sidebar_Widget
 bool Sidebar_Widget::createView( ButtonInfo *data)
 {
 	bool ret = true;
-	KConfigGroup *confFile;
-	confFile = new KConfigGroup(
-	    KSharedConfig::openConfig(data->file, KConfig::SimpleConfig),
-	    "Desktop Entry");
-
 	data->dock = 0;
 	data->module = loadModule(m_area, data->file,data->libName,data);
 
@@ -869,7 +859,6 @@ bool Sidebar_Widget::createView( ButtonI
 			data->module, SLOT(openPreviewOnMouseOver(const KFileItem&)));
 	}
 
-	delete confFile;
 	return ret;
 }
 
--- apps/lib/konq/knewmenu.cpp.sav	2009-10-08 18:45:39.000000000 +0200
+++ apps/lib/konq/knewmenu.cpp	2009-10-08 18:52:41.000000000 +0200
@@ -224,14 +224,13 @@ void KNewMenu::parseFiles()
             // Otherwise (or if no name in it?) use file name
             if ( KDesktopFile::isDesktopFile( filePath ) ) {
                 KDesktopFile desktopFile(  filePath );
-                const KConfigGroup config = desktopFile.desktopGroup();
-                text = config.readEntry("Name");
-                (*templ).icon = config.readEntry("Icon");
-                (*templ).comment = config.readEntry("Comment");
-                QString type = config.readEntry( "Type" );
+                text = desktopFile.readName();
+                (*templ).icon = desktopFile.readIcon();
+                (*templ).comment = desktopFile.readComment();
+                QString type = desktopFile.readType();
                 if ( type == "Link" )
                 {
-                    templatePath = config.readPathEntry("URL", QString());
+                    templatePath = desktopFile.desktopGroup().readPathEntry("URL", QString());
                     if ( templatePath[0] != '/' )
                     {
                         if ( templatePath.startsWith("file:/") )

Places

File desktop-translations.diff of Package kdebase4

Places