Commit by gopala :: r1115681 /branches/work/soc-umbrello/CMakeLists.txt:

Fixed cmake breakage by placing kde4_no_enable_final at appropriate position (after all modules are included)

Commit by gopala :: r1114391 /branches/work/soc-umbrello/:

SVN_SILENT
Recorded merge of revisions 1065859,1068964,1080656,1085561,1085569,1102669,1110984,1113635 via svnmerge from
svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdesdk/umbrello

........
  r1065859 | gopala | 2009-12-24 19:43:27 +0530 (Thu, 24 Dec 2009) | 4 lines

  * Fixed crash while importing pascal code..
  (QString bound checking before accessing index was missing)
........
  r1068964 | scripty | 2010-01-02 17:06:29 +0530 (Sat, 02 Jan 2010) | 1 line

  SVN_SILENT made messages (.desktop file)
........
  r1080656 | pino | 2010-01-26 22:12:51 +0530 (Tue, 26 Jan 2010) | 6 lines

  same fix as in the kdelibs eps exporter:
  make sure that the format of the output file is really postscript

  fixed for kde 4.4
  BUG: 185659
........
  r1085561 | beschow | 2010-02-05 18:55:38 +0530 (Fri, 05 Feb 2010) | 1 line

  fix compilation when KDE4_ENABLE_FINAL=ON
........
  r1085569 | scripty | 2010-02-05 19:03:15 +0530 (Fri, 05 Feb 2010) | 1 line

  SVN_SILENT made messages (.desktop file)
........
  r1102669 | fischer | 2010-03-13 14:27:15 +0530 (Sat, 13 Mar 2010) | 1 line

  Q3ValueList replaced with QList.
........
  r1110984 | fischer | 2010-04-04 20:34:07 +0530 (Sun, 04 Apr 2010) | 1 line

  Patch from Eike Lange applied.
........
  r1113635 | fischer | 2010-04-11 16:33:37 +0530 (Sun, 11 Apr 2010) | 1 line

  r1112708 from branche also applied to trunk.
........

Commit by gopala :: r1114389 /branches/work/soc-umbrello/CMakeLists.txt:

Merged r1085561 of trunk into soc branch.

Commit by beschow:
fix compilation when KDE4_ENABLE_FINAL=ON

Commit by gopala :: r1114390 /branches/work/soc-umbrello/umbrello/umbrello.desktop:

Merged r1085569 of trunk into soc branch.

Commit by scripty:
SVN_SILENT made messages (.desktop file)

Commit by gopala :: r1114388 /branches/work/soc-umbrello/umbrello/umlviewimageexportermodel.cpp:

Merged r1080656 of trunk into soc branch.

Commit by pino:
same fix as in the kdelibs eps exporter:
make sure that the format of the output file is really postscript

BUGNO: 185659

Commit by gopala :: r1114387 /branches/work/soc-umbrello/umbrello/umbrello.desktop:

Merging r1068964 of trunk into soc branch.

Commit by scripty
SVN_SILENT made messages (.desktop file)

Commit by gopala :: r1114386 /branches/work/soc-umbrello/umbrello/codeimport/pascalimport.cpp:

Merged r1065859 of trunk into soc branch.

Commit by gopala:

• Fixed crash while importing pascal code.. (QString bound checking before accessing index was missing)

Commit by gopala :: r1065859 umbrello/trunk/KDE/kdesdk/umbrello/umbrello/codeimport/pascalimport.cpp:

• Fixed crash while importing pascal code.. (QString bound checking before accessing index was missing)

Commit by gopala :: r1059941 /branches/work/soc-umbrello/SOC_MERGE_TODO:

Added a file containing todo's for soc-branch to bring it to state of merge.

Commit by gopala :: r1059926 /branches/work/soc-umbrello/umbrello/ (9 files in 2 dirs):

• Ground work for better undo/redo system design.
• Use the new QGraphicsObject as base class instead of QObject and QGraphicsItem.

Commit by gopala :: r1059260 /branches/work/soc-umbrello/:

SVN_SILENT: Added some file patterns to ignore
(*.diff, *.patch, *.user, patch*)

Commit by gopala :: r1058911 /branches/work/soc-umbrello/ (14 files in 3 dirs):

• Planted widget->activate() calls at appropriate places. (Results in better initialization of widget state) (Also results in AssociaitonWidgets being visible unlike before)
• Cleaned ToolBar* classes.
• WidgetBase now inherits QGraphicsObject class of Qt4.6.
• Fixed setID method to generate valid id in case arg is None.

Commit by gopala :: r1058769 /branches/work/soc-umbrello/ (. test/ umbrello/CMakeLists.txt):

SVN_SILENT:
Merged revisions 1033794,1047926 via svnmerge from
svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdesdk/umbrello

........
  r1033794 | cfeck | 2009-10-11 10:47:05 +0530 (Sun, 11 Oct 2009) | 9 lines

  Do not use add_subdirectory() when there is no CMakeLists.txt

  Volker, I disabled examples from kdepim/CMakeLists.txt, because I
  was not sure if the missing examples/CMakeLists.txt was intended to
  not build the examples. Please uncomment/revert to build them.

  CCMAIL: vkrause at kde dot org
  CCMAIL: neundorf at kde dot org
........
  r1047926 | fischer | 2009-11-12 16:09:17 +0530 (Thu, 12 Nov 2009) | 1 line

  First and intermediate version of the Application Test Procedure.
........

Commit by gopala :: r1058768 /branches/work/soc-umbrello/:

SVN_SILENT:
Recorded merge of revisions 1032431,1033806,1034063 via svnmerge from
svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdesdk/umbrello

........
  r1032431 | fischer | 2009-10-08 01:37:26 +0530 (Thu, 08 Oct 2009) | 1 line

  Patch from Markus Schulz applied - codegenerator for Vala.
........
  r1033806 | fischer | 2009-10-11 13:27:09 +0530 (Sun, 11 Oct 2009) | 1 line

  Some changes from branch applied to trunk reducing the differences.
........
  r1034063 | mlaurent | 2009-10-12 02:41:32 +0530 (Mon, 12 Oct 2009) | 2 lines

  Pedantic
........

Commit by gopala :: r1058767 /branches/work/soc-umbrello/ (. umbrello/umbrello.desktop):

SVN_SILENT:
Merged revisions 1024783,1027109 via svnmerge from
svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdesdk/umbrello

........
  r1024783 | scripty | 2009-09-17 15:01:21 +0530 (Thu, 17 Sep 2009) | 1 line

  SVN_SILENT made messages (.desktop file)
........
  r1027109 | scripty | 2009-09-23 15:52:11 +0530 (Wed, 23 Sep 2009) | 1 line

  SVN_SILENT made messages (.desktop file)
........

Commit by gopala :: r1058766 /branches/work/soc-umbrello/:

SILENT:
Recorded merge of revisions 1009790,1010581,1011859,1020163 via svnmerge from
svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdesdk/umbrello

........
  r1009790 | fischer | 2009-08-11 02:32:52 +0530 (Tue, 11 Aug 2009) | 1 line

  Fixing some Krazy complaints [qclasses].
........
  r1010581 | fischer | 2009-08-13 03:07:50 +0530 (Thu, 13 Aug 2009) | 1 line

  Dialog changed from QDialog to KDialog.
........
  r1011859 | gopala | 2009-08-16 11:21:41 +0530 (Sun, 16 Aug 2009) | 4 lines

  Fixed a crash in ActivityDialog due to mismatch between ActivityType enum
  values and the types[] string used in ActivityDialog::setupGeneralPage()
........
  r1020163 | habacker | 2009-09-05 16:47:09 +0530 (Sat, 05 Sep 2009) | 1 line

  win32 fix
........

Commit by gopala :: r1058765 /branches/work/ (15 files in 4 dirs):

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

........
  r1006625 | habacker | 2009-08-04 11:38:22 +0530 (Tue, 04 Aug 2009) | 2 lines

  added option for using '\' as doxgen tag instead of '@' - this feature is useful when generating code for a project already using '\' as doxygen tag
........

Commit by gopala :: r1017924 /branches/work/soc-umbrello/ (17 files in 3 dirs):

Implemented explicit visibility feature for TextItem so that they are
not visible when parent item is hidden while the child(TextItem) is shown.

Commit by gopala :: r1017899 /branches/work/soc-umbrello/umbrello/ (4 files in 2 dirs):

• Fix wrong size of Widgets on creating them from Toolbar and mouse.
• Improvised CombinedFragmentWidget by not showing partially constructed FloatingDashLineWidgets.

Commit by gopala :: r1017888 /branches/work/soc-umbrello/umbrello/widgets/ (5 files):

• Introduced m_loadData - a QVariantMap, which is used as stash to store all geometrical and other data while loading from XMI. These properties are then applied in the activate() method. (This solves several conceptual issues like invoking virtual calls from paritially constructed widgets and also optimizes several repaints)
• Moved some settings from WidgetBase back to UMLWidgt as in trunk.
• Removed WidgetBase::slotInit(), sceneSetFirstTime() and other workarounds.
• Widgets are now made visible only in activate() method.