[Uml-devel] kdesdk/umbrello/umbrello

[Jonathan Riddell]

CVS commit by jriddell: 

setFocus() on association properties dialogue


  M +5 -1      worktoolbar.cpp   1.36
  M +4 -3      dialogs/assocgenpage.cpp   1.12
  M +3 -2      dialogs/dialog_utils.cpp   1.3
  M +2 -1      dialogs/dialog_utils.h   1.3


--- kdesdk/umbrello/umbrello/worktoolbar.cpp  #1.35:1.36
@@ -283,4 +283,7 @@ void WorkToolBar::setDefaultTool() {
                 b -> animateClick();
 }
+//FIXMEnow
+#include <kicontheme.h>
+#include <kiconloader.h>
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 void WorkToolBar::loadPixmaps() {
@@ -289,5 +292,6 @@ void WorkToolBar::loadPixmaps() {
         dataDir += "/umbrello/pics/";
 
-        m_Pixmaps[tbb_Object].load( dataDir + "object.png" );
+//FIXMEnow      m_Pixmaps[tbb_Object].load( dataDir + "object.png" );
+        m_Pixmaps[tbb_Object] = BarIcon( "folder_green_open" );
         m_Pixmaps[tbb_Seq_Message_Synchronous].load( dataDir + "message-synchronous.png" );
         m_Pixmaps[tbb_Seq_Message_Asynchronous].load( dataDir + "message-asynchronous.png" );

--- kdesdk/umbrello/umbrello/dialogs/assocgenpage.cpp  #1.11:1.12
@@ -61,7 +61,8 @@ void AssocGenPage::constructWidget() {
         //Association name
         QLabel *pAssocNameL = NULL;
-        Umbrello::makeLabeledEditField( nameGB, nameLayout, 0,
+        QLineEdit* nameField = Umbrello::makeLabeledEditField( nameGB, nameLayout, 0,
                                         pAssocNameL, i18n("Name:"),
                                         m_pAssocNameLE, m_pAssociationWidget->getName() );
+        nameField->setFocus();
 
         // document

--- kdesdk/umbrello/umbrello/dialogs/dialog_utils.cpp  #1.2:1.3
@@ -16,5 +16,5 @@
 namespace Umbrello {
 
-void makeLabeledEditField(QGroupBox *containingBox, QGridLayout *layout, int row,
+QLineEdit* makeLabeledEditField(QGroupBox *containingBox, QGridLayout *layout, int row,
                           QLabel * &label, QString labelText, 
                           QLineEdit * &editField, QString editFieldText /* = QString::null */)
@@ -25,4 +25,5 @@ void makeLabeledEditField(QGroupBox *con
         layout->addWidget(editField, row, 1 );
         label->setBuddy(editField);
+        return editField;
 }
 

--- kdesdk/umbrello/umbrello/dialogs/dialog_utils.h  #1.2:1.3
@@ -35,6 +35,7 @@ namespace Umbrello {
          * @param editField             The QLineEdit object allocated (return value)
          * @param editFieldText         Initialization text in the editField (optional.)
+         * @return a pointer to the QLineEdit so you can setFocus() if necessary
          */
-        void makeLabeledEditField(QGroupBox *containingBox, QGridLayout *layout, int row,
+        QLineEdit* makeLabeledEditField(QGroupBox *containingBox, QGridLayout *layout, int row,
                                   QLabel * &label, QString labelText, 
                                   QLineEdit * &editField, QString editFieldText = QString::null);