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

List:       kde-commits
Subject:    kdebase/konqueror/keditbookmarks
From:       Stephan Binner <binner () kde ! org>
Date:       2004-08-03 16:06:40
Message-ID: 20040803160640.C062E99A8 () office ! kde ! org
[Download RAW message or body]

CVS commit by binner: 

Sync with keditbookmarksui.rc changes


  M +20 -10    keditbookmarks-genui.rc   1.6


--- kdebase/konqueror/keditbookmarks/keditbookmarks-genui.rc  #1.5:1.6
@@ -1,4 +1,4 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="keditbookmarks" version="23">
+<kpartgui name="keditbookmarks" version="24">
 
 <MenuBar>
@@ -15,24 +15,30 @@
 
 <Menu name="edit"><text>&amp;Edit</text>
-  <!-- undo/redo/cut/copy/paste stuff is 
+  <!-- undo/redo/cut/copy/paste stuff is
        merged (?) at this point (ui_standards.rc) -->
   <!-- Various things -->
-  <Action name="rename"/>
+  <Action name="rename" append="edit_paste_merge"/>
+  <Action name="delete" append="edit_paste_merge"/>
+  <Separator/>
   <Action name="changeurl"/>
   <Action name="changecomment"/>
   <Action name="changeicon"/>
-  <Action name="delete"/>
-  <Separator/><!-- Stuff for folders -->
-  <Action name="sort"/>
-  <Action name="recursivesort"/>
-  <Separator/><!-- Expand/collapse -->
+</Menu>
+
+<Menu name="view"><text>&amp;View</text>
   <Action name="expandall"/>
   <Action name="collapseall"/>
 </Menu>
 
-<Menu name="insert"><text>&amp;Insert</text>
-  <Action name="newbookmark"/>
+<Menu name="folder"><text>&amp;Folder</text>
   <Action name="newfolder"/>
   <Action name="insertseparator"/>
+  <Separator/>
+  <Action name="sort"/>
+  <Action name="recursivesort"/>
+  </Menu>
+
+<Menu name="bookmark"><text>&amp;Bookmark</text>
+  <Action name="newbookmark"/>
 </Menu>
 
@@ -46,6 +52,8 @@
 <ToolBar name="mainToolBar" noMerge="1" fullWidth="true"><text>Main Toolbar</text>
   <Action name="file_save"/>
+  <Separator/>
   <Action name="edit_undo"/>
   <Action name="edit_redo"/>
+  <Separator/>
   <Action name="newbookmark"/>
   <Action name="newfolder"/>
@@ -57,4 +65,6 @@
   <Action name="sort"/>
   <Action name="recursivesort"/>
+   <Separator/>
+  <Action name="testlink"/>
   <Separator/><!-- Clipboard -->
   <Action name="edit_undo"/>


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