Umbrello UML Modeller

CVS commit by jriddell: 

the list of interfaces are now listed as an option when creating
operations, operation paramaters and attributes


  M +6 -0      parmpropdlg.cpp   1.3
  M +6 -0      umlattributedialog.cpp   1.5


--- kdesdk/umbrello/umbrello/dialogs/parmpropdlg.cpp  #1.2:1.3
@@ -10,4 +10,5 @@
 #include "parmpropdlg.h"
 #include "../concept.h"
+#include "../interface.h"
 #include "../umldoc.h"
 #include <klocale.h>
@@ -86,4 +87,9 @@ ParmPropDlg::ParmPropDlg(QWidget * paren
         for(obj=namesList.first(); obj!=0 ;obj=namesList.next()) {
                 m_pTypeCB->insertItem( obj->getName() );
+        }
+        QPtrList<UMLInterface> interfaceList( m_pUmldoc->getInterfaces() );
+        UMLInterface* pInterface = 0;
+        for(pInterface=interfaceList.first(); pInterface!=0 ;pInterface=interfaceList.next()) {
+                m_pTypeCB->insertItem( pInterface->getName() );
         }
 

--- kdesdk/umbrello/umbrello/dialogs/umlattributedialog.cpp  #1.4:1.5
@@ -10,4 +10,5 @@
 #include "umlattributedialog.h"
 #include "../attribute.h"
+#include "../interface.h"
 #include "../concept.h"
 #include "../umldoc.h"
@@ -103,4 +104,9 @@ void UMLAttributeDialog::setupDialog() {
         for (obj=namesList.first(); obj!=0; obj=namesList.next()) {
                 m_pTypeCB->insertItem( obj->getName() );
+        }
+        QPtrList<UMLInterface> interfaceList( pDoc->getInterfaces() );
+        UMLInterface* pInterface = 0;
+        for(pInterface=interfaceList.first(); pInterface!=0 ;pInterface=interfaceList.next()) {
+                m_pTypeCB->insertItem( pInterface->getName() );
         }

CVS commit by luis: 

Cannot use the old dialogs from the new diagram code, so I had
to re-do'em.
while at it, make all layout be designer-based.


  A            classpropertiesbase.ui   1.1
  A            classpropertiespage.cpp   1.1
  A            classpropertiespage.h   1.1
  A            dialogpage.h   1.1
  M +1 -1      Makefile.am   1.7


--- kdesdk/umbrello/umbrello/dialogs/Makefile.am  #1.6:1.7
@@ -5,3 +5,3 @@
 libdialogs_la_METASOURCES = AUTO
 
-libdialogs_la_SOURCES = overwritedialogue.cpp codegenerationwizard.cpp codegenerationoptionspage.cpp codegenerationwizardbase.ui codegenerationoptionsbase.ui selectlanguagesdlg.cpp sellanguagesbase.ui classwizard.cpp configgeneratorsbase.ui configcodegenerators.cpp notedialog.cpp activitydialog.cpp activitypage.cpp umlwidgetcolorpage.cpp umlviewdialog.cpp umloperationdialog.cpp umlattributedialog.cpp statedialog.cpp settingsdlg.cpp selectopdlg.cpp parmpropdlg.cpp diagramprintpage.cpp classpropdlg.cpp classoptionspage.cpp classopspage.cpp classgenpage.cpp classattpage.cpp assocpropdlg.cpp assocpage.cpp diagrampropertiespage.ui assocrolepage.cpp assocgenpage.cpp umltemplatedialog.cpp classtemplatepage.cpp
+libdialogs_la_SOURCES = overwritedialogue.cpp codegenerationwizard.cpp codegenerationoptionspage.cpp codegenerationwizardbase.ui codegenerationoptionsbase.ui selectlanguagesdlg.cpp sellanguagesbase.ui classwizard.cpp configgeneratorsbase.ui configcodegenerators.cpp notedialog.cpp activitydialog.cpp activitypage.cpp umlwidgetcolorpage.cpp umlviewdialog.cpp umloperationdialog.cpp umlattributedialog.cpp statedialog.cpp settingsdlg.cpp selectopdlg.cpp parmpropdlg.cpp diagramprintpage.cpp classpropdlg.cpp classoptionspage.cpp classopspage.cpp classgenpage.cpp classattpage.cpp assocpropdlg.cpp assocpage.cpp diagrampropertiespage.ui assocrolepage.cpp assocgenpage.cpp umltemplatedialog.cpp classtemplatepage.cpp classpropertiesbase.ui classpropertiespage.cpp

CVS commit by pfeiffer: 

everything compiles, finally


  M +16 -14    classpropertiespage.cpp   1.2
  M +4 -5      classpropertiespage.h   1.2
  M +1 -1      dialogpage.h   1.2

CVS commit by jriddell: 

Component instances (on deployment diagrams) can now set the stereotype through the 
properties dialogue


  M +22 -13    classgenpage.cpp   1.13
  M +4 -5      classgenpage.h   1.6
  M +3 -3      classpropdlg.cpp   1.8
  M +1 -1      classpropdlg.h   1.4

CVS commit by luis: 

Added "base" files to repository.
NOTE: these files are generated by uic from the corresponding .ui (designer) files
But I need to add them to cvs (at least for now) because they are not generated
by the normal build process.
If you change the ui file and one to re-generate these, take a look at the
the file makebase


  A            classattributesbase.cpp   1.1
  A            classattributesbase.h   1.1
  A            classoperationsbase.cpp   1.1
  A            classoperationsbase.h   1.1
  A            classpropertiesbase.cpp   1.1
  A            classpropertiesbase.h   1.1

CVS commit by luis: 

Designer files for some dialogs.
To generate the source code you need to run uic on them and filter the result
as done in makebase. This is not done automatically by the build system for now


  A            classattributesbase.ui   1.1
  A            classoperationsbase.ui   1.1
  M +82 -82    classpropertiesbase.ui   1.2

CVS commit by luis: 

A Container for DialogPages


  A            umbrellodialog.cpp   1.1
  A            umbrellodialog.h   1.1

CVS commit by luis: 

Implementation of some DialogPages


  A            classattributespage.cpp   1.1
  A            classattributespage.h   1.1
  A            classoperationspage.cpp   1.1
  A            classoperationspage.h   1.1

CVS commit by luis: 

Filter the result of uic to generate the base for all DialogPages.
If someone knows how to integrate this in the normal build system, please contact 
me.


  A            makebase   1.1

CVS commit by luis: 

More work on the dialog pages... still far for complete, but we are on the way.


  M +2 -1      Makefile.am   1.8
  M +58 -28    classpropertiespage.cpp   1.3
  M +7 -8      classpropertiespage.h   1.3
  M +15 -7     dialogpage.h   1.3

CVS commit by jriddell: 

removed FIXMEnow which didn't need fixing


  M +2 -2      classattributesbase.cpp   1.2
  M +2 -3      classattributesbase.h   1.2
  M +2 -2      classoperationsbase.cpp   1.2
  M +2 -3      classoperationsbase.h   1.2
  M +0 -2      classpropertiespage.cpp   1.5


--- kdesdk/umbrello/umbrello/dialogs/classattributesbase.cpp  #1.1:1.2
@@ -2,5 +2,5 @@
 ** Form implementation generated from reading ui file 'classattributesbase.ui'
 **
-** Created: Mon Mar 10 23:43:50 2003
+** Created: Fri Mar 14 13:34:18 2003
 **      by: The User Interface Compiler ($Id$)
 **

--- kdesdk/umbrello/umbrello/dialogs/classattributesbase.h  #1.1:1.2
@@ -2,5 +2,5 @@
 ** Form interface generated from reading ui file 'classattributesbase.ui'
 **
-** Created: Mon Mar 10 23:43:50 2003
+** Created: Fri Mar 14 13:34:18 2003
 **      by: The User Interface Compiler ($Id$)
 **

--- kdesdk/umbrello/umbrello/dialogs/classoperationsbase.cpp  #1.1:1.2
@@ -2,5 +2,5 @@
 ** Form implementation generated from reading ui file 'classoperationsbase.ui'
 **
-** Created: Mon Mar 10 23:43:51 2003
+** Created: Fri Mar 14 13:34:18 2003
 **      by: The User Interface Compiler ($Id$)
 **

--- kdesdk/umbrello/umbrello/dialogs/classoperationsbase.h  #1.1:1.2
@@ -2,5 +2,5 @@
 ** Form interface generated from reading ui file 'classoperationsbase.ui'
 **
-** Created: Mon Mar 10 23:43:51 2003
+** Created: Fri Mar 14 13:34:18 2003
 **      by: The User Interface Compiler ($Id$)
 **

--- kdesdk/umbrello/umbrello/dialogs/classpropertiespage.cpp  #1.4:1.5
@@ -53,10 +53,8 @@ void ClassPropertiesPage::cancel()
 void ClassPropertiesPage::pageContentsModified()
 {
-        /*FIXMEnow m_autoApply doesn't seem to exist -- jr 13/3/2003
         if(m_autoApply)
         {
                 saveData();
         }
-        */
 }

Am Freitag, 14. M=C3=A4rz 2003 14:36 schrieb Jonathan Riddell:
> CVS commit by jriddell:=20
>=20
> removed FIXMEnow which didn't need fixing
>=20
>=20
>   M +2 -2      classattributesbase.cpp   1.2
>   M +2 -3      classattributesbase.h   1.2
>   M +2 -2      classoperationsbase.cpp   1.2
>   M +2 -3      classoperationsbase.h   1.2
>   M +0 -2      classpropertiespage.cpp   1.5

You should remove these generated files out of CVS.

Greetings, Stephan

>=20
>=20
> --- kdesdk/umbrello/umbrello/dialogs/classattributesbase.cpp  #1.1:1.2
> @@ -2,5 +2,5 @@
>  ** Form implementation generated from reading ui file 'classattributesba=
se.ui'
>  **
> -** Created: Mon Mar 10 23:43:50 2003
> +** Created: Fri Mar 14 13:34:18 2003
>  **      by: The User Interface Compiler ($Id$)
>  **
>=20
> --- kdesdk/umbrello/umbrello/dialogs/classattributesbase.h  #1.1:1.2
> @@ -2,5 +2,5 @@
>  ** Form interface generated from reading ui file 'classattributesbase.ui'
>  **
> -** Created: Mon Mar 10 23:43:50 2003
> +** Created: Fri Mar 14 13:34:18 2003
>  **      by: The User Interface Compiler ($Id$)
>  **
>=20
> --- kdesdk/umbrello/umbrello/dialogs/classoperationsbase.cpp  #1.1:1.2
> @@ -2,5 +2,5 @@
>  ** Form implementation generated from reading ui file 'classoperationsba=
se.ui'
>  **
> -** Created: Mon Mar 10 23:43:51 2003
> +** Created: Fri Mar 14 13:34:18 2003
>  **      by: The User Interface Compiler ($Id$)
>  **
>=20
> --- kdesdk/umbrello/umbrello/dialogs/classoperationsbase.h  #1.1:1.2
> @@ -2,5 +2,5 @@
>  ** Form interface generated from reading ui file 'classoperationsbase.ui'
>  **
> -** Created: Mon Mar 10 23:43:51 2003
> +** Created: Fri Mar 14 13:34:18 2003
>  **      by: The User Interface Compiler ($Id$)
>  **
>=20
> --- kdesdk/umbrello/umbrello/dialogs/classpropertiespage.cpp  #1.4:1.5
> @@ -53,10 +53,8 @@ void ClassPropertiesPage::cancel()
>  void ClassPropertiesPage::pageContentsModified()
>  {
> -        /*FIXMEnow m_autoApply doesn't seem to exist -- jr 13/3/2003
>          if(m_autoApply)
>          {
>                  saveData();
>          }
> -        */
>  }
> =20
>=20
>=20
>=20

On Tuesday 18 March 2003 08:59, Stephan Kulow wrote:
>
> You should remove these generated files out of CVS.

no, please dont!
they are uic-generated files, true, but then they are "post-prosessed" by 
"makebase" in umbrello/dialogs directory, and since this doesnt happen 
automatically during the build process ( I couldn't figure out how to 
integrate that into the build system ) I added them to the repository.

luis

CVS commit by ossi: 

adding .ui files to _SOURCES, as otherwise am_edit freaks out


  M +1 -1      Makefile.am   1.9


--- kdesdk/umbrello/umbrello/dialogs/Makefile.am  #1.8:1.9
@@ -5,4 +5,4 @@
 libdialogs_la_METASOURCES = AUTO
 
-libdialogs_la_SOURCES = overwritedialogue.cpp codegenerationwizard.cpp codegenerationoptionspage.cpp codegenerationwizardbase.ui codegenerationoptionsbase.ui selectlanguagesdlg.cpp sellanguagesbase.ui classwizard.cpp configgeneratorsbase.ui configcodegenerators.cpp notedialog.cpp activitydialog.cpp activitypage.cpp umlwidgetcolorpage.cpp umlviewdialog.cpp umloperationdialog.cpp umlattributedialog.cpp statedialog.cpp settingsdlg.cpp selectopdlg.cpp parmpropdlg.cpp diagramprintpage.cpp classpropdlg.cpp classoptionspage.cpp classopspage.cpp classgenpage.cpp classattpage.cpp assocpropdlg.cpp assocpage.cpp diagrampropertiespage.ui assocrolepage.cpp assocgenpage.cpp umltemplatedialog.cpp classtemplatepage.cpp umbrellodialog.cpp classpropertiespage.cpp classpropertiesbase.cpp classattributespage.cpp classattributesbase.cpp classoperationspage.cpp classoperationsbase.cpp
+libdialogs_la_SOURCES = overwritedialogue.cpp codegenerationwizard.cpp codegenerationoptionspage.cpp codegenerationwizardbase.ui codegenerationoptionsbase.ui selectlanguagesdlg.cpp sellanguagesbase.ui classwizard.cpp configgeneratorsbase.ui configcodegenerators.cpp notedialog.cpp activitydialog.cpp activitypage.cpp umlwidgetcolorpage.cpp umlviewdialog.cpp umloperationdialog.cpp umlattributedialog.cpp statedialog.cpp settingsdlg.cpp selectopdlg.cpp parmpropdlg.cpp diagramprintpage.cpp classpropdlg.cpp classoptionspage.cpp classopspage.cpp classgenpage.cpp classattpage.cpp assocpropdlg.cpp assocpage.cpp diagrampropertiespage.ui assocrolepage.cpp assocgenpage.cpp umltemplatedialog.cpp classtemplatepage.cpp umbrellodialog.cpp classpropertiespage.cpp classpropertiesbase.ui classpropertiesbase.cpp classattributespage.cpp classattributesbase.ui classattributesbase.cpp classoperationspage.cpp classoperationsbase.ui classoperationsbase.cpp

CVS commit by mueller: 

remove ui generated files


  R            classattributesbase.cpp   1.2
  R            classattributesbase.h   1.2
  R            classoperationsbase.cpp   1.2
  R            classoperationsbase.h   1.2
  R            classpropertiesbase.cpp   1.1
  R            classpropertiesbase.h   1.1

CVS commit by kalass: 

use multiple inheritance instead of the hackish makebase script to make the dialog
pages all have one common feature


  M +1 -0      classattributespage.cpp   1.4
  M +6 -1      classattributespage.h   1.4
  M +1 -0      classoperationspage.cpp   1.3
  M +6 -1      classoperationspage.h   1.3
  M +1 -0      classpropertiespage.cpp   1.6
  M +6 -1      classpropertiespage.h   1.5
  M +16 -14    dialogpage.h   1.4
  M +2 -2      umbrellodialog.cpp   1.2
  M +1 -1      umbrellodialog.h   1.2

CVS commit by kalass: 

use path relative to top directory so that the generated header is found when builddir != sourcedir


  M +1 -1      classattributespage.h   1.5
  M +1 -1      classoperationspage.h   1.4
  M +1 -1      classpropertiespage.h   1.6


--- kdesdk/umbrello/umbrello/dialogs/classattributespage.h  #1.4:1.5
@@ -11,5 +11,5 @@
 #define CLASS_ATTRIBUTES_PAGE
 
-#include "classattributesbase.h"
+#include "umbrello/umbrello/dialogs/classattributesbase.h"
 #include <qptrlist.h>
 #include "dialogpage.h"

--- kdesdk/umbrello/umbrello/dialogs/classoperationspage.h  #1.3:1.4
@@ -11,5 +11,5 @@
 #define CLASS_OPERATIONS_PAGE
 
-#include "classoperationsbase.h"
+#include "umbrello/umbrello/dialogs/classoperationsbase.h"
 #include "dialogpage.h"
 

--- kdesdk/umbrello/umbrello/dialogs/classpropertiespage.h  #1.5:1.6
@@ -11,5 +11,5 @@
 #define CLASS_PROPERTIES_PAGE
 
-#include "classpropertiesbase.h"
+#include "umbrello/umbrello/dialogs/classpropertiesbase.h"
 #include "dialogpage.h"

CVS commit by kalass: 

disable the auto apply feature for pages in a dialog


  M +2 -1      umbrellodialog.cpp   1.3


--- kdesdk/umbrello/umbrello/dialogs/umbrellodialog.cpp  #1.2:1.3
@@ -21,5 +21,6 @@ UmbrelloDialog::~UmbrelloDialog()
 void UmbrelloDialog::addPage( QWidget *page, const QString &title, const QPixmap &pixmap )
 {
-        //page->setAutoApply(false);
+        DialogPage *dpage = dynamic_cast<DialogPage*>(page);
+        if (dpage) dpage->setAutoApply(false);
         connect(this,SIGNAL(cancelClicked()),page,SLOT(cancel()));
         connect(this,SIGNAL(applyClicked()),page,SLOT(apply()));

CVS commit by kalass: 

removed obsolete hack


  R            makebase   1.1

CVS commit by thomas: 

I cant get this to compile without this include statement, perhaps
the prior pruning was a bit much? 


  M +1 -0      classattributespage.h   1.6


--- kdesdk/umbrello/umbrello/dialogs/classattributespage.h  #1.5:1.6
@@ -13,4 +13,5 @@
 #include "umbrello/umbrello/dialogs/classattributesbase.h"
 #include <qptrlist.h>
+#include <qpixmap.h>
 #include "dialogpage.h"

CVS commit by luis: 

Added more dialog pages and their ui-base files.
not all functionality implemented


  A            attributepropertiesbase.ui   1.1
  A            classdisplayoptionsbase.ui   1.1
  A            classdisplayoptionspage.cpp   1.1
  A            classdisplayoptionspage.h   1.1
  A            operationpropertiesbase.ui   1.1
  A            operationpropertiespage.cpp   1.1
  A            operationpropertiespage.h   1.1
  A            widgetcolorsbase.ui   1.1
  A            widgetcolorspage.cpp   1.1
  A            widgetcolorspage.h   1.1

CVS commit by luis: 

Added documentation.
Misc. improvements


  M +6 -1      classattributespage.cpp   1.5
  M +27 -7     classattributespage.h   1.7

CVS commit by luis: 

Added documentation
Misc. small improvements


  M +13 -0     classoperationspage.cpp   1.4
  M +10 -6     classpropertiespage.cpp   1.7
  M +25 -7     classpropertiespage.h   1.7
  M +0 -2      dialogpage.h   1.5

CVS commit by luis: 

Type names should not be translated. removed i18n from typenames like "bool" and "int"


  M +2 -2      umloperationdialog.cpp   1.11


--- kdesdk/umbrello/umbrello/dialogs/umloperationdialog.cpp  #1.10:1.11
@@ -109,6 +109,6 @@ void UMLOperationDialog::setupDialog() {
 
         //add some standard return types to combo box
-        QString types[] = {i18n("void"), i18n("int"), i18n("long"), i18n("bool"), i18n("string"), i18n("double"),
-                           i18n("float"), i18n("date")};
+        QString types[] = {"void", "int", "long", "bool", "string", "double",
+                           "float", "date"};
 
         for (int i=0; i<6; i++) {

CVS commit by luis: 

Add new files to build system (dialog pages)


  M +1 -1      Makefile.am   1.10


--- kdesdk/umbrello/umbrello/dialogs/Makefile.am  #1.9:1.10
@@ -5,4 +5,4 @@
 libdialogs_la_METASOURCES = AUTO
 
-libdialogs_la_SOURCES = overwritedialogue.cpp codegenerationwizard.cpp codegenerationoptionspage.cpp codegenerationwizardbase.ui codegenerationoptionsbase.ui selectlanguagesdlg.cpp sellanguagesbase.ui classwizard.cpp configgeneratorsbase.ui configcodegenerators.cpp notedialog.cpp activitydialog.cpp activitypage.cpp umlwidgetcolorpage.cpp umlviewdialog.cpp umloperationdialog.cpp umlattributedialog.cpp statedialog.cpp settingsdlg.cpp selectopdlg.cpp parmpropdlg.cpp diagramprintpage.cpp classpropdlg.cpp classoptionspage.cpp classopspage.cpp classgenpage.cpp classattpage.cpp assocpropdlg.cpp assocpage.cpp diagrampropertiespage.ui assocrolepage.cpp assocgenpage.cpp umltemplatedialog.cpp classtemplatepage.cpp umbrellodialog.cpp classpropertiespage.cpp classpropertiesbase.ui classpropertiesbase.cpp classattributespage.cpp classattributesbase.ui classattributesbase.cpp classoperationspage.cpp classoperationsbase.ui classoperationsbase.cpp
+libdialogs_la_SOURCES = overwritedialogue.cpp codegenerationwizard.cpp codegenerationoptionspage.cpp codegenerationwizardbase.ui codegenerationoptionsbase.ui selectlanguagesdlg.cpp sellanguagesbase.ui classwizard.cpp configgeneratorsbase.ui configcodegenerators.cpp notedialog.cpp activitydialog.cpp activitypage.cpp umlwidgetcolorpage.cpp umlviewdialog.cpp umloperationdialog.cpp umlattributedialog.cpp statedialog.cpp settingsdlg.cpp selectopdlg.cpp parmpropdlg.cpp diagramprintpage.cpp classpropdlg.cpp classoptionspage.cpp classopspage.cpp classgenpage.cpp classattpage.cpp assocpropdlg.cpp assocpage.cpp diagrampropertiespage.ui assocrolepage.cpp assocgenpage.cpp umltemplatedialog.cpp classtemplatepage.cpp umbrellodialog.cpp classpropertiespage.cpp classpropertiesbase.ui classpropertiesbase.cpp classattributespage.cpp classattributesbase.ui classattributesbase.cpp classoperationspage.cpp classoperationsbase.ui classoperationsbase.cpp operationpropertiesbase.ui operationpropertiesbase.cpp operationpropertiespage.cpp classdisplayoptionsbase.ui classdisplayoptionsbase.cpp widgetcolorsbase.ui widgetcolorsbase.cpp widgetcolorspage.cpp classdisplayoptionsbase.ui classdisplayoptionsbase.cpp classdisplayoptionspage.cpp

CVS commit by luis: 

Added new ui-generated files to cvsignore


  M +10 -0     .cvsignore   1.4


--- kdesdk/umbrello/umbrello/dialogs/.cvsignore  #1.3:1.4
@@ -13,2 +13,12 @@
 classpropertiesbase.cpp
 classpropertiesbase.h
+classattributesbase.cpp
+classattributesbase.h
+classdisplayoptionsbase.cpp
+classdisplayoptionsbase.h
+classoperationsbase.cpp
+classoperationsbase.h
+operationpropertiesbase.cpp
+operationpropertiesbase.h
+widgetcolorsbase.cpp
+widgetcolorsbase.h

CVS commit by sstein: 

added i18n() call to string "Association font", reported by Caulier Gilles on uml-devel@...


  M +1 -5      assocpropdlg.cpp   1.5


--- kdesdk/umbrello/umbrello/dialogs/assocpropdlg.cpp  #1.4:1.5
@@ -112,8 +112,4 @@ void AssocPropDlg::setupFontPage()
         m_pChooser = new KFontChooser( (QWidget*)page, "font", false, QStringList(), false);
         m_pChooser->setFont( m_pAssoc->getFont());
-        m_pChooser->setSampleText("Association font");
-
+        m_pChooser->setSampleText(i18n("Association font"));
 }
-
-
-

CVS commit by sstein: 

added i18n() call to "example font" strings, reported by Caulier Gilles on uml-devel@...


  M +1 -1      activitydialog.cpp   1.4
  M +1 -1      classpropdlg.cpp   1.11
  M +1 -1      settingsdlg.cpp   1.9
  M +1 -1      statedialog.cpp   1.5
  M +1 -1      umlviewdialog.cpp   1.13


--- kdesdk/umbrello/umbrello/dialogs/umlviewdialog.cpp  #1.12:1.13
@@ -106,5 +106,5 @@ void UMLViewDialog::setupFontPage() {
         m_pChooser = new KFontChooser( (QWidget*)page, "font", false, QStringList(), false);
         m_pChooser -> setFont( m_pView -> getOptionState().uiState.font );
-        m_pChooser->setSampleText("Umbrello font");
+        m_pChooser->setSampleText(i18n("Umbrello font"));
 }
 

--- kdesdk/umbrello/umbrello/dialogs/statedialog.cpp  #1.4:1.5
@@ -120,5 +120,5 @@ void StateDialog::setupFontPage() {
         m_pChooser = new KFontChooser( (QWidget*)page, "font", false, QStringList(), false);
         m_pChooser -> setFont( m_pStateWidget -> getFont() );
-        m_pChooser->setSampleText("Umbrello font");
+        m_pChooser->setSampleText(i18n("Umbrello font"));
 }
 

--- kdesdk/umbrello/umbrello/dialogs/settingsdlg.cpp  #1.8:1.9
@@ -193,5 +193,5 @@ void SettingsDlg::setupFontPage() {
         QVBox * page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts")  );
         m_FontWidgets.chooser = new KFontChooser( page, "font", false, QStringList(), false);
-        m_FontWidgets.chooser->setSampleText("Umbrello font");
+        m_FontWidgets.chooser->setSampleText(i18n("Umbrello font"));
 
 }

--- kdesdk/umbrello/umbrello/dialogs/classpropdlg.cpp  #1.10:1.11
@@ -225,5 +225,5 @@ void ClassPropDlg::setupFontPage() {
         m_pChooser = new KFontChooser( (QWidget*)page, "font", false, QStringList(), false);
         m_pChooser -> setFont( m_pWidget -> getFont() );
-        m_pChooser->setSampleText("Umbrello font");
+        m_pChooser->setSampleText(i18n("Umbrello font"));
 }
 

--- kdesdk/umbrello/umbrello/dialogs/activitydialog.cpp  #1.3:1.4
@@ -106,5 +106,5 @@ void ActivityDialog::setupFontPage() {
         m_pChooser = new KFontChooser( (QWidget*)page, "font", false, QStringList(), false);
         m_pChooser -> setFont( m_pActivityWidget -> getFont() );
-        m_pChooser->setSampleText("Umbrello font");
+        m_pChooser->setSampleText(i18n("Umbrello font"));
 }

CVS commit by sstein: 

changed strings, I think they were only copy and pasted from another class and not changed to the context of "role" handling:

Class A Properties -> Role A Properties
Rolename A Visibility -> Role A Visibility
Rolename A Changeabilitity -> Role A Changeabilitity


  M +6 -6      assocrolepage.cpp   1.3


--- kdesdk/umbrello/umbrello/dialogs/assocrolepage.cpp  #1.2:1.3
@@ -46,12 +46,12 @@ void AssocRolePage::constructWidget() {
         QGroupBox *propsAGB = new QGroupBox(this);
         QGroupBox *propsBGB = new QGroupBox(this);
-        QButtonGroup * scopeABG = new QButtonGroup(i18n("Rolename A Visibility"), this );
-        QButtonGroup * scopeBBG = new QButtonGroup(i18n("Rolename B Visibility"), this );
-        QButtonGroup * changeABG = new QButtonGroup(i18n("Rolename A Changeability"), this );
-        QButtonGroup * changeBBG = new QButtonGroup(i18n("Rolename B Changeability"), this );
+        QButtonGroup * scopeABG = new QButtonGroup(i18n("Role A Visibility"), this );
+        QButtonGroup * scopeBBG = new QButtonGroup(i18n("Role B Visibility"), this );
+        QButtonGroup * changeABG = new QButtonGroup(i18n("Role A Changeability"), this );
+        QButtonGroup * changeBBG = new QButtonGroup(i18n("Role B Changeability"), this );
         QGroupBox *docAGB = new QGroupBox(this);
         QGroupBox *docBGB = new QGroupBox(this);
-        propsAGB -> setTitle(i18n("Class A Properties"));
-        propsBGB -> setTitle(i18n("Class B Properties"));
+        propsAGB -> setTitle(i18n("Role A Properties"));
+        propsBGB -> setTitle(i18n("Role B Properties"));
         docAGB -> setTitle(i18n("Documentation"));
         docBGB -> setTitle(i18n("Documentation"));

CVS commit by sstein: 

typo fixed


  M +2 -2      assocrolepage.cpp   1.4


--- kdesdk/umbrello/umbrello/dialogs/assocrolepage.cpp  #1.3:1.4
@@ -119,5 +119,5 @@ void AssocRolePage::constructWidget() {
         changeALayout -> addWidget(m_FrozenARB);
 
-        m_AddOnlyARB = new QRadioButton(i18n("AddOnly"), changeABG);
+        m_AddOnlyARB = new QRadioButton(i18n("Add Only"), changeABG);
         changeALayout -> addWidget(m_AddOnlyARB);
 
@@ -174,5 +174,5 @@ void AssocRolePage::constructWidget() {
         changeBLayout -> addWidget(m_FrozenBRB);
 
-        m_AddOnlyBRB = new QRadioButton(i18n("AddOnly"), changeBBG);
+        m_AddOnlyBRB = new QRadioButton(i18n("Add Only"), changeBBG);
         changeBLayout -> addWidget(m_AddOnlyBRB);

CVS commit by luis: 

react to the umlobject' modified() signal


  M +13 -4     classattpage.cpp   1.6
  M +1 -1      classattpage.h   1.4
  M +8 -3      classopspage.cpp   1.6
  M +0 -6      classpropdlg.cpp   1.12
  M +16 -6     classtemplatepage.cpp   1.3
  M +1 -1      classtemplatepage.h   1.3
  M +0 -8      classwizard.cpp   1.3

CVS commit by luis: 

coment


  M +0 -1      classtemplatepage.cpp   1.4


--- kdesdk/umbrello/umbrello/dialogs/classtemplatepage.cpp  #1.3:1.4
@@ -302,5 +302,4 @@ void ClassTemplatePage::slotDoubleClick(
         if ( dialogue.exec() ) {
                 m_pTemplateLB->changeItem( pTemplate->getName(), m_pTemplateLB->index(item) );
-//FIXME         m_pDoc->signalChildUMLObjectUpdate(pTemplate);
         }
 }

CVS commit by mlaurent: 

includemoc


  M +2 -0      assocgenpage.cpp   1.2
  M +2 -0      assocpropdlg.cpp   1.6
  M +2 -0      assocrolepage.cpp   1.5
  M +7 -8      widgetcolorspage.cpp   1.2


--- kdesdk/umbrello/umbrello/dialogs/assocgenpage.cpp  #1.1:1.2
@@ -212,2 +212,4 @@ void AssocGenPage::updateObject() {
 }
 
+
+#include "assocgenpage.moc"

--- kdesdk/umbrello/umbrello/dialogs/assocpropdlg.cpp  #1.5:1.6
@@ -114,2 +114,4 @@ void AssocPropDlg::setupFontPage()
         m_pChooser->setSampleText(i18n("Association font"));
 }
+
+#include "assocpropdlg.moc"

--- kdesdk/umbrello/umbrello/dialogs/assocrolepage.cpp  #1.4:1.5
@@ -259,2 +259,4 @@ void AssocRolePage::updateObject() {
 }
 
+
+#include "assocrolepage.moc"

--- kdesdk/umbrello/umbrello/dialogs/widgetcolorspage.cpp  #1.1:1.2
@@ -40,4 +40,3 @@ void WidgetColorsPage::cancel()
  
  
- #include "widgetcolorspage.moc"
- 
\ No newline at end of file
+#include "widgetcolorspage.moc"

CVS commit by coolo: 

top_srcdir is usually not in include path, so I wonder what this is supposed
to do :)


  M +1 -1      classpropertiespage.h   1.8


--- kdesdk/umbrello/umbrello/dialogs/classpropertiespage.h  #1.7:1.8
@@ -16,5 +16,5 @@
 #define CLASS_PROPERTIES_PAGE
 
-#include "umbrello/umbrello/dialogs/classpropertiesbase.h"
+#include "classpropertiesbase.h"
 #include "dialogpage.h"

Am Freitag, 11. April 2003 15:55 schrieb Stephan Kulow:
> CVS commit by coolo:
>
> top_srcdir is usually not in include path, so I wonder what this is
> supposed to do :)
cvs annotate -r 1.7 gives:
1.6          (kalass   22-Mar-03): #include=20
"umbrello/umbrello/dialogs/classpropertiesbase.h"

cvs log gives:
revision 1.6
date: 2003/03/22 18:46:22;  author: kalass;  state: Exp;  lines: +1 -1
use path relative to top directory so that the generated header is found wh=
en=20
builddir !=3D sourcedir

Does a *clean* build of umbrello compile with your change? Here it does not:

In file included from=20
/kde/src/kdesdk/umbrello/umbrello/diagram/classwidget.cpp:19:
/kde/src/kdesdk/umbrello/umbrello/dialogs/classpropertiespage.h:18:33:=20
classpropertiesbase.h: No such file or directory


Klas

CVS commit by coolo: 

if the ui file is in SOURCES, adding the cpp file too is just confusing am_edit


  M +1 -1      Makefile.am   1.11


--- kdesdk/umbrello/umbrello/dialogs/Makefile.am  #1.10:1.11
@@ -5,4 +5,4 @@
 libdialogs_la_METASOURCES = AUTO
 
-libdialogs_la_SOURCES = overwritedialogue.cpp codegenerationwizard.cpp codegenerationoptionspage.cpp codegenerationwizardbase.ui codegenerationoptionsbase.ui selectlanguagesdlg.cpp sellanguagesbase.ui classwizard.cpp configgeneratorsbase.ui configcodegenerators.cpp notedialog.cpp activitydialog.cpp activitypage.cpp umlwidgetcolorpage.cpp umlviewdialog.cpp umloperationdialog.cpp umlattributedialog.cpp statedialog.cpp settingsdlg.cpp selectopdlg.cpp parmpropdlg.cpp diagramprintpage.cpp classpropdlg.cpp classoptionspage.cpp classopspage.cpp classgenpage.cpp classattpage.cpp assocpropdlg.cpp assocpage.cpp diagrampropertiespage.ui assocrolepage.cpp assocgenpage.cpp umltemplatedialog.cpp classtemplatepage.cpp umbrellodialog.cpp classpropertiespage.cpp classpropertiesbase.ui classpropertiesbase.cpp classattributespage.cpp classattributesbase.ui classattributesbase.cpp classoperationspage.cpp classoperationsbase.ui classoperationsbase.cpp operationpropertiesbase.ui operationpropertiesbase.cpp operationpropertiespage.cpp classdisplayoptionsbase.ui classdisplayoptionsbase.cpp widgetcolorsbase.ui widgetcolorsbase.cpp widgetcolorspage.cpp classdisplayoptionsbase.ui classdisplayoptionsbase.cpp classdisplayoptionspage.cpp
+libdialogs_la_SOURCES = overwritedialogue.cpp codegenerationwizard.cpp codegenerationoptionspage.cpp codegenerationwizardbase.ui codegenerationoptionsbase.ui selectlanguagesdlg.cpp sellanguagesbase.ui classwizard.cpp configgeneratorsbase.ui configcodegenerators.cpp notedialog.cpp activitydialog.cpp activitypage.cpp umlwidgetcolorpage.cpp umlviewdialog.cpp umloperationdialog.cpp umlattributedialog.cpp statedialog.cpp settingsdlg.cpp selectopdlg.cpp parmpropdlg.cpp diagramprintpage.cpp classpropdlg.cpp classoptionspage.cpp classopspage.cpp classgenpage.cpp classattpage.cpp assocpropdlg.cpp assocpage.cpp diagrampropertiespage.ui assocrolepage.cpp assocgenpage.cpp umltemplatedialog.cpp classtemplatepage.cpp umbrellodialog.cpp classpropertiespage.cpp classpropertiesbase.ui classattributespage.cpp classattributesbase.ui classoperationspage.cpp classoperationsbase.ui operationpropertiesbase.ui operationpropertiespage.cpp classdisplayoptionsbase.ui widgetcolorsbase.ui widgetcolorspage.cpp classdisplayoptionsbase.ui classdisplayoptionspage.cpp

A reminder: Coolo, please fix the compile problem you introduced, either by=
=20
reverting or by doing a proper fix if the former solution was wrong.

Am Freitag, 11. April 2003 19:10 schrieb Klas Kalass:
> Am Freitag, 11. April 2003 15:55 schrieb Stephan Kulow:
> > CVS commit by coolo:
> >
> > top_srcdir is usually not in include path, so I wonder what this is
> > supposed to do :)
>
> cvs annotate -r 1.7 gives:
> 1.6          (kalass   22-Mar-03): #include
> "umbrello/umbrello/dialogs/classpropertiesbase.h"
>
> cvs log gives:
> revision 1.6
> date: 2003/03/22 18:46:22;  author: kalass;  state: Exp;  lines: +1 -1
> use path relative to top directory so that the generated header is found
> when builddir !=3D sourcedir
>
> Does a *clean* build of umbrello compile with your change? Here it does
> not:
>
> In file included from
> /kde/src/kdesdk/umbrello/umbrello/diagram/classwidget.cpp:19:
> /kde/src/kdesdk/umbrello/umbrello/dialogs/classpropertiespage.h:18:33:
> classpropertiesbase.h: No such file or directory
>
>
> Klas

Am Montag, 14. April 2003 08:25 schrieb Stephan Kulow:
> Am Monday 14 April 2003 08:12 schrieb Klas Kalass:
> > A reminder: Coolo, please fix the compile problem you introduced, either
> > by reverting or by doing a proper fix if the former solution was wrong.
>
> Funny that you say that: it compiles fine for me.
Since you are the build system expert, what is the reason for the compile=20
error you snipped, then?

Please note that this only occured for a clean build and srcdir!=3Dbuilddir=
=20
here.

here is the error once again:

In file included from=20
/kde/src/kdesdk/umbrello/umbrello/diagram/classwidget.cpp:19:
/kde/src/kdesdk/umbrello/umbrello/dialogs/classpropertiespage.h:18:33:=20
classpropertiesbase.h: No such file or directory

Am Montag, 14. April 2003 08:52 schrieb Stephan Kulow:
> Am Monday 14 April 2003 08:32 schrieb Klas Kalass:
> > Am Montag, 14. April 2003 08:25 schrieb Stephan Kulow:
> > > Am Monday 14 April 2003 08:12 schrieb Klas Kalass:
> > > > A reminder: Coolo, please fix the compile problem you introduced,
> > > > either by reverting or by doing a proper fix if the former solution
> > > > was wrong.
> > >
> > > Funny that you say that: it compiles fine for me.
> >
> > Since you are the build system expert, what is the reason for the compi=
le
> > error you snipped, then?
> >
> > Please note that this only occured for a clean build and srcdir!=3Dbuil=
ddir
> > here.
>
> Still after my friday commit?
because of that commit. Before your friday commit everything was fine, beca=
use=20
of  rev 1.6.

>
> > here is the error once again:
> >
> > In file included from
> > /kde/src/kdesdk/umbrello/umbrello/diagram/classwidget.cpp:19:
> > /kde/src/kdesdk/umbrello/umbrello/dialogs/classpropertiespage.h:18:33:
> > classpropertiesbase.h: No such file or directory
>
> That the file needs to be generated?
it is, but of course in /kde/build/kdesdk/umbrello/umbrello/dialogs
and that directory is not in the include directories. Note the subdir=20
'dialogs' instead of 'diagram' and the 'build' instead of 'src'.

Cheers,
  Klas

CVS commit by jriddell: 

Fix beastie 57424:  unable to change initial parameter on an operation


  M +3 -1      umloperationdialog.cpp   1.12


--- kdesdk/umbrello/umbrello/dialogs/umloperationdialog.cpp  #1.11:1.12
@@ -287,5 +287,7 @@ void UMLOperationDialog::slotParameterPr
                         return;
                 }
-                if( !pAtt || ( pOldAtt->getTypeName() != dlg.getTypeName() ) ) {
+                if ( !pAtt || pOldAtt->getTypeName() != dlg.getTypeName() ||
+                     pOldAtt->getDoc() != dlg.getDoc() ||
+                     pOldAtt->getInitialValue() != dlg.getInitialValue() ) {
                         pOldAtt->setName( name );
                         pOldAtt->setTypeName( dlg.getTypeName() );

CVS commit by jriddell: 

Added accelarators to some dialogues and removed autocompletion from some
combo boxes because String was autocompleteing as string for Java people
Bug 55300 now closed


  M +12 -9     classgenpage.cpp   1.17
  M +6 -3      parmpropdlg.cpp   1.6
  M +8 -5      umlattributedialog.cpp   1.8
  M +5 -4      umloperationdialog.cpp   1.13
  M +5 -2      umltemplatedialog.cpp   1.4
  M +4 -2      umlwidgetcolorpage.cpp   1.8

CVS commit by coolo: 

removing more of these insane paths


  M +1 -1      classattributespage.h   1.8
  M +1 -1      classoperationspage.h   1.5


--- kdesdk/umbrello/umbrello/dialogs/classattributespage.h  #1.7:1.8
@@ -16,5 +16,5 @@
 #define CLASS_ATTRIBUTES_PAGE
 
-#include "umbrello/umbrello/dialogs/classattributesbase.h"
+#include "classattributesbase.h"
 #include <qptrlist.h>
 #include <qpixmap.h>

--- kdesdk/umbrello/umbrello/dialogs/classoperationspage.h  #1.4:1.5
@@ -11,5 +11,5 @@
 #define CLASS_OPERATIONS_PAGE
 
-#include "umbrello/umbrello/dialogs/classoperationsbase.h"
+#include "classoperationsbase.h"
 #include "dialogpage.h"

CVS commit by pfeiffer: 

use the KDE Completion facility for types (it doesn't suffer from the
problems, QComboBox' autocompletion has). 

This types combobox and its completion handling should be factored into 
a separate class somewhen, I guess


  M +16 -9     umlattributedialog.cpp   1.9
  M +9 -3      umlattributedialog.h   1.2
  M +13 -8     umloperationdialog.cpp   1.14
  M +9 -4      umloperationdialog.h   1.3

CVS commit by sstein: 

this code didn't anything, I think


  M +3 -1      classoperationspage.cpp   1.5


--- kdesdk/umbrello/umbrello/dialogs/classoperationspage.cpp  #1.4:1.5
@@ -123,4 +123,5 @@ void ClassOperationsPage::createOperatio
 void ClassOperationsPage::editSelected( )
 {kdDebug()<<"edit selected"<<endl;
+/*
         QPtrList<UMLOperation> *opList = m_umlObject->getOpList();
         UMLOperation *op(0);
@@ -134,5 +136,5 @@ void ClassOperationsPage::editSelected( 
                 QWidget *page = new OperationPropertiesPage(op,this,"operation properties");
         }
-        
+*/      
 }

CVS commit by luis: 

remove unused file classdisplayoptionspage. 
 - only pages for UML elements or generic diagram elements goes here, shape-specific pages goes in the corresponding plugin.

split the Makefile into several lines. otherwise it's impossible to have an overiew of changes


  M +11 -1     Makefile.am   1.12
  R            classdisplayoptionsbase.ui   1.1
  R            classdisplayoptionspage.cpp   1.1
  R            classdisplayoptionspage.h   1.1


--- kdesdk/umbrello/umbrello/dialogs/Makefile.am  #1.11:1.12
@@ -5,4 +5,14 @@
 libdialogs_la_METASOURCES = AUTO
 
-libdialogs_la_SOURCES = overwritedialogue.cpp codegenerationwizard.cpp codegenerationoptionspage.cpp codegenerationwizardbase.ui codegenerationoptionsbase.ui selectlanguagesdlg.cpp sellanguagesbase.ui classwizard.cpp configgeneratorsbase.ui configcodegenerators.cpp notedialog.cpp activitydialog.cpp activitypage.cpp umlwidgetcolorpage.cpp umlviewdialog.cpp umloperationdialog.cpp umlattributedialog.cpp statedialog.cpp settingsdlg.cpp selectopdlg.cpp parmpropdlg.cpp diagramprintpage.cpp classpropdlg.cpp classoptionspage.cpp classopspage.cpp classgenpage.cpp classattpage.cpp assocpropdlg.cpp assocpage.cpp diagrampropertiespage.ui assocrolepage.cpp assocgenpage.cpp umltemplatedialog.cpp classtemplatepage.cpp umbrellodialog.cpp classpropertiespage.cpp classpropertiesbase.ui classattributespage.cpp classattributesbase.ui classoperationspage.cpp classoperationsbase.ui operationpropertiesbase.ui operationpropertiespage.cpp classdisplayoptionsbase.ui widgetcolorsbase.ui widgetcolorspage.cpp classdisplayoptionsbase.ui classdisplayoptionspage.cpp
+libdialogs_la_SOURCES = overwritedialogue.cpp codegenerationwizard.cpp codegenerationoptionspage.cpp codegenerationwizardbase.ui \
+                        codegenerationoptionsbase.ui selectlanguagesdlg.cpp sellanguagesbase.ui classwizard.cpp \
+                        configgeneratorsbase.ui configcodegenerators.cpp notedialog.cpp activitydialog.cpp activitypage.cpp \
+                        umlwidgetcolorpage.cpp umlviewdialog.cpp umloperationdialog.cpp umlattributedialog.cpp \
+                        statedialog.cpp settingsdlg.cpp selectopdlg.cpp parmpropdlg.cpp diagramprintpage.cpp \
+                        classpropdlg.cpp classoptionspage.cpp classopspage.cpp classgenpage.cpp classattpage.cpp \
+                        assocpropdlg.cpp assocpage.cpp diagrampropertiespage.ui assocrolepage.cpp assocgenpage.cpp \
+                        umltemplatedialog.cpp classtemplatepage.cpp umbrellodialog.cpp classpropertiespage.cpp \
+                        classpropertiesbase.ui classattributespage.cpp classattributesbase.ui classoperationspage.cpp \
+                        classoperationsbase.ui operationpropertiesbase.ui operationpropertiespage.cpp \
+                        widgetcolorsbase.ui widgetcolorspage.cpp

CVS commit by sstein: 

fixed a compiler warning


  M +2 -2      umlwidgetcolorpage.cpp   1.9


--- kdesdk/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp  #1.8:1.9
@@ -67,10 +67,10 @@ UMLWidgetColorPage::~UMLWidgetColorPage(
 
 void UMLWidgetColorPage::slotLineButtonClicked() {
-        UMLView * pView = dynamic_cast<UMLView *>( m_pUMLWidget -> parent() );
+//      UMLView * pView = dynamic_cast<UMLView *>( m_pUMLWidget -> parent() );
         m_pLineColorB -> setColor( UMLApp::app() -> getOptionState().uiState.lineColor );
 }
 
 void UMLWidgetColorPage::slotFillButtonClicked() {
-        UMLView * pView = dynamic_cast<UMLView *>( m_pUMLWidget -> parent() );
+//      UMLView * pView = dynamic_cast<UMLView *>( m_pUMLWidget -> parent() );
         m_pFillColorB -> setColor( UMLApp::app() -> getOptionState().uiState.fillColor );
 }

CVS commit by luis: 


Added dialog pages for 
Classes, Attributes, Properties, Parameters, Templates, Interfaces, Packages
etc.
The dialog pages for most of Classes, Interfaces and Packages are close to complete. This means the class diagram is getting usable.

The refactoring assistant should be much better now, since you can change props of atts and ops instead of just "moving" them


  A            attributepropertiespage.cpp   1.1
  A            attributepropertiespage.h   1.1
  A            classtemplatesbase.ui   1.1
  A            classtemplatespage.cpp   1.1
  A            classtemplatespage.h   1.1
  A            interfacepropertiesbase.ui   1.1
  A            interfacepropertiespage.cpp   1.1
  A            interfacepropertiespage.h   1.1
  A            packagepropertiesbase.ui   1.1
  A            packagepropertiespage.cpp   1.1
  A            packagepropertiespage.h   1.1
  A            parameterpropertiesbase.ui   1.1
  A            parameterpropertiespage.cpp   1.1
  A            parameterpropertiespage.h   1.1
  A            templatepropertiesbase.ui   1.1
  A            templatepropertiespage.cpp   1.1
  A            templatepropertiespage.h   1.1
  A            umlobjectassociationsbase.ui   1.1
  A            umlobjectassociationspage.cpp   1.1
  A            umlobjectassociationspage.h   1.1
  M +13 -0     .cvsignore   1.5
  M +11 -3     Makefile.am   1.13
  M +4 -4      attributepropertiesbase.ui   1.3
  M +2 -30     classattributesbase.ui   1.3
  M +167 -90   classattributespage.cpp   1.6
  M +8 -4      classattributespage.h   1.9
  M +5 -8      classpropertiesbase.ui   1.4
  M +18 -12    classpropertiespage.cpp   1.8
  M +7 -3      classpropertiespage.h   1.9
  M +27 -10    operationpropertiesbase.ui   1.3
  M +213 -9    operationpropertiespage.cpp   1.2
  M +21 -2     operationpropertiespage.h   1.2
  M +26 -7     umbrellodialog.cpp   1.4
  M +5 -2      umbrellodialog.h   1.3
  M +33 -2     widgetcolorspage.cpp   1.3
  M +13 -3     widgetcolorspage.h   1.2
  R            classoperationsbase.ui   1.1
  R            classoperationspage.cpp   1.5
  R            classoperationspage.h   1.5

CVS commit by luis: 


These escaped the last commit.
more dialog pages


  A            classifieroperationsbase.ui   1.1
  A            classifieroperationspage.cpp   1.1
  A            classifieroperationspage.h   1.1
  M +4 -0      .cvsignore   1.6


--- kdesdk/umbrello/umbrello/dialogs/.cvsignore  #1.5:1.6
@@ -35,3 +35,7 @@
 attributepropertiesbase.h
 attributepropertiesbase.cpp
+classtemplatesbase.h
+classtemplatesbase.cpp
+classifieroperationsbase.h
+classifieroperationsbase.cpp

CVS commit by mlaurent: 

Minor fix


  M +5 -6      umlobjectassociationspage.cpp   1.2


--- kdesdk/umbrello/umbrello/dialogs/umlobjectassociationspage.cpp  #1.1:1.2
@@ -89,5 +89,4 @@ void UMLObjectAssociationsPage::saveData
 } // namespace Umbrello
 
- #include "umlobjectassociationspage.moc"
-
+#include "umlobjectassociationspage.moc"

CVS commit by pfeiffer: 

the font dialog's default text is more useful than "Umbrello font"


  M +0 -1      activitydialog.cpp   1.5
  M +0 -1      classpropdlg.cpp   1.13
  M +0 -1      settingsdlg.cpp   1.10
  M +0 -1      statedialog.cpp   1.6
  M +0 -1      umlviewdialog.cpp   1.15


--- kdesdk/umbrello/umbrello/dialogs/activitydialog.cpp  #1.4:1.5
@@ -106,5 +106,4 @@ void ActivityDialog::setupFontPage() {
         m_pChooser = new KFontChooser( (QWidget*)page, "font", false, QStringList(), false);
         m_pChooser -> setFont( m_pActivityWidget -> getFont() );
-        m_pChooser->setSampleText(i18n("Umbrello font"));
 }
 

--- kdesdk/umbrello/umbrello/dialogs/classpropdlg.cpp  #1.12:1.13
@@ -219,5 +219,4 @@ void ClassPropDlg::setupFontPage() {
         m_pChooser = new KFontChooser( (QWidget*)page, "font", false, QStringList(), false);
         m_pChooser -> setFont( m_pWidget -> getFont() );
-        m_pChooser->setSampleText(i18n("Umbrello font"));
 }
 

--- kdesdk/umbrello/umbrello/dialogs/settingsdlg.cpp  #1.9:1.10
@@ -193,5 +193,4 @@ void SettingsDlg::setupFontPage() {
         QVBox * page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts")  );
         m_FontWidgets.chooser = new KFontChooser( page, "font", false, QStringList(), false);
-        m_FontWidgets.chooser->setSampleText(i18n("Umbrello font"));
 
 }

--- kdesdk/umbrello/umbrello/dialogs/statedialog.cpp  #1.5:1.6
@@ -120,5 +120,4 @@ void StateDialog::setupFontPage() {
         m_pChooser = new KFontChooser( (QWidget*)page, "font", false, QStringList(), false);
         m_pChooser -> setFont( m_pStateWidget -> getFont() );
-        m_pChooser->setSampleText(i18n("Umbrello font"));
 }
 

--- kdesdk/umbrello/umbrello/dialogs/umlviewdialog.cpp  #1.14:1.15
@@ -106,5 +106,4 @@ void UMLViewDialog::setupFontPage() {
         m_pChooser = new KFontChooser( (QWidget*)page, "font", false, QStringList(), false);
         m_pChooser -> setFont( m_pView -> getOptionState().uiState.font );
-        m_pChooser->setSampleText(i18n("Umbrello font"));
 }

CVS commit by jriddell: 

Fix beastie 60204, classes created with New Class Wizard now
show up in the tree view


  M +1 -1      classwizard.cpp   1.4


--- kdesdk/umbrello/umbrello/dialogs/classwizard.cpp  #1.3:1.4
@@ -81,5 +81,5 @@ void ClassWizard::back() {
 void ClassWizard::accept() {
         m_pDoc -> addUMLObject( m_pClass );
-        //add signal code here for list view
+        m_pDoc->signalUMLObjectCreated(m_pClass);
         m_pDoc -> getListView() -> setLoading( false );
         QWizard::accept();

CVS commit by antlarr: 

I have a development talk next tuesday and I'd like to show umbrello,
so it's better if it compiles :) 


  M +1 -0      umlviewdialog.cpp   1.16


--- kdesdk/umbrello/umbrello/dialogs/umlviewdialog.cpp  #1.15:1.16
@@ -24,4 +24,5 @@
 #include "umlviewdialog.h"
 #include "../umlview.h"
+#include "../umldoc.h"
 #include "../classwidget.h"
 #include "diagrampropertiespage.h"

Sebastian, Antonio,

> CVS commit by antlarr: 
>
> I have a development talk next tuesday and I'd like to show umbrello,
> so it's better if it compiles :) 

I wonder how I could get umbrello compiled - I will check this.

Sorry for that,

Oliver

CVS commit by sstein: 

fix bug 57887: Property changes in a diagram are not automatically applied to all widgets in the diagram. The new properties are only used for the next widget to be added to the diagram. This is the normal GUI behaviour. On the downside, now it is impossible to change properties of different widget with one action.


  M +1 -1      umlviewdialog.cpp   1.19


--- kdesdk/umbrello/umbrello/dialogs/umlviewdialog.cpp  #1.18:1.19
@@ -144,5 +144,5 @@ void UMLViewDialog::applyPage( Page page
                         }
                         m_pOptionsPage->updateUMLWidget();
-                        m_pView->setClassWidgetOptions( m_pOptionsPage );
+                        //m_pView->setClassWidgetOptions( m_pOptionsPage );
                         m_pOptionsPage->setWidget( m_pTempWidget );
                         options.classState.showAtts = m_pTempWidget->getShowAtts();

CVS commit by sstein: 

first try to fix bug 55051: When using the class properties dialog to add a new operation/attribute, the documentation 	entered is now saved before a new operation is created or the properties of the operation/attribute are called.

Well, the fix only works if the selected attribute/operation with the new documentation isn't the last one in the attribute/operation list. If it is the last one, the documentation is still lost when clicking on the Create button. No idea why, it must be some kind of index problem...


  M +10 -0     classattpage.cpp   1.8
  M +11 -1     classopspage.cpp   1.8


--- kdesdk/umbrello/umbrello/dialogs/classopspage.cpp  #1.7:1.8
@@ -168,5 +168,5 @@ void ClassOpsPage::slotOpRightButtonPres
 }
 
-void ClassOpsPage::slotOpRightButtonClicked(QListBoxItem */*item*/, const QPoint &/*p*/) {
+void ClassOpsPage::slotOpRightButtonClicked(QListBoxItem * /*item*/, const QPoint & /*p*/) {
         if(m_pMenu) {
                 m_pMenu -> hide();
@@ -285,4 +285,9 @@ void ClassOpsPage::slotDoubleClick( QLis
 
 void ClassOpsPage::slotProperties() {
+        //save highlighted item first
+        UMLOperation* selectedOperation = m_pOpList->at( m_pOpsLB -> currentItem() );
+        if (selectedOperation)
+                selectedOperation -> setDoc( m_pDocTE -> text() );
+
         slotDoubleClick( m_pOpsLB -> item( m_pOpsLB -> currentItem() ) );
 }
@@ -298,4 +303,9 @@ void ClassOpsPage::slotDelete() {
 
 void ClassOpsPage::slotNewOperation() {
+        //save highlighted item first
+        UMLOperation* selectedOperation = m_pOpList->at( m_pOpsLB -> currentItem() );
+        if (selectedOperation)
+                selectedOperation -> setDoc( m_pDocTE -> text() );
+
         m_bSigWaiting = true;
         m_pDoc->createUMLObject(m_pConcept, Uml::ot_Operation);

--- kdesdk/umbrello/umbrello/dialogs/classattpage.cpp  #1.7:1.8
@@ -313,8 +313,18 @@ void ClassAttPage::slotDelete() {
 
 void ClassAttPage::slotProperties() {
+        //save highlighted item first
+        UMLAttribute* selectedAttribute = m_pAttList->at( m_pAttsLB->currentItem() );
+        if (selectedAttribute)
+                selectedAttribute -> setDoc( m_pDocTE -> text() );
+
         slotDoubleClick( m_pAttsLB->item( m_pAttsLB->currentItem() ) );
 }
 
 void ClassAttPage::slotNewAttribute() {
+        //save highlighted item first
+        UMLAttribute* selectedAttribute = m_pAttList->at( m_pAttsLB->currentItem() );
+        if (selectedAttribute)
+                selectedAttribute -> setDoc( m_pDocTE -> text() );
+
         m_bSigWaiting = true;
         m_pDoc->createUMLObject(m_pClass, Uml::ot_Attribute);

CVS commit by jriddell: 

Add classifierlistpage.{cpp,h}


  A            classifierlistpage.cpp   1.1 [no copyright GPL (v2+)]
  A            classifierlistpage.h   1.1 [no copyright GPL (v2+)]

CVS commit by thomas: 

removed commented out code for updateNoteWidgets


  M +0 -4      assocrolepage.cpp   1.8


--- kdesdk/umbrello/umbrello/dialogs/assocrolepage.cpp  #1.7:1.8
@@ -251,8 +251,4 @@ void AssocRolePage::updateObject() {
                 m_pAssociationWidget->setRoleBDoc(m_pDocB->text());
 
-                // needed?
-//              if(m_pUmldoc->getCurrentView())
-//                      m_pUmldoc->getCurrentView()->updateNoteWidgets();
-
         } //end if m_pAssociationWidget

CVS commit by thomas: 

changed to new codegeneration settings page AND added code viewer settings page


  M +24 -18    settingsdlg.cpp   1.11
  M +23 -16    settingsdlg.h   1.6

CVS commit by thomas: 

new umlrole diagram component for editing the UMLRole class


  A            umlroleproperties.h   1.1 [no copyright GPL (v2+)]
  A            umlrolepropertiesbase.ui   1.1

CVS commit by thomas: 

new dialogs for codeviewer tool


  A            codeviewerdialog.cpp   1.1 [GPL (v2+)]
  A            codeviewerdialog.h   1.1 [GPL (v2+)]
  A            codevieweroptionsbase.ui   1.1

CVS commit by thomas: 

new code editor component for codeviewerdialog


  A            codeeditor.cpp   1.1 [GPL (v2+)]
  A            codeeditor.h   1.1 [GPL (v2+)]

CVS commit by thomas: 

new umlrole diagram component for editing the UMLRole class


  A            umlroledialog.cpp   1.1 [no copyright GPL (v2+)]
  A            umlroledialog.h   1.1 [no copyright GPL (v2+)]
  A            umlroleproperties.cpp   1.1 [no copyright GPL (v2+)]

CVS commit by thomas: 

new codegeneration settings page 


  A            codegenerationpolicybase.ui   1.1
  A            codegenerationpolicypage.cpp   1.1 [GPL (v2+)]
  A            codegenerationpolicypage.h   1.1 [GPL (v2+)]

CVS commit by thomas: 

changes made fo rnew code generation scheme


  M +9 -6      Makefile.am   1.15
  M +468 -233  codegenerationoptionsbase.ui   1.5
  M +130 -30   codegenerationoptionspage.cpp   1.3
  M +28 -3     codegenerationoptionspage.h   1.3
  M +22 -21    codegenerationwizard.cpp   1.8
  M +4 -2      codegenerationwizard.h   1.5

CVS commit by thomas: 

changed to reflect changes in UMLOperation


  M +3 -3      classifieroperationspage.cpp   1.3


--- kdesdk/umbrello/umbrello/dialogs/classifieroperationspage.cpp  #1.2:1.3
@@ -71,5 +71,5 @@ void ClassifierOperationsPage::loadData(
         for( UMLOperation* op = list->last(); op; op = list->prev() )
         {
-                copy = new UMLOperation(this, op->getName(),-1, op->getScope(), op->getReturnType());
+                copy = new UMLOperation(m_umlObject, op->getName(),-1, op->getScope(), op->getReturnType());
                 m_opsList.prepend(copy);
                 item = new QListViewItem( m_operationsList, copy->getName() );
@@ -202,5 +202,5 @@ void ClassifierOperationsPage::moveDown(
 void ClassifierOperationsPage::createOperation( )
 {
-        UMLOperation *o = new UMLOperation(this,"new_operation",-1);
+        UMLOperation *o = new UMLOperation(m_umlObject,"new_operation",-1);
         UmbrelloDialog dialog(this, UmbrelloDialog::Swallow, "edit_operation", true, i18n("Operation properties"),
                                UmbrelloDialog::Ok | UmbrelloDialog::Cancel );

CVS commit by thomas: 

changes made fo rnew code generation scheme


  M +33 -25    operationpropertiespage.cpp   1.3
  M +1 -1      operationpropertiespage.h   1.4
  M +6 -2      selectlanguagesdlg.cpp   1.2

CVS commit by thomas: 

new code generation system dialog editor component


  A            codeviewerdialogbase.ui   1.1
  A            defaultcodegenpolicypage.cpp   1.1 [GPL (v2+)]
  A            defaultcodegenpolicypage.h   1.1 [no copyright GENERATED FILE]

CVS commit by thomas: 

new page for code viewer options


  A            codevieweroptionspage.cpp   1.1 [GPL (v2+)]
  A            codevieweroptionspage.h   1.1 [GPL (v2+)]

CVS commit by thomas: 

codeoperationdialog is not currently used.. removed from file


  M +1 -2      Makefile.am   1.16
  M +0 -1      codeviewerdialog.cpp   1.2


--- kdesdk/umbrello/umbrello/dialogs/Makefile.am  #1.15:1.16
@@ -23,6 +23,5 @@
                         classtemplatesbase.ui classtemplatespage.cpp templatepropertiesbase.ui templatepropertiespage.cpp \
                         umlobjectassociationsbase.ui umlobjectassociationspage.cpp umlroledialog.cpp umlroleproperties.cpp \
-                        widgetcolorsbase.ui widgetcolorspage.cpp codeoperationdialog.cpp codevieweroptionspage.cpp \
-                        codeoperationdialogbase.cpp
+                        widgetcolorsbase.ui widgetcolorspage.cpp codevieweroptionspage.cpp
 
 libdialogs_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic

--- kdesdk/umbrello/umbrello/dialogs/codeviewerdialog.cpp  #1.1:1.2
@@ -24,5 +24,4 @@
 #include <qregexp.h>
 
-#include "codeoperationdialog.h"
 #include "codeviewerdialog.h"
 #include "../attribute.h"

CVS commit by thomas: 

classifierlistpage entry re-inserted (was dropped when codegen dialogs were merged in )


  M +1 -1      Makefile.am   1.17


--- kdesdk/umbrello/umbrello/dialogs/Makefile.am  #1.16:1.17
@@ -20,5 +20,5 @@
                         classattributesbase.ui classattributespage.cpp classifieroperationsbase.ui classifieroperationspage.cpp \
                         operationpropertiesbase.ui operationpropertiespage.cpp attributepropertiesbase.ui attributepropertiespage.cpp \
-                        parameterpropertiesbase.ui parameterpropertiespage.cpp \
+                        parameterpropertiesbase.ui parameterpropertiespage.cpp classifierlistpage.cpp\
                         classtemplatesbase.ui classtemplatespage.cpp templatepropertiesbase.ui templatepropertiespage.cpp \
                         umlobjectassociationsbase.ui umlobjectassociationspage.cpp umlroledialog.cpp umlroleproperties.cpp \

CVS commit by thomas: 

added source code files for ui files: umlrolepropertiesbase, codevieweroptionsbase, codeviewerdialogbase, and codegenerationpolicybase


  M +8 -1      .cvsignore   1.7


--- kdesdk/umbrello/umbrello/dialogs/.cvsignore  #1.6:1.7
@@ -39,3 +39,10 @@
 classifieroperationsbase.h
 classifieroperationsbase.cpp
-
+codegenerationpolicybase.h
+codegenerationpolicybase.cpp
+codeviewerdialogbase.h
+codeviewerdialogbase.cpp
+codevieweroptionsbase.h
+codevieweroptionsbase.cpp
+umlrolepropertiesbase.h
+umlrolepropertiesbase.cpp

CVS commit by thomas: 

fix bug: output directory not being set in apply()


  M +1 -1      codegenerationoptionspage.cpp   1.4


--- kdesdk/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp  #1.3:1.4
@@ -171,5 +171,5 @@ cerr<<"Apply clicked for codegenoptionsp
                 m_parentPolicy->setCodeVerboseDocumentComments(m_forceDoc->isChecked());
                 m_parentPolicy->setCodeVerboseSectionComments(m_forceSections->isChecked());
-                m_parentPolicy->getOutputDirectory().setPath(m_outputDir->text());
+                m_parentPolicy->setOutputDirectory(QDir(m_outputDir->text()));
                 m_parentPolicy->setIncludeHeadings(m_includeHeadings->isChecked());
                 m_parentPolicy->setHeadingFileDir(m_headingsDir->text());

CVS commit by jriddell: 

Fix compile


  M +5 -5      codegenerationpolicypage.cpp   1.3


--- kdesdk/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp  #1.2:1.3
@@ -41,4 +41,4 @@ void CodeGenerationPolicyPage::apply() {
 void CodeGenerationPolicyPage::setDefaults() { }
 
-#include "codegenerationpolicypage.moc"
+#include "codegenerationpolicypage.moc.cpp"

On Friday 05 September 2003 10:41, Jonathan Riddell wrote:
> CVS commit by jriddell: 
> 
> Fix compile
> 
> 
>   M +5 -5      codegenerationpolicypage.cpp   1.3
> 
> 
> --- kdesdk/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp  #1.2:1.3
> @@ -41,4 +41,4 @@ void CodeGenerationPolicyPage::apply() {
>  void CodeGenerationPolicyPage::setDefaults() { }
>  
> -#include "codegenerationpolicypage.moc"
> +#include "codegenerationpolicypage.moc.cpp"
>  
You better revert that and call make force-reedit in that directory.

Greetings, Stephan

-- 
There may be no I in TEAM, but a M and an E.

CVS commit by jriddell: 

Revert previous change, run  `make force-reedit` instead to get it fixed.
Thanks Kulow


  M +1 -1      codegenerationpolicypage.cpp   1.4


--- kdesdk/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp  #1.3:1.4
@@ -41,4 +41,4 @@ void CodeGenerationPolicyPage::apply() {
 void CodeGenerationPolicyPage::setDefaults() { }
 
-#include "codegenerationpolicypage.moc.cpp"
+#include "codegenerationpolicypage.moc"

CVS commit by mlaurent: 

Fix includemoc


  M +2 -0      codeeditor.cpp   1.4
  M +2 -0      umlroledialog.cpp   1.3
  M +2 -0      umlroleproperties.cpp   1.2


--- kdesdk/umbrello/umbrello/dialogs/codeeditor.cpp  #1.3:1.4
@@ -75,2 +75,4 @@ void CodeEditor::init () {
 }
 
+
+#include "codeeditor.moc"

--- kdesdk/umbrello/umbrello/dialogs/umlroledialog.cpp  #1.2:1.3
@@ -59,2 +59,4 @@ void UMLRoleDialog::slotOk() {
 }
 
+
+#include "umlroledialog.moc"

--- kdesdk/umbrello/umbrello/dialogs/umlroleproperties.cpp  #1.1:1.2
@@ -105,2 +105,4 @@ void UMLRoleProperties::updateObject() {
 }
 
+
+#include "umlroleproperties.moc"

CVS commit by jriddell: 

Change layout of colour selection widgets, saves space.


  M +8 -59     codevieweroptionsbase.ui   1.3

CVS commit by thomas: 

patch to improve the highlighting of code blocks, allow the user to see 'hidden' codeblocks, menu to allow insertion, hidding/showing, cut/paste operations on codeblocks. All in all a big upgrade in codeviewer functionality


  M +167 -39   codeeditor.cpp   1.6
  M +20 -5     codeeditor.h   1.3
  M +11 -16    codeviewerdialog.cpp   1.4
  M +17 -9     codeviewerdialogbase.ui   1.3
  M +205 -22   codevieweroptionsbase.ui   1.4
  M +8 -4      codevieweroptionspage.cpp   1.4

CVS commit by thomas: 

bug fix: not saving/passing along options parameters when closing


  M +4 -4      codeviewerdialog.cpp   1.5


--- kdesdk/umbrello/umbrello/dialogs/codeviewerdialog.cpp  #1.4:1.5
@@ -93,12 +93,12 @@ bool CodeViewerDialog::close ( bool also
 
         // remember widget size for next time
-        getState().height = height() / fontMetrics().lineSpacing();
-        getState().width = width() / fontMetrics().maxWidth();
+        m_state.height = height() / fontMetrics().lineSpacing();
+        m_state.width = width() / fontMetrics().maxWidth();
 
         // remember block highlighting
-        getState().blocksAreHighlighted = m_highlightCheckBox->isChecked();
+        m_state.blocksAreHighlighted = m_highlightCheckBox->isChecked();
 
         // remember block show status
-        getState().showHiddenBlocks = m_showHiddenCodeCB->isChecked();
+        m_state.showHiddenBlocks = m_showHiddenCodeCB->isChecked();
 
         // run superclass close now

CVS commit by thomas: 

feature enhancement: added cut, paste and copy functions to right-click menu


  M +78 -14    codeeditor.cpp   1.7
  M +4 -1      codeeditor.h   1.4

CVS commit by thomas: 

fix wrong header line for kfontdialog.h.. shouldnt have path


  M +1 -1      codevieweroptionsbase.ui   1.5


--- kdesdk/umbrello/umbrello/dialogs/codevieweroptionsbase.ui  #1.4:1.5
@@ -346,5 +346,5 @@
     <customwidget>
         <class>KFontChooser</class>
-        <header location="global">/usr/include/kde/kfontdialog.h</header>
+        <header location="global">kfontdialog.h</header>
         <sizehint>
             <width>-1</width>

CVS commit by thomas: 

changes to coloriztion of operations/decl/accessor codeblocks to be umlObject


  M +19 -10    codeeditor.cpp   1.8


--- kdesdk/umbrello/umbrello/dialogs/codeeditor.cpp  #1.7:1.8
@@ -329,4 +329,5 @@ void CodeEditor::insertText (CodeClassFi
         UMLObject * parentObj = db->getParentClassField()->getParentObject();
 
+        QColor bgcolor = getState().editBlockColor;
         QString componentName = QString("");
         if(parentObj)
@@ -338,9 +339,9 @@ void CodeEditor::insertText (CodeClassFi
                         componentName = parentDocName + "::association_field(" + role->getName() + ")";
                 }
+                bgcolor = getState().umlObjectColor;
         }
 
         insertText(db->getComment(), db, parentObj,componentName);
 
-        QColor bgcolor = getState().editBlockColor;
         if(!db->getWriteOutText() && m_showHiddenBlocks)
                 bgcolor = getState().hiddenColor;
@@ -357,5 +358,5 @@ void CodeEditor::insertText (CodeMethodB
                 return;
 
-        QColor bgcolor;
+        QColor bgcolor = getState().umlObjectColor;
         QString indent = mb->getIndentationString();
         QString bodyIndent = mb->getIndentationString(mb->getIndentationLevel()+1);
@@ -365,13 +366,21 @@ void CodeEditor::insertText (CodeMethodB
         QString endText = mb->formatMultiLineText( mb->getEndMethodText(), indent, "\n");
 
-        if(dynamic_cast<CodeAccessorMethod*>(mb)) {
-                bgcolor = getState().editBlockColor;
-        } else {
-                bgcolor = getState().nonEditBlockColor;
-        }
-
         if(!mb->getWriteOutText() && m_showHiddenBlocks)
+        {
+
+                // quick check, IF CodeAccessors are hidden, we DONT show
+                // it even when requested as the hiddeness of these methods
+                // should be controled by the class fields, not the user.
+/*
+                if(mb->contentType() == CodeBlock::AutoGenerated 
+                                && dynamic_cast<CodeAccessorMethod*>(mb)) 
+                        return;
+*/
+
+                // everything else gets the 'hidden' color
                 bgcolor = getState().hiddenColor;
 
+        }
+
         QString componentName = QString("<b>parentless method\?</b>");
 
@@ -445,5 +454,5 @@ void CodeEditor::insertText(Hierarchical
                         componentName = parentDocName + "::UNKNOWN(" + parentObj->getName() + ")";
 
-                paperColor = getState().editBlockColor;
+                paperColor = getState().umlObjectColor;
         }
 
@@ -644,5 +653,5 @@ void CodeEditor::slotPasteTextBlock ( ) 
         if(m_textBlockToPaste) 
         {
-                m_parentDoc->insertTextBlock(m_textBlockToPaste, m_selectedTextBlock);
+                m_parentDoc->insertTextBlock(m_textBlockToPaste, m_selectedTextBlock)
                 m_textBlockToPaste = 0;
                 rebuildView(m_lastPara);

CVS commit by thomas: 

fix typo


  M +1 -1      codeeditor.cpp   1.9


--- kdesdk/umbrello/umbrello/dialogs/codeeditor.cpp  #1.8:1.9
@@ -653,5 +653,5 @@ void CodeEditor::slotPasteTextBlock ( ) 
         if(m_textBlockToPaste) 
         {
-                m_parentDoc->insertTextBlock(m_textBlockToPaste, m_selectedTextBlock)
+                m_parentDoc->insertTextBlock(m_textBlockToPaste, m_selectedTextBlock); 
                 m_textBlockToPaste = 0;
                 rebuildView(m_lastPara);

CVS commit by thomas: 

allow user to enter text into empty methods


  M +5 -5      codeeditor.cpp   1.11


--- kdesdk/umbrello/umbrello/dialogs/codeeditor.cpp  #1.10:1.11
@@ -221,7 +221,4 @@ void CodeEditor::insert (const QString &
 {
 
-        if(StringIsBlank(text))
-                return;
-
         // we will need this later for background coloring
         int startLine = paragraphs()-1;
@@ -366,4 +363,7 @@ void CodeEditor::insertText (CodeMethodB
         QString endText = mb->formatMultiLineText( mb->getEndMethodText(), indent, "\n");
 
+        if(body.isEmpty())
+                body = " \n";
+
         if(!mb->getWriteOutText() && m_showHiddenBlocks)
         {
@@ -413,5 +413,5 @@ void CodeEditor::insertText (CodeMethodB
         if(!StringIsBlank(startText))
                 insert(startText,mb,false,getState().fontColor,bgcolor,parentObj);
-        if(!StringIsBlank(body))
+        // always insert body of method block.
                 insert(body,mb,true,getState().fontColor,bgcolor,parentObj);
         if(!StringIsBlank(endText))

CVS commit by thomas: 

minor cleanup: remove margin..looks better without it


  M +2 -2      codeeditor.cpp   1.12


--- kdesdk/umbrello/umbrello/dialogs/codeeditor.cpp  #1.11:1.12
@@ -690,10 +690,10 @@ void CodeEditor::init ( CodeViewerDialog
 
         // set some viewability parameters
-        int margin = fontMetrics().height();
+        //int margin = fontMetrics().height();
 
         QBrush pbrush = QBrush ( getState().paperColor);
         setPaper(pbrush);
 
-        setMargin(margin);
+        // setMargin(margin);
 
 //       connect(this,SIGNAL(newLinePressed()),this,SLOT(newLinePressed()));

On Thursday 25 September 2003 03:00 pm, Oliver Kellogg wrote:
> > I dont think we need to have a
> > localID at all, and I dont see a need (currently) for the umlwidget to be
> > storing object id's as thier id's unless they are 'objectwidgets'. So
> > perhaps the object widget class is the class that has an 'objectID' field
> > (and remove terrible localID).
>
> Agreed for the case of "thick" widgets, i.e. widgets that have a
> UML counterpart.
> OTOH something like the NoteWidget (which does not have the UML
> counterpart) probably needs the ID, else we couldn't tell different
> NoteWidgets apart.

	Well, I still think we need 'widgetId' in all cases. Its just that *sometimes*
	the object id is also needed, and in those cases, we need to create a 
	subclass of umlwidget. Perhaps an abstract class called 'umlwidgetwithobject'
	that may be inherted in..e.g. a 'brief tree of inheritance might look like:

         umlWidget (has basic fields like widgetId)
              /\
               |
               |
       assocationWidget                   ownedByUMLObject (adds objectId)
               /\    (adds assocList)                  /\
                |                                                      |
                ---------------------------------------------
                                           |
                    ownedFloatTextWidget (adds text field)

	The ownedFloatTextWidget would multiply inhert from both 'floatingTextWidget' and
	'ownedByUMLObject'. The 'associationWidget' (the old 'floatingTextWidget' used
	in associations) would add in fields for association lists. While Im here, I think the 
	'widgetType' id's (like wt_Text) suck too. Each id really means its a different class (or
	should be) especially if there are fields in umlwidget (like the association list) which are
	only used for some of the types of widget.

	Well, having said all that, I wouldnt want to see a code-rewrite of this nature right now.
	The code base is unstable enough as is, we should wait to change the structure of the 
	widgets after KDE 3.2 comes out.


					-b.t.

CVS commit by sstein: 

don't use the same accel keys for different items in one menu/window


  M +2 -2      codegenerationoptionsbase.ui   1.9
  M +2 -2      operationpropertiesbase.ui   1.4


--- kdesdk/umbrello/umbrello/dialogs/operationpropertiesbase.ui  #1.3:1.4
@@ -36,5 +36,5 @@
                     </property>
                     <property name="text">
-                        <string>Name:</string>
+                        <string>Na&amp;me:</string>
                     </property>
                 </widget>
@@ -94,5 +94,5 @@
                     </property>
                     <property name="text">
-                        <string>Public</string>
+                        <string>P&amp;ublic</string>
                     </property>
                 </widget>

--- kdesdk/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui  #1.8:1.9
@@ -116,5 +116,5 @@
                                         </property>
                                         <property name="text">
-                                            <string>&amp;Browse...</string>
+                                            <string>Bro&amp;wse...</string>
                                         </property>
                                     </widget>
@@ -221,5 +221,5 @@
                                         </property>
                                         <property name="text">
-                                            <string>&amp;Overwrite</string>
+                                            <string>O&amp;verwrite</string>
                                         </property>
                                         <property name="whatsThis" stdset="0">

CVS commit by sstein: 

fix bug #65312
Patch provide by John Ratke <jratke@...>


  M +1 -0      classifierlistpage.cpp   1.5


--- kdesdk/umbrello/umbrello/dialogs/classifierlistpage.cpp  #1.4:1.5
@@ -347,4 +347,5 @@ void ClassifierListPage::slotDelete() {
         m_pDoc->removeUMLObject(selectedAttribute);
         m_pItemListLB->removeItem( m_pItemListLB->currentItem());
+        m_pOldListItem = 0;
         slotClicked(0);
 }

CVS commit by jratke: 


Remove unused variable 'name' in two functions.


  M +2 -2      classifierlistpage.cpp   1.6


--- kdesdk/umbrello/umbrello/dialogs/classifierlistpage.cpp  #1.5:1.6
@@ -167,5 +167,5 @@ void ClassifierListPage::slotClicked(QLi
                 return;
         }
-        QString name = m_pItemListLB ->currentText();
+
         UMLClassifierListItem* listItem = m_pItemList->at( m_pItemListLB->index(item) );
 
@@ -329,5 +329,5 @@ void ClassifierListPage::slotDoubleClick
         if( !item )
                 return;
-        QString name = item->text();
+
         UMLClassifierListItem* listItem  = m_pItemList->at( m_pItemListLB->index( item ) );
         if( !listItem ) {

CVS commit by thomas: 

 added safety call to codeDoc->syncronize() to insure code is really up to date


  M +3 -0      codeeditor.cpp   1.14


--- kdesdk/umbrello/umbrello/dialogs/codeeditor.cpp  #1.13:1.14
@@ -662,4 +662,7 @@ void CodeEditor::slotPasteTextBlock ( ) 
 void CodeEditor::init ( CodeViewerDialog * parentDlg, CodeDocument * parentDoc ) {
 
+        // safety to insure that we are up to date
+        parentDoc->syncronize();
+
         m_parentDlg = parentDlg;
         m_parentDoc = parentDoc;

CVS commit by jratke: 


Replace the term "attribute" with the more general term "item" for
variable names and comments.


  M +16 -14    classifierlistpage.cpp   1.7

CVS commit by okellogg: 

slotPopupMenuSel() : Call removeAssocInViewAndDoc() on mt_Delete.


  M +1 -1      assocpage.cpp   1.4


--- kdesdk/umbrello/umbrello/dialogs/assocpage.cpp  #1.3:1.4
@@ -114,5 +114,5 @@ void AssocPage::slotPopupMenuSel(int id)
         switch(id) {
                 case ListPopupMenu::mt_Delete:
-                        m_pView->removeAssoc(a);
+                        m_pView->removeAssocInViewAndDoc(a);
                         fillListBox();
                         break;

CVS commit by okellogg: 

Made the "Package name" field non-editable.


  M +1 -0      classgenpage.cpp   1.21


--- kdesdk/umbrello/umbrello/dialogs/classgenpage.cpp  #1.20:1.21
@@ -88,4 +88,5 @@ ClassGenPage::ClassGenPage(UMLDoc* d, QW
 
                 m_pPackageLE -> setText(o -> getPackage());
+                m_pPackageLE -> setEnabled(false);
                 m_pPackageL->setBuddy(m_pPackageLE);
         }

CVS commit by luis: 

code clean up :
make UMLView dialog not create a "temp" WidgetClass, but feed an OptionState structure to ClassOptionsPage and to UMLWidgetColorPage


  M +106 -2    classoptionspage.cpp   1.6
  M +23 -4     classoptionspage.h   1.5
  M +16 -31    umlviewdialog.cpp   1.21
  M +2 -4      umlviewdialog.h   1.7
  M +35 -7     umlwidgetcolorpage.cpp   1.11
  M +29 -14    umlwidgetcolorpage.h   1.4

CVS commit by okellogg: 

Files in alpha order for easier compile progress monitoring.


  M +53 -16    Makefile.am   1.19

CVS commit by binner: 

Added missing label for datatype name


  M +2 -0      classgenpage.cpp   1.23


--- kdesdk/umbrello/umbrello/dialogs/classgenpage.cpp  #1.22:1.23
@@ -43,4 +43,6 @@ ClassGenPage::ClassGenPage(UMLDoc* d, QW
         } else if (t == Uml::ot_Enum) {
                 name = i18n("Enum &name:");
+        } else if (t == Uml::ot_Datatype) {
+                name = i18n("Datatype &name:");
         } else {
                 kdWarning() << "creating class gen page for unknown widget type" << endl;

CVS commit by thomas: 

bug fix to insert codeblock/cut menu items. Now allows editing of method comments


  M +211 -96   codeeditor.cpp   1.15
  M +33 -27    codeeditor.h   1.6

CVS commit by sstein: 

remove unused variables


  M +0 -3      umlviewdialog.cpp   1.22


--- kdesdk/umbrello/umbrello/dialogs/umlviewdialog.cpp  #1.21:1.22
@@ -102,7 +102,4 @@ void UMLViewDialog::setupFontPage() {
 void UMLViewDialog::applyPage( Page page ) {
 
-        Uml::Signature_Type sig;
-        bool showSig = false;
-
         switch (page) {
                 case General:

CVS commit by jriddell: 

Improve classifierlistpage (used in class and interface preferences
for attributes and operations etc) so it all fits on in the properties
dialogue and not cut off the right hand side.


  M +20 -14    classifierlistpage.cpp   1.10

CVS commit by okellogg: 

UMLAssociation::toString(Uml::Association_Type) was renamed to
typeAsString() and was made static.


  M +1 -1      umlobjectassociationspage.cpp   1.4


--- kdesdk/umbrello/umbrello/dialogs/umlobjectassociationspage.cpp  #1.3:1.4
@@ -73,5 +73,5 @@ void UMLObjectAssociationsPage::loadData
         {
                 item = new QListViewItem(m_associationList,a->getName(),
-                                   a->toString(a->getAssocType()));
+                                 UMLAssociation::typeAsString(a->getAssocType()));
 
         }

CVS commit by okellogg: 

Use new utility UMLAssociation::typeAsString().


  M +1 -47     assocgenpage.cpp   1.7


--- kdesdk/umbrello/umbrello/dialogs/assocgenpage.cpp  #1.6:1.7
@@ -34,11 +34,4 @@ AssocGenPage::~AssocGenPage() {}
 void AssocGenPage::constructWidget() {
 
-        // bah. should be in association class, not here -b.t.
-        QString types[] = { i18n("Generalization"), i18n("Dependancy"),
-                        i18n("Aggregation"), i18n("Association"), i18n("Implementation"),
-                        i18n("Composition"), i18n("Unidirectional Association"), i18n("Realization"),
-                        i18n("State Transition")
-                        };
-
         // general configuration of the GUI
         int margin = fontMetrics().height();
@@ -81,44 +74,5 @@ void AssocGenPage::constructWidget() {
 
         // set value in association type
-        switch ( m_pAssociationWidget-> getAssocType()) {
-                case Uml::at_Generalization:
-                        m_pTypeLE -> setText(types[0]);
-                        break;
-
-                case Uml::at_Association:
-                        m_pTypeLE -> setText(types[3]);
-                        break;
-
-                case Uml::at_Aggregation:
-                        m_pTypeLE -> setText(types[2]);
-                        break;
-
-                case Uml::at_Dependency:
-                        m_pTypeLE -> setText(types[1]);
-                        break;
-
-                case Uml::at_Implementation:
-                        m_pTypeLE -> setText(types[4]);
-                        break;
-
-                case Uml::at_Composition:
-                        m_pTypeLE -> setText(types[5]);
-                        break;
-
-                case Uml::at_UniAssociation:
-                        m_pTypeLE -> setText(types[6]);
-                        break;
-
-                case Uml::at_Realization:
-                        m_pTypeLE -> setText(types[7]);
-                        break;
-
-                case Uml::at_State:
-                        m_pTypeLE -> setText(types[8]);
-                        break;
-
-                default:
-                        break;
-        } //end switch
+        m_pTypeLE->setText(UMLAssociation::typeAsString(m_assoc->getAssocType()));
 
         m_pDoc->setWordWrap(QMultiLineEdit::WidgetWidth);

CVS commit by okellogg: 

Oops, fix the fix.


  M +2 -1      assocgenpage.cpp   1.8


--- kdesdk/umbrello/umbrello/dialogs/assocgenpage.cpp  #1.7:1.8
@@ -15,4 +15,5 @@
 
 #include "assocgenpage.h"
+#include "../association.h"
 
 AssocGenPage::AssocGenPage (UMLDoc *d, QWidget *parent, AssociationWidget *assoc)
@@ -74,5 +75,5 @@ void AssocGenPage::constructWidget() {
 
         // set value in association type
-        m_pTypeLE->setText(UMLAssociation::typeAsString(m_assoc->getAssocType()));
+        m_pTypeLE->setText(UMLAssociation::typeAsString(m_pAssociationWidget->getAssocType()));
 
         m_pDoc->setWordWrap(QMultiLineEdit::WidgetWidth);

On Wed, Oct 29, 2003 at 12:29:57AM +0100, Oliver Kellogg wrote:
> CVS commit by okellogg: 
> 
> Oops, fix the fix.
> 
> 
>   M +2 -1      assocgenpage.cpp   1.8
> 
> 
> --- kdesdk/umbrello/umbrello/dialogs/assocgenpage.cpp  #1.7:1.8
> @@ -15,4 +15,5 @@
>  
>  #include "assocgenpage.h"
> +#include "../association.h"
>  
>  AssocGenPage::AssocGenPage (UMLDoc *d, QWidget *parent, AssociationWidget *assoc)
> @@ -74,5 +75,5 @@ void AssocGenPage::constructWidget() {
>  
>          // set value in association type
> -        m_pTypeLE->setText(UMLAssociation::typeAsString(m_assoc->getAssocType()));
> +        m_pTypeLE->setText(UMLAssociation::typeAsString(m_pAssociationWidget->getAssocType()));
>  
>          m_pDoc->setWordWrap(QMultiLineEdit::WidgetWidth);

Ah hah, was just about to ask if that was my fault or your fault.
Fortunatly you took the blame :)

Jonathan Riddell

CVS commit by okellogg: 

Symmetry makes for better reading.


  M +6 -5      selectopdlg.cpp   1.10


--- kdesdk/umbrello/umbrello/dialogs/selectopdlg.cpp  #1.9:1.10
@@ -15,5 +15,7 @@
 #include <qlayout.h>
 
-SelectOpDlg::SelectOpDlg(QWidget * parent, UMLClassifier * c) : KDialogBase(Plain, i18n("Select Operation"), Ok | Cancel , Ok, parent, "_SELOPDLG_", true, true) {
+SelectOpDlg::SelectOpDlg(QWidget * parent, UMLClassifier * c)
+  : KDialogBase(Plain, i18n("Select Operation"), Ok | Cancel , Ok, parent, "_SELOPDLG_", true, true)
+{
         QVBoxLayout * topLayout = new QVBoxLayout(plainPage());
 
@@ -31,10 +33,10 @@ SelectOpDlg::SelectOpDlg(QWidget * paren
         mainLayout -> addWidget(m_pSeqLE, 0, 1);
 
-        m_pOpCB = new QComboBox(m_pOpGB);
-        mainLayout -> addWidget(m_pOpCB, 1, 1);
-
         m_pOpRB = new QRadioButton(i18n("Class operation:"), m_pOpGB);
         mainLayout -> addWidget(m_pOpRB, 1, 0);
 
+        m_pOpCB = new QComboBox(m_pOpGB);
+        mainLayout -> addWidget(m_pOpCB, 1, 1);
+
         m_pCustomRB = new QRadioButton(i18n("Custom operation:"), m_pOpGB);
         mainLayout -> addWidget(m_pCustomRB, 2, 0);
@@ -52,5 +54,4 @@ SelectOpDlg::SelectOpDlg(QWidget * paren
         UMLClassifierListItem* obj=0;
         for(obj=list -> first();obj != 0;obj=list -> next()) {
-                obj -> toString(Uml::st_SigNoScope);
                 m_pOpCB -> insertItem(obj -> toString(Uml::st_SigNoScope));
         }

CVS commit by okellogg: 

Add PkgContentsPage.


  A            pkgcontentspage.cpp   1.1 [no copyright GPL (v2+)]
  A            pkgcontentspage.h   1.1 [no copyright GPL (v2+)]
  M +1 -0      Makefile.am   1.21
  M +17 -6     classpropdlg.cpp   1.17
  M +2 -0      classpropdlg.h   1.8


--- kdesdk/umbrello/umbrello/dialogs/Makefile.am  #1.20:1.21
@@ -43,4 +43,5 @@
 overwritedialogue.cpp \
 packagepropertiespage.cpp \
+pkgcontentspage.cpp \
 parameterpropertiespage.cpp \
 parmpropdlg.cpp \

--- kdesdk/umbrello/umbrello/dialogs/classpropdlg.cpp  #1.16:1.17
@@ -17,4 +17,5 @@
 #include "classgenpage.h"
 #include "classifierlistpage.h"
+#include "pkgcontentspage.h"
 #include "assocpage.h"
 #include "classoptionspage.h"
@@ -27,5 +28,6 @@
 #include "../umlview.h"
 
-ClassPropDlg::ClassPropDlg(QWidget *parent, UMLObject * c, int pageNum, bool assoc) : KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help,
+ClassPropDlg::ClassPropDlg(QWidget *parent, UMLObject * c, int pageNum, bool assoc)
+  : KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help,
         Ok, parent, "_CLASSDLG_", true, true) {
         m_pWidget = 0;
@@ -44,5 +46,6 @@ ClassPropDlg::ClassPropDlg(QWidget *pare
 }
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-ClassPropDlg::ClassPropDlg(QWidget *parent, ObjectWidget * o) : KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help,
+ClassPropDlg::ClassPropDlg(QWidget *parent, ObjectWidget * o)
+  : KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help,
         Ok, parent, "_CLASSDLG_", true, true) {
         m_pWidget = o;
@@ -72,5 +75,6 @@ ClassPropDlg::ClassPropDlg(QWidget *pare
 }
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-ClassPropDlg::ClassPropDlg(QWidget *parent, UMLWidget * w) : KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help,
+ClassPropDlg::ClassPropDlg(QWidget *parent, UMLWidget * w)
+  : KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help,
         Ok, parent, "_CLASSDLG_", true, true) {
         m_pWidget = w;
@@ -205,4 +209,11 @@ void ClassPropDlg::setupPages(UMLObject 
                 connect(m_pEnumLiteralPage, SIGNAL(sigUpdateChildObject(int)),
                         this, SLOT(slotUpdateChildObject(int)));
+        }
+        if (c->getBaseType() == Uml::ot_Package ) {
+                // Set up containment page.
+                QFrame* newPage = addPage( i18n("Contents"), i18n("Contents Settings"), DesktopIcon("misc") );
+                m_pPkgContentsPage = new PkgContentsPage(newPage, (UMLPackage*)(c));
+                QHBoxLayout* contentsLayout = new QHBoxLayout(newPage);
+                contentsLayout->addWidget(m_pPkgContentsPage);
         }
         if (assoc) {

--- kdesdk/umbrello/umbrello/dialogs/classpropdlg.h  #1.7:1.8
@@ -19,4 +19,5 @@ class ClassifierListPage;
 class ClassOpsPage;
 class ClassTemplatePage;
+class PkgContentsPage;
 class AssocPage;
 class ClassOptionsPage;
@@ -104,4 +105,5 @@ private:
         ClassifierListPage* m_pTemplatePage;
         ClassifierListPage* m_pEnumLiteralPage;
+        PkgContentsPage * m_pPkgContentsPage;
         AssocPage * m_pAssocPage;
         ClassOptionsPage * m_pOptionsPage;

On Sun, Nov 02, 2003 at 06:38:34PM +0100, Oliver Kellogg wrote:
> +                QFrame* newPage = addPage( i18n("Contents"), i18n("Contents Settings"), DesktopIcon("misc") );

Remember that KDE is in a feature and string freeze.  While this could
probably be argued to be a bug fix or completeing a feature the string
addition is likely to cause complaints.

Release Countdown: KDE 3.2 due on 8th December but I think the last
code commit is 24th November.

Jonathan Riddell

CVS commit by sstein: 

- fix same shortcut keys 
bug #67209


  M +2 -2      umloperationdialog.cpp   1.21


--- kdesdk/umbrello/umbrello/dialogs/umloperationdialog.cpp  #1.20:1.21
@@ -83,5 +83,5 @@ void UMLOperationDialog::setupDialog() {
         scopeLayout -> setMargin(margin);
 
-        m_pPublicRB = new QRadioButton(i18n("&Public"), m_pScopeBG);
+        m_pPublicRB = new QRadioButton(i18n("P&ublic"), m_pScopeBG);
         scopeLayout -> addWidget(m_pPublicRB);
 
@@ -102,5 +102,5 @@ void UMLOperationDialog::setupDialog() {
 
         KButtonBox* buttonBox = new KButtonBox(m_pParmsGB);
-        buttonBox->addButton( i18n("&New Parameter..."), this, SLOT(slotNewParameter()) );
+        buttonBox->addButton( i18n("Ne&w Parameter..."), this, SLOT(slotNewParameter()) );
         m_pDeleteButton = buttonBox->addButton( i18n("&Delete"), this, SLOT(slotDeleteParameter()) );
         m_pPropertiesButton = buttonBox->addButton( i18n("&Properties"), this,

CVS commit by sstein: 

fix bug #66997


  M +1 -1      settingsdlg.cpp   1.16


--- kdesdk/umbrello/umbrello/dialogs/settingsdlg.cpp  #1.15:1.16
@@ -215,5 +215,5 @@ void SettingsDlg::setupCodeGenPage(CodeG
         QVBox * page = addVBoxPage( i18n("Code Generation"), i18n("Code Generation Settings"), DesktopIcon( "source") );
         m_pCodeGenPage = new CodeGenerationOptionsPage(gen, ldict, activeLanguage, page);
-        connect( m_pCodeGenPage, SIGNAL(languageChanged()), this, SLOT(slotOk()) );
+        connect( m_pCodeGenPage, SIGNAL(languageChanged()), this, SLOT(slotApply()) );
 }

CVS commit by sstein: 

since code generators are linked in, those setting pages are not needed anymore


  M +0 -2      Makefile.am   1.22
  R            configgeneratorsbase.ui   1.2
  R            sellanguagesbase.ui   1.4


--- kdesdk/umbrello/umbrello/dialogs/Makefile.am  #1.21:1.22
@@ -11,10 +11,8 @@
                         codeviewerdialogbase.ui \
                         codevieweroptionsbase.ui \
-                        configgeneratorsbase.ui \
                         diagrampropertiespage.ui \
                         interfacepropertiesbase.ui \
                         packagepropertiesbase.ui \
                         parameterpropertiesbase.ui \
-                        sellanguagesbase.ui \
                         umlobjectassociationsbase.ui \
                         umlrolepropertiesbase.ui \

CVS commit by thomas: 

fix bug 69332 : code gen wizard now changes language correctly


  M +11 -4     codegenerationwizard.cpp   1.12
  M +4 -0      codegenerationwizard.h   1.7


--- kdesdk/umbrello/umbrello/dialogs/codegenerationwizard.cpp  #1.11:1.12
@@ -49,4 +49,5 @@ CodeGenerationWizard::CodeGenerationWiza
         m_CodeGenerationOptionsPage = new CodeGenerationOptionsPage(doc->getCurrentCodeGenerator(), ldict,
                                                                     activeLanguage, this);
+        connect( m_CodeGenerationOptionsPage, SIGNAL(languageChanged()), this, SLOT(changeLanguage()) );
 
         insertPage(m_CodeGenerationOptionsPage, i18n("Code Generation Options"), 1);
@@ -106,6 +107,4 @@ void CodeGenerationWizard::generateCode(
         CodeGenerator* codeGenerator = m_app->getGenerator();
 
-kdDebug()<<" WIZARD: gets generator:"<<codeGenerator<<endl;
-
         if (codeGenerator) {
 
@@ -123,5 +122,4 @@ kdDebug()<<" WIZARD: gets generator:"<<c
                         cList.append(concept);
                 }
-kdDebug()<<" WIZARD: Writing code to CFile"<<endl;
                 codeGenerator->writeCodeToFile(cList);
                 finishButton()->setText(i18n("Finish"));
@@ -135,5 +133,5 @@ void CodeGenerationWizard::classGenerate
         QListViewItem* item = m_statusList->findItem( concept->getName(), 0 );
         if( !item ) {
-                kdDebug()<<"GenerationStatusPage::Error finding class in list view"<<endl;
+                kdError()<<"GenerationStatusPage::Error finding class in list view"<<endl;
         } else if (generated) {
                 item->setText( 1, i18n("Code Generated") );
@@ -244,3 +242,12 @@ CodeGenerator* CodeGenerationWizard::gen
 }
 
+// when we change language, we need to update the codegenoptions page
+// language-dependent stuff. THe way to do this is to call its "apply" method.
+void CodeGenerationWizard::changeLanguage() 
+{
+        m_app->setActiveLanguage( m_CodeGenerationOptionsPage->getCodeGenerationLanguage() );
+        m_CodeGenerationOptionsPage->setCodeGenerator(m_doc->getCurrentCodeGenerator());
+        m_CodeGenerationOptionsPage->apply();
+}
+
 #include "codegenerationwizard.moc"

--- kdesdk/umbrello/umbrello/dialogs/codegenerationwizard.h  #1.6:1.7
@@ -57,4 +57,8 @@ protected slots:
         void classGenerated(UMLClassifier* concept, bool generated);
 
+private slots:
+        void changeLanguage();
+
+
 private:
         CodeGenerator* generator();

CVS commit by mlaurent: 

Fix default value 'disable "select auto-save" combobox' when "enable autosave" is unchecked


  M +3 -2      settingsdlg.cpp   1.18


--- kdesdk/umbrello/umbrello/dialogs/settingsdlg.cpp  #1.17:1.18
@@ -256,4 +256,5 @@ void SettingsDlg::slotDefault() {
                         m_GeneralWidgets.autosaveCB -> setChecked( false );
                         m_GeneralWidgets.timeKB -> setCurrentItem( 0 );
+                        m_GeneralWidgets.timeKB->setEnabled( false );
                         m_GeneralWidgets.logoCB -> setChecked( true );
                         m_GeneralWidgets.tipCB -> setChecked( true );

CVS commit by mlaurent: 

Enable/disable ok button when name is empty


  M +7 -0      umlattributedialog.cpp   1.12
  M +1 -0      umlattributedialog.h   1.4
  M +11 -2     umloperationdialog.cpp   1.22
  M +4 -2      umloperationdialog.h   1.6


--- kdesdk/umbrello/umbrello/dialogs/umlattributedialog.cpp  #1.11:1.12
@@ -126,4 +126,11 @@ void UMLAttributeDialog::setupDialog() {
 
         m_pNameLE->setFocus();
+        connect( m_pNameLE, SIGNAL( textChanged ( const QString & ) ), SLOT( slotNameChanged( const QString & ) ) );
+        slotNameChanged(m_pNameLE->text() );
+}
+
+void UMLAttributeDialog::slotNameChanged( const QString &_text )
+{
+    enableButtonOK( !_text.isEmpty() );
 }
 

--- kdesdk/umbrello/umbrello/dialogs/umlattributedialog.h  #1.3:1.4
@@ -74,4 +74,5 @@ public slots:
          */
         void slotOk();
+    void slotNameChanged( const QString & );
 };
 

--- kdesdk/umbrello/umbrello/dialogs/umloperationdialog.cpp  #1.21:1.22
@@ -178,6 +178,15 @@ void UMLOperationDialog::setupDialog() {
 
         m_pNameLE->setFocus();
+        connect( m_pNameLE, SIGNAL( textChanged ( const QString & ) ), SLOT( slotNameChanged( const QString & ) ) );
+        slotNameChanged(m_pNameLE->text() );
+
 }
 
+void UMLOperationDialog::slotNameChanged( const QString &_text )
+{
+    enableButtonOK( !_text.isEmpty() );
+}
+
+
 void UMLOperationDialog::slotParmRightButtonPressed(QListBoxItem *item, const QPoint &p) {
         ListPopupMenu::Menu_Type type = ListPopupMenu::mt_Undefined;

--- kdesdk/umbrello/umbrello/dialogs/umloperationdialog.h  #1.5:1.6
@@ -115,4 +115,6 @@ public slots:
          */
         void slotOk();
+    void slotNameChanged( const QString & );
+
 };

CVS commit by mlaurent: 

Fix reverselayout


  M +8 -1      codegenerationwizard.cpp   1.13


--- kdesdk/umbrello/umbrello/dialogs/codegenerationwizard.cpp  #1.12:1.13
@@ -23,4 +23,5 @@
 #include <klocale.h>
 #include <kmessagebox.h>
+#include <qapplication.h>
 
 #include "codegenerationwizard.h"
@@ -71,4 +72,10 @@ CodeGenerationWizard::CodeGenerationWiza
         finishButton()->setText(i18n("&Generate"));
         connect(finishButton(),SIGNAL(clicked()),this,SLOT(generateCode()));
+        if ( QApplication::reverseLayout() )
+        {
+            QPixmap tmpPixmap( *m_addButton->pixmap() );
+            m_addButton->setPixmap(*m_removeButton->pixmap());
+            m_removeButton->setPixmap(tmpPixmap);
+        }
 }

CVS commit by thomas: 

fix bug: association role dialog-- connected umlobject name appears now


  M +18 -2     assocrolepage.cpp   1.11


--- kdesdk/umbrello/umbrello/dialogs/assocrolepage.cpp  #1.10:1.11
@@ -15,4 +15,6 @@
 
 #include "assocrolepage.h"
+#include "../association.h"
+#include "../umlrole.h"
 
 AssocRolePage::AssocRolePage (UMLDoc *d, QWidget *parent, AssociationWidget *assoc)
@@ -37,4 +39,18 @@ AssocRolePage::~AssocRolePage() {}
 void AssocRolePage::constructWidget() {
 
+        // underlying roles and objects
+        UMLRole * roleA = m_pAssociationWidget->getAssociation()->getUMLRoleA();
+        UMLRole * roleB = m_pAssociationWidget->getAssociation()->getUMLRoleB();
+        UMLObject * objA = roleA->getObject();
+        UMLObject * objB = roleB->getObject();
+        QString nameA = objA->getName();
+        QString nameB = objB->getName();
+        QString titleA = i18n("Role A Properties");
+        QString titleB = i18n("Role B Properties"); 
+        if(!nameA.isEmpty())
+                titleA.append( "("+nameA+")"); 
+        if(!nameB.isEmpty())
+                titleB.append( "("+nameB+")"); 
+
         // general configuration of the GUI
         int margin = fontMetrics().height();
@@ -52,6 +68,6 @@ void AssocRolePage::constructWidget() {
         QGroupBox *docAGB = new QGroupBox(this);
         QGroupBox *docBGB = new QGroupBox(this);
-        propsAGB -> setTitle(i18n("Role A Properties"));
-        propsBGB -> setTitle(i18n("Role B Properties"));
+        propsAGB -> setTitle(titleA);
+        propsBGB -> setTitle(titleB);
         docAGB -> setTitle(i18n("Documentation"));
         docBGB -> setTitle(i18n("Documentation"));

CVS commit by okellogg: 

constructWidget: Simplify, improve robustness.


  M +4 -10     assocrolepage.cpp   1.12


--- kdesdk/umbrello/umbrello/dialogs/assocrolepage.cpp  #1.11:1.12
@@ -15,6 +15,4 @@
 
 #include "assocrolepage.h"
-#include "../association.h"
-#include "../umlrole.h"
 
 AssocRolePage::AssocRolePage (UMLDoc *d, QWidget *parent, AssociationWidget *assoc)
@@ -40,10 +38,6 @@ void AssocRolePage::constructWidget() {
 
         // underlying roles and objects
-        UMLRole * roleA = m_pAssociationWidget->getAssociation()->getUMLRoleA();
-        UMLRole * roleB = m_pAssociationWidget->getAssociation()->getUMLRoleB();
-        UMLObject * objA = roleA->getObject();
-        UMLObject * objB = roleB->getObject();
-        QString nameA = objA->getName();
-        QString nameB = objB->getName();
+        QString nameA = m_pAssociationWidget->getRoleNameA();
+        QString nameB = m_pAssociationWidget->getRoleNameB();
         QString titleA = i18n("Role A Properties");
         QString titleB = i18n("Role B Properties"); 
@@ -96,5 +90,5 @@ void AssocRolePage::constructWidget() {
         m_pRoleALE = new QLineEdit(propsAGB);
         propsALayout -> addWidget(m_pRoleALE, 0, 1);
-        m_pRoleALE -> setText(m_pAssociationWidget->getRoleNameA());
+        m_pRoleALE -> setText(nameA);
 
         // Multi A
@@ -150,5 +144,5 @@ void AssocRolePage::constructWidget() {
         m_pRoleBLE = new QLineEdit(propsBGB);
         propsBLayout -> addWidget(m_pRoleBLE, 0, 1);
-        m_pRoleBLE -> setText( m_pAssociationWidget->getRoleNameB() );
+        m_pRoleBLE -> setText(nameB);
 
         // Multi B

CVS commit by sstein: 

fix bug #73042: code generation ignores output directory

In fact, it ignored all settings before code generation was started. I also re-added the check, if the output directory exists and is writable. I will backport this change to KDE 3.2 in the next days. Please have a look at the function CodeGenerationWizard::generator()! What was the purpose of this function? Can we remove it completely???


  M +18 -14    codegenerationwizard.cpp   1.14


--- kdesdk/umbrello/umbrello/dialogs/codegenerationwizard.cpp  #1.13:1.14
@@ -157,14 +157,19 @@ void CodeGenerationWizard::populateStatu
 void CodeGenerationWizard::showPage(QWidget *page) {
         if (indexOf(page) == 2)
-        {//before advancint to the final page, check that the output directory exists and is
-         //writtable
-/*
-// FIX, needed?
-                SettingsDlg::CodeGenState codegenState;
-                ((CodeGenerationOptionsPage*)QWizard::page(1))->state(codegenState);
-                QFileInfo info(codegenState.outputDir);
+        {
+                // first save the settings to the selected generator policy
+                ((CodeGenerationOptionsPage*)QWizard::page(1))->apply();
+
+                // before going on to the final page, check that the output directory exists and is
+                // writable
+
+                // get the policy for the current code generator
+                CodeGenerationPolicy *policy = m_doc->getCurrentCodeGenerator()->getPolicy();
+                
+                // get the output directory path
+                QFileInfo info(policy->getOutputDirectory().absPath());
                 if(!info.exists())
                 {
-                        if(KMessageBox::questionYesNo(this,
+                        if (KMessageBox::questionYesNo(this,
                         i18n("The directory %1 does not exist. Do you want to create it now?").arg(info.filePath()),
                         i18n("Output Directoy Does Not Exist")) == KMessageBox::Yes)
@@ -185,6 +190,6 @@ void CodeGenerationWizard::showPage(QWid
                                 return;
                         }
-                }
-                {//directory exists.. make sure we can write to it
+                } else {
+                //directory exists.. make sure we can write to it
                         if(!info.isWritable())
                         {
@@ -202,5 +207,4 @@ void CodeGenerationWizard::showPage(QWid
                         }
                 }
-*/
         }
                 populateStatusList();

CVS commit by sstein: 

fix bug #73278: changing the name of a state causes it to be drawn in bold

This now works in HEAD, I will backport the fix to KDE 3.2 in some days, so
that the problem will be solved with KDE 3.2.1. When I have done this, I will
close the bug report.


  M +3 -0      statedialog.cpp   1.7


--- kdesdk/umbrello/umbrello/dialogs/statedialog.cpp  #1.6:1.7
@@ -68,4 +68,5 @@ void StateDialog::applyPage( Page page )
                 case ColorPage:
                         m_pColorPage -> updateUMLWidget();
+                        break;
 
                 case FontPage:
@@ -117,4 +118,6 @@ void StateDialog::setupGeneralPage() {
 
 void StateDialog::setupFontPage() {
+        if ( !m_pStateWidget )
+                return;
         QVBox * page = addVBoxPage( i18n("Font"), i18n("Font Settings"), DesktopIcon( "fonts")  );
         m_pChooser = new KFontChooser( (QWidget*)page, "font", false, QStringList(), false);

CVS commit by coles: 



Corrected typo (line 180).


  M +1 -1      codegenerationwizard.cpp   1.17


--- kdesdk/umbrello/umbrello/dialogs/codegenerationwizard.cpp  #1.16:1.17
@@ -178,5 +178,5 @@ void CodeGenerationWizard::showPage(QWid
                                 if(!dir.mkdir(info.filePath()))
                                 {
-                                        KMessageBox::sorry(this,i18n("The directory could not be created.\nPlease make sure you have write access to its parent directory or select valid directory."),
+                                        KMessageBox::sorry(this,i18n("The directory could not be created.\nPlease make sure you have write access to its parent directory or select another, valid, directory."),
                                         i18n("Error Creating Directory"));
                                         return;

CVS commit by okellogg: 

getParmKind(): New.


  M +11 -8     parmpropdlg.cpp   1.9
  M +20 -12    parmpropdlg.h   1.4


--- kdesdk/umbrello/umbrello/dialogs/parmpropdlg.cpp  #1.8:1.9
@@ -154,13 +154,16 @@ ParmPropDlg::ParmPropDlg(QWidget * paren
 }
 
-void ParmPropDlg::slotOk() {
-        if (m_pAtt != NULL) {
+Uml::Parameter_Kind ParmPropDlg::getParmKind() {
+        Uml::Parameter_Kind pk = Uml::pk_In;
                 if (m_pOut->isChecked())
-                        m_pAtt->setParmKind(Uml::pk_Out);
+                pk = Uml::pk_Out;
                 else if (m_pInOut->isChecked())
-                        m_pAtt->setParmKind(Uml::pk_InOut);
-                else
-                        m_pAtt->setParmKind(Uml::pk_In);
-        }
+                pk = Uml::pk_InOut;
+        return pk;
+}
+
+void ParmPropDlg::slotOk() {
+        if (m_pAtt != NULL)
+                m_pAtt->setParmKind( getParmKind() );
         accept();
 }

--- kdesdk/umbrello/umbrello/dialogs/parmpropdlg.h  #1.3:1.4
@@ -83,4 +83,12 @@ public:
         }
 
+        /**
+         * Return the kind of the parameter (in, out, or inout).
+         *
+         * @return      The Uml::Parameter_Kind corresponding to
+         *              the selected "Kind" radiobutton.
+         */
+        Uml::Parameter_Kind getParmKind();
+
 public slots:
         void slotOk();

CVS commit by okellogg: 

No need for the QHBoxLayout *kindLayout being a member.
Put the Kind button group beneath the Properties group (thanks Jon).


  M +17 -20    parmpropdlg.cpp   1.10
  M +0 -1      parmpropdlg.h   1.5


--- kdesdk/umbrello/umbrello/dialogs/parmpropdlg.cpp  #1.9:1.10
@@ -37,24 +37,4 @@ ParmPropDlg::ParmPropDlg(QWidget * paren
         topLayout -> setMargin(margin);
 
-        m_pKind =  new QButtonGroup(i18n("Kind"), plainPage());
-        m_pKind->setExclusive(true);
-        m_pKindLayout = new QHBoxLayout( m_pKind );
-        m_pKindLayout->setMargin(margin);
-        // m_pKind->setTitle("Kind");
-        //m_pKind->setColumnLayout(0, Qt::Vertical );
-        //m_pKind->layout()->setSpacing( 6 );
-        //m_pKindLayout->setAlignment( Qt::AlignTop );
-
-        m_pIn =  new QRadioButton( "in", m_pKind );
-        m_pKindLayout->addWidget( m_pIn );
-
-        m_pInOut =  new QRadioButton( "inout", m_pKind );
-        m_pKindLayout->addWidget( m_pInOut );
-
-        m_pOut =  new QRadioButton( "out", m_pKind );
-        m_pKindLayout->addWidget( m_pOut );
-
-        topLayout -> addWidget(m_pKind);
-
         m_pParmGB = new QGroupBox(i18n("Properties"), plainPage());
         topLayout -> addWidget(m_pParmGB);
@@ -87,4 +67,21 @@ ParmPropDlg::ParmPropDlg(QWidget * paren
         m_pInitialL->setBuddy(m_pInitialLE);
 
+        m_pKind =  new QButtonGroup(i18n("Kind"), plainPage());
+        m_pKind->setExclusive(true);
+
+        QHBoxLayout * kindLayout = new QHBoxLayout( m_pKind );
+        kindLayout->setMargin(margin);
+
+        m_pIn =  new QRadioButton( "in", m_pKind );
+        kindLayout->addWidget( m_pIn );
+
+        m_pInOut =  new QRadioButton( "inout", m_pKind );
+        kindLayout->addWidget( m_pInOut );
+
+        m_pOut =  new QRadioButton( "out", m_pKind );
+        kindLayout->addWidget( m_pOut );
+
+        topLayout -> addWidget(m_pKind);
+
         m_pDocGB = new QGroupBox(i18n("Documentation"), plainPage());
         QHBoxLayout * docLayout = new QHBoxLayout(m_pDocGB);

--- kdesdk/umbrello/umbrello/dialogs/parmpropdlg.h  #1.4:1.5
@@ -96,5 +96,4 @@ public slots:
 private:
         QGroupBox * m_pParmGB, * m_pDocGB;
-        QHBoxLayout *m_pKindLayout;
         QButtonGroup *m_pKind;
         QRadioButton * m_pIn, * m_pOut, *m_pInOut;

CVS commit by okellogg: 

Remove unneeded files.


  M +0 -4      Makefile.am   1.23
  R            attributepropertiesbase.ui   1.3
  R            attributepropertiespage.cpp   1.1
  R            attributepropertiespage.h   1.2
  R            classattributesbase.ui   1.3
  R            classattributespage.cpp   1.11
  R            classattributespage.h   1.11
  R            classifieroperationsbase.ui   1.3
  R            classifieroperationspage.cpp   1.6
  R            classifieroperationspage.h   1.3
  R            classtemplatesbase.ui   1.3
  R            classtemplatespage.cpp   1.5
  R            classtemplatespage.h   1.3
  R            operationpropertiesbase.ui   1.4
  R            operationpropertiespage.cpp   1.6
  R            operationpropertiespage.h   1.5
  R            parameterpropertiesbase.ui   1.3
  R            parameterpropertiespage.cpp   1.1
  R            parameterpropertiespage.h   1.2
  R            umlobjectassociationsbase.ui   1.1
  R            umlobjectassociationspage.cpp   1.4
  R            umlobjectassociationspage.h   1.2
  R            widgetcolorsbase.ui   1.2
  R            widgetcolorspage.cpp   1.3
  R            widgetcolorspage.h   1.3


--- kdesdk/umbrello/umbrello/dialogs/Makefile.am  #1.22:1.23
@@ -14,6 +14,4 @@
                         interfacepropertiesbase.ui \
                         packagepropertiesbase.ui \
-                        parameterpropertiesbase.ui \
-                        umlobjectassociationsbase.ui \
                         umlrolepropertiesbase.ui \
 activitydialog.cpp \
@@ -42,5 +40,4 @@
 packagepropertiespage.cpp \
 pkgcontentspage.cpp \
-parameterpropertiespage.cpp \
 parmpropdlg.cpp \
 selectopdlg.cpp \
@@ -48,5 +45,4 @@
 statedialog.cpp \
 umlattributedialog.cpp \
-umlobjectassociationspage.cpp \
 umloperationdialog.cpp \
 umltemplatedialog.cpp \

CVS commit by thomas: 

ugh. A bug in the Qt interaction between QTextEdit and Menu can sometimes trigger a clear() call of the text area after the popup menu is destroyed. The workaround is to disable the behavior by blocking the destroy signal from the menu.


  M +8 -4      codeeditor.cpp   1.17


--- kdesdk/umbrello/umbrello/dialogs/codeeditor.cpp  #1.16:1.17
@@ -649,13 +649,17 @@ QPopupMenu * CodeEditor::createPopupMenu
         m_lastPara = paragraphAt(pos);
 
-//      return QTextEdit::createPopupMenu ( pos );
         QPopupMenu * menu = new QPopupMenu(this);
+        // ugh. A bug in the Qt interaction between QTextEdit and Menu
+        // can sometimes trigger a clear() call of the text area after
+        // the popup menu is destroyed. The workaround is to disable
+        // the behavior by blocking the destroy signal from the menu.
+        menu->blockSignals(true);
 
         if (m_selectedTextBlock)
         {
                 if(tb->getWriteOutText())
-                        menu->insertItem("Hide",this,SLOT(slotChangeSelectedBlockView()), Key_H , 0);
+                        menu->insertItem("Hide",this,SLOT(slotChangeSelectedBlockView()), Key_H, 0);
                 else
-                        menu->insertItem("Show",this,SLOT(slotChangeSelectedBlockView()), Key_H , 0);
+                        menu->insertItem("Show",this,SLOT(slotChangeSelectedBlockView()), Key_S, 0);
 
                 CodeBlockWithComments * cb = dynamic_cast<CodeBlockWithComments*>(tb);
@@ -664,5 +668,5 @@ QPopupMenu * CodeEditor::createPopupMenu
                                 menu->insertItem("Hide Comment",this,SLOT(slotChangeSelectedBlockCommentView()), CTRL+Key_H, 1);
                         else
-                                menu->insertItem("Show Comment",this,SLOT(slotChangeSelectedBlockCommentView()), CTRL+Key_H, 1);
+                                menu->insertItem("Show Comment",this,SLOT(slotChangeSelectedBlockCommentView()), CTRL+Key_S, 1);
                 menu->insertSeparator();

CVS commit by okellogg: 

Remove "using namespace Settings" from settingsdlg.h.
Thanks to Raymond Bosman for motivating this.


  M +23 -23    settingsdlg.cpp   1.22
  M +5 -7      settingsdlg.h   1.13

CVS commit by thomas: 

bug fix: codeeditor has 2 problems : 1. only first edit was being saved by the editor. 2. Incorrect indentation being passed to unformat comment block text in some cases. Both issues fixed


  M +6 -4      codeeditor.cpp   1.19


--- kdesdk/umbrello/umbrello/dialogs/codeeditor.cpp  #1.18:1.19
@@ -697,4 +697,5 @@ QPopupMenu * CodeEditor::createPopupMenu
                         menu->setItemEnabled (4, false);
 
+                m_selectedTextBlock->insertCodeEditMenuItems(menu);
         }
 
@@ -814,5 +815,6 @@ void CodeEditor::updateTextBlockFromText
 
                 CodeMethodBlock * cmb = dynamic_cast<CodeMethodBlock*>(block);
-                QString baseIndent = block->getNewEditorLine(block->getIndentationLevel()+(cmb ? 1 : 0));
+                //QString baseIndent = block->getNewEditorLine(block->getIndentationLevel()+(cmb ? 1 : 0));
+                QString baseIndent = block->getIndentationString(block->getIndentationLevel()+(cmb ? 1 : 0));
 
                 TextBlockInfo *info = (*m_tbInfoMap)[block];
@@ -894,5 +896,5 @@ void CodeEditor::cursorPositionChanged(i
                 QString currentParaText = text(para);
                 QString baseIndent = tBlock->getNewEditorLine(tBlock->getIndentationLevel()+(cmb ? 1 : 0));
-//cerr<<"AUTO INDENT:["<<baseIndent.latin1()<<"] isMethod?"<<(cmb?"true":"false")<<endl;
+// cerr<<"AUTO INDENT:["<<baseIndent.latin1()<<"] isMethod?"<<(cmb?"true":"false")<<endl;
                 int minPos = baseIndent.length();
 
@@ -960,5 +962,5 @@ void CodeEditor::cursorPositionChanged(i
         // look for changes in editability, if they occur, we need to record
         // the edits which have been made
-        if((editPara && !lastParaIsEditable) || (!editPara && lastParaIsEditable)) {
+        if((editPara && !m_lastTextBlockToBeEdited) || (!editPara && m_lastTextBlockToBeEdited)) {
 
                 setReadOnly(editPara ? false : true);

Brian Thomas <thomas@...> [040420 09:45]:
> bug fix: codeeditor has 2 problems : 1. only first edit was being saved by
> the editor. 2. Incorrect indentation being passed to unformat comment
> block text in some cases. Both issues fixed
> 
> 
>   M +6 -4      codeeditor.cpp   1.19

It doesn't compile anymore:

make[2]: Entering directory
`/cvs/kde/kdesdk/umbrello/umbrello/dialogs'
if /bin/sh ../../../libtool --silent --mode=compile --tag=CXX g++
-DHAVE_CONFIG_H -I. -I. -I../../.. -I../../.. -I/opt/kde/include
-I/usr/lib/qt/include -I/usr/X11R6/include   -DQT_THREAD_SUPPORT
-D_REENTRANT  -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -W
-Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE
-Wcast-align -Wconversion -Wchar-subscripts -g -O2 -Wformat-security
-Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common
-DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT
-DQT_NO_TRANSLATION  -MT codeeditor.lo -MD -MP -MF ".deps/codeeditor.Tpo" -c
-o codeeditor.lo codeeditor.cpp; \
then mv -f ".deps/codeeditor.Tpo" ".deps/codeeditor.Plo"; else rm -f
".deps/codeeditor.Tpo"; exit 1; fi
codeeditor.cpp: In member function `virtual QPopupMenu*
   CodeEditor::createPopupMenu(const QPoint&)':
codeeditor.cpp:699: error: `insertCodeEditMenuItems' undeclared (first use
this
   function)
codeeditor.cpp:699: error: (Each undeclared identifier is reported only once
   for each function it appears in.)

Steinchen
-- 
ONE FAMILY! Leipzig 2012 - Olympic Summer Games
http://www.leipzig2012.com/

CVS commit by thomas: 

bug fix: incomplete patch prevented compilation..now fixed


  M +6 -1      codeeditor.cpp   1.20
  M +2 -0      codeeditor.h   1.8


--- kdesdk/umbrello/umbrello/dialogs/codeeditor.h  #1.7:1.8
@@ -22,4 +22,5 @@
 #include <qpopupmenu.h>
 #include <qstring.h>
+#include <qlabel.h>
 #include <qtextedit.h>
 #include "../codeviewerstate.h"
@@ -138,4 +139,5 @@ public slots:
         void changeHighlighting(int signal);
         void changeShowHidden (int signal);
+        void slotRedrawText();
 
 protected slots:

--- kdesdk/umbrello/umbrello/dialogs/codeeditor.cpp  #1.19:1.20
@@ -697,5 +697,6 @@ QPopupMenu * CodeEditor::createPopupMenu
                         menu->setItemEnabled (4, false);
                 
-                m_selectedTextBlock->insertCodeEditMenuItems(menu);
+                // TBD
+                // m_selectedTextBlock->insertCodeEditMenuItems(menu, this);
         }
 
@@ -761,4 +762,8 @@ void CodeEditor::slotPasteTextBlock ( ) 
 }
 
+void CodeEditor::slotRedrawText() {
+        rebuildView(m_lastPara);
+}
+
 void CodeEditor::init ( CodeViewerDialog * parentDlg, CodeDocument * parentDoc ) {

Brian Thomas <thomas@...> [040422 00:50]:
> bug fix: incomplete patch prevented compilation..now fixed
> 
> 
>   M +6 -1      codeeditor.cpp   1.20
>   M +2 -0      codeeditor.h   1.8

Another thing is not compiling. Maybe you could just revert the commits of
the last days and commit them again, if you found the time to finish the
feature. Here the compile error:

make[2]: Entering directory
`/cvs/kde/kdesdk/umbrello/umbrello/codegenerators'
if /bin/sh ../../../libtool --silent --mode=compile --tag=CXX g++
-DHAVE_CONFIG_H -I. -I. -I../../.. -I../dialogs
-I../../../umbrello/umbrello/dialogs -I/opt/kde/include
-I/usr/lib/qt/include -I/usr/X11R6/include   -DQT_THREAD_SUPPORT
-D_REENTRANT  -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -W
-Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE
-Wcast-align -Wconversion -Wchar-subscripts -g -O2 -Wformat-security
-Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common
-DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT
-DQT_NO_TRANSLATION  -MT cppcodegenerationformbase.lo -MD -MP -MF
".deps/cppcodegenerationformbase.Tpo" -c -o cppcodegenerationformbase.lo
cppcodegenerationformbase.cpp; \
then mv -f ".deps/cppcodegenerationformbase.Tpo"
".deps/cppcodegenerationformbase.Plo"; else rm -f
".deps/cppcodegenerationformbase.Tpo"; exit 1; fi
cppcodegenerationformbase.cpp: In constructor `
   CPPCodeGenerationFormBase::CPPCodeGenerationFormBase(QWidget*, const
char*,
   unsigned int)':
cppcodegenerationformbase.cpp:101: error: `spacer4' undeclared (first use
this
   function)
cppcodegenerationformbase.cpp:101: error: (Each undeclared identifier is
   reported only once for each function it appears in.)
cppcodegenerationformbase.cpp:148: error: `spacer2_2_2_2' undeclared (first
use
   this function)
cppcodegenerationformbase.cpp:150: error: `spacer1_2_2_2' undeclared (first
use
   this function)

Bye,

Sebastian
-- 
ONE FAMILY! Leipzig 2012 - Olympic Summer Games
http://www.leipzig2012.com/

Sebastian, 

	Hmm. Not sure what I changed that could have an effect 
	on the cppcodegenerationformbase.ui file. It looks like
	developer was run on it, and either new widget parts added
	or the names were changed on existing ones. Looking at
	the cvs log, it looks like it was last changed by Oliver, in 2003.

	Can you email me a copy of your file so I can test? 

	=b.t.

On Wednesday 21 April 2004 07:07 pm, Sebastian Stein wrote:
> Brian Thomas <thomas@...> [040422 00:50]:
> > bug fix: incomplete patch prevented compilation..now fixed
> > 
> > 
> >   M +6 -1      codeeditor.cpp   1.20
> >   M +2 -0      codeeditor.h   1.8
> 
> Another thing is not compiling. Maybe you could just revert the commits of
> the last days and commit them again, if you found the time to finish the
> feature. Here the compile error:
> 
> make[2]: Entering directory
> `/cvs/kde/kdesdk/umbrello/umbrello/codegenerators'
> if /bin/sh ../../../libtool --silent --mode=compile --tag=CXX g++
> -DHAVE_CONFIG_H -I. -I. -I../../.. -I../dialogs
> -I../../../umbrello/umbrello/dialogs -I/opt/kde/include
> -I/usr/lib/qt/include -I/usr/X11R6/include   -DQT_THREAD_SUPPORT
> -D_REENTRAN
> T  -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -W 
> -Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE
> -Wcast-align -Wconversion -Wchar-subscripts -g -O2 -Wformat-security
> -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common
> -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT
> -DQT_NO_TRANSLATION  -MT cppcodegenerationformbase.lo -MD -MP -MF
> ".deps/cppcodegenerationformbase.Tpo" -c -o cppcodegenerationformbase.lo
> cppcodegenerationformbase.cpp; \
> then mv -f ".deps/cppcodegenerationformbase.Tpo"
> ".deps/cppcodegenerationformbase.Plo"; else rm -f
> ".deps/cppcodegenerationformbase.Tpo"; exit 1; fi
> cppcodegenerationformbase.cpp: In constructor `
>    CPPCodeGenerationFormBase::CPPCodeGenerationFormBase(QWidget*, const
> char*,
>    unsigned int)':
> cppcodegenerationformbase.cpp:101: error: `spacer4' undeclared (first use
> this
>    function)
> cppcodegenerationformbase.cpp:101: error: (Each undeclared identifier is
>    reported only once for each function it appears in.)
> cppcodegenerationformbase.cpp:148: error: `spacer2_2_2_2' undeclared (first
> use
>    this function)
> cppcodegenerationformbase.cpp:150: error: `spacer1_2_2_2' undeclared (first
> use
>    this function)
> 
> Bye,
> 
> Sebastian

-- 

  * Dr. Brian Thomas

  * Dept of Astronomy/University of Maryland-College Park
  * Code 695/Goddard Space Flight Center-NASA

  *   fax: (301) 286-1775
  * phone: (301) 286-6128 [GSFC]
           (301) 405-2312 [UMD]

Brian Thomas <brian.thomas@...> [040422 09:33]:
> 	Hmm. Not sure what I changed that could have an effect 
> 	on the cppcodegenerationformbase.ui file. It looks like
> 	developer was run on it, and either new widget parts added
> 	or the names were changed on existing ones.

After doing a make clean in the codegen subdir, it now compiles ;-)

Sebastian
-- 
ONE FAMILY! Leipzig 2012 - Olympic Summer Games
http://www.leipzig2012.com/

CVS commit by sstein: 

remove unneeded includes

I ran "fixkdeincludes -m", this runs much faster, but it doesn't find all unneeded headers.


  M +0 -1      codegenerationoptionspage.cpp   1.7
  M +0 -1      codegenerationwizard.cpp   1.18
  M +0 -1      settingsdlg.cpp   1.26
  M +0 -1      umlroledialog.cpp   1.4


--- kdesdk/umbrello/umbrello/dialogs/umlroledialog.cpp  #1.3:1.4
@@ -13,5 +13,4 @@
 
 //kde includes
-#include <kdebug.h>
 #include <klocale.h>
 

--- kdesdk/umbrello/umbrello/dialogs/settingsdlg.cpp  #1.25:1.26
@@ -12,5 +12,4 @@
 #include <klocale.h>
 #include <kfiledialog.h>
-#include <kdebug.h>
 //qt includes
 #include <qlayout.h>

--- kdesdk/umbrello/umbrello/dialogs/codegenerationwizard.cpp  #1.17:1.18
@@ -20,5 +20,4 @@
 #include <qlistview.h>
 #include <qfileinfo.h>
-#include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>

--- kdesdk/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp  #1.6:1.7
@@ -24,5 +24,4 @@
 #include <kfiledialog.h>
 #include <klocale.h>
-#include <kdebug.h>
 
 //qt include

CVS commit by okellogg: 

apply(): Improve debugging.


  M +8 -2      umlattributedialog.cpp   1.14


--- kdesdk/umbrello/umbrello/dialogs/umlattributedialog.cpp  #1.13:1.14
@@ -151,5 +151,9 @@ bool UMLAttributeDialog::apply() {
         }
 
-        m_pAttribute->setTypeName( m_pTypeCB->currentText() );
+        QString typeName = m_pTypeCB->currentText();
+        // TODO: The type of UMLAttributes is just a "passive" string.
+        // UMLAttribute should be enhanced to give the user the choice
+        // of referencing existing UMLClassifiers instead.
+        m_pAttribute->setTypeName( typeName );
         m_pAttribute->setInitialValue( m_pInitialLE->text() );
         QString name = m_pNameLE->text();
@@ -171,5 +175,7 @@ bool UMLAttributeDialog::apply() {
         m_pAttribute->setStatic( m_pStaticCB->isChecked() );
 
-        UMLApp::app()->getDocument()->createDatatype( m_pTypeCB->currentText() );
+        UMLDoc *umldoc = UMLApp::app()->getDocument();
+        if (umldoc->findUMLObject(typeName) == NULL)
+                umldoc->createDatatype( m_pTypeCB->currentText() );
 
         return true;

CVS commit by okellogg: 

Remove the convenience accessors for the AssociationWidget.
 Callers shall use the accessors in AssociationWidget instead.


  M +0 -49     assocpropdlg.h   1.7


--- kdesdk/umbrello/umbrello/dialogs/assocpropdlg.h  #1.6:1.7
@@ -46,53 +46,4 @@ public:
         ~AssocPropDlg();
 
-        /* accessor methods to underlying association */
-        QString getName() { 
-                return m_pAssoc->getName(); 
-        } 
-
-        QString getRoleAName() { 
-                return m_pAssoc->getRoleNameA(); 
-        }
-
-        QString getDoc() { 
-                return m_pAssoc->getDoc(); 
-        }
-
-        QString getRoleADoc() { 
-                return m_pAssoc->getRoleADoc(); 
-        }
-
-        QString getRoleBName() { 
-                return m_pAssoc->getRoleNameB(); 
-        } 
-
-        QString getRoleBDoc() { 
-                return m_pAssoc->getRoleBDoc(); 
-        }
-
-        QString getMultiA() { 
-                return m_pAssoc->getMultiA(); 
-        } 
-
-        QString getMultiB() { 
-                return m_pAssoc->getMultiB(); 
-        } 
-
-        Scope getVisibilityA() { 
-                return m_pAssoc->getVisibilityA(); 
-        }
-
-        Scope getVisibilityB() { 
-                return m_pAssoc->getVisibilityB(); 
-        }
-
-        Changeability_Type getChangeabilityA() { 
-                return m_pAssoc->getChangeabilityA(); 
-        }
-
-        Changeability_Type getChangeabilityB() { 
-                return m_pAssoc->getChangeabilityB(); 
-        }
-
         enum Page { page_gen = 0, page_role, page_font };

CVS commit by jriddell: 

Turn off autocompletion, causes more problems than it helps with


  M +1 -1      parmpropdlg.cpp   1.11


--- kdesdk/umbrello/umbrello/dialogs/parmpropdlg.cpp  #1.10:1.11
@@ -116,5 +116,5 @@ ParmPropDlg::ParmPropDlg(QWidget * paren
         m_pTypeCB->setDuplicatesEnabled(false);//only allow one of each type in box
         m_pTypeCB->setEditable(true);
-        m_pTypeCB->setAutoCompletion(true);
+        m_pTypeCB->setAutoCompletion(false);
 
         //now add the Concepts

CVS commit by sstein: 

fix bug #84262: in property dialog attr/operation/template doc didn't updated when selecting another attr/operation/template by keyboard


  M +1 -0      classifierlistpage.cpp   1.13


--- kdesdk/umbrello/umbrello/dialogs/classifierlistpage.cpp  #1.12:1.13
@@ -106,4 +106,5 @@ ClassifierListPage::ClassifierListPage(Q
         m_pOldListItem = 0;
         connect(m_pItemListLB, SIGNAL(clicked(QListBoxItem*)), this, SLOT(slotClicked(QListBoxItem*)));
+        connect(m_pItemListLB, SIGNAL(selectionChanged(QListBoxItem*)), this, SLOT(slotClicked(QListBoxItem*)));
 
         connect(m_pItemListLB, SIGNAL(rightButtonPressed(QListBoxItem*, const QPoint&)),

CVS commit by sstein: 

leak fixes and a real bug fix:

==23607== 7480 bytes in 170 blocks are definitely lost in loss record 220 of 232
==23607==    at 0x3C01D54C: operator new(unsigned) (vg_replace_malloc.c:107)
==23607==    by 0x82339FB: CodeEditor::insert(QString const&, TextBlock*, bool, QColor const&, QColor const&, UMLObject*, QString const&, int) (codeeditor.cpp:260)
==23607==    by 0x8233DFD: CodeEditor::appendText(CodeComment*, TextBlock*, UMLObject*, QString const&) (codeeditor.cpp:378)
==23607==    by 0x8235199: CodeEditor::appendText(CodeMethodBlock*) (codeeditor.cpp:489)

==23607== Conditional jump or move depends on uninitialised value(s)
==23607==    at 0x3CEAA0F0: QGList::locate(unsigned) (in /usr/lib/qt-3.3.2/lib/libqt-mt.so.3.3.2)
==23607==    by 0x82386EA: CodeEditor::isParaEditable(int) (qglist.h:174)
==23607==    by 0x8237DD5: CodeEditor::cursorPositionChanged(int, int) (codeeditor.cpp:877)
==23607==    by 0x82392C0: CodeEditor::qt_invoke(int, QUObject*) (qucom_p.h:388)

==20759== 8 bytes in 2 blocks are definitely lost in loss record 32 of 231
==20759==    at 0x3C01D54C: operator new(unsigned) (vg_replace_malloc.c:107)
==20759==    by 0x8237695: CodeEditor::init(CodeViewerDialog*, CodeDocument*) (codeeditor.cpp:788)
==20759==    by 0x8232791: CodeEditor::CodeEditor(CodeViewerDialog*, char const*, CodeDocument*) (codeeditor.cpp:63)
==20759==    by 0x820DA0F: CodeViewerDialog::addCodeDocument(CodeDocument*) (codeviewerdialog.cpp:79)


  M +19 -5     codeeditor.cpp   1.21


--- kdesdk/umbrello/umbrello/dialogs/codeeditor.cpp  #1.20:1.21
@@ -67,12 +67,23 @@ CodeEditor::CodeEditor ( CodeViewerDialo
  *  Destroys the object and frees any allocated resources
  */
-CodeEditor::~CodeEditor() { }
+CodeEditor::~CodeEditor() {
+        clearText();
+        delete m_tbInfoMap;
+}
 
 // clear the display of all text
 void CodeEditor::clearText () {
 
-//        setCaption( tr2i18n("") );
         m_selectedTextBlock = 0;
+
+        // clearing the text means more then just calling clear()!
+        // because the data() is a pointer and must be deleted first
+        QMap<TextBlock*,TextBlockInfo*>::Iterator it;
+        for ( it = m_tbInfoMap->begin(); it != m_tbInfoMap->end(); ++it ) 
+        {
+                delete it.data();
+        }
         m_textBlockList.clear();
+
         m_tbInfoMap->clear();
 
@@ -771,4 +782,7 @@ void CodeEditor::init ( CodeViewerDialog
         parentDoc->synchronize();
 
+        // at startup there is no last parameter
+        m_lastPara = -1;
+
         m_parentDlg = parentDlg;
         m_parentDoc = parentDoc;

CVS commit by sstein: 

and some more leaks:

class CodeEditor is really complex...

==32084== 7728 bytes in 276 blocks are definitely lost in loss record 202 of 212
==32084==    at 0x3C01D54C: operator new(unsigned) (vg_replace_malloc.c:107)
==32084==    by 0x8233930: CodeEditor::insert(QString const&, TextBlock*, bool, QColor const&, QColor const&, UMLObject*, QString const&, int) (codeeditor.cpp:292)
==32084==    by 0x82353B4: CodeEditor::appendText(CodeMethodBlock*) (codeeditor.cpp:503)
==32084==    by 0x8233D0E: CodeEditor::appendText(QPtrList<TextBlock>*) (codeeditor.cpp:356)


  M +3 -0      codeeditor.cpp   1.22


--- kdesdk/umbrello/umbrello/dialogs/codeeditor.cpp  #1.21:1.22
@@ -82,4 +82,7 @@ void CodeEditor::clearText () {
         for ( it = m_tbInfoMap->begin(); it != m_tbInfoMap->end(); ++it ) 
         {
+                it.data()->m_paraList.setAutoDelete(true);
+                it.data()->m_paraList.clear();
+
                 delete it.data();
         }

CVS commit by sstein: 

fix bug 72801: This one was a little bit ugly, because you can not deselect the items in the list box, if there are still items left. A call to clearSelection() in such a case results in selecting the first item. I think that's not good behaviour, but it is a Qt issue and it is documented in Qt docs for function QListBox::clearSelection().

Now, after adding a new item (attr, ...), this item will be selected so that the user can go on working with this new item.

modified functions:
	void ClassifierListPage::slotListItemCreated(UMLObject* object)
	void ClassifierListPage::slotClicked(QListBoxItem*item)


  M +18 -5     classifierlistpage.cpp   1.14


--- kdesdk/umbrello/umbrello/dialogs/classifierlistpage.cpp  #1.13:1.14
@@ -167,14 +167,23 @@ void ClassifierListPage::slotClicked(QLi
         }
 
-        //make sure clicked on an item
-        if(!item) {
+        // make sure clicked on an item
+        // it is impossible to deselect all items, because our list box has keyboard
+        // focus and so at least one item is always selected; this doesn't happen, if
+        // there are no items of course;
+        //
+        // for more information see Qt doc for void QListBox::clearSelection()
+        UMLClassifierListItem* listItem;
+        if(!item && m_pItemListLB->count() == 0) {
                 enableWidgets(false);
                 m_pOldListItem = 0;
                 m_pItemListLB->clearSelection();
                 return;
+        } else if (!item && m_pItemListLB->count() > 0) {
+                m_pItemListLB->setSelected(0, true);
+                listItem = getItemList().at(0);
+        } else {
+                listItem = getItemList().at( m_pItemListLB->index(item) );
         }
 
-        UMLClassifierListItem* listItem = getItemList().at( m_pItemListLB->index(item) );
-
         //now update screen
         m_pDocTE->setText( listItem->getDoc() );
@@ -205,5 +214,9 @@ void ClassifierListPage::slotListItemCre
         m_pItemListLB ->insertItem((static_cast<UMLClassifierListItem*>(object))->getShortName(), index);
         m_bSigWaiting = false;
-        slotClicked(0);
+
+        // now select the new item, so that the user can go on adding doc or calling
+        // the property dialog
+        m_pItemListLB->setSelected(index, true);
+        slotClicked(m_pItemListLB->item(index));
 }
 ////////////////////////////////////////////////////////////////////////////////////////////////////

CVS commit by okellogg: 

Factor the frequently used single-line QLabel/QLineEdit combo into
 Dialog_Utils::makeLabeledEditField().


  A            dialog_utils.cpp   1.1 [no copyright]
  A            dialog_utils.h   1.1 [no copyright GPL (v2+)]
  M +1 -0      Makefile.am   1.24
  M +13 -12    activitydialog.cpp   1.6
  M +15 -12    assocgenpage.cpp   1.9
  M +23 -17    assocrolepage.cpp   1.14
  M +22 -27    parmpropdlg.cpp   1.13
  M +14 -8     selectopdlg.cpp   1.13
  M +13 -11    settingsdlg.cpp   1.29
  M +12 -12    statedialog.cpp   1.8
  M +31 -36    umlattributedialog.cpp   1.16
  M +2 -2      umlattributedialog.h   1.6
  M +12 -17    umloperationdialog.cpp   1.28
  M +2 -2      umloperationdialog.h   1.9
  M +15 -19    umltemplatedialog.cpp   1.7

CVS commit by sstein: 

fix for bug 86083: I think "Passing Direction" is more clear.


  M +3 -1      parmpropdlg.cpp   1.15


--- kdesdk/umbrello/umbrello/dialogs/parmpropdlg.cpp  #1.14:1.15
@@ -13,4 +13,5 @@
 // qt includes
 #include <qlayout.h>
+#include <qtooltip.h>
 
 // kde includes
@@ -71,6 +72,7 @@ ParmPropDlg::ParmPropDlg(QWidget * paren
                                             m_pStereoTypeLE, m_pAtt->getStereotype() );
 
-        m_pKind =  new QButtonGroup(i18n("Kind"), plainPage());
+        m_pKind =  new QButtonGroup(i18n("Passing Direction"), plainPage());
         m_pKind->setExclusive(true);
+        QToolTip::add(m_pKind, i18n("\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" is a parameter for reading and writing."));
 
         QHBoxLayout * kindLayout = new QHBoxLayout( m_pKind );

CVS commit by okellogg: 

Move to namespace Umbrello. Document.


  M +9 -1      dialog_utils.cpp   1.2
  M +17 -1     dialog_utils.h   1.2


--- kdesdk/umbrello/umbrello/dialogs/dialog_utils.h  #1.1:1.2
@@ -18,6 +18,22 @@ class QLabel;
 class QLineEdit;
 
-namespace Dialog_Utils {
+/**
+ * Dialog utilities.
+ * @author Oliver Kellogg
+ * Bugs and comments to uml-devel@... or http://bugs.kde.org
+ */
+namespace Umbrello {
 
+        /**
+         * Create a labeled text lineedit widget.
+         *
+         * @param containingBox         The containing QGroupBox.
+         * @param layout                The QGridLayout to use.
+         * @param row                   The row number within the QGridLayout.
+         * @param label                 The QLabel object allocated (return value)
+         * @param labelText             The label text.
+         * @param editField             The QLineEdit object allocated (return value)
+         * @param editFieldText         Initialization text in the editField (optional.)
+         */
         void makeLabeledEditField(QGroupBox *containingBox, QGridLayout *layout, int row,
                                   QLabel * &label, QString labelText, 

--- kdesdk/umbrello/umbrello/dialogs/dialog_utils.cpp  #1.1:1.2
@@ -1,2 +1,10 @@
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
 #include "dialog_utils.h"
 
@@ -6,5 +14,5 @@
 #include <qlineedit.h>
 
-namespace Dialog_Utils {
+namespace Umbrello {
 
 void makeLabeledEditField(QGroupBox *containingBox, QGridLayout *layout, int row,

CVS commit by okellogg: 

Moved Dialog_Utils to Umbrello.


  M +2 -2      activitydialog.cpp   1.7
  M +2 -2      assocgenpage.cpp   1.10
  M +4 -4      assocrolepage.cpp   1.15
  M +3 -3      parmpropdlg.cpp   1.16
  M +1 -1      selectopdlg.cpp   1.15
  M +1 -1      settingsdlg.cpp   1.30
  M +2 -2      statedialog.cpp   1.9
  M +3 -3      umlattributedialog.cpp   1.18
  M +2 -2      umloperationdialog.cpp   1.30
  M +2 -2      umltemplatedialog.cpp   1.9

CVS commit by okellogg: 

Oops, these files should have been removed too.


  R            classpropertiespage.cpp   1.8
  R            classpropertiespage.h   1.10
  R            interfacepropertiespage.cpp   1.1
  R            interfacepropertiespage.h   1.2
  R            packagepropertiespage.cpp   1.1
  R            packagepropertiespage.h   1.2
  R            templatepropertiespage.cpp   1.1
  R            templatepropertiespage.h   1.2

CVS commit by okellogg: 

Minor reformatting.


  M +4 -4      assocgenpage.cpp   1.11
  M +8 -8      assocrolepage.cpp   1.16

CVS commit by okellogg: 

Slipped through the cracks - should have been removed.


  R            templatepropertiesbase.ui   1.3

CVS commit by jriddell: 

Revert slotClicked() to a previous version, this one didn't allow you to select items


  M +12 -19    classifierlistpage.cpp   1.20


--- kdesdk/umbrello/umbrello/dialogs/classifierlistpage.cpp  #1.19:1.20
@@ -175,23 +175,16 @@ void ClassifierListPage::slotClicked(QLi
         // for more information see Qt doc for void QListBox::clearSelection()
         UMLClassifierListItem* listItem;
-        if (item == NULL) {
-                if (m_pItemListLB->count() == 0) {
+        if(!item && m_pItemListLB->count() == 0) {
                         enableWidgets(false);
                         m_pOldListItem = 0;
                         m_pItemListLB->clearSelection();
-                } else {
-                        kdDebug() << "ClassifierListPage::slotClicked: item is NULL"
-                                  << endl;
-                }
                 return;
-        }
-        UMLClassifierListItemList itemList(getItemList());
-        if (m_pItemListLB->count() > 0) {
+        } else if (!item && m_pItemListLB->count() > 0) {
                 m_pItemListLB->setSelected(0, true);
-                listItem = itemList.at(0);
+                listItem = getItemList().at(0);
         } else {
-                int index = m_pItemListLB->index(item);
-                listItem = itemList.at(index);
+                listItem = getItemList().at( m_pItemListLB->index(item) );
         }
+
         if (listItem) {
                 //now update screen

CVS commit by okellogg: 

Patch for bug #74249 by Tobias-Wulff_AT_codeeye.de


  M +8 -0      parmpropdlg.cpp   1.20


--- kdesdk/umbrello/umbrello/dialogs/parmpropdlg.cpp  #1.19:1.20
@@ -143,4 +143,12 @@ ParmPropDlg::ParmPropDlg(QWidget * paren
         }
 
+        // set tab order
+        setTabOrder(m_pKind, m_pTypeCB);
+        setTabOrder(m_pTypeCB, m_pNameLE);
+        setTabOrder(m_pNameLE, m_pInitialLE);
+        setTabOrder(m_pInitialLE, m_pStereoTypeLE);
+        setTabOrder(m_pStereoTypeLE, m_pIn);
+        setTabOrder(m_pIn, m_pDoc);
+
         m_pNameLE->setFocus();
 }

CVS commit by okellogg: 

Signature of slotUpdateChildObject has changed.


  M +7 -4      classpropdlg.cpp   1.20


--- kdesdk/umbrello/umbrello/dialogs/classpropdlg.cpp  #1.19:1.20
@@ -180,5 +180,6 @@ void ClassPropDlg::setupPages(UMLObject 
                 QHBoxLayout * attLayout = new QHBoxLayout(newPage);
                 attLayout -> addWidget(m_pAttPage);
-                connect(m_pAttPage, SIGNAL(sigUpdateChildObject(int)), this, SLOT(slotUpdateChildObject(int)));
+                connect(m_pAttPage, SIGNAL(sigUpdateChildObject(int)),
+                        this, SLOT(slotUpdateChildObject(UML::IDType)));
         }
 
@@ -190,5 +191,6 @@ void ClassPropDlg::setupPages(UMLObject 
                 QHBoxLayout* pOpsLayout = new QHBoxLayout(newPage);
                 pOpsLayout -> addWidget(m_pOpsPage);
-                connect(m_pOpsPage, SIGNAL(sigUpdateChildObject(int)), this, SLOT(slotUpdateChildObject(int)));
+                connect(m_pOpsPage, SIGNAL(sigUpdateChildObject(int)),
+                        this, SLOT(slotUpdateChildObject(UML::IDType)));
         }
 
@@ -199,5 +201,6 @@ void ClassPropDlg::setupPages(UMLObject 
                 QHBoxLayout* templatesLayout = new QHBoxLayout(newPage);
                 templatesLayout->addWidget(m_pTemplatePage);
-                connect(m_pTemplatePage, SIGNAL(sigUpdateChildObject(int)), this, SLOT(slotUpdateChildObject(int)));
+                connect(m_pTemplatePage, SIGNAL(sigUpdateChildObject(int)),
+                        this, SLOT(slotUpdateChildObject(UML::IDType)));
         }
         if (c->getBaseType() == Uml::ot_Enum) {
@@ -208,5 +211,5 @@ void ClassPropDlg::setupPages(UMLObject 
                 enumLiteralsLayout->addWidget(m_pEnumLiteralPage);
                 connect(m_pEnumLiteralPage, SIGNAL(sigUpdateChildObject(int)),
-                        this, SLOT(slotUpdateChildObject(int)));
+                        this, SLOT(slotUpdateChildObject(UML::IDType)));
         }
         if (c->getBaseType() == Uml::ot_Package ) {

CVS commit by okellogg: 

Fix for bug 92116 by Stefan Walter (sw_AT_gegenunendlich.de)


  M +1 -1      classifierlistpage.cpp   1.22


--- kdesdk/umbrello/umbrello/dialogs/classifierlistpage.cpp  #1.21:1.22
@@ -353,5 +353,5 @@ void ClassifierListPage::slotDownClicked
         UMLClassifierListItem* currentAtt = getItemList().at( index );
         takeClassifier(currentAtt);
-        addClassifier(currentAtt, index + 2);
+        addClassifier(currentAtt, index + 1);
         slotClicked( item );
 }

CVS commit by okellogg: 

Remove unused signal.


  M +0 -6      classifierlistpage.h   1.7


--- kdesdk/umbrello/umbrello/dialogs/classifierlistpage.h  #1.6:1.7
@@ -164,10 +164,4 @@ public slots:
          */
         void slotProperties();
-
-signals:
-        /**
-         * slots into classpropdlg::slotUpdateChildObject() whatever that does
-         */
-        void sigUpdateChildObject(int id);
 };

CVS commit by okellogg: 

Remove unused slot.


  M +0 -19     classpropdlg.cpp   1.21
  M +0 -5      classpropdlg.h   1.10


--- kdesdk/umbrello/umbrello/dialogs/classpropdlg.cpp  #1.20:1.21
@@ -129,15 +129,4 @@ void ClassPropDlg::slotOk() {
 }
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-void ClassPropDlg::slotUpdateChildObject(Uml::IDType id) {
-
-        UMLObject * o; // = ((UMLClassifier*)m_pObject) -> findChildObject(id);
-
-        if (typeid(m_pObject) == typeid(UMLClass))
-                o = ((UMLClass *)m_pObject) -> findChildObject(id);
-        else
-                o = ((UMLClassifier *)m_pObject) -> findChildObject(id);
-
-}
-////////////////////////////////////////////////////////////////////////////////////////////////////
 void ClassPropDlg::slotApply() {
         if (m_pGenPage) {
@@ -180,6 +169,4 @@ void ClassPropDlg::setupPages(UMLObject 
                 QHBoxLayout * attLayout = new QHBoxLayout(newPage);
                 attLayout -> addWidget(m_pAttPage);
-                connect(m_pAttPage, SIGNAL(sigUpdateChildObject(int)),
-                        this, SLOT(slotUpdateChildObject(UML::IDType)));
         }
 
@@ -191,6 +178,4 @@ void ClassPropDlg::setupPages(UMLObject 
                 QHBoxLayout* pOpsLayout = new QHBoxLayout(newPage);
                 pOpsLayout -> addWidget(m_pOpsPage);
-                connect(m_pOpsPage, SIGNAL(sigUpdateChildObject(int)),
-                        this, SLOT(slotUpdateChildObject(UML::IDType)));
         }
 
@@ -201,6 +186,4 @@ void ClassPropDlg::setupPages(UMLObject 
                 QHBoxLayout* templatesLayout = new QHBoxLayout(newPage);
                 templatesLayout->addWidget(m_pTemplatePage);
-                connect(m_pTemplatePage, SIGNAL(sigUpdateChildObject(int)),
-                        this, SLOT(slotUpdateChildObject(UML::IDType)));
         }
         if (c->getBaseType() == Uml::ot_Enum) {
@@ -210,6 +193,4 @@ void ClassPropDlg::setupPages(UMLObject 
                 QHBoxLayout* enumLiteralsLayout = new QHBoxLayout(newPage);
                 enumLiteralsLayout->addWidget(m_pEnumLiteralPage);
-                connect(m_pEnumLiteralPage, SIGNAL(sigUpdateChildObject(int)),
-                        this, SLOT(slotUpdateChildObject(UML::IDType)));
         }
         if (c->getBaseType() == Uml::ot_Package ) {

--- kdesdk/umbrello/umbrello/dialogs/classpropdlg.h  #1.9:1.10
@@ -121,9 +121,4 @@ private:
                       };
         Page_Type m_Type;
-public slots:
-        /**
-         * FIXME not honestly sure what this does
-         */
-        void slotUpdateChildObject(Uml::IDType id);
 };

CVS commit by okellogg: 

BUG:91434 - Use getFullyQualifiedName() in lieu of just getName()


  M +8 -10     codegenerationwizard.cpp   1.20


--- kdesdk/umbrello/umbrello/dialogs/codegenerationwizard.cpp  #1.19:1.20
@@ -52,14 +52,12 @@ CodeGenerationWizard::CodeGenerationWiza
         insertPage(m_CodeGenerationOptionsPage, i18n("Code Generation Options"), 1);
 
-        UMLClassifierList cList = m_doc->getClassesAndInterfaces();
+        UMLClassifierList cList;
 
-        if(classList) {
-                for(UMLClassifier *c = classList->first(); c ; c = classList->next()) {
-                        new QListViewItem( m_selectedList, c->getName());
-                }
-        } else {
-                for(UMLClassifier *c = cList.first(); c ; c = cList.next()) {
-                        new QListViewItem( m_selectedList, c->getName());
+        if (classList == NULL) {
+                cList = m_doc->getClassesAndInterfaces();
+                classList = &cList;
                 }
+        for (UMLClassifier *c = classList->first(); c ; c = classList->next()) {
+                new QListViewItem( m_selectedList, c->getFullyQualifiedName());
         }
 
@@ -136,5 +134,5 @@ void CodeGenerationWizard::generateCode(
 
 void CodeGenerationWizard::classGenerated(UMLClassifier* concept, bool generated) {
-        QListViewItem* item = m_statusList->findItem( concept->getName(), 0 );
+        QListViewItem* item = m_statusList->findItem( concept->getFullyQualifiedName(), 0 );
         if( !item ) {
                 kdError()<<"GenerationStatusPage::Error finding class in list view"<<endl;

CVS commit by okellogg: 

Constructor, slotOk(): The owning classifier is the _grandparent_ of m_pAtt.


  M +20 -10    parmpropdlg.cpp   1.23


--- kdesdk/umbrello/umbrello/dialogs/parmpropdlg.cpp  #1.22:1.23
@@ -126,8 +126,13 @@ ParmPropDlg::ParmPropDlg(QWidget * paren
 
         //add template parameters
-        UMLClassifier *pConcept = static_cast<UMLClassifier*>( m_pAtt->parent() );
+        UMLClassifier *pConcept = dynamic_cast<UMLClassifier*>( m_pAtt->parent()->parent() );
+        if (pConcept == NULL) {
+                kdError() << "ParmPropDlg: grandparent of " << m_pAtt->getName()
+                          << " is not a UMLClassifier" << endl;
+        } else {
         UMLTemplateList tmplParams( pConcept->getTemplateList() );
         for (UMLTemplate *t = tmplParams.first(); t; t = tmplParams.next())
                 m_pTypeCB->insertItem( t->getName() );
+        }
         //now add the Concepts
         UMLClassifierList namesList( m_pUmldoc->getConcepts() );
@@ -180,5 +185,9 @@ void ParmPropDlg::slotOk() {
                 m_pAtt->setStereotype( m_pStereoTypeLE->text() );
                 QString typeName = m_pTypeCB->currentText();
-                UMLClassifier * pConcept = static_cast<UMLClassifier*>( m_pAtt->parent() );
+                UMLClassifier * pConcept = dynamic_cast<UMLClassifier*>( m_pAtt->parent()->parent() );
+                if (pConcept == NULL) {
+                        kdError() << "ParmPropDlg::slotOk: grandparent of " << m_pAtt->getName()
+                                  << " is not a UMLClassifier" << endl;
+                } else {
                 UMLTemplate *tmplParam = pConcept->findTemplate(typeName);
                 if (tmplParam) {
@@ -187,4 +196,5 @@ void ParmPropDlg::slotOk() {
                         return;
                 }
+                }
                 UMLClassifierList namesList( m_pUmldoc->getConcepts() );
                 UMLClassifier * obj;

CVS commit by okellogg: 

{add,take,remove}Classifier(): Sanitize arg naming.


  M +21 -21    classifierlistpage.cpp   1.24

CVS commit by okellogg: 

Reduce #includes.


  M +5 -1      codegenerationoptionspage.cpp   1.11
  M +1 -1      codegenerationoptionspage.h   1.7


--- kdesdk/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp  #1.10:1.11
@@ -13,6 +13,10 @@
  *                                                                         *
  ***************************************************************************/
-#include <kdebug.h>
+// own header
 #include "codegenerationoptionspage.h"
+// qt/kde includes
+#include <qcheckbox.h>
+#include <kdebug.h>
+// app includes
 #include "codegenerationpolicypage.h"
 #include "defaultcodegenpolicypage.h"

--- kdesdk/umbrello/umbrello/dialogs/codegenerationoptionspage.h  #1.6:1.7
@@ -22,5 +22,5 @@
 #include <qwidget.h>
 #include "codegenerationoptionsbase.h"
-#include "settingsdlg.h"
+#include "../codegenerator.h"
 
 /**

CVS commit by okellogg: 

Display template parameters also for interfaces.


  M +3 -9      classifierlistpage.cpp   1.25
  M +12 -9     classpropdlg.cpp   1.23
  M +9 -8      umltemplatedialog.cpp   1.13

CVS commit by okellogg: 

Use fully qualified name for parameter type (fix for bug 100307.)


  M +2 -2      parmpropdlg.cpp   1.24


--- kdesdk/umbrello/umbrello/dialogs/parmpropdlg.cpp  #1.23:1.24
@@ -139,5 +139,5 @@ ParmPropDlg::ParmPropDlg(QWidget * paren
         UMLClassifier * obj;
         for(obj=namesList.first(); obj!=0 ;obj=namesList.next()) {
-                m_pTypeCB->insertItem( obj->getName() );
+                m_pTypeCB->insertItem( obj->getFullyQualifiedName() );
         }
 
@@ -200,5 +200,5 @@ void ParmPropDlg::slotOk() {
                 UMLClassifier * obj;
                 for (obj = namesList.first(); obj; obj = namesList.next()) {
-                        if (obj->getName() == typeName) {
+                        if (obj->getFullyQualifiedName() == typeName) {
                                 m_pAtt->setType( obj );
                                 break;

CVS commit by okellogg: 

Use '.' as the path separator in fully qualified names.


  M +2 -2      parmpropdlg.cpp   1.25


--- kdesdk/umbrello/umbrello/dialogs/parmpropdlg.cpp  #1.24:1.25
@@ -139,5 +139,5 @@ ParmPropDlg::ParmPropDlg(QWidget * paren
         UMLClassifier * obj;
         for(obj=namesList.first(); obj!=0 ;obj=namesList.next()) {
-                m_pTypeCB->insertItem( obj->getFullyQualifiedName() );
+                m_pTypeCB->insertItem( obj->getFullyQualifiedName(".") );
         }
 
@@ -200,5 +200,5 @@ void ParmPropDlg::slotOk() {
                 UMLClassifier * obj;
                 for (obj = namesList.first(); obj; obj = namesList.next()) {
-                        if (obj->getFullyQualifiedName() == typeName) {
+                        if (obj->getFullyQualifiedName(".") == typeName) {
                                 m_pAtt->setType( obj );
                                 break;

CVS commit by okellogg: 

Apply fix for bug 100307 also to operation return type.


  M +2 -2      umloperationdialog.cpp   1.39


--- kdesdk/umbrello/umbrello/dialogs/umloperationdialog.cpp  #1.38:1.39
@@ -162,5 +162,5 @@ void UMLOperationDialog::setupDialog() {
         UMLClassifier* pConcept = 0;
         for(pConcept=namesList.first(); pConcept!=0 ;pConcept=namesList.next()) {
-                insertType( pConcept->getName() );
+                insertType( pConcept->getFullyQualifiedName(".") );
         }
 
@@ -353,5 +353,5 @@ void UMLOperationDialog::slotParameterPr
                                 UMLClassifier* obj = NULL;
                                 for (obj=namesList.first(); obj!=0; obj=namesList.next()) {
-                                        if (typeName == obj->getName()) {
+                                        if (typeName == obj->getFullyQualifiedName(".")) {
                                                 pOldAtt->setType( obj );
                                                 break;

CVS commit by okellogg: 

Use the new class ClassifierWidget.


  M +57 -86    classoptionspage.cpp   1.10
  M +33 -39    classoptionspage.h   1.9

CVS commit by okellogg: 

Whoops, this should have been committed together with classoptionspage.{h,cpp}


  M +4 -3      classpropdlg.cpp   1.24


--- kdesdk/umbrello/umbrello/dialogs/classpropdlg.cpp  #1.23:1.24
@@ -26,4 +26,5 @@
 #include "../umlobject.h"
 #include "../umldoc.h"
+#include "../classifierwidget.h"
 #include "../objectwidget.h"
 #include "../componentwidget.h"
@@ -97,6 +98,5 @@ ClassPropDlg::ClassPropDlg(QWidget *pare
         if (w->getBaseType() == Uml::wt_Class
                 || w->getBaseType() == Uml::wt_Interface
-                || w->getBaseType() == Uml::wt_Package
-        ) {
+                || w->getBaseType() == Uml::wt_Package) {
                 setupPages(m_pObject, true);
         } else if (w->getBaseType() == Uml::wt_Component) {
@@ -116,5 +116,6 @@ ClassPropDlg::ClassPropDlg(QWidget *pare
                 QFrame* newPage = addPage( i18n("Display"), i18n("Display Options"), DesktopIcon("info") );
                 QHBoxLayout* m_pOptionsLayout = new QHBoxLayout(newPage);
-                m_pOptionsPage = new ClassOptionsPage( newPage, w, w->getBaseType() );
+                ClassifierWidget *cw = static_cast<ClassifierWidget*>(w);
+                m_pOptionsPage = new ClassOptionsPage( newPage, cw );
                 m_pOptionsLayout -> addWidget(m_pOptionsPage);
         }

CVS commit by okellogg: 

setupPage(): Replaces setup{Class,Interface}Page().


  M +37 -73    classoptionspage.cpp   1.11
  M +3 -8      classoptionspage.h   1.10

CVS commit by okellogg: 

Unused, remove.


  R            umbrellodialog.cpp   1.5
  R            umbrellodialog.h   1.7