Bay Dam
ae88f9d8fb
Fix some name space conflicts
2016-03-16 22:18:57 +01:00
baydam
b375367811
Integrate all code inside a namespace
2016-03-16 18:05:47 +00:00
Tats
a98b164aee
Added option on the commandline to force language.
2016-03-16 01:11:38 -04:00
Tats
fd92154e95
Small cleanup.
2016-03-05 21:42:00 -05:00
Tats
e5f73277b2
Removed unused items to prevent compilation warnings.
2016-03-05 18:15:57 -05:00
baydam
5fe89ab9ac
Cosmetic changes.
2016-02-23 22:01:07 +00:00
Tats
8b48b6dc8b
Renamed Media* to Video* to avoid confusion.
2016-02-19 18:58:38 -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
6c723fddd9
Make the console and the application more readable
2016-02-02 18:35:47 +00: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
Alexandre Quessy
f3c24dbeb0
Fix typos in a print
2015-10-29 17:03:19 -04:00
Alexandre Quessy
3f9176974b
Fix Stylesheet is not applied when the app is installed on Linux #139
2015-10-27 10:31:40 -04:00
Alexandre Quessy
97d56c472a
Make sure the splash screen image is packaged
2015-10-27 10:02:22 -04:00
Tats
7e85ab493c
Merge branch 'spike-qgraphicsview-zoom-and-scroll' into spike-qgraphicsview-zoom-and-scroll-merge-develop
...
Conflicts:
DestinationGLCanvas.cpp
DestinationGLCanvas.h
MainWindow.cpp
MainWindow.h
MapperGLCanvas.cpp
MapperGLCanvas.h
2015-07-06 20:38:51 -06:00
Tats
36c2c2b539
Implemented MainWindow singleton pattern.
2015-07-03 17:20:42 -06:00
baydam
6a3545ff47
Segmentation fault fixed
2015-01-29 20:39:49 +00:00
Alexandre Quessy
218694b285
Add positional option for the project file name
2014-12-28 17:42:46 -05:00
Tats
7d4e060b78
Removed commandline options for Qt < 5.0.0 (because it is not supported then).
2014-10-20 10:39:20 +00:00
Vasilis Liaskovitis
8e9f7dd7e5
use startFullScreen to fix compilation failure (introduced for bug #33 )
2014-10-18 17:35:06 +02:00
Alexandre Quessy
2a66de38ff
add --osc-port option
2014-10-17 13:57:13 -04:00
Alexandre Quessy
63e01d5285
add --file option
2014-10-17 13:33:04 -04:00
Alexandre Quessy
a0cea41fc5
Add --reset-settings option
2014-10-17 13:12:07 -04:00
Alexandre Quessy
a72f183d24
Try to make --fullscreen option work
2014-10-17 11:58:55 -04:00
Alexandre Quessy
ecf0efe956
Port to Qt5 on GNU/Linux
2014-10-16 21:27:06 -04:00
Tats
ad96d87cf0
Removed useless waiting for splash screen
2014-06-23 21:50:18 -04:00
Tats
bca6e7651d
Merge branch 'develop' into mike-style-integration
...
Conflicts:
main.cpp
2014-05-04 17:50:49 -04:00
Tats
ecce84194b
Merge branch 'gui-controls-refactor' into develop
2014-05-03 13:41:57 -04:00
Alexandre Quessy
4906cfdf29
Do not force French language
2014-05-03 11:16:22 -04:00
Tats
0e582f87ba
Cosmetic change
2014-05-03 00:26:11 -04:00
Tats
a2823dd44c
Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
...
Conflicts:
Paint.cpp
2014-05-01 13:52:52 -04:00
Alexandre Quessy
ef57a458da
Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
2014-04-30 21:40:31 -04:00
Alexandre Quessy
d72a386ed2
set env vars if needed (for OS X)
2014-04-30 21:27:02 -04:00
Tats
1a583beba7
Removed unused Common.h,cpp.
2014-04-30 20:32:10 -04:00
Tats
942c957be9
Small changes in splash message.
2014-04-30 20:31:54 -04:00
Tats
e1bb6c4333
Fixed a warning concerning string literals
2014-04-30 20:14:29 -04:00
Tats
786fca080a
Added splash screen to the app
2014-04-30 20:06:35 -04:00
Tats
3698abaf30
Set font to Helvetica Neue LTP (bold)
2014-04-29 23:01:04 -04:00
Tats
3f4dd9979c
Added stylesheet
2014-04-29 17:48:03 -04:00
Alexandre Quessy
74efb0dada
fix crash on Mac OS X
2014-04-04 00:29:41 -04:00
Alexandre Quessy
0cf4a5086c
Rename project to MapMap
2014-03-04 11:35:12 -05:00
Tats
a539023a30
Created a class MainApplication to handle notify()
2014-01-23 23:24:20 -05:00
Tats
27089582d5
Proof of concept: runs in french
2014-01-05 18:50:32 -05:00
Tats
559a7ebf90
Merge branch 'develop' into statesaving
...
Conflicts:
DestinationGLCanvas.cpp
MainWindow.cpp
MainWindow.h
Mapper.h
MappingManager.cpp
MappingManager.h
Paint.h
Shape.h
SourceGLCanvas.cpp
Util.cpp
libremapping.pro
main.cpp
2014-01-05 18:06:41 -05:00
Alexandre Quessy
7f99061cf0
minor edits
2014-01-05 15:48:53 -05:00
Vasilis Liaskovitis
5852cde869
Shape: Convert Point to QObject / QPointF
...
Also add one Q_PROPERTY for each coordinate (x and y) of a Point. This will
enable the controller to set and get these properties.
Since QObjects cannot be copied, we also need to change the Shape class to have
a vector of pointers to Points, instead of actual Point structs.
2013-12-24 13:50:20 +02:00
Alexandre Quessy
31de8211cd
Add optional OSC support
...
Add OSC receiver
add BUGS
fix README
OSC: use QVariantList to send messages to the main window
show text under icons in toolbar
remove deprecated class
detect liblo and make it optional
2013-12-10 04:55:22 -05:00
Tats
65b956a28d
Initialize MainWindow instance in main.cpp
2013-12-08 11:58:26 -05:00
Tats
5a999f1983
- Put all mappings and paints in a single MappingManager class
...
- Basic compiling / running program (no quads for now)
2013-11-30 19:19:29 -05:00
Tats
fd958cecf2
Merge branch 'master' of github.com:libremapping/libremapping
...
Conflicts:
Common.cpp
Common.h
DestinationGLCanvas.cpp
SourceGLCanvas.cpp
main.cpp
2013-11-29 12:09:49 -05:00
