Commit Graph

293 Commits

Author SHA1 Message Date
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
baydam
045c8a1055 Merge branch 'feature-zoom-control' into develop 2016-01-13 20:45:36 +00:00
baydam
4e3ccf45d4 Add "zoom in/out/reset and fit to content" buttons 2016-01-13 20:38:43 +00:00
baydam
b29207ccd7 Fix bug when display undo stack is unchecked 2016-01-12 18:28:24 +00:00
baydam
5afc6b3cb5 Fix: #181 Image glitch when undo stack not displayed 2016-01-07 18:42:26 +00:00
baydam
f03be893a3 Fix: #159 Handle corrupted files 2016-01-05 18:45:54 +00:00
baydam
03a66c5000 Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop 2016-01-05 12:19:38 +00:00
baydam
093fb3cd9d Fix: #179 Paints and mappings renamings are now saved in file 2016-01-05 12:10:54 +00:00
Tats
c3b57dcfe7 Fixed potentially unfreed QMenu. 2015-12-31 16:01:42 -06:00
baydam
a20beba15b Manage show and hide of Undo Stack tab #145 2015-12-31 15:46:56 +00:00
baydam
61a530375f Be able to rename paints and mappings OSC #72 2015-12-29 16:44:31 +00:00
baydam
73f28ae340 Can rename Paint with double click #174 2015-12-29 14:36:06 +00:00
Tats
41b1c87283 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
Conflicts:
	MainWindow.cpp
2015-12-28 16:25:20 -06:00
Tats
e0c53be751 Imperfect fix of ellipse conical projection (works better but still perspectively incorrect) (enhancement #177). 2015-12-28 16:24:22 -06:00
baydam
b30d2fac05 Fix merge conflict 2015-12-28 13:24:56 +00:00
Tats
fc627b2306 Compilation errors fix in MainWindow. 2015-12-26 19:25:37 -05:00
baydam
61528b3701 Fix merge bugs 2015-12-24 19:17:10 +00:00
baydam
038a705e5d Resolve merge conflicts 2015-12-24 18:51:59 +00:00
Tats
eb9a024635 Merge branch 'refactor-mapper-mapping-gui' into develop 2015-12-23 19:15:29 -05:00
baydam
41036354b8 Able to rename mapping with double click 2015-12-18 12:54:36 +00:00
baydam
66fc373e7b Fixed bug #101 Sending OSC visible parameter to paint that doesn't exist will not crash the software anymore 2015-12-14 15:14:05 +00:00
baydam
bafd700a1c Change shortcut for adding color paint #137 2015-12-11 23:32:10 +00:00
Tats
e76bdf1d9f Renamed Mapper to MappingGui (to correspond to Paint -> PaintGui). 2015-12-11 00:43:47 -05:00