Tats
bcdfed3aca
Start timer after creating everything
2014-06-25 23:00:24 -04:00
Tats
ab2df9a00f
Make icons invisible in menus (not working on Ubuntu Unity but maybe somewhere else)
2014-06-25 21:28:42 -04:00
Tats
00a437864d
Integration of toolbars in a single mainToolBar, with runToolBar at the top-right end
2014-06-24 00:39:38 -04:00
Tats
f5c05a2e15
Play button replaces pause, pause replaces play
2014-06-24 00:38:02 -04:00
Tats
7c37c0ede9
Added new toolbars and their appropriate placement
2014-06-23 21:48:05 -04:00
Tats
7fc4f711c5
Integration of new icons
2014-06-23 21:47:29 -04:00
Tats
670a686c37
Merge branch 'mike-style-integration' into develop
2014-06-23 18:37:07 -04:00
Tats
0748eda051
Added output window actions to toolbar + dummy buttons
2014-06-23 17:26:20 -04:00
Tats
96ae61cea8
Play disables pause and vice-versa
2014-06-23 17:09:29 -04:00
Tats
cb0deae5f1
Base implementation of play/pause/rewind (working, still adjustments to do in the GUI)
2014-06-23 16:54:44 -04:00
Tats
b02dc5e622
Bug fix: in Qt5 the layoutChanged() did not work anymore for the layer reordering
2014-06-23 16:20:52 -04:00
Alexandre Quessy
64889af9a9
Fixed OSX-related runtime errors that were making the application crash
2014-06-23 14:53:29 -04:00
Tats
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
Vasilis Liaskovitis
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
Tats
bca6e7651d
Merge branch 'develop' into mike-style-integration
...
Conflicts:
main.cpp
2014-05-04 17:50:49 -04:00
Alexandre Quessy
d36a4fb56b
Fix: open dialog can open files with any ext
2014-05-03 12:46:14 -04:00
Alexandre Quessy
74b7f36582
add a todo
2014-05-03 12:30:05 -04:00
Alexandre Quessy
6ba3f353f4
FIX: Append file ext if not provided when save
2014-05-03 12:03:26 -04:00
Alexandre Quessy
ad66eaf650
Translations: more fr strings translated
2014-05-02 10:30:46 -04:00
Tats
996b408ba4
Remove text under buttons in toolbar
2014-04-29 23:00:41 -04:00
Tats
85ee38f9af
Include Mike's icon paths in QActions
2014-04-29 23:00:13 -04:00
Tats
c6d9ca123c
Enable fullscreen action only if outputwindow is being displayed
2014-04-29 16:45:42 -04:00
Tats
df73b0b631
Fixed problem with full screen in Linux
2014-04-29 16:45:03 -04:00
Tats
4b681a3b28
Merge branch 'fullscreen' into develop
2014-04-28 19:24:02 -04:00
Tats
ff3fdf3aa6
Merge branch 'develop' of 10.10.10.103:git/mapmap into develop
2014-04-27 00:21:16 +01:00
Tats
2a08f32cc3
Stop and start video timer in dialogs to avoid freezing
2014-04-27 00:09:09 +01:00
Alexandre Quessy
26873722c9
towards a fullscreen output window
2014-04-26 20:06:29 +01:00
Alexandre Quessy
348ffcb37e
Implement OSC callback to set video URI
2014-04-26 19:20:21 +01:00
Tats
d276c6a126
Changed extension for mapmap
2014-04-26 12:37:51 +01:00
Tats
430b0f223a
Refactor Video -> Media
2014-04-26 12:22:33 +01:00
Tats
26e709c5c6
Replaced updateAll() by updateCanvases()
2014-04-26 12:08:00 +01:00
Tats
e2b7f9b982
Compilation fixes
2014-04-26 11:27:59 +01:00
Alexandre Quessy
e91496b96a
Merge branch 'spike-video-drone' into gst-osx
2014-04-25 20:52:49 -04:00
Tats
6e58f94a48
Simple "hack" with a QTimer to time the video
2014-04-26 01:01:44 +01:00
Tats
ada827de41
Replaced images by videos + implemented hack on update() / runVideo() to quickly test gstreamer (works!)
2014-04-26 00:07:25 +01:00
Tats
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
Tats
4d3694fe28
Added an option to toggle the display of shape control points
2014-04-10 18:27:40 -04:00
Tats
419834b0ee
Removed MainWindow singleton, replacing it with much more appropriate member pointers in custom widgets
2014-04-10 17:39:37 -04:00
Alexandre Quessy
ad7bc89f28
thank you La Francophonie
2014-04-09 19:29:46 -04:00
Alexandre Quessy
74efb0dada
fix crash on Mac OS X
2014-04-04 00:29:41 -04:00
Tats
edc5f90a79
Merge branch 'master' of github.com:mapmapteam/mapmap
2014-03-22 02:03:25 -04:00
Alexandre Quessy
f7bfeb415d
Use major.minor.micro for version number.
2014-03-21 22:34:20 -04:00
Tats
441664e6f0
Added a Polygon shape and corresponding mappers (just used as a superclass of Quad and Triangle for now).
2014-03-19 22:34:34 -04:00
Tats
7602a77166
Allow reordering of sources in list
2014-03-19 15:01:18 -04:00
Tats
aa0dce3831
Cosmetic change.
2014-03-18 23:27:06 -04:00
Tats
08da5d4fa6
Properly manage the windowModified() calls to let the software know something has changed.
2014-03-18 23:26:58 -04:00
Tats
ff1d98e1a8
Created a method addPaintId similar to the addMappingId to reuse some code.
2014-03-18 23:26:17 -04:00
Tats
9c85eb17fc
Bug fix: once all mappings were destroyed, current ids were not reset (removed).
2014-03-18 23:03:08 -04:00
Tats
2da3f4a5a1
Added dialog when deleting paint.
2014-03-18 23:00:24 -04:00
Tats
63f59b4486
Enable/disable creation of mappings depending on whether a paint is selected.
2014-03-16 19:36:36 -04:00
