6adad6ac77
Video plays by default (at startup).
2014-09-16 20:54:14 -04:00
91425ab014
improve release process on OS X
2014-07-07 15:59:39 -04:00
42b0a6708f
Merge branch 'develop' into osc-fix-july-2014
2014-07-07 15:30:37 -04:00
03635c4904
Import video and image dialogs are now restrictive on definite file extensions (with option to select any)
2014-06-26 00:56:53 -04:00
e8f7f44493
Moved MAPMAP_VERSION and MAPMAP_EXTENSION as part of static class MM
2014-06-26 00:56:24 -04:00
2ede19425b
Fixed bug in ellipse creation: two last points of input ellipse were wrong
2014-06-26 00:27:15 -04:00
45535c80a1
Cleanup debug message
2014-06-26 00:13:42 -04:00
bbc0eeb6ae
Added option to import image files using QImage
2014-06-26 00:08:46 -04:00
bcdfed3aca
Start timer after creating everything
2014-06-25 23:00:24 -04:00
ab2df9a00f
Make icons invisible in menus (not working on Ubuntu Unity but maybe somewhere else)
2014-06-25 21:28:42 -04:00
00a437864d
Integration of toolbars in a single mainToolBar, with runToolBar at the top-right end
2014-06-24 00:39:38 -04:00
f5c05a2e15
Play button replaces pause, pause replaces play
2014-06-24 00:38:02 -04:00
7c37c0ede9
Added new toolbars and their appropriate placement
2014-06-23 21:48:05 -04:00
7fc4f711c5
Integration of new icons
2014-06-23 21:47:29 -04:00
670a686c37
Merge branch 'mike-style-integration' into develop
2014-06-23 18:37:07 -04:00
0748eda051
Added output window actions to toolbar + dummy buttons
2014-06-23 17:26:20 -04:00
96ae61cea8
Play disables pause and vice-versa
2014-06-23 17:09:29 -04:00
cb0deae5f1
Base implementation of play/pause/rewind (working, still adjustments to do in the GUI)
2014-06-23 16:54:44 -04:00
b02dc5e622
Bug fix: in Qt5 the layoutChanged() did not work anymore for the layer reordering
2014-06-23 16:20:52 -04:00
64889af9a9
Fixed OSX-related runtime errors that were making the application crash
2014-06-23 14:53:29 -04:00
0a14650d88
Reimplement most widgets in the GUI on OS X
2014-06-23 13:11:36 -04:00
0f40608562
Fixed basic problem with QGLFormat that was causing a crash; still re-building the application step by step
2014-06-23 12:54:58 -04:00
f08f25c7cb
Stripped down layout so that it runs on OSX
2014-06-23 12:35:37 -04:00
fae18b4606
Save display output window state in settings to preserve preference / last saved state of the user
2014-06-11 14:42:34 -04:00
1aace8a578
Change the uri of existing media or color paint with double-click
...
When double-clicking a paint QListWidgetItem, the uri of that paint can be
altered.
A new signal is sent to ColorMapper and TextureMapper objects so that they can
update heir color and texture paints respectively. Mappings of the old paint are
transferred to the new paint.
TODO: the active mapping may be lost in some cases, needs some more testing.
2014-05-22 11:30:25 +02:00
bca6e7651d
Merge branch 'develop' into mike-style-integration
...
Conflicts:
main.cpp
2014-05-04 17:50:49 -04:00
d36a4fb56b
Fix: open dialog can open files with any ext
2014-05-03 12:46:14 -04:00
74b7f36582
add a todo
2014-05-03 12:30:05 -04:00
6ba3f353f4
FIX: Append file ext if not provided when save
2014-05-03 12:03:26 -04:00
ad66eaf650
Translations: more fr strings translated
2014-05-02 10:30:46 -04:00
996b408ba4
Remove text under buttons in toolbar
2014-04-29 23:00:41 -04:00
85ee38f9af
Include Mike's icon paths in QActions
2014-04-29 23:00:13 -04:00
c6d9ca123c
Enable fullscreen action only if outputwindow is being displayed
2014-04-29 16:45:42 -04:00
df73b0b631
Fixed problem with full screen in Linux
2014-04-29 16:45:03 -04:00
4b681a3b28
Merge branch 'fullscreen' into develop
2014-04-28 19:24:02 -04:00
ff3fdf3aa6
Merge branch 'develop' of 10.10.10.103:git/mapmap into develop
2014-04-27 00:21:16 +01:00
2a08f32cc3
Stop and start video timer in dialogs to avoid freezing
2014-04-27 00:09:09 +01:00
26873722c9
towards a fullscreen output window
2014-04-26 20:06:29 +01:00
348ffcb37e
Implement OSC callback to set video URI
2014-04-26 19:20:21 +01:00
d276c6a126
Changed extension for mapmap
2014-04-26 12:37:51 +01:00
430b0f223a
Refactor Video -> Media
2014-04-26 12:22:33 +01:00
26e709c5c6
Replaced updateAll() by updateCanvases()
2014-04-26 12:08:00 +01:00
e2b7f9b982
Compilation fixes
2014-04-26 11:27:59 +01:00
e91496b96a
Merge branch 'spike-video-drone' into gst-osx
2014-04-25 20:52:49 -04:00
6e58f94a48
Simple "hack" with a QTimer to time the video
2014-04-26 01:01:44 +01:00
ada827de41
Replaced images by videos + implemented hack on update() / runVideo() to quickly test gstreamer (works!)
2014-04-26 00:07:25 +01:00
ed3f476d6b
Brutal port of Drone code to try to make video work using gstreamer 0.10 using appsink
2014-04-25 23:38:46 +01:00
4d3694fe28
Added an option to toggle the display of shape control points
2014-04-10 18:27:40 -04:00
419834b0ee
Removed MainWindow singleton, replacing it with much more appropriate member pointers in custom widgets
2014-04-10 17:39:37 -04:00
ad7bc89f28
thank you La Francophonie
2014-04-09 19:29:46 -04:00
Tats