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

List:       kde-commits
Subject:    kdebase/kioslave/settings
From:       Joseph Wenninger <kde () jowenn ! at>
Date:       2004-08-21 11:26:41
Message-ID: 20040821112641.047AF2E8D () office ! kde ! org
[Download RAW message or body]

CVS commit by jowenn: 

make applications:/ a synonym for applications:/


  A            applications.protocol   1.1
  M +1 -1      Makefile.am   1.3
  M +13 -3     kio_settings.cc   1.11


--- kdebase/kioslave/settings/Makefile.am  #1.2:1.3
@@ -11,5 +11,5 @@
 noinst_HEADERS = kio_settings.h
 
-kdelnk_DATA = settings.protocol programs.protocol
+kdelnk_DATA = settings.protocol programs.protocol applications.protocol
 kdelnkdir = $(kde_servicesdir)
 

--- kdebase/kioslave/settings/kio_settings.cc  #1.10:1.11
@@ -35,5 +35,5 @@ class SettingsProtocol : public KIO::Sla
 {
 public:
-        enum RunMode { SettingsMode, ProgramsMode };
+        enum RunMode { SettingsMode, ProgramsMode, ApplicationsMode };
         SettingsProtocol(const QCString &protocol, const QCString &pool, const \
QCString &app);  virtual ~SettingsProtocol();
@@ -104,4 +104,7 @@ SettingsProtocol::SettingsProtocol( cons
                 m_runMode = ProgramsMode;
         else
+                if (protocol == "applications")
+                        m_runMode = ApplicationsMode;
+                else
                 m_runMode = SettingsMode;
 
@@ -189,9 +192,12 @@ void SettingsProtocol::stat(const KURL& 
 
         if (grp && grp->isValid()) {
-                createDirEntry(entry, (m_runMode == SettingsMode) ? i18n("Settings") \
: i18n("Programs"), +                createDirEntry(entry, (m_runMode == \
SettingsMode) ? i18n("Settings") : ( (m_runMode==ApplicationsMode) ? \
i18n("Applications") : i18n("Programs")),  url.url(), "inode/directory",grp->icon() \
);  } else {
                 KService::Ptr service = KService::serviceByName( url.fileName() );
                 if (service && service->isValid()) {
+//                      QString desktopEntryPath = "file:" + locate("apps", \
service->desktopEntryPath()); +//                      createFileEntry(entry, \
service->name(), desktopEntryPath, "application/x-desktop", service->icon()); +
                         createFileEntry(entry, service->name(), url.url(), \
"application/x-desktop", service->icon());  } else {
@@ -267,4 +273,8 @@ void SettingsProtocol::listDir(const KUR
                                 createDirEntry(entry, groupCaption, \
"programs:/"+relPath, "inode/directory",g->icon());  break;
+                          case( ApplicationsMode ):
+                                kdDebug() << "SettingsProtocol: adding entry \
applications:/" << relPath << endl; +                                \
createDirEntry(entry, groupCaption, "applications:/"+relPath, \
"inode/directory",g->icon()); +                                break;
                 }
 


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