[Uml-devel] branches/work/soc-umbrello/umbrello
Andi Fischer
andi.fischer at hispeed.ch
Tue Jan 17 21:01:54 UTC 2012
SVN commit 1274305 by fischer:
Changes to trunk also applied.
M +13 -13 dialogs/assocrolepage.cpp
M +1 -1 dialogs/assocrolepage.h
M +15 -15 dialogs/classgenpage.cpp
M +1 -1 dialogs/classgenpage.h
M +12 -12 dialogs/classifierlistpage.cpp
M +2 -2 dialogs/classifierlistpage.h
M +8 -8 dialogs/notedialog.cpp
M +2 -2 dialogs/notedialog.h
M +4 -4 dialogs/parmpropdlg.cpp
M +1 -1 dialogs/parmpropdlg.h
U dialogs/umlentityattributedialog.cpp
M +3 -3 docgenerators/docbook2xhtmlgeneratorjob.cpp
M +1 -1 docgenerators/docbook2xhtmlgeneratorjob.h
--- branches/work/soc-umbrello/umbrello/dialogs/assocrolepage.cpp #1274304:1274305
@@ -253,21 +253,21 @@
// Document A
QHBoxLayout * docALayout = new QHBoxLayout(docAGB);
docALayout->setMargin(margin);
- m_pDocA = new KTextEdit(docAGB);
- docALayout->addWidget(m_pDocA);
- m_pDocA-> setText(m_pAssociationWidget->roleDocumentation(Uml::A));
- // m_pDocA->setText("<<not implemented yet>>");
- // m_pDocA->setEnabled(false);
- m_pDocA->setLineWrapMode(QTextEdit::WidgetWidth);
+ m_docA = new KTextEdit(docAGB);
+ docALayout->addWidget(m_docA);
+ m_docA-> setText(m_pAssociationWidget->roleDocumentation(Uml::A));
+ // m_docA->setText("<<not implemented yet>>");
+ // m_docA->setEnabled(false);
+ m_docA->setLineWrapMode(QTextEdit::WidgetWidth);
// Document B
QHBoxLayout * docBLayout = new QHBoxLayout(docBGB);
docBLayout->setMargin(margin);
- m_pDocB = new KTextEdit(docBGB);
- docBLayout->addWidget(m_pDocB);
- m_pDocB->setText(m_pAssociationWidget->roleDocumentation(Uml::B));
- // m_pDocB->setEnabled(false);
- m_pDocB->setLineWrapMode(QTextEdit::WidgetWidth);
+ m_docB = new KTextEdit(docBGB);
+ docBLayout->addWidget(m_docB);
+ m_docB->setText(m_pAssociationWidget->roleDocumentation(Uml::B));
+ // m_docB->setEnabled(false);
+ m_docB->setLineWrapMode(QTextEdit::WidgetWidth);
// add group boxes to main layout
mainLayout->addWidget( propsAGB, 0, 0);
@@ -326,8 +326,8 @@
else
m_pAssociationWidget->setChangeability(Uml::Changeability::Changeable, Uml::B);
- m_pAssociationWidget->setRoleDocumentation(m_pDocA->toPlainText(), Uml::A);
- m_pAssociationWidget->setRoleDocumentation(m_pDocB->toPlainText(), Uml::B);
+ m_pAssociationWidget->setRoleDocumentation(m_docA->toPlainText(), Uml::A);
+ m_pAssociationWidget->setRoleDocumentation(m_docB->toPlainText(), Uml::B);
} //end if m_pAssociationWidget
}
--- branches/work/soc-umbrello/umbrello/dialogs/assocrolepage.h #1274304:1274305
@@ -57,7 +57,7 @@
private:
KLineEdit *m_pRoleALE, *m_pRoleBLE;
KComboBox *m_pMultiACB, *m_pMultiBCB;
- KTextEdit *m_pDocA, *m_pDocB;
+ KTextEdit *m_docA, *m_docB;
AssociationWidget *m_pAssociationWidget;
UMLDoc *m_pUmldoc;
ObjectWidget *m_pWidget;
--- branches/work/soc-umbrello/umbrello/dialogs/classgenpage.cpp #1274304:1274305
@@ -221,14 +221,14 @@
topLayout->addWidget(m_pButtonGB);
// setup documentation
- m_pDocGB = new QGroupBox(this);
- QHBoxLayout * docLayout = new QHBoxLayout(m_pDocGB);
+ m_docGB = new QGroupBox(this);
+ QHBoxLayout * docLayout = new QHBoxLayout(m_docGB);
docLayout->setMargin(margin);
- m_pDocGB->setTitle(i18n("Documentation"));
+ m_docGB->setTitle(i18n("Documentation"));
- m_doc = new KTextEdit(m_pDocGB);
+ m_doc = new KTextEdit(m_docGB);
docLayout->addWidget(m_doc);
- topLayout->addWidget(m_pDocGB);
+ topLayout->addWidget(m_docGB);
// setup fields
m_pClassNameLE->setText(o->name());
@@ -300,13 +300,13 @@
m_pNameLayout->addWidget(m_pDeconCB, 2,1);
}
// setup documentation
- m_pDocGB = new QGroupBox(this);
- topLayout->addWidget(m_pDocGB, 1, 0);
- QHBoxLayout * docLayout = new QHBoxLayout(m_pDocGB);
+ m_docGB = new QGroupBox(this);
+ topLayout->addWidget(m_docGB, 1, 0);
+ QHBoxLayout * docLayout = new QHBoxLayout(m_docGB);
docLayout->setMargin(margin);
- m_pDocGB->setTitle(i18n("Documentation"));
+ m_docGB->setTitle(i18n("Documentation"));
- m_doc = new KTextEdit(m_pDocGB);
+ m_doc = new KTextEdit(m_docGB);
m_doc->setLineWrapMode(QTextEdit::WidgetWidth);
m_doc->setText(o->documentation());
docLayout->addWidget(m_doc);
@@ -363,13 +363,13 @@
m_pNameLayout->addWidget(m_pInstanceLE, 2, 1);
//setup documentation
- m_pDocGB = new QGroupBox(this);
- topLayout->addWidget(m_pDocGB, 1, 0);
- QHBoxLayout* docLayout = new QHBoxLayout(m_pDocGB);
+ m_docGB = new QGroupBox(this);
+ topLayout->addWidget(m_docGB, 1, 0);
+ QHBoxLayout* docLayout = new QHBoxLayout(m_docGB);
docLayout->setMargin(margin);
- m_pDocGB->setTitle(i18n("Documentation"));
+ m_docGB->setTitle(i18n("Documentation"));
- m_doc = new KTextEdit(m_pDocGB);
+ m_doc = new KTextEdit(m_docGB);
m_doc->setLineWrapMode(QTextEdit::WidgetWidth);
m_doc->setText(widget->documentation());
docLayout->addWidget(m_doc);
--- branches/work/soc-umbrello/umbrello/dialogs/classgenpage.h #1274304:1274305
@@ -78,7 +78,7 @@
UMLWidget * m_pInstanceWidget;
UMLDoc * m_pUmldoc;
- QGroupBox * m_pDocGB;
+ QGroupBox * m_docGB;
QGroupBox * m_pButtonGB;
QLabel * m_pNameL, * m_pInstanceL, * m_pStereoTypeL, * m_pPackageL;
KLineEdit * m_pClassNameLE, * m_pInstanceLE, * m_pPackageLE;
--- branches/work/soc-umbrello/umbrello/dialogs/classifierlistpage.cpp #1274304:1274305
@@ -82,7 +82,7 @@
mainLayout->addWidget(m_pItemListGB);
setupDocumentationGroup(margin);
- mainLayout->addWidget(m_pDocGB);
+ mainLayout->addWidget(m_docGB);
reloadItemListBox();
@@ -215,21 +215,21 @@
*/
void ClassifierListPage::setupDocumentationGroup(int margin)
{
- m_pDocGB = new QGroupBox(i18n("Documentation"), this);
- QVBoxLayout* docLayout = new QVBoxLayout(m_pDocGB);
+ m_docGB = new QGroupBox(i18n("Documentation"), this);
+ QVBoxLayout* docLayout = new QVBoxLayout(m_docGB);
docLayout->setSpacing(10);
docLayout->setMargin(margin);
if (m_itemType == UMLObject::ot_Operation) {
- m_pDocTE = new KTextEdit();
+ m_docTE = new KTextEdit();
m_pCodeTE = new CodeTextEdit();
KTabWidget* tabWidget = new KTabWidget();
- tabWidget->addTab(m_pDocTE, i18n("Comment"));
+ tabWidget->addTab(m_docTE, i18n("Comment"));
tabWidget->addTab(m_pCodeTE, i18n("Source Code"));
docLayout->addWidget(tabWidget);
}
else {
- m_pDocTE = new KTextEdit();
- docLayout->addWidget(m_pDocTE);
+ m_docTE = new KTextEdit();
+ docLayout->addWidget(m_docTE);
}
}
@@ -257,13 +257,13 @@
*/
void ClassifierListPage::enableWidgets(bool state)
{
- m_pDocTE->setEnabled( state );
+ m_docTE->setEnabled( state );
if (m_itemType == UMLObject::ot_Operation) {
m_pCodeTE->setEnabled( state );
}
//if disabled clear contents
if ( !state ) {
- m_pDocTE->setText( "" );
+ m_docTE->setText( "" );
if (m_itemType == UMLObject::ot_Operation) {
m_pCodeTE->setPlainText( "" );
}
@@ -316,7 +316,7 @@
//if not first time an item is highlighted
//save old highlighted item first
if (m_pOldListItem) {
- m_pOldListItem->setDoc( m_pDocTE->toPlainText() );
+ m_pOldListItem->setDoc( m_docTE->toPlainText() );
if (m_itemType == UMLObject::ot_Operation) {
UMLOperation* op = dynamic_cast<UMLOperation*>(m_pOldListItem);
op->setSourceCode( m_pCodeTE->toPlainText() );
@@ -351,7 +351,7 @@
if (listItem) {
//now update screen
- m_pDocTE->setText( listItem->doc() );
+ m_docTE->setText( listItem->doc() );
if (m_itemType == UMLObject::ot_Operation) {
m_pCodeTE->setPlainText( dynamic_cast<UMLOperation*>(listItem)->getSourceCode() );
}
@@ -752,7 +752,7 @@
UMLClassifierListItem* selectedItem = getItemList().at( currentItemIndex );
if (selectedItem) {
- selectedItem->setDoc( m_pDocTE->toPlainText() );
+ selectedItem->setDoc( m_docTE->toPlainText() );
if (m_itemType == UMLObject::ot_Operation) {
dynamic_cast<UMLOperation*>(selectedItem)->setSourceCode( m_pCodeTE->toPlainText() );
}
--- branches/work/soc-umbrello/umbrello/dialogs/classifierlistpage.h #1274304:1274305
@@ -74,9 +74,9 @@
void printItemList(const QString &prologue);
- QGroupBox* m_pDocGB;
+ QGroupBox* m_docGB;
QGroupBox* m_pItemListGB;
- KTextEdit* m_pDocTE;
+ KTextEdit* m_docTE;
CodeTextEdit* m_pCodeTE;
QListWidget* m_pItemListLB;
--- branches/work/soc-umbrello/umbrello/dialogs/notedialog.cpp #1274304:1274305
@@ -35,20 +35,20 @@
QFrame *frame = new QFrame( this );
setMainWidget( frame );
- m_pDocGB = new QGroupBox(i18n("Documentation"), frame);
+ m_docGB = new QGroupBox(i18n("Documentation"), frame);
QVBoxLayout * mainLayout = new QVBoxLayout(frame);
- mainLayout->addWidget(m_pDocGB);
+ mainLayout->addWidget(m_docGB);
mainLayout->setSpacing(10);
mainLayout->setMargin(margin);
- QHBoxLayout * docLayout = new QHBoxLayout(m_pDocGB);
+ QHBoxLayout * docLayout = new QHBoxLayout(m_docGB);
docLayout->setSpacing(10);
docLayout->setMargin(margin);
- m_pDocTE = new KTextEdit( m_pDocGB );
- m_pDocTE->setFocus();
- docLayout->addWidget( m_pDocTE );
- m_pDocTE->setText( pNote->documentation() );
+ m_docTE = new KTextEdit( m_docGB );
+ m_docTE->setFocus();
+ docLayout->addWidget( m_docTE );
+ m_docTE->setText( pNote->documentation() );
setMinimumSize(330, 160);
connect(this,SIGNAL(okClicked()),this,SLOT(slotOk()));
}
@@ -59,7 +59,7 @@
void NoteDialog::slotOk()
{
- m_pNoteWidget->setDocumentation( m_pDocTE->toPlainText() );
+ m_pNoteWidget->setDocumentation( m_docTE->toPlainText() );
accept();
}
--- branches/work/soc-umbrello/umbrello/dialogs/notedialog.h #1274304:1274305
@@ -45,8 +45,8 @@
private:
//GUI widgets
- QGroupBox * m_pDocGB;
- KTextEdit * m_pDocTE;
+ QGroupBox * m_docGB;
+ KTextEdit * m_docTE;
/**
* Note widget to show documentation for.
--- branches/work/soc-umbrello/umbrello/dialogs/parmpropdlg.cpp #1274304:1274305
@@ -112,15 +112,15 @@
topLayout->addWidget(m_pKind);
- m_pDocGB = new QGroupBox(i18n("Documentation"), frame);
- QHBoxLayout * docLayout = new QHBoxLayout(m_pDocGB);
+ m_docGB = new QGroupBox(i18n("Documentation"), frame);
+ QHBoxLayout * docLayout = new QHBoxLayout(m_docGB);
docLayout->setMargin(margin);
- m_doc = new KTextEdit(m_pDocGB);
+ m_doc = new KTextEdit(m_docGB);
m_doc->setWordWrapMode(QTextOption::WordWrap);
m_doc->setText(text);
docLayout->addWidget(m_doc);
- topLayout->addWidget(m_pDocGB);
+ topLayout->addWidget(m_docGB);
// Check the proper Kind radiobutton.
if (attr) {
--- branches/work/soc-umbrello/umbrello/dialogs/parmpropdlg.h #1274304:1274305
@@ -80,7 +80,7 @@
virtual void slotButtonClicked(int button);
private:
- QGroupBox * m_pParmGB, * m_pDocGB;
+ QGroupBox * m_pParmGB, * m_docGB;
QGroupBox *m_pKind;
QRadioButton * m_pIn, * m_pOut, *m_pInOut;
QLabel * m_pTypeL, * m_pNameL, * m_pInitialL, * m_pStereoTypeL;
--- branches/work/soc-umbrello/umbrello/docgenerators/docbook2xhtmlgeneratorjob.cpp #1274304:1274305
@@ -39,7 +39,7 @@
* @param parent Parent object for QThread constructor
*/
Docbook2XhtmlGeneratorJob::Docbook2XhtmlGeneratorJob(KUrl& docBookUrl, QObject* parent )
- :QThread(parent),m_pDocbookUrl( docBookUrl )
+ :QThread(parent),m_docbookUrl( docBookUrl )
{
}
@@ -81,8 +81,8 @@
xmlLoadExtDtdDefaultValue = 1;
uDebug() << "Parsing stylesheet " << tmpXsl.fileName();
cur = xsltParseStylesheetFile((const xmlChar *)tmpXsl.fileName().toLatin1().constData());
- uDebug() << "Parsing file " << m_pDocbookUrl.path();
- doc = xmlParseFile((const char*)(m_pDocbookUrl.path().toUtf8()));
+ uDebug() << "Parsing file " << m_docbookUrl.path();
+ doc = xmlParseFile((const char*)(m_docbookUrl.path().toUtf8()));
uDebug() << "Applying stylesheet ";
res = xsltApplyStylesheet(cur, doc, params);
--- branches/work/soc-umbrello/umbrello/docgenerators/docbook2xhtmlgeneratorjob.h #1274304:1274305
@@ -34,7 +34,7 @@
void run();
private:
- KUrl m_pDocbookUrl;
+ KUrl m_docbookUrl;
signals:
void xhtmlGenerated(const QString&);
More information about the umbrello-devel
mailing list