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

List:       kde-commits
Subject:    kdebase/kmenuedit
From:       Waldo Bastian <bastian () kde ! org>
Date:       2004-05-11 15:05:14
Message-ID: 20040511150514.B356B2012 () office ! kde ! org
[Download RAW message or body]

CVS commit by waba: 

Add "New Separator" menu action


  A            pixmaps/cr22-action-menu_new_sep.png   1.1
  A            pixmaps/cr32-action-menu_new_sep.png   1.1
  M +2 -2      kmenuedit.cpp   1.61
  M +3 -1      kmenueditui.rc   1.7
  M +35 -0     treeview.cpp   1.88
  M +1 -0      treeview.h   1.34


--- kdebase/kmenuedit/kmenuedit.cpp  #1.60:1.61
@@ -38,6 +38,4 @@
 #include "kmenuedit.moc"
 
-// TODO: Add "Add Separator" menu entry.
-
 KMenuEdit::KMenuEdit (bool controlCenter, QWidget *, const char *name)
   : KMainWindow (0, name), m_tree(0), m_basicTab(0), m_splitter(0), \
m_controlCenter(controlCenter) @@ -77,4 +75,6 @@ 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"); +    if (!m_controlCenter)
+       (void)new KAction(i18n("New &Separator"), "menu_new_sep", 0, \
actionCollection(), "newsep");  
     m_actionDelete = 0;

--- kdebase/kmenuedit/kmenueditui.rc  #1.6:1.7
@@ -1,4 +1,4 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="kmenuedit" version="4">
+<kpartgui name="kmenuedit" version="5">
 
 <MenuBar>
@@ -7,4 +7,5 @@
  <Action name="newitem"/>
  <Action name="newsubmenu" />
+ <Action name="newsep" />
  <Separator/>
  <Action name="file_save"/>
@@ -30,4 +31,5 @@
  <Action name="newitem"/>
  <Action name="newsubmenu"/>
+ <Action name="newsep" />
  <Separator/>
  <Action name="edit_cut"/>

--- kdebase/kmenuedit/treeview.cpp  #1.87:1.88
@@ -177,4 +177,6 @@ TreeView::TreeView( bool controlCenter, 
     connect(m_ac->action("newitem"), SIGNAL(activated()), SLOT(newitem()));
     connect(m_ac->action("newsubmenu"), SIGNAL(activated()), SLOT(newsubmenu()));
+    if (m_ac->action("newsep"))
+        connect(m_ac->action("newsep"), SIGNAL(activated()), SLOT(newsep()));
 
     m_menuFile = new MenuFile( locateLocal("xdgconf-menu", \
"applications-kmenuedit.menu")); @@ -244,4 +246,6 @@ void TreeView::setViewMode(bool \
showHidd  if(m_ac->action("newsubmenu"))
         m_ac->action("newsubmenu")->plug(m_rmb);
+    if(m_ac->action("newsep"))
+        m_ac->action("newsep")->plug(m_rmb);
 
     m_showHidden = showHidden;
@@ -957,4 +961,35 @@ void TreeView::newitem()
 }
 
+void TreeView::newsep()
+{
+   TreeItem *parentItem = 0;
+   TreeItem *item = (TreeItem*)selectedItem();
+
+   if(!item)
+   {
+      parentItem = 0;
+   }
+   else if(item->isDirectory())
+   {
+      parentItem = item;
+      item = 0;
+   }
+   else
+   {
+      parentItem = static_cast<TreeItem*>(item->parent());
+   }
+
+   // create the TreeItem
+   if(parentItem)
+      parentItem->setOpen(true);
+
+   TreeItem *newItem = createTreeItem(parentItem, item, m_separator, true);
+
+   setSelected ( newItem, true);
+   itemSelected( newItem);
+
+   setLayoutDirty(parentItem);
+}
+
 void TreeView::cut()
 {

--- kdebase/kmenuedit/treeview.h  #1.33:1.34
@@ -115,4 +115,5 @@ protected slots:
     void newsubmenu();
     void newitem();
+    void newsep();
 
     void cut();


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