kdevelop

[Alexander Dymo]

CVS commit by dymo: 

Don't know if this is a right fix for our build toolbar problem but it works for me.
CCMAIL: kdevelop-devel at kdevelop.org


  M +1 -1      buildtools/ada/kdevadaproject.rc   1.3
  M +1 -1      buildtools/autotools/kdevautoproject.rc   1.16
  M +2 -2      buildtools/custommakefiles/kdevcustomproject.rc   1.6
  M +2 -2      buildtools/generic/kdevgenericproject.rc   1.2
  M +3 -3      buildtools/haskell/kdevhaskellproject.rc   1.2
  M +1 -1      buildtools/pascal/kdevpascalproject.rc   1.4
  M +3 -3      buildtools/qmake/kdevtrollproject.rc   1.9
  M +2 -1      src/kdevelopui.rc   1.61


--- kdevelop/buildtools/ada/kdevadaproject.rc  #1.2:1.3
@@ -8,5 +8,5 @@
   </Menu>
 </MenuBar>
-<ToolBar name="mainToolBar">
+<ToolBar name="mainToolBar" noMerge="1">
     <Action name="build_build" group="build_operations" />
     <Action name="build_execute" group="build_operations" />

--- kdevelop/buildtools/autotools/kdevautoproject.rc  #1.15:1.16
@@ -22,5 +22,5 @@
   </Menu>
 </MenuBar>
-<ToolBar name="buildToolBar">
+<ToolBar name="buildToolBar" noMerge="1">
     <Action name="build_build" group="build_operations" />
     <Action name="build_buildactivetarget" group="build_operations" />

--- kdevelop/buildtools/custommakefiles/kdevcustomproject.rc  #1.5:1.6
@@ -12,8 +12,8 @@
   </Menu>
 </MenuBar>
-<ToolBar name="buildToolBar">
+<ToolBar name="buildToolBar" noMerge="1">
     <Action name="build_build" group="build_operations" />
     <Action name="build_compilefile" group="build_operations" />
-    <Separator/>
+    <Separator group="build_operations"/>
     <Action name="build_execute" group="build_operations" />
 </ToolBar>

--- kdevelop/buildtools/generic/kdevgenericproject.rc  #1.1:1.2
@@ -11,7 +11,7 @@
   </Menu>
 </MenuBar>
-<ToolBar name="buildToolBar">
+<ToolBar name="buildToolBar" noMerge="1">
     <Action name="build" group="build_operations" />
-    <Separator/>
+    <Separator group="build_operations"/>
     <Action name="execute" group="build_operations" />
 </ToolBar>

--- kdevelop/buildtools/haskell/kdevhaskellproject.rc  #1.1:1.2
@@ -8,7 +8,7 @@
   </Menu>
 </MenuBar>
-<ToolBar name="buildToolBar">
-    <Action name="build_build" />
-    <Action name="build_execute" />
+<ToolBar name="buildToolBar" noMerge="1">
+    <Action name="build_build"  group="build_operations" />
+    <Action name="build_execute"  group="build_operations" />
 </ToolBar>
 </kpartplugin>

--- kdevelop/buildtools/pascal/kdevpascalproject.rc  #1.3:1.4
@@ -8,5 +8,5 @@
   </Menu>
 </MenuBar>
-<ToolBar name="buildToolBar">
+<ToolBar name="buildToolBar" noMerge="1">
     <Action name="build_build" group="build_operations" />
     <Action name="build_execute" group="build_operations" />

--- kdevelop/buildtools/qmake/kdevtrollproject.rc  #1.8:1.9
@@ -16,13 +16,13 @@
   </Menu>
 </MenuBar>
-<ToolBar name="buildToolBar">
+<ToolBar name="buildToolBar" noMerge="1">
     <Action name="build_build_project" group="build_operations" />
     <Action name="build_rebuild_project" group="build_operations" />
     <Action name="build_execute_project" group="build_operations" />
-    <Separator/>
+    <Separator  group="build_operations"/>
     <Action name="build_build_target" group="build_operations" />
     <Action name="build_rebuild_target" group="build_operations" />
     <Action name="build_execute_target" group="build_operations" />
-    <Separator/>
+    <Separator  group="build_operations"/>
     <Action name="build_compilefile" group="build_operations" />
 </ToolBar>

--- kdevelop/src/kdevelopui.rc  #1.60:1.61
@@ -1,4 +1,4 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui version="17" name="kdevelop" >
+<kpartgui version="18" name="kdevelop" >
 <MenuBar>
   <Menu name="file" noMerge="1"><text>&File</text>
@@ -63,4 +63,5 @@
     <Separator/>
     <Merge/>
+    <DefineGroup name="designer_project"/>
     <Action name="project_options"/>
     <Separator/>