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

List:       kde-commits
Subject:    extragear/office/skrooge
From:       Stephane Mankowski <stephane () mankowski ! fr>
Date:       2009-08-17 8:04:15
Message-ID: 1250496255.143689.31776.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1012234 by smankowski:

Correction on .rc file

 M  +2 -2      skgbasegui/skrooge.rc  
 M  +3 -0      skrooge_bookmark/skrooge_bookmark.rc  
 M  +3 -0      skrooge_categories/skrooge_categories.rc  
 M  +1 -1      skrooge_delete/skrooge_delete.rc  
 M  +2 -2      skrooge_file/skrooge_file.rc  
 M  +6 -0      skrooge_importexport/skrooge_importexport.rc  
 M  +1 -1      skrooge_operation/skrooge_operation.rc  
 M  +3 -0      skrooge_print/skrooge_print.rc  
 M  +1 -1      skrooge_properties/skrooge_properties.rc  
 M  +1 -1      skrooge_report/skrooge_report.rc  
 M  +1 -1      skrooge_scheduled/skrooge_scheduled.rc  
 M  +1 -1      skrooge_undoredo/skrooge_undoredo.rc  
 M  +3 -0      skrooge_unit/skrooge_unit.rc  
 M  +1 -1      templates/skrooge_xxx/skrooge_xxx.rc  


--- trunk/extragear/office/skrooge/skgbasegui/skrooge.rc #1012233:1012234
@@ -26,11 +26,11 @@
 	  <Merge/>
   </Menu>
 </MenuBar>
-<ToolBar name="file" fullWidth="false" newline="false" >
+<ToolBar noMerge="1" name="file" fullWidth="false" newline="false" >
 	<text>File</text>
 	<Merge/>
 </ToolBar>
-<ToolBar name="edit" fullWidth="false" newline="false" >
+<ToolBar noMerge="1" name="edit" fullWidth="false" newline="false" >
 	<text>Edit</text>
 	<Merge/>
 </ToolBar>
--- trunk/extragear/office/skrooge/skrooge_bookmark/skrooge_bookmark.rc #1012233:1012234
@@ -11,4 +11,7 @@
 	  <Action name="view_bookmarks"/>
   </Menu>
 </MenuBar>
+<ToolBar noMerge="1" name="file" fullWidth="false" newline="false" >
+	<text>File</text>
+</ToolBar>
 </kpartgui>
--- trunk/extragear/office/skrooge/skrooge_categories/skrooge_categories.rc #1012233:1012234
@@ -9,4 +9,7 @@
     </Menu>
   </Menu>
 </MenuBar>
+<ToolBar noMerge="1" name="file" fullWidth="false" newline="false" >
+	<text>File</text>
+</ToolBar>
 </kpartgui>
--- trunk/extragear/office/skrooge/skrooge_delete/skrooge_delete.rc #1012233:1012234
@@ -6,7 +6,7 @@
 	  <Action name="edit_delete" />
   </Menu>
 </MenuBar>
-<ToolBar name="edit"><text>Edit</text>
+<ToolBar noMerge="1" name="edit"><text>Edit</text>
 	<Action name="edit_delete" />
 	<Separator/>
 </ToolBar>
--- trunk/extragear/office/skrooge/skrooge_file/skrooge_file.rc #1012233:1012234
@@ -14,13 +14,13 @@
 	  <Merge/>
   </Menu>
 </MenuBar>
-<ToolBar name="file" fullWidth="false" newline="false" >
+<ToolBar noMerge="1" name="file" fullWidth="false" newline="false" >
 	<text>File</text>
 	<Action name="file_new" />
 	<Action name="file_open" />
 	<Separator/>
 	<Action name="file_save" />
-	<Action name="file_save_as" />	
+	<Action name="file_save_as" />
 	<Separator/>
 	<Merge/>
 </ToolBar>
--- trunk/extragear/office/skrooge/skrooge_importexport/skrooge_importexport.rc #1012233:1012234
@@ -26,4 +26,10 @@
 	  <Action name="view_open_not_validated"/>
   </Menu>
 </MenuBar>
+<ToolBar noMerge="1" name="file" fullWidth="false" newline="false" >
+	<text>File</text>
+</ToolBar>
+<ToolBar noMerge="1" name="edit" fullWidth="false" newline="false" >
+	<text>Edit</text>
+</ToolBar>
 </kpartgui>
--- trunk/extragear/office/skrooge/skrooge_operation/skrooge_operation.rc #1012233:1012234
@@ -14,7 +14,7 @@
 	  <Action name="view_open_highlight"/>
   </Menu>
 </MenuBar>
-<ToolBar name="edit"><text>Edit</text>
+<ToolBar noMerge="1" name="edit"><text>Edit</text>
 	<Separator/>
 	<Action name="fast_edition" />
 </ToolBar>
--- trunk/extragear/office/skrooge/skrooge_print/skrooge_print.rc #1012233:1012234
@@ -7,4 +7,7 @@
 	<Separator/>
   </Menu>
 </MenuBar>
+<ToolBar noMerge="1" name="file" fullWidth="false" newline="false" >
+	<text>File</text>
+</ToolBar>
 </kpartgui>
--- trunk/extragear/office/skrooge/skrooge_properties/skrooge_properties.rc #1012233:1012234
@@ -3,6 +3,6 @@
 <MenuBar>
   <Menu name="view">
 	  <Action name="view_properties"/>
-  </Menu>  
+  </Menu>
 </MenuBar>
 </kpartgui>
--- trunk/extragear/office/skrooge/skrooge_report/skrooge_report.rc #1012233:1012234
@@ -5,7 +5,7 @@
 	  <Action name="open_report" />
   </Menu>
 </MenuBar>
-<ToolBar name="edit"><text>Edit</text>
+<ToolBar noMerge="1" name="edit"><text>Edit</text>
 	<Action name="open_report" />
 	<Separator/>
 </ToolBar>
--- trunk/extragear/office/skrooge/skrooge_scheduled/skrooge_scheduled.rc #1012233:1012234
@@ -5,7 +5,7 @@
 	  <Action name="schedule_operation" />
   </Menu>
 </MenuBar>
-<ToolBar name="operation"><Text>Operation</Text>
+<ToolBar noMerge="1" name="operation"><Text>Operation</Text>
 	<Action name="schedule_operation" />
 </ToolBar>
 </kpartgui>
--- trunk/extragear/office/skrooge/skrooge_undoredo/skrooge_undoredo.rc #1012233:1012234
@@ -10,7 +10,7 @@
 	  <Action name="view_transactions"/>
   </Menu>
 </MenuBar>
-<ToolBar name="edit"><text>Edit</text>
+<ToolBar noMerge="1" name="edit"><text>Edit</text>
 	<Action name="edit_undo" />
 	<Action name="edit_redo" />
 	<Separator/>
--- trunk/extragear/office/skrooge/skrooge_unit/skrooge_unit.rc #1012233:1012234
@@ -6,4 +6,7 @@
 	  <Action name="edit_split_stock" />
   </Menu>
 </MenuBar>
+<ToolBar noMerge="1" name="edit" fullWidth="false" newline="false" >
+	<text>Edit</text>
+</ToolBar>
 </kpartgui>
--- trunk/extragear/office/skrooge/templates/skrooge_xxx/skrooge_xxx.rc #1012233:1012234
@@ -4,6 +4,6 @@
   <Menu name="edit"><text>Edit</text>
   </Menu>
 </MenuBar>
-<ToolBar name="edit"><text>Edit</text>
+<ToolBar noMerge="1" name="edit"><text>Edit</text>
 </ToolBar>
 </kpartgui>
[prev in list] [next in list] [prev in thread] [next in thread]