[Uml-devel] branches/work/isi-umbrello/umbrello
Thibault Normand
thibault.normand at gmail.com
Tue Feb 13 18:26:58 UTC 2007
SVN commit 633288 by tnormand:
+ U/R Rename UML Object
M +7 -7 Doxyfile
M +1 -0 umbrello/CMakeLists.txt
M +1 -0 umbrello/cmds.h
M +2 -1 umbrello/cmds/cmd_handle_rename.cpp
M +1 -1 umbrello/cmds/cmd_handle_rename.h
AM umbrello/cmds/generic/cmd_rename_umlobject.cpp [License: GPL (v2+)]
AM umbrello/cmds/generic/cmd_rename_umlobject.h [License: GPL (v2+)]
M +3 -1 umbrello/uml.cpp
M +5 -5 umbrello/umldoc.cpp
M +1 -3 umbrello/umldoc.h
M +7 -5 umbrello/umllistviewitem.cpp
M +2 -1 umbrello/umlobject.cpp
M +83 -10 uml.kdevelop
--- branches/work/isi-umbrello/umbrello/Doxyfile #633287:633288
@@ -7,7 +7,7 @@
PROJECT_NUMBER =
OUTPUT_DIRECTORY =
CREATE_SUBDIRS = NO
-OUTPUT_LANGUAGE = English
+OUTPUT_LANGUAGE = French
USE_WINDOWS_ENCODING = NO
BRIEF_MEMBER_DESC = YES
REPEAT_BRIEF = YES
@@ -43,11 +43,11 @@
#---------------------------------------------------------------------------
# Build related configuration options
#---------------------------------------------------------------------------
-EXTRACT_ALL = NO
-EXTRACT_PRIVATE = NO
-EXTRACT_STATIC = NO
+EXTRACT_ALL = YES
+EXTRACT_PRIVATE = YES
+EXTRACT_STATIC = YES
EXTRACT_LOCAL_CLASSES = YES
-EXTRACT_LOCAL_METHODS = NO
+EXTRACT_LOCAL_METHODS = YES
HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
HIDE_FRIEND_COMPOUNDS = NO
@@ -132,7 +132,7 @@
*.moc \
*.xpm \
*.dox
-RECURSIVE = yes
+RECURSIVE = YES
EXCLUDE =
EXCLUDE_SYMLINKS = NO
EXCLUDE_PATTERNS =
@@ -214,7 +214,7 @@
#---------------------------------------------------------------------------
# configuration options related to the XML output
#---------------------------------------------------------------------------
-GENERATE_XML = yes
+GENERATE_XML = YES
XML_OUTPUT = xml
XML_SCHEMA =
XML_DTD =
--- branches/work/isi-umbrello/umbrello/umbrello/CMakeLists.txt #633287:633288
@@ -224,6 +224,7 @@
cmds/classdiag/cmd_create_class.cpp
cmds/generic/cmd_create_umlobject.cpp
+ cmds/generic/cmd_rename_umlobject.cpp
cmds/widget/cmd_create_widget.cpp
--- branches/work/isi-umbrello/umbrello/umbrello/cmds.h #633287:633288
@@ -45,6 +45,7 @@
************************************************************/
#include "cmds/generic/cmd_create_umlobject.h"
+#include "cmds/generic/cmd_rename_umlobject.h"
/************************************************************
* Widgets
--- branches/work/isi-umbrello/umbrello/umbrello/cmds/cmd_handle_rename.cpp #633287:633288
@@ -32,8 +32,9 @@
namespace Uml
{
- cmdHandleRename::cmdHandleRename(FloatingTextWidget* _ftw, QString txt):ftw(_ftw),newstring(txt)
+ cmdHandleRename::cmdHandleRename(FloatingTextWidget* _ftw, QString& txt):ftw(_ftw),newstring(txt)
{
+ setText(i18n("Change text"));
oldstring = _ftw->getText();
}
--- branches/work/isi-umbrello/umbrello/umbrello/cmds/cmd_handle_rename.h #633287:633288
@@ -23,7 +23,7 @@
{
//friend class FloatingTextWidget;
public:
- cmdHandleRename(FloatingTextWidget* _ftw, QString txt);
+ cmdHandleRename(FloatingTextWidget* _ftw, QString& txt);
~cmdHandleRename();
void redo();
** branches/work/isi-umbrello/umbrello/umbrello/cmds/generic/cmd_rename_umlobject.cpp #property svn:eol-style
+ native
** branches/work/isi-umbrello/umbrello/umbrello/cmds/generic/cmd_rename_umlobject.h #property svn:eol-style
+ native
--- branches/work/isi-umbrello/umbrello/umbrello/uml.cpp #633287:633288
@@ -1574,7 +1574,7 @@
//Allowing undo of the whole class importing. I think it eats a lot of memory
//m_doc->setModified(true);
//Setting the modification, but without allowing undo
- m_doc->setModified(true, false);
+ m_doc->setModified(true);
}
void UMLApp::slotClassWizard() {
@@ -1896,6 +1896,8 @@
void UMLApp::EndMacro() {
if(m_hasBegunMacro)
m_pUndoStack->endMacro();
+
+ m_hasBegunMacro = false;
}
//static pointer, holding the unique instance
--- branches/work/isi-umbrello/umbrello/umbrello/umldoc.cpp #633287:633288
@@ -855,7 +855,7 @@
pkg->removeObject(assoc);
if (doSetModified) // so we will save our document
- setModified(true, false);
+ setModified(true);
}
UMLAssociation * UMLDoc::findAssociation(Uml::Association_Type assocType,
@@ -991,7 +991,7 @@
temp->setID( UniqueID::gen() );
addView(temp);
emit sigDiagramCreated( temp->getID() );
- setModified(true, false);
+ setModified(true);
UMLApp::app()->enablePrint(true);
changeCurrentView( temp->getID() );
return temp;
@@ -1036,7 +1036,7 @@
if(name.length() == 0)
KMessageBox::error(0, i18n("That is an invalid name."), i18n("Invalid Name"));
else if (isUnique(name)) {
- o->setName(name);
+ UMLApp::app()->executeCommand(new cmdRenameUMLObject(o,name));
setModified(true);
break;
} else {
@@ -1066,7 +1066,7 @@
|| ((o->getBaseType() == Uml::ot_Operation) && KMessageBox::warningYesNo( kapp -> mainWidget() ,
i18n( "The name you entered was not unique.\nIs this what you wanted?" ),
i18n( "Name Not Unique"),KGuiItem(i18n("Use Name")),KGuiItem(i18n("Enter New Name"))) == KMessageBox::Yes) ) {
- o->setName(name);
+ UMLApp::app()->executeCommand(new cmdRenameUMLObject(o,name));
setModified(true);
break;
} else {
@@ -1911,7 +1911,7 @@
return accumulator;
}
-void UMLDoc::setModified(bool modified /*=true*/, bool addToUndo /*=true*/) {
+void UMLDoc::setModified(bool modified /*=true*/) {
if(!m_bLoading) {
m_modified = modified;
UMLApp::app()->setModified(modified);
--- branches/work/isi-umbrello/umbrello/umbrello/umldoc.h #633287:633288
@@ -123,10 +123,8 @@
* action on the view connected to the document.
*
* @param _m The value to set the modified flag to.
- * @param addToUndo Whether this is an action which should be
- * added to the undo stack.
*/
- void setModified(bool _m=true, bool addToUndo=true);
+ void setModified(bool _m=true);
/**
* Returns if the document is modified or not. Use this to
--- branches/work/isi-umbrello/umbrello/umbrello/umllistviewitem.cpp #633287:633288
@@ -37,6 +37,8 @@
#include "uniqueid.h"
#include "uml.h"
+#include "cmds.h"
+
UMLListView* UMLListViewItem::s_pListView = 0;
UMLListViewItem::UMLListViewItem( UMLListView * parent, const QString &name,
@@ -318,7 +320,7 @@
cancelRenameWithMsg();
return;
}
- m_pObject -> setName( newText );
+ UMLApp::app()->executeCommand(new Uml::cmdRenameUMLObject(m_pObject,newText));
doc->setModified(true);
m_Label = newText;
break;
@@ -335,7 +337,7 @@
Model_Utils::Parse_Status st = Model_Utils::parseOperation(newText, od, parent);
if (st == Model_Utils::PS_OK) {
// TODO: Check that no operation with the exact same profile exists.
- op->setName( od.m_name );
+ UMLApp::app()->executeCommand(new Uml::cmdRenameUMLObject(op,od.m_name));
op->setType( od.m_pReturnType );
UMLAttributeList parmList = op->getParmList();
const int newParmListCount = parmList.count();
@@ -356,7 +358,7 @@
a = new UMLAttribute(op);
a->setID( UniqueID::gen() );
}
- a->setName(nm_tp.m_name);
+ UMLApp::app()->executeCommand(new Uml::cmdRenameUMLObject(a,nm_tp.m_name));
a->setType(nm_tp.m_type);
a->setParmKind(nm_tp.m_direction);
a->setInitialValue(nm_tp.m_initialValue);
@@ -390,7 +392,7 @@
cancelRenameWithMsg();
return;
}
- m_pObject->setName(nt.m_name);
+ UMLApp::app()->executeCommand(new Uml::cmdRenameUMLObject(m_pObject,nt.m_name));
UMLAttribute *pAtt = static_cast<UMLAttribute*>(m_pObject);
pAtt->setType(nt.m_type);
pAtt->setParmKind(nt.m_direction);
@@ -420,7 +422,7 @@
cancelRenameWithMsg();
return;
}
- m_pObject->setName(nt.m_name);
+ UMLApp::app()->executeCommand(new Uml::cmdRenameUMLObject(m_pObject,nt.m_name));
UMLTemplate *tmpl = static_cast<UMLTemplate*>(m_pObject);
tmpl->setType(nt.m_type);
m_Label = tmpl->toString(Uml::st_SigNoVis);
--- branches/work/isi-umbrello/umbrello/umbrello/umlobject.cpp #633287:633288
@@ -102,7 +102,8 @@
}
void UMLObject::setName(const QString &strName) {
- UMLApp::app()->executeCommand(new cmdSetName(this,strName));
+ m_Name = strName;
+ emit modified();
}
void UMLObject::setNamecmd(const QString &strName) {
--- branches/work/isi-umbrello/umbrello/uml.kdevelop #633287:633288
@@ -10,28 +10,54 @@
<keyword>Qt</keyword>
</keywords>
<projectname>uml</projectname>
+ <projectdirectory>.</projectdirectory>
+ <absoluteprojectpath>false</absoluteprojectpath>
+ <version></version>
+ <description></description>
+ <defaultencoding></defaultencoding>
+ <versioncontrol>kdevsubversion</versioncontrol>
</general>
<kdevautoproject>
<general>
<mainprogram>umbrello</mainprogram>
+ <useconfiguration>default</useconfiguration>
</general>
<configure>
<configargs>\s--build=i386-linux --host=i386-linux --target=i386-linux --prefix=/opt/kde3 --enable-debug\s</configargs>
</configure>
<make>
- <abortonerror/>
- <numberofjobs/>
- <dontact/>
- <makebin/>
+ <abortonerror>true</abortonerror>
+ <numberofjobs>1</numberofjobs>
+ <dontact>false</dontact>
+ <makebin></makebin>
<envvars>
<envvar value="1" name="WANT_AUTOCONF_2_5" />
<envvar value="1" name="WANT_AUTOMAKE_1_6" />
</envvars>
+ <runmultiplejobs>false</runmultiplejobs>
+ <prio>0</prio>
</make>
<compiler>
<cflags/>
<cxxflags>\s-O0 -g3 -Wall</cxxflags>
</compiler>
+ <configurations>
+ <default>
+ <envvars/>
+ </default>
+ </configurations>
+ <run>
+ <mainprogram>/home/kde-devel/svn/isi-umbrello/umbrello</mainprogram>
+ <programargs></programargs>
+ <globaldebugarguments></globaldebugarguments>
+ <globalcwd>/home/kde-devel/svn/isi-umbrello/umbrello</globalcwd>
+ <useglobalprogram>false</useglobalprogram>
+ <terminal>false</terminal>
+ <autocompile>false</autocompile>
+ <autoinstall>false</autoinstall>
+ <autokdesu>false</autokdesu>
+ <envvars/>
+ </run>
</kdevautoproject>
<kdevfileview>
<groups>
@@ -60,15 +86,27 @@
<kdevdebugger>
<general>
<dbgshell>libtool</dbgshell>
+ <gdbpath></gdbpath>
+ <configGdbScript></configGdbScript>
+ <runShellScript></runShellScript>
+ <runGdbScript></runGdbScript>
+ <breakonloadinglibs>true</breakonloadinglibs>
+ <separatetty>false</separatetty>
+ <floatingtoolbar>false</floatingtoolbar>
</general>
+ <display>
+ <staticmembers>false</staticmembers>
+ <demanglenames>true</demanglenames>
+ <outputradix>10</outputradix>
+ </display>
</kdevdebugger>
<kdevcppsupport>
<qt>
- <used>false</used>
- <version>3</version>
- <includestyle>3</includestyle>
+ <used>true</used>
+ <version>4</version>
+ <includestyle>4</includestyle>
<root>/usr/lib/qt3</root>
- <designerintegration>EmbeddedKDevDesigner</designerintegration>
+ <designerintegration>ExternalDesigner</designerintegration>
<qmake>/usr/lib/qt3/bin/qmake</qmake>
<designer>/usr/lib/qt3/bin/designer</designer>
<designerpluginpaths/>
@@ -78,7 +116,7 @@
<pcs>Umbrello</pcs>
</references>
<codecompletion>
- <automaticCodeCompletion>false</automaticCodeCompletion>
+ <automaticCodeCompletion>true</automaticCodeCompletion>
<automaticArgumentsHint>true</automaticArgumentsHint>
<automaticHeaderCompletion>true</automaticHeaderCompletion>
<codeCompletionDelay>250</codeCompletionDelay>
@@ -97,8 +135,43 @@
<resolveIncludePaths>true</resolveIncludePaths>
<alwaysParseInBackground>true</alwaysParseInBackground>
<usePermanentCaching>true</usePermanentCaching>
- <alwaysIncludeNamespaces>false</alwaysIncludeNamespaces>
+ <alwaysIncludeNamespaces>true</alwaysIncludeNamespaces>
<includePaths>.;</includePaths>
</codecompletion>
+ <creategettersetter>
+ <prefixGet></prefixGet>
+ <prefixSet>set</prefixSet>
+ <prefixVariable>m_,_</prefixVariable>
+ <parameterName>theValue</parameterName>
+ <inlineGet>true</inlineGet>
+ <inlineSet>true</inlineSet>
+ </creategettersetter>
+ <splitheadersource>
+ <enabled>false</enabled>
+ <synchronize>true</synchronize>
+ <orientation>Vertical</orientation>
+ </splitheadersource>
</kdevcppsupport>
+ <cppsupportpart>
+ <filetemplates>
+ <interfacesuffix>.h</interfacesuffix>
+ <implementationsuffix>.cpp</implementationsuffix>
+ </filetemplates>
+ </cppsupportpart>
+ <kdevfilecreate>
+ <filetypes>
+ <type icon="source_cpp" ext="cpp" create="template" name="C++ Source" >
+ <descr>A new empty C++ file.</descr>
+ </type>
+ </filetypes>
+ <useglobaltypes>
+ <type ext="c" />
+ <type ext="h" />
+ </useglobaltypes>
+ </kdevfilecreate>
+ <ctagspart>
+ <customArguments></customArguments>
+ <customTagfilePath>/home/kde-devel/svn/isi-umbrello/umbrello/tags</customTagfilePath>
+ <activeTagsFiles/>
+ </ctagspart>
</kdevelop>
More information about the umbrello-devel
mailing list