Bugfix: Projects from history not loaded and geometry in class diagram crash.

.gitignore

@@ -4,6 +4,7 @@
 *.pro.user
 *.o
 *moc_*
+src/moc_*
 *.rar
 debug/*
 release/*
@@ -24,10 +25,12 @@ makefile.*
 Makefile.*
 Makefile*
 makefile*
+!/Makefile
 include/Libs*
 .cproject
 .project
 .settings
+src/moc_*.cpp
 *.log
 *.cppcheck
 *.rc
@@ -106,3 +109,17 @@ src/ui/ui_*.h
 bin/douml
 qrc_*.cpp
 src/CppReverse/cpp_reverse
+/bin/
+!/bin/settings.ini
+!src/settings_ini.h
+/install/
+.DS_Store
+.qmake.stash
+xcuserdata/
+Info.plist
+*.xcodeproj
+project.pbxproj
+project.xcworkspace
+qt_makeqmake.mak
+qt_preprocess.mak
+xcshareddata/

CHANGELOG.md

@@ -0,0 +1,140 @@
+
+
+# Next release
+[#155]: https://github.com/DoUML/douml/pull/155
+[#161]: https://github.com/DoUML/douml/pull/161
+[#167]: https://github.com/DoUML/douml/pull/167
+[#170]: https://github.com/DoUML/douml/pull/170
+[#173]: https://github.com/DoUML/douml/pull/173
+[#179]: https://github.com/DoUML/douml/pull/179
+[#194]: https://github.com/DoUML/douml/pull/194
+
+* Fixed compilation on OS X El Capitan [#155]
+* Fixed warning about duplicated uml entities showing up needlessly [#161]
+* Build date and time automated [#161]
+* Fixed mutually exclusive attribute menus when they should not be [#161] [#167]
+* Fixed some keywords not being parsed by cpp reverse and roundtrip [#161]
+* Some UI improvements [#161] [#194]
+* Version bump [#161]
+* Improvements regarding Qt5 style handling [#167]
+* Crash fix and code improvements [#167] [#179]
+* Missing specifiers of c++ operation added to CppReverse and CppRoundtrip [#167]
+* Fix missing = sign in default and delete specifiers [#167]
+* Reduce amount of warnings [#170]
+* Warnings about deprecated use of Qt will be shown when compiling. [#170]
+* Various improvements on Makefiles and .pro files [#170]
+* The Makefile 'install' target on OS X now builds a .app bundle with all the executables inside (so that they can be launched from DoUML). For this reason only douml is still build as a bundle. Then macdeployqt adds needed frameworks and makes a .dmg file, but it's still very rough and needs more work (for instance, including all support files, translation, documentation, etc.) [#170]
+* Added to the Makefile the target 'xcodeprojects' to generate Xcode projects. [#170]
+* Changed some remaining "BoUML" text to "DoUML" [#170]
+* Set a better size for the Image dialog box and its Browse button. [#170]
+* Removed a misplaced text only appearing on Mac OS X in the Shortcut dialog. [#170]
+* Fixed segmentation fault when quitting DoUML with opened project. [#170]
+* Non latin1 string support is added [#173] 
+* Fix positioning of sequence diagrams labels [#194]
+* Some dialogs are now modal [#194]
+* Fix diagrams appearing twice when double clicked in browser view [#194]
+* Correct tabs disappearing in the drawing settings dialog [#194]
+* Fix snapshots and copying pictures of diagrams [#194]
+* Fix zValue of diagrams not being saved correctly [#194]
+
+# v1.0.8
+* Numerous bugfixes
+
+# v1.0b7.4
+* Fixed the crash at editing unidirectional association.
+
+# v1.0b7.1 
+* Fixed the crash that could occur if the user closed quick edit while editing param type
+* Attribute and operations added through quick edit now appear at their proper places in main tree view
+* Fixed operation propagation that got broken during previous releases
+
+# v1.0b7.1 
+* Fixed the issue that stopped app from closing rpoperly
+
+# v1.0b7
+
+* Previously, after "close window" button was clicked and user selected "Cancel" the app closed nevertheless. No longer the case.
+* Fixed crash when reopening operation window that had different amount of KV-pairs
+* Duplicated items in tree appear next to their source (valid of class, attribute, operation, extra member)
+* Settings will now be craeted automatically if there is no file present.
+* Fixed "relative path" for cpp generation.
+* Added capability of adding enum items and class attributes to Quickedit window
+* Added buttons for clipboard access and Quickedit to the toolbar
+* List of recent projects now lives in settings.ini
+* Updated "About" dialog and a new icon 
+
+# v1.0b6
+* Import/Export XMI2.1 are working now. Pls test for any possible bugs before fully embracing them.
+
+# v1.0b5
+* Duplicating class, operation and attribute produces its name in the name request edit.
+* Vastly expanded functionality of Quickedit window. 
+* Repeatedly pressing "ctrl-e" closes it if it is already open
+* It will remember the state it was in prior to close and restore itself accordingly.
+* Almost all features necessary for C++ editing are present. 
+* Postfix/prefix columns in quickedit table mean how parameter is actually passed in the function where: const/volatile(prefix), \*,&(postfix) 
+* You can add operation by clicking on +Operation button if you are currently on the operation or class node.
+* You can add operation parameters by clicking on +Parameter button if you are on an attribute or operation node.
+* You can delete all nodes by clicking on "Delete" column. Deleting is done in Bouml way where "deleted" node is marked as deleted but is not actually deleted until program is closed.
+A thing to note - operation parameters are also deleted in this way, but they are only present in their "deleted" state until window is closed or trr is filtered.
+10. You can move operation parameters within a single function (I will expand this later). To move parameters - click on their "mark" column, then right click on parameter you want to move them to and select either "Move after" or "Move before"
+11. If you do not ant to see c++ columns in the table - untick "C++" checkbox on the top of the window.
+!. There is a drawback to using this window atm - it knows nothing of propagation through hierarchy. Once You've edited an operation - make sure to make same edits in the others.
+!!. Quickedit, at the moment, knows _nothing_ of the changes you make in the other dialogs, if you are using it in windowed mode - make sure to press refresh button on the top left after you've changed stuff! Although I'd recommend closing it immediately after you edited what you wanted and reopening with correct data later.
+
+Now the only major things missing from Quickedit are management of enums and adding attributes to classes. These will be added in the next version.
+
+
+# v1.0b4
+Added a new class/operation/parameter control. It is brought up by pressing Ctlr-E on Package, Classview, Class, Operation or Attribute nodes in main tree
+This control is essentially an alternative way to insert quick fixes into class hierarchy. 
+Things of note:
+* you can quickly search for classes/operation etc... by entering text in lineedit on the top. It even picks operation parameters!
+* two buttons to the left of the search lineedit allow you to expand/collapse whole levels in the tree
+* "Type" of an operation node is actually its return type.
+* Nodes below operations are their parameters
+* Changes made into editable cells are IMMEDIATELY done to the model. So far there is no rollback once you've edited something.
+* Classviews/Packages are not shown in the tree, but they are used to create it.
+
+Currently, the changes you can insert in this editor are limited, and some buttons are disabled but you can expect to have MUCH more control from it in later versions.
+Feedback and requests will be appreciated.
+
+
+
+# v1.0b3
+* App entered endless cycle while trying to open some diagrams. Fixed
+
+
+# v1.0b2
+
+## Changes
+* Previously, opened tab was saved in operation dialog between dialog opens.This turned out to be very anoying and is now disabled.
+
+
+## Bugfixes
+* cpp header file was not produced correctly on generation of new projects.
+* Deploy plugin was freezing on some classes due to some weird bug which involved ->bytesAvailable function to return different value than what was written to socket.
+* Mini toolbar could crash when user tried navigating above the highest node via arrow buttons.
+* Some icons were not shown in minit-toolbar.
+* "Unmark all" did not change the color of generator label.
+* Propagating changes from abstract operation will not null op definition in subclasses.
+* Clicking OK in relations dialog while ot editing relation's name produced "illegal name" error.
+* static class members were incorrectly given "= {$value] " when generated in cpp headers.
+* In Properties tables around the app pressing enter or any arrow button finished editing of the cell.
+* Reopening class dialog did not properly reinitialize formals/inheritance/properties.
+* Reopening operation dialog did not properly reinitialize exceptions.
+
+
+## Features
+* Added "Catalog" widget below class tree. This widget is used for quick tree navigation and has 3 tabs.
+* "Visited" tab updates each time user clicks on a node in a tree. This node is inserted into visited and clicking on it will.
+  immediately scroll the main tree to it.
+* "Marked" tab tracks user selection and serves double purpose of tree navigation(as in "Visited") and node deselection via rightclick menu.
+* "Favourites" tab is used when user ahs often visited tree nodes and wants an easy wasy to return to the in a tree.
+* Adding nodes s done by dragging them from the main tree onto favourites tabs.
+* Catalog widget has line edit under tabs which serves the purpose of filtering the Visited view (only Visited atm).
+* "Builtin types" tab in generation settings has been completely reworked. 
+* User can now search and sort it.
+* User can selectively turn off languages he does not use in the table.
+* When a new row is being produced it is initialized with enough defaults to make assigning UML name the only obligatory edit before clicking "OK".
+* Adding new rows is now done through "Add type" button and a few options were removed from "do" menu as they no longer make sense.

Makefile

@@ -0,0 +1,219 @@
+# The directory where all the douml files will be installed, you
+# can change it for instance because you don't have root permission
+DOUML_LIB = /usr/lib/douml
+
+# The directory where the douml shell script will be installed, you
+# can change it for instance because you don't have root permission
+DOUML_DIR = /usr/bin
+
+# The directory where the doc will be installed, you
+# can change it for instance because you don't have root permission
+DOUML_DOC_DIR = /usr/share/doc/douml
+
+# The directory where the doc will be installed, you
+# can change it for instance because you don't have root permission
+DOUML_LOCALE_DIR = ${DOUML_LIB}/locale
+
+# The directory containing douml.desktop
+# The copy is not done if you comment the definition
+DOUML_DESKTOP_DIR = /usr/share/applications
+
+# The directories containing the douml icons are
+# <DOUML_ICONS_PREFIX_DIR>/<size>x<size>/apps
+# The copy is not done if you comment the definition
+DOUML_ICONS_PREFIX_DIR = /usr/share/icons/hicolor
+
+# On several Unix systems, the icons used inside the
+# menus must be stored inside the pixmaps' directory.
+# The copy is done if you uncomment the definition.
+DOUML_UNIX_PIXMAPS_DIR = /usr/share/pixmaps
+
+# Using uname to detect the platform
+uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
+
+# If not defined (local install), DoUML will be install into LOCAL_DESTDIR or "./install" directory
+# Else (packaging) desktop and executable script are copied into DESTDIR but reference are /
+ifndef DESTDIR
+  ifndef LOCAL_DESTDIR
+    LOCAL_DESTDIR = ${PWD}/install
+  endif
+  DESTDIR = ${LOCAL_DESTDIR}
+endif
+
+QMAKE=qmake
+
+MAKE=make
+
+# using CONFIG variable for 'release' or 'debug' and it's case sensitive!
+ifndef CONFIG
+  CONFIG=release
+endif
+
+SRC_DIRS=\
+	src/CppGenerator  \
+	src/CppReverse  \
+	src/CppRoundtrip  \
+	src/IdlGenerator  \
+	src/JavaCat  \
+	src/JavaGenerator  \
+	src/JavaReverse  \
+	src/JavaRoundtrip  \
+	src/PhpGenerator  \
+	src/PhpReverse  \
+	src/PlugOutUpgrade  \
+	src/ProjectControl  \
+	src/ProjectSynchro  \
+	src/PythonGenerator  \
+	src/RoundtripBody
+
+PLUGOUT_DIRS=genplugouts/BrowserSort  \
+	genplugouts/CppUtilities  \
+	genplugouts/deploy  \
+	genplugouts/FileControl  \
+	genplugouts/GlobalChange  \
+	genplugouts/gpro  \
+	genplugouts/HtmlDoc  \
+	genplugouts/import_rose  \
+	genplugouts/singleton  \
+	genplugouts/sm  \
+	genplugouts/uml_projection  \
+	genplugouts/usecasewizard  \
+	genplugouts/xmi  \
+	genplugouts/Xmi2Generator  \
+	genplugouts/xmi2import
+
+# the main program (built as a .app bundle on OS X)
+MAINPROG=douml
+
+# all the other side programs (NOT built as .app bundle on OS X)
+SIDEPROGS= \
+	browsersort  \
+	cpp_generator  \
+	cpp_reverse  \
+	cpp_roundtrip  \
+	cpp_util  \
+	deplcl \
+	file_control  \
+	ghtml  \
+	global_change \
+	gpro \
+	gxmi \
+	gxmi2  \
+	idl_generator  \
+	ixmi2 \
+	java_catalog  \
+	java_generator  \
+	java_reverse  \
+	java_roundtrip  \
+	php_generator  \
+	php_reverse  \
+	python_generator  \
+	roundtrip_body  \
+	usecasewizard
+
+# all the programs
+PROGS = $(MAINPROG) $(SIDEPROGS)
+
+compile:
+	( cd src/Libs/L_UniversalModels ; $(QMAKE) -config ${CONFIG} L_UniversalModels.pro; ) || exit 1 ; $(MAKE) -C src/Libs/L_UniversalModels || exit 1
+	( cd src ; $(QMAKE) -config ${CONFIG} douml.pro; ) || exit 1 ; $(MAKE) -C src || exit 1
+	for i in $(SRC_DIRS); do if [ -d $$i ]; then ( cd $$i; $(QMAKE) -config ${CONFIG}; ) || exit 1 ; $(MAKE) -C $$i || exit 1 ; fi; done
+	for i in $(PLUGOUT_DIRS); do if [ -d $$i ]; then ( cd $$i; $(QMAKE) -config ${CONFIG}; ) || exit 1 ; $(MAKE) -C $$i || exit 1 ; fi; done
+
+# Useful for debugging on OS X with XCode, this target will generate appropriate xcode projects files
+xcodeprojects: $(QTPROJECTFILES)
+	( cd src/Libs/L_UniversalModels ; $(QMAKE) -config ${CONFIG} -spec macx-xcode L_UniversalModels.pro; ) || exit 1
+	( cd src ; $(QMAKE) -config ${CONFIG} -spec macx-xcode douml.pro; ) || exit 1
+	for i in $(SRC_DIRS); do if [ -d $$i ]; then ( cd $$i; $(QMAKE) -config ${CONFIG} -spec macx-xcode; ) || exit 1 ; fi; done
+	for i in $(PLUGOUT_DIRS); do if [ -d $$i ]; then ( cd $$i; $(QMAKE) -config ${CONFIG} -spec macx-xcode; ) || exit 1 ; fi; done
+
+install:
+	mkdir -p "$(DESTDIR)$(DOUML_DIR)"
+	if test -n "$(DOUML_ICONS_PREFIX_DIR)" ; \
+	then \
+		for i in 16 32 48 64; do \
+			mkdir -p "$(DESTDIR)$(DOUML_ICONS_PREFIX_DIR)/$$i"x"$$i/apps"; \
+			cp -p douml.$$i.png "$(DESTDIR)$(DOUML_ICONS_PREFIX_DIR)/$$i"x"$$i/apps/douml.png"; \
+		done; \
+	fi
+	if test -n "$(DOUML_UNIX_PIXMAPS_DIR)"; then \
+		mkdir -p "$(DESTDIR)$(DOUML_UNIX_PIXMAPS_DIR)"; \
+		cp -f douml.48.png "$(DESTDIR)$(DOUML_UNIX_PIXMAPS_DIR)/douml.png"; \
+	fi
+	mkdir -p "$(DESTDIR)$(DOUML_LIB)"
+	cp -Rp plugouts/empty "$(DESTDIR)$(DOUML_LIB)"
+	mkdir -p "$(DESTDIR)$(DOUML_DOC_DIR)"
+	mkdir -p "$(DESTDIR)$(DOUML_LOCALE_DIR)"
+	cp -p *.lang "$(DESTDIR)$(DOUML_LOCALE_DIR)"
+# If on Darwin/Mac OS X, we are building a .dmg for deployment of a .app bundle
+ifeq ($(uname_S),Darwin)
+# First we copy the douml.app bundle directory that only contains the douml executable
+	cp -pR bin/$(MAINPROG).app "$(DESTDIR)$(DOUML_LIB)"
+# We then copy all the other side programs (executables built with qt no app bundle option)
+# inside the bundle's Contents/MacOS subfolder.
+	for i in $(SIDEPROGS); do cp -p bin/$$i "$(DESTDIR)$(DOUML_LIB)/$(MAINPROG).app/Contents/MacOS" ; done
+# We also copy the douml icon for OS X in the Resources subfolder
+	mkdir -p "$(DESTDIR)$(DOUML_LIB)/$(MAINPROG).app/Contents/Resources/"
+	cp ./douml.icns "$(DESTDIR)$(DOUML_LIB)/$(MAINPROG).app/Contents/Resources/"
+# We run the macdeployqt tool to add the appropriate frameworks and
+# configuration files to the bundle and to create a .dmg disk image file.
+ifeq ($(CONFIG),debug)
+# In debug mode we don't create the dmg file. Instead we tell macdeployqt to add the debug versions of
+# the Qt frameworks, and we edit the bundle's Info.plist to set the environment variable
+# DYLD_IMAGE_SUFFIX=_debug so that the app will load the debug versions of Qt libraries
+	/usr/libexec/PlistBuddy -c "Add :LS_Environment dict" "$(DESTDIR)$(DOUML_LIB)/$(MAINPROG).app/Contents/Info.plist"
+	/usr/libexec/PlistBuddy -c "Add :LS_Environment:DYLD_IMAGE_SUFFIX string '_debug'" "$(DESTDIR)$(DOUML_LIB)/$(MAINPROG).app/Contents/Info.plist"
+	macdeployqt "$(DESTDIR)$(DOUML_LIB)/$(MAINPROG).app" -verbose=2 -use-debug-libs \
+		$(patsubst %,-executable="$(DESTDIR)$(DOUML_LIB)/$(MAINPROG).app/Contents/MacOS/%",$(SIDEPROGS))
+else
+	macdeployqt "$(DESTDIR)$(DOUML_LIB)/$(MAINPROG).app" -verbose=2 -dmg \
+		$(patsubst %,-executable="$(DESTDIR)$(DOUML_LIB)/$(MAINPROG).app/Contents/MacOS/%",$(SIDEPROGS))
+endif
+else
+	for i in $(PROGS); do cp -p bin/$$i "$(DESTDIR)$(DOUML_LIB)" ; done
+endif
+	echo "#!/bin/sh" >$(DESTDIR)$(DOUML_DIR)/douml
+	echo "PATH=$(LOCAL_DESTDIR)$(DOUML_LIB):$$"PATH >>$(DESTDIR)$(DOUML_DIR)/douml
+	echo "DOUML_LIB_DIR=$(LOCAL_DESTDIR)$(DOUML_LIB)" >>$(DESTDIR)$(DOUML_DIR)/douml
+	echo "export PATH" >>$(DESTDIR)$(DOUML_DIR)/douml
+	echo "export DOUML_LIB_DIR" >>$(DESTDIR)$(DOUML_DIR)/douml
+	echo "exec $(LOCAL_DESTDIR)$(DOUML_LIB)/douml \"$$"@"\"" >>$(DESTDIR)$(DOUML_DIR)/douml
+	chmod +x "$(DESTDIR)$(DOUML_DIR)/douml"
+	if test -n "$(DOUML_DESKTOP_DIR)" ; \
+	then \
+		mkdir -p "$(DESTDIR)$(DOUML_DESKTOP_DIR)" ; \
+		echo "[Desktop Entry]" > "$(DESTDIR)$(DOUML_DESKTOP_DIR)/douml.desktop" ; \
+		echo "Encoding=UTF-8" >> "$(DESTDIR)$(DOUML_DESKTOP_DIR)/douml.desktop" ; \
+		echo "Name=DoUML" >> "$(DESTDIR)$(DOUML_DESKTOP_DIR)/douml.desktop" ; \
+		echo "Type=Application" >> "$(DESTDIR)$(DOUML_DESKTOP_DIR)/douml.desktop" ; \
+		echo "GenericName=Free UML 2 modeler" >> "$(DESTDIR)$(DOUML_DESKTOP_DIR)/douml.desktop" ; \
+		echo "Comment=Free UML 2 modeler" >> "$(DESTDIR)$(DOUML_DESKTOP_DIR)/douml.desktop" ; \
+		echo "Exec=$(LOCAL_DESTDIR)$(DOUML_DIR)/douml" >> "$(DESTDIR)$(DOUML_DESKTOP_DIR)/douml.desktop" ; \
+		echo "TryExec=douml" >> "$(DESTDIR)$(DOUML_DESKTOP_DIR)/douml.desktop" ; \
+		echo "Icon=douml" >> "$(DESTDIR)$(DOUML_DESKTOP_DIR)/douml.desktop" ; \
+		echo "Categories=Development;Building;GUIDesigner;IDE;Documentation;" >> "$(DESTDIR)$(DOUML_DESKTOP_DIR)/douml.desktop" ; \
+	fi
+
+uninstall:
+	rm -rf $(DESTDIR)$(DOUML_LIB) $(DESTDIR)$(DOUML_DIR)/douml
+	for i in 16 32 48 64; do \
+		rm -f "$(DESTDIR)$(DOUML_ICONS_PREFIX_DIR)/$$i"x"$$i/apps/douml.png"; \
+	done
+	rm -f "$(DESTDIR)$(DOUML_UNIX_PIXMAPS_DIR)/douml.png"
+	rm -f "$(DESTDIR)$(DOUML_DESKTOP_DIR)/douml.desktop"
+
+clean:
+	for i in $(SRC_DIRS) $(PLUGOUT_DIRS); do if [ -d $$i ]; then (cd $$i; $(QMAKE) -config ${CONFIG}; $(MAKE) clean; rm -f Makefile; ) || exit 1 ; fi; done
+	( cd src ; $(QMAKE) -config ${CONFIG} douml.pro; ) || exit 1 ; (cd src; $(MAKE) clean; rm -f Makefile; ) || exit 1
+	( cd src/Libs/L_UniversalModels ; $(QMAKE) -config ${CONFIG} L_UniversalModels.pro; ) || exit 1 ; (cd src/Libs/L_UniversalModels; $(MAKE) clean; rm -f Makefile; ) || exit 1
+# If on Darwin/Mac OS X we are removing the douml .app bundle
+ifeq ($(uname_S),Darwin)
+	rm -rf "bin/$(MAINPROG).app"
+	for i in $(SIDEPROGS); do rm -f bin/$$i; done
+else
+	for i in $(PROGS); do rm -f bin/$$i; done
+endif
+	rm -rf bin/moc_release bin/moc_debug
+	rm -rf bin/obj_release bin/obj_debug
+
+.PHONY: compile clean install uninstall