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

List:       kde-commits
Subject:    koffice/kexi/data
From:       Jaroslaw Staniek <js () iidea ! pl>
Date:       2004-10-22 16:33:59
Message-ID: 20041022163359.2015716C4E () office ! kde ! org
[Download RAW message or body]

CVS commit by staniek: 


data_cancel_row_changes action added, data_save_row added for toolbar


  M +3 -3      kexiquerypartinstui.rc   1.4
  M +9 -4      kexitablepartinstui.rc   1.5
  M +7 -4      kexiui.rc   1.50


--- koffice/kexi/data/kexiquerypartinstui.rc  #1.3:1.4
@@ -1,4 +1,4 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="kexiquerypartinst" version="2">
+<kpartgui name="kexiquerypartinst" version="3">
 
 <MenuBar>
@@ -15,6 +15,6 @@
 </MenuBar>
 
-<ToolBar name="querypart" fullWidth="false" noMerge="1">
-  <text>Query</text>
+<ToolBar name="design" fullWidth="false" noMerge="0">
+  <text>Design</text>
   <Action name="querypart_check_query"/>
   <Action name="querypart_execute_query"/>

--- koffice/kexi/data/kexitablepartinstui.rc  #1.4:1.5
@@ -1,12 +1,17 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="kexitablepartinst" version="4">
+<kpartgui name="kexitablepartinst" version="5">
 
 <MenuBar>
+  <Menu name="edit" noMerge="0">
+    <text>&amp;Edit</text>
+    <Separator/>
+    <Action name="tablepart_toggle_pkey"/>
+  </Menu>
 </MenuBar>
 
-<ToolBar name="tablepart" fullWidth="false" noMerge="0">
-  <text>Data</text>
+<ToolBar name="design" fullWidth="false" noMerge="0">
+  <text>Design</text>
   <!-- Design View -->
-  <Action name="tablepart_toggle_pkey"/>
+  <!-- TODO: reenable after shared toggle actions fix: Action name="tablepart_toggle_pkey"/ -->
 </ToolBar>
 

--- koffice/kexi/data/kexiui.rc  #1.49:1.50
@@ -1,4 +1,4 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="kexi" version="122">
+<kpartgui name="kexi" version="123">
 <MenuBar>
   <Menu name="file" noMerge="0">
@@ -70,5 +70,6 @@
   <Menu name="data" noMerge="1">
     <text>&amp;Data</text>
-    <Action name="data_save_row"/>
+    <ActionList name="data_save_row"/>
+    <ActionList name="data_cancel_row_changes"/>
     <ActionList name="data_filter"/>
     <Menu name="data_sort">
@@ -132,8 +133,8 @@
   <Action name="edit_copy"/>
   <Action name="edit_paste"/>
-  <Separator/>
+  <!-- Separator/>
   <Action name="edit_find"/>
   <Action name="view_zoom"/>
-  <Separator/>
+  <Separator/ -->
   <Action name="project_relations"/>
 </ToolBar>
@@ -148,4 +149,6 @@
 <ToolBar name="data" fullWidth="false" noMerge="0">
   <text>Data</text>
+  <ActionList name="data_cancel_row_changes"/>
+  <ActionList name="data_save_row"/>
   <ActionList name="data_sort_az"/>
   <ActionList name="data_sort_za"/>


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