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

[Jonathan Riddell]

SVN commit 442520 by jriddell:

Disable autolayout, graphviz isn't GPL compatible


 M  +8 -6      configure.in.in  
 M  +5 -2      umbrello/Makefile.am  
 M  +4 -45     umbrello/uml.cpp  
 M  +2 -2      umbrello/uml.h  


--- branches/KDE/3.5/kdesdk/umbrello/configure.in.in #442519:442520
@@ -7,13 +7,15 @@
 if test "$kde_have_flex" = "no"; then
   DO_NOT_COMPILE="$DO_NOT_COMPILE umbrello"
 fi
-AC_CHECK_HEADER(graphviz/dot.h,
-  [kde_have_graphviz=yes],
-  [kde_have_graphviz=no])
 
-if test "$kde_have_graphviz" = "no"; then
-  DO_NOT_COMPILE="$DO_NOT_COMPILE umbrello"
-fi
+dnl Not GPL compatible
+dnl AC_CHECK_HEADER(graphviz/dot.h,
+dnl   [kde_have_graphviz=yes],
+dnl   [kde_have_graphviz=no])
+dnl
+dnl if test "$kde_have_graphviz" = "no"; then
+dnl   DO_NOT_COMPILE="$DO_NOT_COMPILE umbrello"
+dnl fi
 AC_LANG_RESTORE
 
 
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/Makefile.am #442519:442520
@@ -99,9 +99,11 @@
 widget_utils.cpp \
 worktoolbar.cpp
 
-umbrello_LDADD   = ./refactoring/librefactoring.la ./classparser/libclassparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la ./autolayout/libautolayout.la  $(LIB_KDEPRINT) $(LIB_KIO) 
+#umbrello_LDADD   = ./refactoring/librefactoring.la ./classparser/libclassparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la ./autolayout/libautolayout.la  $(LIB_KDEPRINT) $(LIB_KIO) 
+umbrello_LDADD   = ./refactoring/librefactoring.la ./classparser/libclassparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(LIB_KDEPRINT) $(LIB_KIO) 
 
-SUBDIRS = classparser dialogs clipboard pics codegenerators headings diagram refactoring plugins autolayout
+#SUBDIRS = classparser dialogs clipboard pics codegenerators headings diagram refactoring plugins autolayout
+SUBDIRS = classparser dialogs clipboard pics codegenerators headings diagram refactoring plugins
 
 KDE_ICON=AUTO
 
@@ -113,6 +115,7 @@
 mimedir = $(kde_mimedir)/application
 mime_DATA = x-umbrello.desktop
 
+#INCLUDES= -Idialogs -Irefactoring $(all_includes) -I/usr/include/graphviz/
 INCLUDES= -Idialogs -Irefactoring $(all_includes) -I/usr/include/graphviz/
 
 METASOURCES = AUTO
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/uml.cpp #442519:442520
@@ -59,7 +59,7 @@
 #include "umllistview.h"
 #include "umlviewlist.h"
 #include "worktoolbar.h"
-#include "autolayout/autolayoutdlg.h"//dimitri
+// #include "autolayout/autolayoutdlg.h"//dimitri
 
 #include "clipboard/umlclipboard.h"
 #include "dialogs/classwizard.h"
@@ -216,8 +216,8 @@
     classDiagram = new KAction( i18n( "&Class Diagram..." ), SmallIconSet("umbrello_diagram_class"), 0,
                                 this, SLOT( slotClassDiagram() ), actionCollection(), "new_class_diagram" );
 
-    autolayout = new KAction(i18n("&Autolayout..."),0,0,this,SLOT(slotAutolayout()),
-                                              actionCollection(),"autolayout");
+    //    autolayout = new KAction(i18n("&Autolayout..."),0,0,this,SLOT(slotAutolayout()),
+    //                                              actionCollection(),"autolayout");
     sequenceDiagram= new KAction( i18n( "&Sequence Diagram..." ), SmallIconSet("umbrello_diagram_sequence"), 0,
                                   this, SLOT( slotSequenceDiagram() ), actionCollection(), "new_sequence_diagram" );
 
@@ -1685,53 +1685,12 @@
     //m_tabWidget->moveTab( m_tabWidget->currentPageIndex(), m_tabWidget->currentPageIndex() + 1 );
 }
 
+/*
 void UMLApp::slotAutolayout(){
  QDialog* d = new AutolayoutDlg(getCurrentView());
  d->show();
-
-/*if ( getCurrentView()->getType()== Uml::dt_Class){
-using namespace Autolayout;
-       int max_x = getCurrentView()->getCanvasWidth();
-       int max_y = getCurrentView()->getCanvasHeight();
-        
-	
-       Diagram d= Diagram(max_x,max_y);
-       UMLWidgetList list = getCurrentView()->getWidgetList();
- UMLWidget* widget;
-       for ( widget = list.first(); widget; widget= list.next() ){
-        if (widget->getBaseType() == Uml::wt_Class){
-
-         
-         d.addNode(widget->getID().c_str(),widget->getWidth(),
-         widget->getHeight());
-        }
 }
-        AssociationWidgetList as_list=getCurrentView()->getAssociationList();
-        AssociationWidget* assoc;
-        AssociationWidgetListIt it(as_list);
-        while ( (assoc = it.current()) != 0 ) {
-          ++it;
-          d.addEdge(assoc->getWidgetID(Uml::A).c_str(),
-           assoc->getWidgetID(Uml::B).c_str());
-        }
-         d.autolayout();
-        for ( widget = list.first(); widget; widget= list.next() )
-        if (widget->getBaseType() == Uml::wt_Class){
-		Node n =d.getNode(widget->getID().c_str());
-               //printf("old values widgets %s x,y:%d,%d\n",widget->getID().c_str(),widget->getX(),widget->getY());
-                int x_old=widget->getX();
-                int x_calc=n.getX();
-                int x_calc2=30 +n.getX()-widget->getWidth()/2;
-               widget->setX(30 +n.getX()-widget->getWidth()/2);
-                int x=widget->getX();
-               widget->setY(max_y/2-(n.getY()+(widget->getHeight()/2)));
-               widget->updateWidget();
-
-        }
-//         d.save();
-       
 */
-}
 
 KTabWidget* UMLApp::tabWidget() {
     return m_tabWidget;
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/uml.h #442519:442520
@@ -501,7 +501,7 @@
     /**
      * Autolayouts the current class diagram
      */
-    void slotAutolayout();
+    //void slotAutolayout();
 
     /**
      * Changes the statusbar contents for the standard label
@@ -887,7 +887,7 @@
     KAction* classWizard;
     KAction* deleteSelectedWidget;
     KAction* deleteDiagram;
-    KAction* autolayout;
+    //KAction* autolayout;
 
     KAction* changeTabLeft;
     KAction* changeTabRight;