[Uml-devel] kdesdk/umbrello/umbrello

[Jonathan Riddell]

CVS commit by jriddell: 

move toolbar to top of screen, not enough room down the side


  M +8 -6      uml.cpp   1.71
  M +1 -1      worktoolbar.cpp   1.27


--- kdesdk/umbrello/umbrello/uml.cpp  #1.70:1.71
@@ -357,6 +357,8 @@ void UMLApp::initView() {
         setCaption(doc->URL().fileName(),false);
 
-        toolsbar = new WorkToolBar(this,"WORKTOOLBAR");
-        addToolBar(toolsbar,Qt::DockRight,true);
+        //the name of the toolbar is used as a tool tip so should be i18n, unfortunatly it
+        //has to be a char* and not a QString
+        toolsbar = new WorkToolBar(this, I18N_NOOP("Diagram Toolbar"));
+        addToolBar(toolsbar, Qt::DockTop, false);
 
         m_mainDock = createDockWidget("maindock", 0L, 0L, "main dock");

--- kdesdk/umbrello/umbrello/worktoolbar.cpp  #1.26:1.27
@@ -19,5 +19,5 @@
 
 WorkToolBar::WorkToolBar(QMainWindow *parentWindow, const char*name)
-  : KToolBar(parentWindow,Qt::DockRight,true,name) {
+  : KToolBar(parentWindow,Qt::DockRight,false,name) {
         m_CurrentButtonID = tbb_Undefined;
         loadPixmaps();