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

List:       kde-commits
Subject:    KDE/kdebase/kmenuedit
From:       Laurent Montel <montel () kde ! org>
Date:       2005-10-03 15:28:17
Message-ID: 1128353297.144996.3716.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 466859 by mlaurent:

Commit but not complet.


 M  +1 -1      kcontrol_main.cpp  
 M  +1 -1      kmenuedit.cpp  
 M  +7 -6      treeview.cpp  


--- trunk/KDE/kdebase/kmenuedit/kcontrol_main.cpp #466858:466859
@@ -34,7 +34,7 @@
 
 extern "C" int KDE_EXPORT kdemain( int argc, char **argv )
 {
-    KLocale::setMainCatalogue("kmenuedit");
+    KLocale::setMainCatalog("kmenuedit");
     KAboutData aboutData("kcontroledit", I18N_NOOP("KDE Control Center Editor"),
 			 version, description, KAboutData::License_GPL,
 			 "(C) 2000-2004, Waldo Bastian, Raffaele Sandrini, Matthias Elter");
--- trunk/KDE/kdebase/kmenuedit/kmenuedit.cpp #466858:466859
@@ -31,7 +31,7 @@
 #include <kservice.h>
 #include <kstdaction.h>
 #include <kstdaccel.h>
-
+#include <kxmlguifactory.h>
 #include "treeview.h"
 #include "basictab.h"
 #include "kmenuedit.h"
--- trunk/KDE/kdebase/kmenuedit/treeview.cpp #466858:466859
@@ -52,7 +52,7 @@
 #include <kservice.h>
 #include <kservicegroup.h>
 #include <kmultipledrag.h>
-#include <kurldrag.h>
+#include <k3urldrag.h>
 #include <QMenu>
 
 #include "treeview.h"
@@ -153,11 +153,12 @@
 
 
 TreeView::TreeView( bool controlCenter, KActionCollection *ac, QWidget *parent, const char *name )
-    : KListView(parent, name), m_ac(ac), m_rmb(0), m_clipboard(0),
+    : KListView(parent), m_ac(ac), m_rmb(0), m_clipboard(0),
       m_clipboardFolderInfo(0), m_clipboardEntryInfo(0),
       m_controlCenter(controlCenter), m_layoutDirty(false)
 {
-    setFrameStyle(QFrame::WinPanel | QFrame::Sunken);
+    setObjectName(name);
+	setFrameStyle(QFrame::WinPanel | QFrame::Sunken);
     setAllColumnsShowFocus(true);
     setRootIsDecorated(true);
     setSorting(-1);
@@ -676,7 +677,7 @@
            (e->source() == const_cast<TreeView *>(this)))
        return true;
     KURL::List urls;
-    if (KURLDrag::decode(e, urls) && (urls.count() == 1) && 
+    if (K3URLDrag::decode(e, urls) && (urls.count() == 1) && 
         urls[0].isLocalFile() && urls[0].path().endsWith(".desktop"))
        return true;
     return false;
@@ -747,7 +748,7 @@
    {
      // External drop
      KURL::List urls;
-     if (!KURLDrag::decode(e, urls) || (urls.count() != 1) || !urls[0].isLocalFile())
+     if (!K3URLDrag::decode(e, urls) || (urls.count() != 1) || !urls[0].isLocalFile())
         return;
      QString path = urls[0].path();
      if (!path.endsWith(".desktop"))
@@ -967,7 +968,7 @@
        {
           KURL url;
           url.setPath(m_dragPath);
-          drag->addDragObject( new KURLDrag(url, 0));
+          drag->addDragObject( new K3URLDrag(url, 0));
        }
     }
     else
[prev in list] [next in list] [prev in thread] [next in thread]