[Uml-devel] branches/work/soc-umbrello

[Gopala Krishna A]

SVN commit 942476 by gopala:

Merged revisions 911086 via svnmerge from 
svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdesdk/umbrello

........
  r911086 | habacker | 2009-01-15 01:32:20 +0530 (Thu, 15 Jan 2009) | 1 line
  
  added "Public Only" option to class tab of class diagram properties and to umbrello class settings - approved by Jonathan Riddell
........


 _M            . (directory)  
 M  +12 -0     umbrello/dialogs/classoptionspage.cpp  
 M  +1 -1      umbrello/dialogs/classoptionspage.h  
 M  +4 -0      umbrello/dialogs/settingsdlg.cpp  
 M  +1 -0      umbrello/dialogs/settingsdlg.h  
 M  +1 -0      umbrello/optionstate.h  
 M  +5 -0      umbrello/umbrello.kcfg  
 M  +2 -0      umbrello/uml.cpp  
 M  +1 -0      umbrello/umlscene.cpp  


** branches/work/soc-umbrello #property svnmerge-integrated
   - /trunk/KDE/kdesdk/umbrello:1-854015,854687,854787,855207-866962,866965-870129,871091,872169-887978,889968-889981,890075-890805,896752-896872,901256-910119
   + /trunk/KDE/kdesdk/umbrello:1-854015,854687,854787,855207-866962,866965-870129,871091,872169-887978,889968-889981,890075-890805,896752-896872,901256-910119,911086
--- branches/work/soc-umbrello/umbrello/dialogs/classoptionspage.cpp #942475:942476
@@ -52,6 +52,7 @@
     m_pShowAttsCB = NULL;
     m_pShowAttSigCB = NULL;
     m_pShowAttribAssocsCB = NULL;
+    m_pShowPublicOnlyCB = NULL;
     m_pDrawAsCircleCB = NULL;
 }
 
@@ -120,6 +121,11 @@
         m_pShowAttSigCB->setChecked(sig);
         visibilityLayout->addWidget(m_pShowAttSigCB, 3, 0);
 
+        m_pShowPublicOnlyCB = new QCheckBox(i18n("&Public Only"), m_pVisibilityGB);
+        m_pShowPublicOnlyCB->setChecked(m_pWidget->visualProperty(ClassifierWidget::ShowPublicOnly));
+        visibilityLayout->addWidget(m_pShowPublicOnlyCB, 3, 1);
+
+
     } else if (type == Uml::wt_Interface) {
         m_pDrawAsCircleCB = new QCheckBox(i18n("Draw as circle"), m_pVisibilityGB);
         m_pDrawAsCircleCB->setChecked( m_pWidget->visualProperty(ClassifierWidget::DrawAsCircle) );
@@ -175,6 +181,10 @@
     m_pShowAttribAssocsCB = new QCheckBox(i18n("&Attribute associations"), m_pVisibilityGB);
     m_pShowAttribAssocsCB->setChecked(m_options->classState.showAttribAssocs);
     visibilityLayout->addWidget(m_pShowAttribAssocsCB, 3, 1);
+
+    m_pShowPublicOnlyCB = new QCheckBox(i18n("&Public Only"), m_pVisibilityGB);
+    m_pShowPublicOnlyCB->setChecked(m_options->classState.showPublicOnly);
+    visibilityLayout->addWidget(m_pShowPublicOnlyCB, 4, 1);
 }
 
 /**
@@ -203,6 +213,7 @@
         m_pWidget->setVisualProperty( ClassifierWidget::ShowStereotype, m_pShowStereotypeCB->isChecked() );
         m_pWidget->setVisualProperty( ClassifierWidget::ShowAttributes, m_pShowAttsCB->isChecked() );
         m_pWidget->setVisualProperty( ClassifierWidget::ShowAttributeSignature, m_pShowAttSigCB->isChecked() );
+        m_pWidget->setVisualProperty( ClassifierWidget::ShowPublicOnly, m_pShowPublicOnlyCB->isChecked() );
     } else if (type == Uml::wt_Interface) {
         if (m_pDrawAsCircleCB)
             m_pWidget->setVisualProperty( ClassifierWidget::DrawAsCircle, m_pDrawAsCircleCB->isChecked() );
@@ -226,4 +237,5 @@
     if (m_pShowAttSigCB)
         m_options->classState.showAttSig = m_pShowAttSigCB->isChecked();
     m_options->classState.showOpSig = m_pShowOpSigCB->isChecked();
+    m_options->classState.showPublicOnly = m_pShowPublicOnlyCB->isChecked();
 }
--- branches/work/soc-umbrello/umbrello/dialogs/classoptionspage.h #942475:942476
@@ -71,7 +71,7 @@
     QGroupBox * m_pVisibilityGB;
     QCheckBox * m_pShowVisibilityCB, * m_pShowAttSigCB;
     QCheckBox * m_pShowOpSigCB, * m_pShowAttsCB, * m_pShowOpsCB;
-    QCheckBox * m_pShowStereotypeCB, * m_pShowPackageCB;
+    QCheckBox * m_pShowStereotypeCB, * m_pShowPackageCB, * m_pShowPublicOnlyCB;
     QCheckBox * m_pShowAttribAssocsCB;
     QCheckBox * m_pDrawAsCircleCB;
 
--- branches/work/soc-umbrello/umbrello/dialogs/settingsdlg.cpp #942475:942476
@@ -274,6 +274,10 @@
     m_ClassWidgets.showOpSigCB = new QCheckBox( i18n("Show operation signature"), m_ClassWidgets.visibilityGB );
     m_ClassWidgets.showOpSigCB->setChecked(  m_pOptionState->classState.showOpSig );
     visibilityLayout->addWidget( m_ClassWidgets.showOpSigCB, 3, 0 );
+
+    m_ClassWidgets.showPublicOnlyCB = new QCheckBox( i18n("Show Public Only"), m_ClassWidgets.visibilityGB );
+    m_ClassWidgets.showPublicOnlyCB->setChecked(  m_pOptionState->classState.showPublicOnly );
+    visibilityLayout->addWidget( m_ClassWidgets.showPublicOnlyCB, 3, 1 );
     visibilityLayout->setRowStretch( 3, 1 );
 
     m_ClassWidgets.scopeGB = new QGroupBox( i18n("Starting Scope"), page );
--- branches/work/soc-umbrello/umbrello/dialogs/settingsdlg.h #942475:942476
@@ -116,6 +116,7 @@
         QCheckBox * showStereotypeCB;
         QCheckBox * showAttSigCB;
         QCheckBox * showPackageCB;
+        QCheckBox * showPublicOnlyCB;
 
         QCheckBox * showOpSigCB;
 
--- branches/work/soc-umbrello/umbrello/optionstate.h #942475:942476
@@ -63,6 +63,7 @@
     bool showOpSig;
     bool showPackage;
     bool showAttribAssocs;
+    bool showPublicOnly;
     Uml::Visibility defaultAttributeScope;
     Uml::Visibility defaultOperationScope;
 };
--- branches/work/soc-umbrello/umbrello/umbrello.kcfg #942475:942476
@@ -154,6 +154,11 @@
          <whatisthis>Show Attribute Associations</whatisthis>
          <default>true</default>
        </entry>
+       <entry name="showPublicOnly" type="Bool">
+          <label>Show Public Only</label>
+          <whatisthis>Enables/Disables showing of public attributes/methods</whatisthis>
+          <default>true</default>
+       </entry> 
        <entry name="showAttSig" type="Bool">
          <label>Show Attribute Signature</label>
          <whatisthis>Show Attribute Signature</whatisthis>
--- branches/work/soc-umbrello/umbrello/uml.cpp #942475:942476
@@ -812,6 +812,7 @@
     UmbrelloSettings::setShowOpSig( optionState.classState.showOpSig );
     UmbrelloSettings::setShowPackage(  optionState.classState.showPackage );
     UmbrelloSettings::setShowAttribAssocs(  optionState.classState.showAttribAssocs );
+    UmbrelloSettings::setShowPublicOnly(  optionState.classState.showPublicOnly );
     UmbrelloSettings::setDefaultAttributeScope( optionState.classState.defaultAttributeScope);
     UmbrelloSettings::setDefaultOperationScope( optionState.classState.defaultOperationScope);
 
@@ -1780,6 +1781,7 @@
     optionState.classState.showOpSig =  UmbrelloSettings::showOpSig();
     optionState.classState.showPackage =  UmbrelloSettings::showPackage();
     optionState.classState.showAttribAssocs =  UmbrelloSettings::showAttribAssocs();
+    optionState.classState.showPublicOnly =  UmbrelloSettings::showPublicOnly();
     optionState.classState.defaultAttributeScope = UmbrelloSettings::defaultAttributeScope();
     optionState.classState.defaultOperationScope = UmbrelloSettings::defaultOperationScope();
 
--- branches/work/soc-umbrello/umbrello/umlscene.cpp #942475:942476
@@ -3412,6 +3412,7 @@
     viewElement.setAttribute("showops", m_Options.classState.showOps);
     viewElement.setAttribute("showpackage", m_Options.classState.showPackage);
     viewElement.setAttribute("showattribassocs", m_Options.classState.showAttribAssocs);
+    viewElement.setAttribute("showpubliconly", m_Options.classState.showPublicOnly);
     viewElement.setAttribute("showscope", m_Options.classState.showVisibility);
     viewElement.setAttribute("showstereotype", m_Options.classState.showStereoType);
     //misc