[Uml-devel] KDE/kdesdk/umbrello/umbrello

[Andi Fischer]

SVN commit 1275092 by fischer:

All options saved and loaded. Small code improvements.

 M  +14 -8     dialogs/umlviewdialog.cpp  
 M  +4 -2      dialogs/umlwidgetstylepage.cpp  
 M  +20 -9     optionstate.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/umlviewdialog.cpp #1275091:1275092
@@ -178,6 +178,7 @@
     }
     else if ( item == m_pageStyleItem )
     {
+        uDebug() << "setting colors ";
         m_pStylePage->updateUMLWidget();
         m_pView->setUseFillColor( m_options.uiState.useFillColor );
         m_pView->setLineColor( m_options.uiState.lineColor );
@@ -210,23 +211,28 @@
  */
 void UMLViewDialog::checkName()
 {
-    QString name = m_diagramProperties->ui_diagramName-> text();
-    UMLDoc * pDoc = UMLApp::app()->document();
-    UMLView * pView = pDoc->findView( m_pView->type(), name );
-    if ( name.length() == 0 ) {
+    QString newName = m_diagramProperties->ui_diagramName->text();
+    if ( newName.length() == 0 ) {
         KMessageBox::sorry(this, i18n("The name you have entered is invalid."),
                            i18n("Invalid Name"), 0);
         m_diagramProperties->ui_diagramName->setText( m_pView->name() );
         return;
     }
-    if ( pView && pView != m_pView ) {
+
+    if (newName != m_pView->name()) {
+        UMLDoc* doc = UMLApp::app()->document();
+        UMLView* view = doc->findView(m_pView->type(), newName);
+        if (view) {
         KMessageBox::sorry(this, i18n("The name you have entered is not unique."),
                            i18n("Name Not Unique"), 0);
         m_diagramProperties->ui_diagramName->setText( m_pView->name() );
-        return;
     }
-    m_pView->setName( name );
-    pDoc->signalDiagramRenamed(m_pView);
+        else {
+            // uDebug() << "Cannot find view with name " << newName;
+            m_pView->setName( newName );
+            doc->signalDiagramRenamed(m_pView);
 }
+    }
+}
 
 #include "umlviewdialog.moc"
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/umlwidgetstylepage.cpp #1275091:1275092
@@ -32,7 +32,8 @@
 /**
  *   Constructor - Observe a UMLWidget.
  */
-UMLWidgetStylePage::UMLWidgetStylePage( QWidget *pParent, WidgetBase *pWidget ) : QWidget( pParent )
+UMLWidgetStylePage::UMLWidgetStylePage( QWidget *pParent, WidgetBase *pWidget )
+  : QWidget( pParent )
 {
     m_pUMLWidget = pWidget;
     m_options = 0;
@@ -58,7 +59,8 @@
 /**
  *   Constructor - Observe an OptionState structure.
  */
-UMLWidgetStylePage::UMLWidgetStylePage( QWidget * pParent, Settings::OptionState *options ) : QWidget( pParent )
+UMLWidgetStylePage::UMLWidgetStylePage( QWidget * pParent, Settings::OptionState *options )
+  : QWidget( pParent )
 {
     m_options = options;
     m_pUMLWidget = 0;
--- trunk/KDE/kdesdk/umbrello/umbrello/optionstate.cpp #1275091:1275092
@@ -35,11 +35,14 @@
     void saveToXMI(QDomElement& element, const OptionState& optstate)
     {
         // uistate
+        element.setAttribute("usefillcolor",     optstate.uiState.useFillColor);
         element.setAttribute("fillcolor",    optstate.uiState.fillColor.name());
         element.setAttribute("linecolor",    optstate.uiState.lineColor.name());
         element.setAttribute("linewidth",    optstate.uiState.lineWidth);
-        element.setAttribute("usefillcolor", optstate.uiState.useFillColor);
+        element.setAttribute("textcolor",        optstate.uiState.textColor.name());
         element.setAttribute("font",         optstate.uiState.font.toString());
+        element.setAttribute("backgroundcolor",  optstate.uiState.backgroundColor.name());
+        element.setAttribute("griddotcolor",     optstate.uiState.gridDotColor.name());
         // classstate
         element.setAttribute("showattsig",       optstate.classState.showAttSig);
         element.setAttribute("showatts",         optstate.classState.showAtts);
@@ -55,11 +58,8 @@
     bool loadFromXMI(QDomElement& element, OptionState& optstate)
     {
         // uistate
-        QString font = element.attribute("font", "");
-        if (!font.isEmpty()) {
-            optstate.uiState.font.fromString(font);
-            optstate.uiState.font.setUnderline(false);
-        }
+        QString usefillcolor = element.attribute("usefillcolor", "0");
+        optstate.uiState.useFillColor = (bool)usefillcolor.toInt();
         QString fillcolor = element.attribute("fillcolor", "");
         if (!fillcolor.isEmpty())
             optstate.uiState.fillColor = QColor(fillcolor);
@@ -69,8 +69,20 @@
         QString linewidth = element.attribute("linewidth", "");
         if (!linewidth.isEmpty())
             optstate.uiState.lineWidth = linewidth.toInt();
-        QString usefillcolor = element.attribute("usefillcolor", "0");
-        optstate.uiState.useFillColor = (bool)usefillcolor.toInt();
+        QString textColor = element.attribute("textcolor", "");
+        if (!textColor.isEmpty())
+            optstate.uiState.textColor = QColor(textColor);
+        QString font = element.attribute("font", "");
+        if (!font.isEmpty()) {
+            optstate.uiState.font.fromString(font);
+            optstate.uiState.font.setUnderline(false);
+        }
+        QString backgroundColor = element.attribute("backgroundcolor", "");
+        if (!backgroundColor.isEmpty())
+            optstate.uiState.backgroundColor = QColor(backgroundColor);
+        QString gridDotColor = element.attribute("griddotcolor", "");
+        if (!gridDotColor.isEmpty())
+            optstate.uiState.gridDotColor = QColor(gridDotColor);
         // classstate
         QString temp = element.attribute("showattsig", "0");
         optstate.classState.showAttSig = (bool)temp.toInt();
@@ -93,4 +105,3 @@
     }
 
 }  // namespace Settings
-