[Uml-devel] KDE/kdesdk/umbrello/umbrello
Ralf Habacker
ralf.habacker at gmail.com
Thu Aug 9 15:18:10 UTC 2012
SVN commit 1309906 by habacker:
Renamed UMLWidget::updateComponentSize() to updateGeometry() to reduced diff to soc branch.
M +3 -3 umlscene.cpp
M +3 -3 widgets/activitywidget.cpp
M +10 -10 widgets/classifierwidget.cpp
M +2 -2 widgets/enumwidget.cpp
M +5 -5 widgets/floatingtextwidget.cpp
M +1 -1 widgets/forkjoinwidget.cpp
M +1 -1 widgets/messagewidget.cpp
M +1 -1 widgets/objectnodewidget.cpp
M +4 -4 widgets/objectwidget.cpp
M +2 -2 widgets/pinwidget.cpp
M +2 -2 widgets/signalwidget.cpp
M +4 -4 widgets/statewidget.cpp
M +7 -7 widgets/umlwidget.cpp
M +1 -1 widgets/umlwidget.h
--- trunk/KDE/kdesdk/umbrello/umbrello/umlscene.cpp #1309905:1309906
@@ -749,7 +749,7 @@
newWidget->slotFillColorChanged(ID());
newWidget->slotTextColorChanged(ID());
newWidget->slotLineWidthChanged(ID());
- newWidget->updateComponentSize();
+ newWidget->updateGeometry();
if (m_Type == Uml::DiagramType::Sequence) {
// Set proper position on the sequence line widget which is
@@ -2286,7 +2286,7 @@
for (int i = 0; i < 5; i++) {
FloatingTextWidget *flotxt = ft[i];
if (flotxt) {
- flotxt->updateComponentSize();
+ flotxt->updateGeometry();
addWidget(flotxt);
}
}
@@ -3857,7 +3857,7 @@
{
// update sizes of all components
foreach(UMLWidget *obj , m_WidgetList) {
- obj->updateComponentSize();
+ obj->updateGeometry();
}
}
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/activitywidget.cpp #1309905:1309906
@@ -66,7 +66,7 @@
void ActivityWidget::setActivityType( ActivityType activityType )
{
m_activityType = activityType;
- updateComponentSize();
+ updateGeometry();
UMLWidget::m_resizable = true;
}
@@ -120,7 +120,7 @@
void ActivityWidget::setPreconditionText(const QString& aPreText)
{
m_preconditionText = aPreText;
- updateComponentSize();
+ updateGeometry();
adjustAssocs( x(), y() );
}
@@ -138,7 +138,7 @@
void ActivityWidget::setPostconditionText(const QString& aPostText)
{
m_postconditionText = aPostText;
- updateComponentSize();
+ updateGeometry();
adjustAssocs( x(), y() );
}
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/classifierwidget.cpp #1309905:1309906
@@ -267,7 +267,7 @@
else if(m_attributeSignature == Uml::SignatureType::NoSig)
m_attributeSignature = Uml::SignatureType::NoSigNoVis;
}
- updateComponentSize();
+ updateGeometry();
update();
}
@@ -292,7 +292,7 @@
{
m_attributeSignature = sig;
updateSignatureTypes();
- updateComponentSize();
+ updateGeometry();
update();
}
@@ -313,7 +313,7 @@
{
m_operationSignature = sig;
updateSignatureTypes();
- updateComponentSize();
+ updateGeometry();
update();
}
@@ -337,7 +337,7 @@
m_attributeSignature = Uml::SignatureType::SigNoVis;
if (UMLApp::app()->document()->loading())
return;
- updateComponentSize();
+ updateGeometry();
update();
}
@@ -359,7 +359,7 @@
} else {
m_attributeSignature = Uml::SignatureType::SigNoVis;
}
- updateComponentSize();
+ updateGeometry();
update();
}
@@ -779,7 +779,7 @@
void ClassifierWidget::setDrawAsCircle(bool drawAsCircle)
{
setVisualProperty(DrawAsCircle, drawAsCircle);
- updateComponentSize();
+ updateGeometry();
update();
}
@@ -802,7 +802,7 @@
{
toggleVisualProperty(DrawAsCircle);
updateSignatureTypes();
- updateComponentSize();
+ updateGeometry();
update();
}
@@ -820,7 +820,7 @@
setVisualProperty(ShowAttributes, ops.classState.showAtts);
setVisualProperty(ShowStereotype, ops.classState.showStereoType);
- updateComponentSize();
+ updateGeometry();
update();
}
@@ -837,7 +837,7 @@
setVisualProperty(ShowAttributes, false);
setVisualProperty(ShowStereotype, true);
- updateComponentSize();
+ updateGeometry();
update();
}
@@ -935,7 +935,7 @@
{
UMLObject::ObjectType ot = ListPopupMenu::convert_MT_OT(sel);
if (Object_Factory::createChildObject(classifier(), ot)) {
- updateComponentSize();
+ updateGeometry();
update();
UMLApp::app()->document()->setModified();
}
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/enumwidget.cpp #1309905:1309906
@@ -71,7 +71,7 @@
void EnumWidget::setShowPackage(bool _status)
{
m_showPackage = _status;
- updateComponentSize();
+ updateGeometry();
update();
}
@@ -81,7 +81,7 @@
void EnumWidget::toggleShowPackage()
{
m_showPackage = !m_showPackage;
- updateComponentSize();
+ updateGeometry();
update();
}
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/floatingtextwidget.cpp #1309905:1309906
@@ -116,7 +116,7 @@
QSize s = minimumSize();
setSize(s.width(), s.height());
- updateComponentSize();
+ updateGeometry();
update();
}
@@ -127,7 +127,7 @@
void FloatingTextWidget::setPreText(const QString &t)
{
m_preText = t;
- updateComponentSize();
+ updateGeometry();
update();
}
@@ -138,7 +138,7 @@
void FloatingTextWidget::setPostText(const QString &t)
{
m_postText = t;
- updateComponentSize();
+ updateGeometry();
update();
}
@@ -188,7 +188,7 @@
if (ok && newText != text() && isTextValid(newText)) {
setText(newText);
setVisible(!text().isEmpty());
- updateComponentSize();
+ updateGeometry();
update();
}
if (!isTextValid(newText))
@@ -436,7 +436,7 @@
}
setVisible(true);
- updateComponentSize();
+ updateGeometry();
update();
}
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/forkjoinwidget.cpp #1309905:1309906
@@ -50,7 +50,7 @@
void ForkJoinWidget::setOrientation(Qt::Orientation ori)
{
m_orientation = ori;
- updateComponentSize();
+ updateGeometry();
UMLWidget::adjustAssocs( x(), y() );
}
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/messagewidget.cpp #1309905:1309906
@@ -489,7 +489,7 @@
if (m_pFText->displayText().isEmpty()) {
return;
}
- m_pFText->updateComponentSize();
+ m_pFText->updateGeometry();
int ftX = constrainX(m_pFText->x(), m_pFText->width(), m_pFText->textRole());
int ftY = y() - m_pFText->height();
m_pFText->setX( ftX );
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/objectnodewidget.cpp #1309905:1309906
@@ -211,7 +211,7 @@
void ObjectNodeWidget::setState(const QString& state)
{
m_state = state;
- updateComponentSize();
+ updateGeometry();
}
/**
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/objectwidget.cpp #1309905:1309906
@@ -110,7 +110,7 @@
if(m_scene->type() != Uml::DiagramType::Collaboration)
return;
m_multipleInstance = multiple;
- updateComponentSize();
+ updateGeometry();
update();
}
@@ -159,7 +159,7 @@
validator);
if (ok) {
m_instanceName = name;
- updateComponentSize();
+ updateGeometry();
moveEvent( 0 );
update();
UMLApp::app()->document()->setModified(true);
@@ -169,7 +169,7 @@
}
case ListPopupMenu::mt_Properties:
showPropertiesDialog();
- updateComponentSize();
+ updateGeometry();
moveEvent( 0 );
update();
break;
@@ -223,7 +223,7 @@
void ObjectWidget::setDrawAsActor(bool drawAsActor)
{
m_drawAsActor = drawAsActor;
- updateComponentSize();
+ updateGeometry();
}
/**
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/pinwidget.cpp #1309905:1309906
@@ -139,7 +139,7 @@
setZ(20);
setPenFromSettings(p);
m_pName->setVisible(( m_pName->text().length() > 0 ));
- m_pName->updateComponentSize();
+ m_pName->updateGeometry();
if(m_selected)
drawSelected(&p, offsetX, offsetY);
}
@@ -150,7 +150,7 @@
void PinWidget::setName(const QString &strName)
{
m_Text = strName;
- updateComponentSize();
+ updateGeometry();
m_pName->setText(m_Text);
}
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/signalwidget.cpp #1309905:1309906
@@ -147,7 +147,7 @@
m_pName->setY(offsetY + h);
}
m_pName->setVisible( ( m_pName->text().length() > 0 ) );
- m_pName->updateComponentSize();
+ m_pName->updateGeometry();
break;
default:
@@ -182,7 +182,7 @@
void SignalWidget::setName(const QString &strName)
{
m_Text = strName;
- updateComponentSize();
+ updateGeometry();
if (signalType() == SignalWidget::Time) {
m_pName->setText(m_Text);
}
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/statewidget.cpp #1309905:1309906
@@ -326,7 +326,7 @@
bool StateWidget::addActivity(const QString &activity)
{
m_Activities.append( activity );
- updateComponentSize();
+ updateGeometry();
return true;
}
@@ -337,7 +337,7 @@
{
if( m_Activities.removeAll( activity ) == 0 )
return false;
- updateComponentSize();
+ updateGeometry();
return true;
}
@@ -359,7 +359,7 @@
void StateWidget::setActivities(const QStringList &list)
{
m_Activities = list;
- updateComponentSize();
+ updateGeometry();
}
/**
@@ -384,7 +384,7 @@
void StateWidget::setDrawVertical(bool to)
{
m_drawVertical = to;
- updateComponentSize();
+ updateGeometry();
UMLWidget::adjustAssocs( x(), y() );
}
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/umlwidget.cpp #1309905:1309906
@@ -228,7 +228,7 @@
*/
void UMLWidget::updateWidget()
{
- updateComponentSize();
+ updateGeometry();
switch (m_baseType) {
case WidgetBase::wt_Class:
m_scene->createAutoAttributeAssociations(this);
@@ -703,7 +703,7 @@
setFont(m_Font);
setSize(width(), height());
m_activated = true;
- updateComponentSize();
+ updateGeometry();
if (m_scene->getPaste()) {
FloatingTextWidget * ft = 0;
QPoint point = m_scene->getPastePoint();
@@ -751,7 +751,7 @@
}
if (m_scene->getPaste())
m_scene->createAutoAssociations(this);
- updateComponentSize();
+ updateGeometry();
return true;
}
@@ -1203,7 +1203,7 @@
m_pObject->setName(strName);
else
m_Text = strName;
- updateComponentSize();
+ updateGeometry();
}
/**
@@ -1301,7 +1301,7 @@
/**
* Update the size of this widget.
*/
-void UMLWidget::updateComponentSize()
+void UMLWidget::updateGeometry()
{
if (m_doc->loading())
return;
@@ -1457,7 +1457,7 @@
if (m_doc->loading())
return;
// calculate the size, based on the new font metric
- updateComponentSize();
+ updateGeometry();
}
/**
@@ -1468,7 +1468,7 @@
void UMLWidget::setShowStereotype(bool flag)
{
m_showStereotype = flag;
- updateComponentSize();
+ updateGeometry();
update();
}
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/umlwidget.h #1309905:1309906
@@ -206,7 +206,7 @@
static bool widgetHasUMLObject(WidgetBase::WidgetType type);
- void updateComponentSize();
+ void updateGeometry();
void clipSize();
More information about the umbrello-devel
mailing list