headers
Andi Fischer | 1 Apr 2012 10:29
Picon

branches/work/soc-umbrello/umbrello

SVN commit 1287797 by fischer:

Differences to trunk reduced.

 M  +3 -1      layoutgenerator.h  
 M  +22 -5     listpopupmenu.cpp  
 M  +8 -12     umlscene.cpp  
 M  +0 -4      umlscene.h  
 M  +30 -14    widgets/forkjoinwidget.cpp  
 M  +5 -10     widgets/forkjoinwidget.h  
 M  +46 -13    widgets/statewidget.cpp  
 M  +5 -5      widgets/statewidget.h  

--- branches/work/soc-umbrello/umbrello/layoutgenerator.h #1287796:1287797
 <at>  <at>  -122,8 +122,10  <at>  <at> 
         QTemporaryFile in;
         QTemporaryFile out;
         QTemporaryFile xdotOut;
-        if (!isEnabled())
+        if (!isEnabled()) {
+            uWarning() << "Could not apply autolayout because graphviz installation has not been found.";
             return false;
+        }

 #ifdef LAYOUTGENERATOR_DEBUG
         in.setAutoRemove(false);
--- branches/work/soc-umbrello/umbrello/listpopupmenu.cpp #1287796:1287797
 <at>  <at>  -4,7 +4,7  <at>  <at> 
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
(Continue reading)

Permalink | Reply | 0 comments |
headers
Andi Fischer | 1 Apr 2012 10:31
Picon

KDE/kdesdk/umbrello/umbrello

SVN commit 1287798 by fischer:

Differences to branch reduced.

 M  +4 -1      dialogs/classpropdlg.cpp  
 M  +1 -0      folder.cpp  
 M  +2 -2      listpopupmenu.cpp  
 M  +120 -96   umlscene.cpp  
 M  +1 -2      umlscene.h  
 M  +38 -16    widgets/forkjoinwidget.cpp  
 M  +9 -5      widgets/forkjoinwidget.h  
 M  +9 -7      widgets/statewidget.cpp  
 M  +2 -2      widgets/widget_factory.cpp  

http://websvn.kde.org/?view=rev&revision=1287798

------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here 
http://p.sf.net/sfu/sfd2d-msazure
Permalink | Reply | 0 comments |
headers
Ralf Habacker | 1 Apr 2012 10:48
Picon

KDE/kdesdk/umbrello/umbrello

SVN commit 1287800 by habacker:

Reduced differences to soc-umbrello branch.

 M  +381 -140  umlscene.cpp  
 M  +59 -218   umlscene.h  

http://websvn.kde.org/?view=rev&revision=1287800

------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here 
http://p.sf.net/sfu/sfd2d-msazure
Permalink | Reply | 0 comments |
headers
Ralf Habacker | 2 Apr 2012 00:48
Picon

branches/work/soc-umbrello/umbrello

SVN commit 1287872 by habacker:

Reduced differences to trunk.

 M  +1 -1      dialogs/umlviewdialog.cpp  
 M  +1 -1      umlscene.cpp  
 M  +1 -1      umlscene.h  
 M  +1 -1      widgets/floatingtextwidget.cpp  
 M  +1 -1      widgets/linkwidget.cpp  

--- branches/work/soc-umbrello/umbrello/dialogs/umlviewdialog.cpp #1287871:1287872
 <at>  <at>  -97,7 +97,7  <at>  <at> 

     m_diagramProperties->ui_diagramName->setText( m_pScene->name() );
     m_diagramProperties->ui_zoom->setValue(m_pScene->activeView()->currentZoom());
-    m_diagramProperties->ui_showOpSigs->setChecked( m_pScene->getShowOpSig() );
+    m_diagramProperties->ui_showOpSigs->setChecked( m_pScene->showOpSig() );

     m_diagramProperties->ui_checkBoxShowGrid->setChecked(m_pScene->isSnapGridVisible());
     m_diagramProperties->ui_snapToGrid->setChecked(m_pScene->snapToGrid());
--- branches/work/soc-umbrello/umbrello/umlscene.cpp #1287871:1287872
 <at>  <at>  -3721,7 +3721,7  <at>  <at> 
 /**
  * Returns whether to show operation signatures.
  */
-bool UMLScene::getShowOpSig() const
+bool UMLScene::showOpSig() const
 {
     return m_Options.classState.showOpSig;
 }
(Continue reading)

Permalink | Reply | 0 comments |
headers
Ralf Habacker | 2 Apr 2012 21:26
Picon

KDE/kdesdk/umbrello/umbrello

SVN commit 1288028 by habacker:

Reduced differences to soc-umbrello branch.

 M  +1 -1      umlscene.cpp  
 M  +3 -6      umlscene.h  

--- trunk/KDE/kdesdk/umbrello/umbrello/umlscene.cpp #1288027:1288028
 <at>  <at>  -105,7 +105,7  <at>  <at> 
 #define MANUAL_CONTROL_DOUBLE_BUFFERING

 // static members
-const int UMLScene::defaultCanvasSize = 1300;
+const UMLSceneValue UMLScene::defaultCanvasSize = 1300;

 using namespace Uml;

--- trunk/KDE/kdesdk/umbrello/umbrello/umlscene.h #1288027:1288028
 <at>  <at>  -280,11 +280,6  <at>  <at> 

     void resizeCanvasToItems();

-    /**
-     * The width and height of a diagram canvas in pixels.
-     */
-    static const int defaultCanvasSize;
-
     // Load/Save interface:

     virtual void saveToXMI(QDomDocument & qDoc, QDomElement & qElement);
(Continue reading)

Permalink | Reply | 0 comments |
headers
Ralf Habacker | 2 Apr 2012 21:42
Picon

KDE/kdesdk/umbrello/umbrello

SVN commit 1288030 by habacker:

Reduced differences to soc-umbrello branch.

 M  +68 -67    umlscene.cpp  

--- trunk/KDE/kdesdk/umbrello/umbrello/umlscene.cpp #1288029:1288030
 <at>  <at>  -10,13 +10,74  <at>  <at> 

 // own header
 #include "umlscene.h"
+
+// application specific includes
+#include "activitywidget.h"
+#include "actorwidget.h"
+#include "artifactwidget.h"
+#include "association.h"
+#include "associationwidget.h"
+#include "assocrules.h"
+#include "attribute.h"
+#include "boxwidget.h"
+#include "classifier.h"
+#include "classifierwidget.h"
+#include "classoptionspage.h"
+#include "cmds.h"
+#include "componentwidget.h"
+#include "datatypewidget.h"
+#include "debug_utils.h"
+#include "docwindow.h"
+#include "entity.h"
(Continue reading)

Permalink | Reply | 0 comments |
headers
Ralf Habacker | 2 Apr 2012 21:42
Picon

branches/work/soc-umbrello/umbrello

SVN commit 1288031 by habacker:

Reduced differences to trunk.

 M  +1 -2      umlscene.cpp  

--- branches/work/soc-umbrello/umbrello/umlscene.cpp #1288030:1288031
 <at>  <at>  -42,7 +42,6  <at>  <at> 
 #include "listpopupmenu.h"
 #include "messagewidget.h"
 #include "model_utils.h"
-#include "nodewidget.h"
 #include "notewidget.h"
 #include "object_factory.h"
 #include "objectnodewidget.h"
 <at>  <at>  -54,8 +53,8  <at>  <at> 
 #include "signalwidget.h"
 #include "statewidget.h"
 #include "toolbarstatefactory.h"
-#include "umldoc.h"
 #include "uml.h"
+#include "umldoc.h"
 #include "umldragdata.h"
 #include "umllistview.h"
 #include "umllistviewitem.h"

------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here 
http://p.sf.net/sfu/sfd2d-msazure
(Continue reading)

Permalink | Reply | 0 comments |
headers
Tom | 4 Apr 2012 08:58
Picon

[Bug 271872] Crash when importing Java Project

https://bugs.kde.org/show_bug.cgi?id=271872

Tom <tm.mst <at> gmx-topmail.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|UNCONFIRMED                 |RESOLVED
         Resolution|---                         |FIXED

--

-- 
You are receiving this mail because:
You are the assignee for the bug.

------------------------------------------------------------------------------
Better than sec? Nothing is better than sec when it comes to
monitoring Big Data applications. Try Boundary one-second 
resolution app monitoring today. Free.
http://p.sf.net/sfu/Boundary-dev2dev
Permalink | Reply | 0 comments |
headers
Ralf Habacker | 5 Apr 2012 18:46
Picon

KDE/kdesdk/umbrello/umbrello/widgets

SVN commit 1288337 by habacker:

Removed unused method isText().

 M  +0 -10     floatingtextwidget.h  
 M  +0 -10     umlwidget.h  

--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/floatingtextwidget.h #1288336:1288337
 <at>  <at>  -75,16 +75,6  <at>  <at> 
     LinkWidget* link() const;
     void setLink(LinkWidget * l);

-    /**
-     * Returns whether this is a line of text.
-     * Used for transparency in printing.
-     *
-     *  <at> return Returns whether this is a line of text.
-     */
-    bool isText() {
-        return true;
-    }
-
     bool activate( IDChangeLog* ChangeLog = 0 );

     Uml::TextRole textRole() const;
--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/umlwidget.h #1288336:1288337
 <at>  <at>  -72,16 +72,6  <at>  <at> 
     virtual void setFillColor(const QColor &color);
     void setFillColorcmd(const QColor &color);
(Continue reading)

Permalink | Reply | 0 comments |
headers
Ralf Habacker | 5 Apr 2012 18:46
Picon

KDE/kdesdk/umbrello/umbrello/widgets

SVN commit 1288338 by habacker:

Reordered methods to reduce the difference to the soc-umbrello branch.

 M  +6 -6      umlwidget.h  

--- trunk/KDE/kdesdk/umbrello/umbrello/widgets/umlwidget.h #1288337:1288338
 <at>  <at>  -158,17 +158,17  <at>  <at> 
     }

     /**
-     * Write property of bool m_isInstance
+     * Read property of bool m_isInstance
      */
-    void setIsInstance(bool isInstance) {
-        m_isInstance = isInstance;
+    bool isInstance() const {
+        return m_isInstance;
     }

     /**
-     * Read property of bool m_isInstance
+     * Write property of bool m_isInstance
      */
-    bool isInstance() const {
-        return m_isInstance;
+    void setIsInstance(bool isInstance) {
+        m_isInstance = isInstance;
     }
(Continue reading)

Permalink | Reply | 0 comments |

Gmane