[Uml-devel] KDE/kdesdk/umbrello/umbrello

[Jonathan Riddell]

SVN commit 901256 by jriddell:

use a newline after toolbar, use icons only for worktoolbar as discussed with Celeste

 M  +1 -1      umbrelloui.rc  
 M  +1 -0      uml.cpp  
 M  +1 -1      worktoolbar.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/umbrelloui.rc #901255:901256
@@ -78,7 +78,7 @@
     <Action name="class_wizard"/>
   </Menu>
 </MenuBar>
-<ToolBar name="mainToolBar">
+<ToolBar name="mainToolBar" fullWidth="true" newline="true">
   <Action name="popup_zoom"/>
   <Action name="zoom100"/>
 </ToolBar>
--- trunk/KDE/kdesdk/umbrello/umbrello/uml.cpp #901255:901256
@@ -167,6 +167,7 @@
     m_imageExporterAll    = new UMLViewImageExporterAll();
 
     setAutoSaveSettings();
+    toolsbar->setToolButtonStyle(Qt::ToolButtonIconOnly); //too many items for text, really we want a toolbox widget
 }
 
 UMLApp::~UMLApp()
--- trunk/KDE/kdesdk/umbrello/umbrello/worktoolbar.cpp #901255:901256
@@ -25,7 +25,7 @@
 
 
 WorkToolBar::WorkToolBar(QMainWindow *parentWindow)
-        : KToolBar("worktoolbar", parentWindow, Qt::RightToolBarArea, false, true)
+  : KToolBar("worktoolbar", parentWindow, Qt::TopToolBarArea, true, true, true)
 {
     m_CurrentButtonID = tbb_Undefined;
     loadPixmaps();