[Uml-devel] branches/work/soc-umbrello (silent)
Gopala Krishna A
krishna.ggk at gmail.com
Sat Dec 13 05:05:19 UTC 2008
SVN commit 896294 by gopala:
Preparing for the new year hacking on soc umbrello code!
SVN_SILENT: svnmerge
--------
Merged revisions 855207,857773,857776,860677,861147,864814,866169,866242,866559,866575,866776,866778,866962 via svnmerge from
svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdesdk/umbrello
........
r855207 | fischer | 2008-08-31 15:37:13 +0530 (Sun, 31 Aug 2008) | 1 line
SVN_SILENT: fix for compiler warning.
........
r857773 | aacid | 2008-09-06 17:43:48 +0530 (Sat, 06 Sep 2008) | 2 lines
makeThemValidate
........
r857776 | scripty | 2008-09-06 17:46:20 +0530 (Sat, 06 Sep 2008) | 1 line
SVN_SILENT made messages (.desktop file)
........
r860677 | fischer | 2008-09-14 01:59:28 +0530 (Sun, 14 Sep 2008) | 1 line
Directory added for model files for testing, development, and demonstration. Work in progress.
........
r861147 | fischer | 2008-09-15 15:29:30 +0530 (Mon, 15 Sep 2008) | 1 line
Documentation entered in the class wizard was not stored and cleared. Some initialization cleanup.
........
r864814 | schwarzer | 2008-09-25 20:35:22 +0530 (Thu, 25 Sep 2008) | 7 lines
let me introduce: typo of the year "the the"
mostly seen as
"the the" -> "the"
"the the" -> "to the"
and in its best case
"a the the" -> "" :)
........
r866169 | fischer | 2008-09-30 15:08:58 +0530 (Tue, 30 Sep 2008) | 1 line
Krazy: fixing postfix usage of ++ and --.
........
r866242 | fischer | 2008-09-30 16:46:00 +0530 (Tue, 30 Sep 2008) | 1 line
Krazy: fixing postfix usage of ++ and --.
........
r866559 | fischer | 2008-10-01 15:41:35 +0530 (Wed, 01 Oct 2008) | 1 line
Krazy: fixing postfix usage of ++ and --.
........
r866575 | fischer | 2008-10-01 16:48:05 +0530 (Wed, 01 Oct 2008) | 1 line
Krazy: fixing postfix usage of ++ and --.
........
r866776 | fischer | 2008-10-02 03:08:21 +0530 (Thu, 02 Oct 2008) | 1 line
Krazy: fixing postfix usage of ++ and --.
........
r866778 | fischer | 2008-10-02 03:09:48 +0530 (Thu, 02 Oct 2008) | 1 line
Krazy: fixing postfix usage of ++ and --.
........
r866962 | fischer | 2008-10-02 19:25:57 +0530 (Thu, 02 Oct 2008) | 1 line
Krazy: fixing postfix usage of ++ and --.
........
_M . (directory)
A models (directory) trunk/KDE/kdesdk/umbrello/models#866962
M +12 -1 umbrello/_unused/configurable.h
M +0 -6 umbrello/association.cpp
M +6 -0 umbrello/associationwidget.h
M +2 -3 umbrello/dialogs/classgenpage.cpp
M +1 -0 umbrello/umbrello.desktop
M +1 -2 umbrello/umbrelloui.rc
M +2 -0 umbrello/uml.cpp
M +1 -1 umbrello/umllistview.cpp
M +1 -1 umbrello/umlscene.cpp
M +4 -0 umbrello/worktoolbar.h
** branches/work/soc-umbrello #property svnmerge-integrated
- /trunk/KDE/kdesdk/umbrello:1-854015,854687,854787
+ /trunk/KDE/kdesdk/umbrello:1-854015,854687,854787,855207-866962
--- branches/work/soc-umbrello/umbrello/_unused/configurable.h #896293:896294
@@ -84,7 +84,18 @@
virtual bool configure() = 0;
protected:
-
+ /**
+ * This is a convenience method for derived classes. Configuration actions
+ * that are intended to load plugins can use this method to parse the string
+ * and actually load the plugins. The string is a set of space separated names.
+ * Each name corresponds to the share object implementing the plugin.
+ *
+ * @param config The object used for configuration.
+ * @param key The group in the config objec.
+ * @param key The key in the group that contains libraries to load.
+ *
+ * @return True on success, false on failure.
+ */
bool loadPlugins(KConfig *config, const QString &group, const QString &key);
bool unloadPlugins();
--- branches/work/soc-umbrello/umbrello/association.cpp #896293:896294
@@ -549,12 +549,6 @@
return m_pRole[role]->getID();
}
*/
-
-/**
- * Returns the Changeablity of the given role.
- *
- * @return Changeability_Type of the given role.
- */
Uml::Changeability_Type UMLAssociation::getChangeability(Uml::Role_Type role) const
{
return m_pRole[role]->getChangeability();
--- branches/work/soc-umbrello/umbrello/associationwidget.h #896293:896294
@@ -131,8 +131,14 @@
void setVisibility (Uml::Visibility visibility, Uml::Role_Type role );
+ /**
+ * Gets the changeability on the given end of the association.
+ */
Uml::Changeability_Type getChangeability(Uml::Role_Type role) const;
+ /**
+ * Sets the changeability on the given end of the association.
+ */
void setChangeability (Uml::Changeability_Type value, Uml::Role_Type role);
Uml::IDType getWidgetID(Uml::Role_Type role) const;
--- branches/work/soc-umbrello/umbrello/dialogs/classgenpage.cpp #896293:896294
@@ -253,7 +253,7 @@
}
ClassGenPage::ClassGenPage(UMLDoc* d, QWidget* parent, ObjectWidget* o)
- : QWidget(parent), m_pObject(0), m_pWidget(o), m_pInstanceWidget(0), m_pUmldoc(d)
+ : QWidget(parent), m_pObject(0), m_pWidget(o), m_pInstanceWidget(0), m_pUmldoc(d)
{
m_pDeconCB = 0;
m_pMultiCB = 0;
@@ -295,8 +295,7 @@
m_pNameLayout->addWidget(m_pMultiCB, 2,1);
if ( m_pDrawActorCB->isChecked() )
m_pMultiCB->setEnabled( false );
- }
- else { // sequence diagram
+ } else { // sequence diagram
m_pDeconCB = new QCheckBox(i18n("Show destruction"), this);
m_pDeconCB->setChecked(o->showDestruction());
m_pNameLayout->addWidget(m_pDeconCB, 2,1);
--- branches/work/soc-umbrello/umbrello/umbrello.desktop #896293:896294
@@ -31,6 +31,7 @@
GenericName[it]=Modellatore UML
GenericName[ja]=UML モデラー
GenericName[kk]=UML үлгілегіші
+GenericName[ko]=UML 모델러
GenericName[lv]=UML modelētājs
GenericName[ms]=Pemodel UML
GenericName[nb]=UML-modelleringsprogram
--- branches/work/soc-umbrello/umbrello/umbrelloui.rc #896293:896294
@@ -28,8 +28,7 @@
<Action name="view_export_image_all"/>
<Separator/>
<Menu name="show_view"><text>Sh&ow</text>
- <ActionList name="view_list">
- </ActionList>
+ <ActionList name="view_list" />
</Menu>
<Menu name="zoom_menu"><text>&Zoom</text>
</Menu>
--- branches/work/soc-umbrello/umbrello/uml.cpp #896293:896294
@@ -227,8 +227,10 @@
editCut = KStandardAction::cut(this, SLOT(slotEditCut()), actionCollection());
editCopy = KStandardAction::copy(this, SLOT(slotEditCopy()), actionCollection());
editPaste = KStandardAction::paste(this, SLOT(slotEditPaste()), actionCollection());
+
createStandardStatusBarAction();
setStandardToolBarMenuEnabled(true);
+
/* QAction* selectAll = */ KStandardAction::selectAll(this, SLOT( slotSelectAll() ), actionCollection());
QAction* fileExportDocbook = actionCollection()->addAction("file_export_docbook");
--- branches/work/soc-umbrello/umbrello/umllistview.cpp #896293:896294
@@ -2215,7 +2215,7 @@
UMLObject* obj = renamedItem->getUMLObject();
UMLUniqueConstraint* uuc = static_cast<UMLUniqueConstraint*>(obj);
UMLEntity* ent = static_cast<UMLEntity*>(uuc->parent());
- if (ent != 0)
+ if (ent)
ent->setAsPrimaryKey(uuc);
return result;
--- branches/work/soc-umbrello/umbrello/umlscene.cpp #896293:896294
@@ -3794,7 +3794,7 @@
m_AssociationList.append(aw);
} else {
uError() << "cannot create assocwidget from ("
- << (int)wA << ", " << (int)wB << ")";
+ << (void*)wA << ", " << (void*)wB << ")";
}
break;
}
--- branches/work/soc-umbrello/umbrello/worktoolbar.h #896293:896294
@@ -169,6 +169,10 @@
void buttonChanged(int b);
void slotResetToolBar();
+ /**
+ * These slots are triggered by the buttons. They call buttonChanged with
+ * the button id
+ */
void slotArrow();
void slotGeneralization();
void slotAggregation();
More information about the umbrello-devel
mailing list