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

List:       kde-commits
Subject:    koffice/kivio
From:       Peter Simonsson <psn () linux ! se>
Date:       2005-03-19 20:29:25
Message-ID: 20050319202925.1B8E21763F () office ! kde ! org
[Download RAW message or body]

CVS commit by psn: 

Clean up the gui a bit


  A            kiviopart/pics/end_arrowhead.png   1.1
  A            kiviopart/pics/start_arrowhead.png   1.1
  M +11 -14    kiviopart/kivio.rc   1.30
  M +2 -2      kiviopart/kivioarrowheadaction.cpp   1.7
  M +2 -0      kiviopart/pics/Makefile.am   1.7
  M +2 -2      plugins/kivioconnectortool/kivioconnectortool.rc   1.5


--- koffice/kivio/kiviopart/kivio.rc  #1.29:1.30
@@ -1,4 +1,4 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd" >
-<kpartgui name="kivio" version="25">
+<kpartgui name="kivio" version="26">
   <MenuBar>
     <Menu name="file">
@@ -89,19 +89,8 @@
   </ToolBar>
   
-  <ToolBar name="FormatToolBar" fullWidth="false"><text>Format</text>
-    <Action name="setFGColor"/>
-    <Action name="setBGColor"/>
-    <Separator/>
-    <Action name="arrowHeads"/>
-    <Action name="setLineWidth"/>
-    <Action name="setLineStyle"/>
-  </ToolBar>
-  
   <ToolBar name="TextBar" fullWidth="false"><text>Text Format</text>
     <Action name="setFontFamily"/>
     <Action name="setFontSize"/>
     <Separator/>
-    <Action name="setTextColor"/>
-    <Separator/>
     <Action name="setFontBold"/>
     <Action name="setFontItalics"/>
@@ -113,6 +102,14 @@
     <Action name="textAlignCenter"/>
     <Action name="textAlignRight"/>
-    <Action name="textVAlignSuper"/>
-    <Action name="textVAlignSub"/>
+  </ToolBar>
+  
+  <ToolBar name="FormatToolBar" fullWidth="false"><text>Format</text>
+    <Action name="setTextColor"/>
+    <Action name="setFGColor"/>
+    <Action name="setBGColor"/>
+    <Separator/>
+    <Action name="arrowHeads"/>
+    <Action name="setLineWidth"/>
+    <Action name="setLineStyle"/>
   </ToolBar>
   

--- koffice/kivio/kiviopart/kivioarrowheadaction.cpp  #1.6:1.7
@@ -49,6 +49,6 @@ KivioArrowHeadAction::KivioArrowHeadActi
   m_startPopup->setCheckable(true);
   m_endPopup->setCheckable(true);
-  m_popup->insertItem(i18n("Arrowhead at Origin"), m_startPopup);
-  m_popup->insertItem(i18n("Arrowhead at End"), m_endPopup);
+  m_popup->insertItem(UserIconSet("start_arrowhead"), i18n("Arrowhead at Origin"), m_startPopup);
+  m_popup->insertItem(UserIconSet("end_arrowhead"), i18n("Arrowhead at End"), m_endPopup);
   loadArrowHeads(m_startPopup, false);
   loadArrowHeads(m_endPopup, true);

--- koffice/kivio/kiviopart/pics/Makefile.am  #1.6:1.7
@@ -2,2 +2,4 @@
 kivioicon_ICON = AUTO
 
+kiviopicsdir = $(kde_datadir)/kivio/pics
+kiviopics_DATA = end_arrowhead.png start_arrowhead.png

--- koffice/kivio/plugins/kivioconnectortool/kivioconnectortool.rc  #1.4:1.5
@@ -1,4 +1,4 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd" >
-<kpartgui name="KivioConnectorTool" library="libkivioconnectortool" version="4">
+<kpartgui name="KivioConnectorTool" library="libkivioconnectortool" version="5">
 <MenuBar>
   <Menu name="Tools">
@@ -8,5 +8,5 @@
 </MenuBar>
 <ToolBar name="ToolsToolBar">
-  <Action name="connector"/>
+  <Action name="polyLineConnector"/>
 </ToolBar>
 </kpartgui>


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