315 Commits

Author	SHA1	Message	Date
Tats	038a0e7e55	Merge branch 'develop' of github.com:mapmapteam/mapmap into develop ... # Conflicts: # MainWindow.h	2016-03-05 22:47:33 -05:00
Tats	3d58c92e97	Merge branch 'feature-advanced-mapping-list' into develop-try-to-merge-with-adv ... # Conflicts: # MainWindow.cpp	2016-03-05 22:41:41 -05:00
baydam	ab9478c4c2	The fullscreen button is activated only in dual screen mode	2016-03-06 03:11:13 +00:00
baydam	afaccacd26	Fix shortcut propagation	2016-03-06 02:41:22 +00:00
baydam	17e4353b4f	Fix: #143 "The output window should provide the same menus and shortcuts as the main window"	2016-03-06 01:36:14 +00:00
Alexandre Quessy	aec2dba6b8	use qDebug for logging	2016-03-05 19:36:05 -05:00
Alexandre Quessy	5a56e1bba6	fix a syntax error	2016-03-05 19:32:28 -05:00
Alexandre Quessy	fa6a88e87f	Merge branch 'develop' of github.com:mapmapteam/mapmap into develop	2016-03-05 19:12:36 -05:00
Alexandre Quessy	bf256e60e6	remove translate shortcuts - See issue #200	2016-03-05 19:12:16 -05:00
Tats	e5f73277b2	Removed unused items to prevent compilation warnings.	2016-03-05 18:15:57 -05:00
Tats	97ff5ff47d	Fixed: Paint and mapping renamings are not saved in file (closes #179).	2016-03-05 17:07:46 -05:00
Tats	59e95e4c02	Replace "mute" by "hide".	2016-03-04 18:46:54 -05:00
Tats	22acf3c215	Changing mapping solo/visible/locked state changes the corresponding QActions in the main window.	2016-03-04 18:12:45 -05:00
baydam	7cc1043368	Fix broken Undo/Redo for Delete command	2016-03-04 12:10:08 +00:00
Tats	e87de3d3e9	Fixed signal/slot loop: on property changes model emits signals that are collected by the MainWindow and sent back to the PaintGui/MappingGui (this fixes OSC changes of model objects).	2016-03-03 22:25:00 -05:00
baydam	7a9457d26d	Cosmetic changes.	2016-03-03 11:36:09 +00:00
baydam	23331abf57	Add buttons on mapping layers	2016-03-03 10:18:54 +00:00
baydam	d3975c841f	Add buttons on mapping layers	2016-03-03 10:15:24 +00:00
baydam	fde9114009	Work In Progress (reverted from commit 17a64fdade)	2016-02-29 16:46:07 +00:00
baydam	17a64fdade	Work In Progress	2016-02-29 16:44:26 +00:00
baydam	5fe89ab9ac	Cosmetic changes.	2016-02-23 22:01:07 +00:00
baydam	38db95ffd4	Wrong approach of mapping layers buttons (reverted from commit 51b0976487)	2016-02-23 18:54:30 +00:00
Tats	8b48b6dc8b	Renamed Media* to Video* to avoid confusion.	2016-02-19 18:58:38 -05:00
baydam	35c9f7b7f8	Wrong approach of mapping layers buttons	2016-02-19 13:38:11 +00:00
Tats	3df0f7a955	Generate thumbnails for videos (closes #178).	2016-02-15 19:49:17 -05:00
Tats	1146a6408e	Merge branch 'develop' into feature/qt-properties ... # Conflicts: # Mapping.h # OscInterface.cpp # ProjectReader.cpp # ProjectWriter.cpp # Shape.h # main.cpp	2016-02-15 13:16:04 -05:00
baydam	8281f7dfef	Show and hide menu bar option not available on Mac & Ubuntu	2016-02-14 22:14:02 +00:00
baydam	420e30b187	UX Design document: status bar	2016-02-14 17:05:03 +00:00
baydam	21c91295d1	Display lock/mute/solo options in the context menu	2016-02-11 21:24:08 +00:00
baydam	acffd5f75a	Add a macro to check for Qt >= 5.5	2016-02-09 12:04:21 +00:00
baydam	18e00e5cbe	Add a macro to check for Qt >= 5.5	2016-02-09 12:01:40 +00:00
baydam	b3065af6ba	Add a macro to check for Qt >= 5.5	2016-02-09 11:52:16 +00:00
baydam	5c66fa1b8d	User can show or hide toolbar	2016-02-08 19:08:37 +00:00
baydam	d1af8b4208	Now we are able to show and hide menubar with ALT key	2016-02-08 16:20:45 +00:00
baydam	d889a6c616	Output window is fullscreen only if a video projector is connected or not visible	2016-02-05 18:17:47 +00:00
baydam	ce74dace68	Reorder the toolbar icons	2016-02-04 20:45:31 +00:00
baydam	f4d0e6bd6a	Merge import media and image actions	2016-02-04 18:28:08 +00:00
baydam	9c5deae1d7	Refresh View at startup	2016-02-04 13:41:05 +00:00
baydam	3238efbdb4	Fix: #199 zoom toolbar moved into the visible area	2016-02-03 13:14:25 +00:00
baydam	39ccd56eef	Fix: #197 Put the zoom toolbar in the bottom-right corner	2016-02-03 00:40:12 +00:00
baydam	6c723fddd9	Make the console and the application more readable	2016-02-02 18:35:47 +00:00
Alexandre Quessy	e52e929108	Add a macro to check for Qt >= 5.4	2016-01-27 10:35:03 -05:00
baydam	a98193c116	Close all top level window when the main window is closed	2016-01-25 19:53:47 +00:00
Tats	fe848a6355	Added actions directly to the MainWindow to allow top-level use of hot keys (closes #40).	2016-01-23 14:52:40 -05:00
Tats	990250ed13	Cosmetic change.	2016-01-23 14:51:32 -05:00
Tats	b9f2c80a19	Read/write of Color and Image paint working.	2016-01-21 20:50:44 -05:00
baydam	156e74acd5	Fix:#183 "Display logging output in a console and able to show and hide"	2016-01-21 21:54:34 +00:00
baydam	efe5c8f02a	Improvements of the menu elements	2016-01-20 18:56:39 +00:00
baydam	d289851890	Merge branch 'feature-zoom-control' into develop	2016-01-15 16:05:25 +00:00
baydam	ffd9d8aadd	Add dropdown menu to show or set zoom level	2016-01-15 16:03:13 +00:00