1. 08 May, 2014 1 commit
  2. 07 May, 2014 2 commits
  3. 30 Apr, 2014 3 commits
  4. 29 Apr, 2014 4 commits
  5. 27 Apr, 2014 3 commits
  6. 26 Apr, 2014 3 commits
  7. 25 Apr, 2014 2 commits
    • Ralf Habacker's avatar
      Add find text in tree view, current diagram and all diagrams feature. · e13d4c31
      Ralf Habacker authored
      The implementation adds menu entries and keyboard shortcuts for 'find', 'find next' and
      'find previous' functions.
      
      On start of a find operation a dialog will be opened, which allows to set the find filter
      and a simple search text. Depending on the selected filter all tree view elements or elements
      from the current or all diagrams are compared case insensitive against the search text.
      The results are stored for later access and the first result will be displayed as described below.
      
      Running 'find next' or 'find previous' using the 'tree view' filter will select the related search result,
      
      Running 'find next' or 'find previous' with current diagram or all diagrams filter set, shows the related
      view and selects the requested widget, which is positioned in the center of the view with a 100% zoom.
      If a related tree view item is present, it will also be selected.
      
      The implementation is undo/redo proof, because it stores scene/object/widget id's instead of pointers.
      
      CCBUG:116354
      e13d4c31
    • Ralf Habacker's avatar
  8. 24 Apr, 2014 3 commits
  9. 23 Apr, 2014 5 commits
  10. 22 Apr, 2014 1 commit
  11. 21 Apr, 2014 3 commits
    • Oliver Kellogg's avatar
      Cosmetics: Remove spaces at line end. · bbf4f903
      Oliver Kellogg authored
      bbf4f903
    • Oliver Kellogg's avatar
      Cosmetics: Replace tab by 8 spaces. · 45268896
      Oliver Kellogg authored
      45268896
    • Oliver Kellogg's avatar
      Followup to commit c0d58b3b for loading UML2/XMI2 files · 3ded4560
      Oliver Kellogg authored
      umbrello/object_factory.cpp function makeObjectFromXMI() :
      - Map UML2 PrimitiveType to UMLClassifier with base type ot_Datatype.
      
      umbrello/attribute.cpp function load() :
      - Replace direct accesses to QDomElement::attribute("xmi.id") by
        Model_Utils::getXmiId()
      - If no xmi.id attribute is found in tempElement then check for attribute
        "href". If href is found then look for a hashmark (#) in its value. If
        found then extract the substring following the hashmark and seek this
        name in the Datatypes folder. If found then set m_pSecondary to the
        datatype object found; else create a new datatype with this name, and
        set m_pSecondary to the new datatype object.
      
      CCBUG:56184
      3ded4560
  12. 20 Apr, 2014 3 commits
    • Oliver Kellogg's avatar
      Initial work on loading UML2/XMI2 files, e.g. · c0d58b3b
      Oliver Kellogg authored
        https://bugs.kde.org/attachment.cgi?id=86180 (Eclipse UML2)
      and
        http://www.omg.org/spec/UML/20110701/Infrastructure.xmi
      
      umbrello/model_utils.{h,cpp}
      - New function getXmiId(QDomElement) encapsulates access to xmi.id (XMI-1)
        and xmi:id (XMI-2)
      
      umbrello/{umlobject,folder,operation}.cpp
      - Replace direct accesses to QDomElement::attribute("xmi.id") by
        Model_Utils::getXmiId()
      
      umbrello/{folder,package}.cpp
      - In function load(QDomElement&), decode UML2 tags packagedElement and
        ownedElement.
      
      umbrello/umldoc.cpp
      - In function loadFromXMI(QIODevice&, short), decode outerTag values
        "Model" and "Package" for UML2;
      - In function loadUMLObjectsFromXMI(QDomElement&),
        - decode UML2 tags packagedElement and ownedElement;
        - admit XMI2 syntax "xmi:id" to the check for xmi.id presence.
      
      umbrello/classifier.cpp
      - In function makeChildObject(const QString&), support UML2 tags
        ownedOperation and ownedAttribute.
      
      CCBUG:56184
      c0d58b3b
    • Oliver Kellogg's avatar
      umbrello/umldoc.h · a9d4efc3
      Oliver Kellogg authored
      - Add ENC_WINDOWS for use by encoding(QIODevice&)
      
      umbrello/umldoc.cpp
      - short UMLDoc::encoding(QIODevice & file) :
        - Introduce variable 'enc' with initial value ENC_UNKNOWN
        - In loop advancing over comments and processing instructions, if
          node.isProcessingInstruction() then analyze the
          node.toProcessingInstruction().data(); if attribute "encoding" is
          found then extract its value. Assign ENC_UNICODE to enc if value is
          "UTF-8"; assign ENC_WINDOWS to enc if value is "windows-1252"; else
          assign ENC_OLD_ENC to enc (indicating a not yet implemented encoding.)
        - Change uWarning() messages added in commit 732b50aa to uDebug()
        - For premature returns, return variable 'enc' instead of ENC_UNKNOWN.
          Reason: Returning ENC_UNKNOWN here is overly strict, it precludes any
          further attempts at loading foreign XMI files. Rather, use the encoding
          attribute from the processing instruction if found.
      - bool UMLDoc::loadFromXMI(QIODevice & file, short encode) :
        Extend check which makes sure it is an XMI file to permit "xmi:XMI" as
        root.tagName()
      
      CCBUG:56184
      a9d4efc3
    • Oliver Kellogg's avatar
  13. 19 Apr, 2014 7 commits
    • Oliver Kellogg's avatar
      732b50aa
    • Oliver Kellogg's avatar
      Improve documentation of class. · 99520bc9
      Oliver Kellogg authored
      99520bc9
    • Oliver Kellogg's avatar
      Fix doc at load() · d3648eea
      Oliver Kellogg authored
      d3648eea
    • Raphael Kubo da Costa's avatar
      Merge branch 'KDE/4.13' · 3d370935
      Raphael Kubo da Costa authored
      * KDE/4.13: (37 commits)
        Remove unused hash_set includes.
        Do not enforce first capital letter for python packages.
        Crash fix on ada import. CCBUG:333363 FIXED-IN:4.13.0 (cherry picked from commit 3094593e)
        Fix another crash editing Time variant of SignalWidget.
        Crash fix loading SignalWidget instance with empty text.
        Do not change empty multiplicity values of associations on opening property dialog without request.
        Show newly created operation in collaboration diagram message to keep in sync with sequence diagrams.
        Show operation dialog on creation of collaboration diagram messages to keep in sync with sequence diagrams.
        Keep auto increment sequence support of collaboration diagrams in sync with sequence diagrams.
        Add sequence number to class AssociationWidget required for collaboration diagram messages.
        Move MessageWidget class member sequence number and related methods to base class LinkWidget.
        Move implementation of LayoutGenerator into cpp file.
        Prevent adding of sequence messages without a custom or class method.
        Determine auto increment sequence start value from highest available sequence number.
        Provide easier access to sequence number of class FloatingTextWidget.
        Make auto increment sequence diagram settings persistent.
        Avoid auto incrementing sequence number on editing sequence messages.
        Update version to 2.12.97.
        Create association widgets on drag and drop of UML objects from tree view into class diagram. (cherry picked from commit 1440ae76)
        Refactor code for creating all attribute associations into separate function to avoid duplicated code. (cherry picked from commit 10dcf7cb)
        ...
      
      Conflicts:
      	lib/cppparser/lexercache.h
      	lib/interfaces/hashedstring.cpp
      	umbrello/widgets/signalwidget.cpp
      3d370935
    • Raphael Kubo da Costa's avatar
      Remove unused hash_set includes. · 1376dd1c
      Raphael Kubo da Costa authored
      These headers are non-standard and their use breaks the build with libc++.
      1376dd1c
    • Ralf Habacker's avatar
      8dff959e
    • Ralf Habacker's avatar
      f4812666