[Uml-devel] branches/work/soc-umbrello (silent)

[Gopala Krishna A]

SVN commit 896506 by gopala:

Preparing for the new year hacking on soc umbrello code!

SVN_SILENT: svnmerge
----------
Merged revisions 889968,889981 via svnmerge from
svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdesdk/umbrello

........
  r889968 | sharan | 2008-11-28 13:10:19 +0530 (Fri, 28 Nov 2008) | 3 lines

  Set the title of the attribute settings page to "Attribute Settings",
  rather than "General Settings"
........
  r889981 | sharan | 2008-11-28 13:46:02 +0530 (Fri, 28 Nov 2008) | 6 lines

  When changing the focus in the attribute list in the class properties
  dialog box, the description was not changing as the  signal-slot
  connection was only for mouse clicks.

  Fixed that bug, and changed the name of the slot to a more generic name.
........


 _M            . (directory)  
 M  +9 -14     umbrello/dialogs/classifierlistpage.cpp  
 M  +6 -2      umbrello/dialogs/classifierlistpage.h  
 M  +1 -1      umbrello/dialogs/classpropdlg.cpp  


** branches/work/soc-umbrello #property svnmerge-integrated
   - /trunk/KDE/kdesdk/umbrello:1-854015,854687,854787,855207-866962,866965-870129,871091,872169-887978
   + /trunk/KDE/kdesdk/umbrello:1-854015,854687,854787,855207-866962,866965-870129,871091,872169-887978,889968-889981
--- branches/work/soc-umbrello/umbrello/dialogs/classifierlistpage.cpp #896505:896506
@@ -66,7 +66,7 @@
     enableWidgets(false);//disable widgets until an att is chosen
     m_pOldListItem = 0;
 
-    connect(m_pItemListLB, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(slotClicked(QListWidgetItem*)));
+    connect(m_pItemListLB, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), this, SLOT(slotActivateItem(QListWidgetItem*)));
     connect(m_pItemListLB, SIGNAL(itemDoubleClicked( QListWidgetItem*)), this, SLOT(slotDoubleClick(QListWidgetItem*)));
     connect(m_pItemListLB, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(slotRightButtonPressed(const QPoint&)));
 
@@ -284,11 +284,7 @@
     m_pPropertiesButton->setEnabled(true);
 }
 
-/**
- * Called when list view is clicked on
- * calls enableWidgets().
- */
-void ClassifierListPage::slotClicked(QListWidgetItem* item)
+void ClassifierListPage::slotActivateItem(QListWidgetItem* item)
 {
     //if not first time an item is highlighted
     //save old highlighted item first
@@ -345,7 +341,7 @@
 {
     saveCurrentItemDocumentation();
     QListWidgetItem* i = m_pItemListLB->currentItem();
-    slotClicked(i);
+    slotActivateItem(i);
 }
 
 void ClassifierListPage::slotListItemCreated(UMLObject* object)
@@ -366,7 +362,7 @@
     // now select the new item, so that the user can go on adding doc or calling
     // the property dialog
     m_pItemListLB->setCurrentRow(index);
-    slotClicked(m_pItemListLB->item(index));
+    slotActivateItem(m_pItemListLB->item(index));
     connect( object, SIGNAL( modified() ), this, SLOT( slotListItemModified() ) );
 }
 
@@ -530,7 +526,7 @@
     uDebug() << currentAtt->getName() << ": peer index in UMLCanvasItem::m_List is " << index;
     addClassifier(currentAtt, 0);
     printItemList("itemList after change: ");
-    slotClicked(item);
+    slotActivateItem(item);
 }
 
 /**
@@ -567,7 +563,7 @@
         index = 0;
     addClassifier(currentAtt, index);
     printItemList("itemList after change: ");
-    slotClicked(item);
+    slotActivateItem(item);
 }
 
 /**
@@ -603,7 +599,7 @@
         index++;   // because we want to go _after_ the following peer item
     addClassifier(currentAtt, index);
     printItemList("itemList after change: ");
-    slotClicked(item);
+    slotActivateItem(item);
 }
 
 /**
@@ -637,7 +633,7 @@
     uDebug() << currentAtt->getName() << ": peer index in UMLCanvasItem::m_List is " << index;
     addClassifier(currentAtt, getItemList().count());
     printItemList("itemList after change: ");
-    slotClicked(item);
+    slotActivateItem(item);
 }
 
 /**
@@ -679,7 +675,7 @@
     m_pDoc->removeUMLObject(selectedItem);
     m_pItemListLB->takeItem( m_pItemListLB->currentRow());
     m_pOldListItem = 0;
-    slotClicked(NULL);
+    slotActivateItem(NULL);
 }
 
 /**
@@ -847,6 +843,5 @@
     m_pBottomArrowB->setVisible(state) ;
 }
 
-
 #include "classifierlistpage.moc"
 
--- branches/work/soc-umbrello/umbrello/dialogs/classifierlistpage.h #896505:896506
@@ -125,9 +125,13 @@
 
     bool m_bSigWaiting;
 
-public slots:
+protected slots:
 
-    void slotClicked(QListWidgetItem* item);
+    /**
+     * Called whenever the list item needs to be activated
+     * calls enableWidgets().
+     */
+    void slotActivateItem(QListWidgetItem* item);
 
     void slotPopupMenuSel(QAction* action);
 
--- branches/work/soc-umbrello/umbrello/dialogs/classpropdlg.cpp #896505:896506
@@ -262,7 +262,7 @@
  */
 void ClassPropDlg::setupAttributesPage()
 {
-    QFrame* page = createPage( i18n("Attributes"), i18n("General Settings"),
+    QFrame* page = createPage( i18n("Attributes"), i18n("Attribute Settings"),
                                Icon_Utils::it_Properties_Attributes );
     m_pAttPage = new ClassifierListPage(page, (UMLClassifier *)m_pObject, m_pDoc, Uml::ot_Attribute);
     QHBoxLayout * attLayout = new QHBoxLayout(page);