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

List:       kde-commits
Subject:    KDE/kdebase/kmenuedit
From:       Wilco Greven <greven () kde ! org>
Date:       2005-10-08 8:53:21
Message-ID: 1128761601.048469.24483.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 468468 by wgreven:

Compile and run.


 M  +1 -1      Makefile.am  
 M  +4 -4      kmenuedit.cpp  


--- trunk/KDE/kdebase/kmenuedit/Makefile.am #468467:468468
@@ -11,7 +11,7 @@
 libkmenueditcommon_la_SOURCES = basictab.cpp treeview.cpp kmenuedit.cpp \
 	khotkeys.cpp menufile.cpp menuinfo.cpp
 
-libkmenueditcommon_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
+libkmenueditcommon_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDE3SUPPORT)
 libkmenueditcommon_la_LDFLAGS = $(all_libraries) -module -avoid-version
 
 kmenuedit_la_SOURCES = main.cpp
--- trunk/KDE/kdebase/kmenuedit/kmenuedit.cpp #468467:468468
@@ -62,10 +62,10 @@
 
 void KMenuEdit::setupActions()
 {
-    (void)new KAction(i18n("&New Submenu..."), "menu_new", 0, actionCollection(), \
                "newsubmenu");
-    (void)new KAction(i18n("New &Item..."), "filenew", KStdAccel::openNew(), \
actionCollection(), "newitem"); +    (void)new KAction(i18n("&New Submenu..."), \
"menu_new", KShortcut(), 0, 0, actionCollection(), "newsubmenu"); +    (void)new \
KAction(i18n("New &Item..."), "filenew", KStdAccel::openNew(), 0, 0, \
actionCollection(), "newitem");  if (!m_controlCenter)
-       (void)new KAction(i18n("New S&eparator"), "menu_new_sep", 0, \
actionCollection(), "newsep"); +       (void)new KAction(i18n("New S&eparator"), \
"menu_new_sep", KShortcut(), 0, 0, actionCollection(), "newsep");  
     m_actionDelete = 0;
 
@@ -124,7 +124,7 @@
 
     delete m_actionDelete;
 
-    m_actionDelete = new KAction(i18n("&Delete"), "editdelete", Qt::Key_Delete, \
actionCollection(), "delete"); +    m_actionDelete = new KAction(i18n("&Delete"), \
"editdelete", Qt::Key_Delete, 0, 0, actionCollection(), "delete");  
     if (!m_splitter)
        setupView();


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