[Uml-devel] KDE/kdesdk/umbrello/umbrello/widgets
Ralf Habacker
ralf.habacker at gmail.com
Thu Jan 12 11:20:43 UTC 2012
SVN commit 1273206 by habacker:
Reduced differences to soc-umbrello branch by renaming 'colour' to 'color' - finished.
M +6 -6 associationwidget.cpp
M +2 -2 boxwidget.cpp
M +54 -54 umlwidget.cpp
M +24 -24 umlwidget.h
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/associationwidget.cpp #1273205:1273206
@@ -2763,9 +2763,9 @@
case ListPopupMenu::mt_Line_Color:
{
- /* QColor newColour;
- if( KColorDialog::getColor(newColour) ) {
- m_scene->selectionSetLineColor(newColour);
+ /* QColor newColor;
+ if( KColorDialog::getColor(newColor) ) {
+ m_scene->selectionSetLineColor(newColor);
m_umldoc->setModified(true);
}*/
}
@@ -2852,10 +2852,10 @@
/**
* Overrides the method from WidgetBase.
*/
-void AssociationWidget::setLineColor(const QColor &colour)
+void AssociationWidget::setLineColor(const QColor &color)
{
- WidgetBase::setLineColor(colour);
- m_LinePath.setLineColor(colour);
+ WidgetBase::setLineColor(color);
+ m_LinePath.setLineColor(color);
}
/**
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/boxwidget.cpp #1273205:1273206
@@ -21,8 +21,8 @@
: UMLWidget(scene, type, id)
{
setSize(100,80);
- m_usesDiagramLineColour = false; // boxes be black
- m_LineColour = QColor("black");
+ m_usesDiagramLineColor = false; // boxes be black
+ m_LineColor = QColor("black");
setZ(m_origZ = 0);
}
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/umlwidget.cpp #1273205:1273206
@@ -111,10 +111,10 @@
WidgetBase::operator=(other);
// assign members loaded/saved
- m_useFillColour = other.m_useFillColour;
- m_usesDiagramFillColour = other.m_usesDiagramFillColour;
- m_usesDiagramUseFillColour = other.m_usesDiagramUseFillColour;
- m_FillColour = other.m_FillColour;
+ m_useFillColor = other.m_useFillColor;
+ m_usesDiagramFillColor = other.m_usesDiagramFillColor;
+ m_usesDiagramUseFillColor = other.m_usesDiagramUseFillColor;
+ m_FillColor = other.m_FillColor;
m_Assocs = other.m_Assocs;
m_Text = other.m_Text; //new
m_Font = other.m_Font;
@@ -184,7 +184,7 @@
// NOTE: In the comparison tests we are going to do, we don't need these values.
// They will actually stop things functioning correctly so if you change these, be aware of that.
/*
- if(m_useFillColour != other.m_useFillColour)
+ if(m_useFillColor != other.m_useFillColor)
return false;
if(m_nId != other.m_nId)
return false;
@@ -291,18 +291,18 @@
m_menuIsEmbedded = false;
m_isInstance = false;
if (m_scene) {
- m_useFillColour = true;
- m_usesDiagramFillColour = true;
- m_usesDiagramUseFillColour = true;
+ m_useFillColor = true;
+ m_usesDiagramFillColor = true;
+ m_usesDiagramUseFillColor = true;
const Settings::OptionState& optionState = m_scene->optionState();
- m_FillColour = optionState.uiState.fillColor;
+ m_FillColor = optionState.uiState.fillColor;
m_Font = optionState.uiState.font;
m_showStereotype = optionState.classState.showStereoType;
} else {
uError() << "SERIOUS PROBLEM - m_scene is NULL";
- m_useFillColour = false;
- m_usesDiagramFillColour = false;
- m_usesDiagramUseFillColour = false;
+ m_useFillColor = false;
+ m_usesDiagramFillColor = false;
+ m_usesDiagramUseFillColor = false;
m_showStereotype = false;
}
@@ -338,7 +338,7 @@
*/
void UMLWidget::slotMenuSelection(QAction* action)
{
- QColor newColour;
+ QColor newColor;
const WidgetBase::WidgetType wt = m_Type;
UMLWidget* widget = 0; // use for select the first object properties (fill, line color)
@@ -377,10 +377,10 @@
case ListPopupMenu::mt_Line_Color:
widget = m_scene->getFirstMultiSelectedWidget();
if (widget) {
- newColour = widget->lineColor();
+ newColor = widget->lineColor();
}
- if (KColorDialog::getColor(newColour)) {
- m_scene->selectionSetLineColor(newColour);
+ if (KColorDialog::getColor(newColor)) {
+ m_scene->selectionSetLineColor(newColor);
m_pDoc->setModified(true);
}
@@ -389,18 +389,18 @@
case ListPopupMenu::mt_Fill_Color:
widget = m_scene->getFirstMultiSelectedWidget();
if (widget) {
- newColour = widget->getFillColor();
+ newColor = widget->getFillColor();
}
- if (KColorDialog::getColor(newColour)) {
- m_scene->selectionSetFillColor(newColour);
+ if (KColorDialog::getColor(newColor)) {
+ m_scene->selectionSetFillColor(newColor);
m_pDoc->setModified(true);
}
break;
case ListPopupMenu::mt_Use_Fill_Color:
- m_useFillColour = !m_useFillColour;
- m_usesDiagramUseFillColour = false;
- m_scene->selectionUseFillColor(m_useFillColour);
+ m_useFillColor = !m_useFillColor;
+ m_usesDiagramUseFillColor = false;
+ m_scene->selectionUseFillColor(m_useFillColor);
break;
case ListPopupMenu::mt_Show_Attributes_Selection:
case ListPopupMenu::mt_Show_Operations_Selection:
@@ -499,14 +499,14 @@
if (m_scene->getID() != viewID) {
return;
}
- if (m_usesDiagramFillColour) {
- m_FillColour = m_scene->getFillColor();
+ if (m_usesDiagramFillColor) {
+ m_FillColor = m_scene->getFillColor();
}
- if (m_usesDiagramLineColour) {
- m_LineColour = m_scene->getLineColor();
+ if (m_usesDiagramLineColor) {
+ m_LineColor = m_scene->getLineColor();
}
- if (m_usesDiagramUseFillColour) {
- m_useFillColour = m_scene->getUseFillColor();
+ if (m_usesDiagramUseFillColor) {
+ m_useFillColor = m_scene->getUseFillColor();
}
update();
}
@@ -544,10 +544,10 @@
*
* @param fc the status of using fill color.
*/
-void UMLWidget::setUseFillColour(bool fc)
+void UMLWidget::setUseFillColor(bool fc)
{
- m_useFillColour = fc;
- m_usesDiagramUseFillColour = false;
+ m_useFillColor = fc;
+ m_usesDiagramUseFillColor = false;
update();
}
@@ -600,7 +600,7 @@
*
* @param color the new fill color
*/
-void UMLWidget::setFillColour(const QColor &color)
+void UMLWidget::setFillColor(const QColor &color)
{
UMLApp::app()->executeCommand(new CmdChangeFillColor(this, color));
}
@@ -610,19 +610,19 @@
*
* @param color the new fill color
*/
-void UMLWidget::setFillColourcmd(const QColor &color)
+void UMLWidget::setFillColorcmd(const QColor &color)
{
- m_FillColour = color;
- m_usesDiagramFillColour = false;
+ m_FillColor = color;
+ m_usesDiagramFillColor = false;
update();
}
/**
- * Read property m_FillColour.
+ * Read property m_FillColor.
*/
QColor UMLWidget::getFillColor() const
{
- return m_FillColour;
+ return m_FillColor;
}
/**
@@ -946,7 +946,7 @@
*/
void UMLWidget::setPenFromSettings(QPainter & p)
{
- p.setPen(QPen(m_LineColour, m_LineWidth));
+ p.setPen(QPen(m_LineColor, m_LineWidth));
}
/**
@@ -1351,18 +1351,18 @@
WidgetBase::saveToXMI(qDoc, qElement);
qElement.setAttribute("xmi.id", ID2STR(id()));
qElement.setAttribute("font", m_Font.toString());
- qElement.setAttribute("usefillcolor", m_useFillColour);
+ qElement.setAttribute("usefillcolor", m_useFillColor);
qElement.setAttribute("x", getX());
qElement.setAttribute("y", getY());
qElement.setAttribute("width", getWidth());
qElement.setAttribute("height", getHeight());
// for consistency the following attributes now use american spelling for "color"
- qElement.setAttribute("usesdiagramfillcolor", m_usesDiagramFillColour);
- qElement.setAttribute("usesdiagramusefillcolor", m_usesDiagramUseFillColour);
- if (m_usesDiagramFillColour) {
+ qElement.setAttribute("usesdiagramfillcolor", m_usesDiagramFillColor);
+ qElement.setAttribute("usesdiagramusefillcolor", m_usesDiagramUseFillColor);
+ if (m_usesDiagramFillColor) {
qElement.setAttribute("fillcolor", "none");
} else {
- qElement.setAttribute("fillcolor", m_FillColour.name());
+ qElement.setAttribute("fillcolor", m_FillColor.name());
}
qElement.setAttribute("isinstance", m_isInstance);
if (!m_instanceName.isEmpty())
@@ -1386,12 +1386,12 @@
So first we need to keep backward compatibility and try to retrieve the *colour attribute.
Next we overwrite this value if we find a *color, otherwise the former *colour is kept.
*/
- QString fillColour = qElement.attribute("fillcolour", "none");
- fillColour = qElement.attribute("fillcolor", fillColour);
- QString usesDiagramFillColour = qElement.attribute("usesdiagramfillcolour", "1");
- usesDiagramFillColour = qElement.attribute("usesdiagramfillcolor", usesDiagramFillColour);
- QString usesDiagramUseFillColour = qElement.attribute("usesdiagramusefillcolour", "1");
- usesDiagramUseFillColour = qElement.attribute("usesdiagramusefillcolor", usesDiagramUseFillColour);
+ QString fillColor = qElement.attribute("fillcolour", "none");
+ fillColor = qElement.attribute("fillcolor", fillColor);
+ QString usesDiagramFillColor = qElement.attribute("usesdiagramfillcolour", "1");
+ usesDiagramFillColor = qElement.attribute("usesdiagramfillcolor", usesDiagramFillColor);
+ QString usesDiagramUseFillColor = qElement.attribute("usesdiagramusefillcolour", "1");
+ usesDiagramUseFillColor = qElement.attribute("usesdiagramusefillcolor", usesDiagramUseFillColor);
m_nId = STR2ID(id);
@@ -1404,14 +1404,14 @@
<< " for widget with xmi.id " << ID2STR(m_nId) << endl;
//setFont( m_Font );
}
- m_useFillColour = (bool)usefillcolor.toInt();
- m_usesDiagramFillColour = (bool)usesDiagramFillColour.toInt();
- m_usesDiagramUseFillColour = (bool)usesDiagramUseFillColour.toInt();
+ m_useFillColor = (bool)usefillcolor.toInt();
+ m_usesDiagramFillColor = (bool)usesDiagramFillColor.toInt();
+ m_usesDiagramUseFillColor = (bool)usesDiagramUseFillColor.toInt();
setSize(w.toInt(), h.toInt());
setX(x.toInt());
setY(y.toInt());
- if (fillColour != "none") {
- m_FillColour = QColor(fillColour);
+ if (fillColor != "none") {
+ m_FillColor = QColor(fillColor);
}
QString isinstance = qElement.attribute("isinstance", "0");
m_isInstance = (bool)isinstance.toInt();
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/umlwidget.h #1273205:1273206
@@ -56,13 +56,13 @@
bool operator==(const UMLWidget& other) const;
- void setUseFillColour(bool fc);
+ void setUseFillColor(bool fc);
/**
- * Read property of bool m_useFillColour.
+ * Read property of bool m_useFillColor.
*/
- bool getUseFillColour() const {
- return m_useFillColour;
+ bool getUseFillColor() const {
+ return m_useFillColor;
}
void setTextColor(const QColor &color);
@@ -74,8 +74,8 @@
void setLineWidth(uint width);
QColor getFillColor() const;
- void setFillColour(const QColor &color);
- void setFillColourcmd(const QColor &color);
+ void setFillColor(const QColor &color);
+ void setFillColorcmd(const QColor &color);
/**
* Returns whether this is a line of text.
@@ -190,31 +190,31 @@
}
/**
- * Returns m_usesDiagramFillColour
+ * Returns m_usesDiagramFillColor
*/
- bool getUsesDiagramFillColour() const {
- return m_usesDiagramFillColour;
+ bool getUsesDiagramFillColor() const {
+ return m_usesDiagramFillColor;
}
/**
- * Returns m_usesDiagramUseFillColour
+ * Returns m_usesDiagramUseFillColor
*/
- bool getUsesDiagramUseFillColour() const {
- return m_usesDiagramUseFillColour;
+ bool getUsesDiagramUseFillColor() const {
+ return m_usesDiagramUseFillColor;
}
/**
- * Sets m_usesDiagramFillColour
+ * Sets m_usesDiagramFillColor
*/
- void setUsesDiagramFillColour(bool usesDiagramFillColour) {
- m_usesDiagramFillColour = usesDiagramFillColour;
+ void setUsesDiagramFillColor(bool usesDiagramFillColor) {
+ m_usesDiagramFillColor = usesDiagramFillColor;
}
/**
- * Sets m_usesDiagramUseFillColour
+ * Sets m_usesDiagramUseFillColor
*/
- void setUsesDiagramUseFillColour(bool usesDiagramUseFillColour) {
- m_usesDiagramUseFillColour = usesDiagramUseFillColour;
+ void setUsesDiagramUseFillColor(bool usesDiagramUseFillColor) {
+ m_usesDiagramUseFillColor = usesDiagramUseFillColor;
}
/**
@@ -320,21 +320,21 @@
///////////////// Data Loaded/Saved /////////////////////////////////
/**
- * This flag indicates if the UMLWidget uses the Diagram FillColour
+ * This flag indicates if the UMLWidget uses the Diagram FillColor
*/
- bool m_useFillColour;
+ bool m_useFillColor;
/**
- * true by default, false if the colours have
+ * true by default, false if the colors have
* been explicitly set for this widget
*/
- bool m_usesDiagramFillColour;
- bool m_usesDiagramUseFillColour;
+ bool m_usesDiagramFillColor;
+ bool m_usesDiagramUseFillColor;
/**
* Color of the background of the widget
*/
- QColor m_FillColour;
+ QColor m_FillColor;
/**
* A list of AssociationWidgets between the UMLWidget and other UMLWidgets in the diagram
More information about the umbrello-devel
mailing list