eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-04-15 20:19:06 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,032 Commits 60 Branches 10 Tags
bd2aba7075de91c4ee69bc002b3203570efb319d
Commit Graph

1032 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tats
bd2aba7075 Update INSTALL building instructions for Mac OSX. 2016-03-16 11:34:49 -04:00
Tats
470b360d14 Reverts commit afb771ba22 which has been fixed by adb076ab12. 2016-03-16 11:03:26 -04:00
Tats
7b7f0639b0 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2016-03-16 10:57:14 -04:00
Tats
adb076ab12 Integrated the lrelease process of *.ts to *.qm to avoid "RCC: Error in 'mapmap.qrc': Cannot find file 'mapmap_fr.qm'" errors. 2016-03-16 10:56:46 -04:00
baydam
afb771ba22 Fix compilation error 2016-03-16 10:41:28 +00:00
Bay Dam
c708fc24e4 Preparing for Windows operating system 2016-03-16 11:08:49 +01:00
Tats
0836e904a3 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2016-03-16 01:12:37 -04:00
Tats
448d9e877c Made source and destination panel QWidgets part of the MainWindow class. 2016-03-16 01:12:21 -04:00
Tats
296772d34c Some cleanup in mapmap.qrc. 2016-03-16 01:11:50 -04:00
Tats
a98b164aee Added option on the commandline to force language. 2016-03-16 01:11:38 -04:00
Tats
12a46018fe Fixed error in mapmap.pro related to translations. 2016-03-16 01:11:14 -04:00
Tats
0dd48c3ccb Fixed blocking bug on OSX: program was freezing when move was loaded 2016-03-15 19:19:20 -04:00
Tats
20839efc05 Implemented new feature: holding the shift key while moving a vertex temporarily inverts sticky vertex condition (closes #226). 2016-03-11 10:21:33 -05:00
Bay Dam
7b5fe0c7e9 Fix compilation error 2016-03-10 17:41:24 +01:00
baydam
0c093eefe3 Update Linux spec in pro file 2016-03-10 16:12:32 +00:00
Bay Dam
706f40309a Fix circular dependencies on Windows 2016-03-10 17:09:12 +01:00
baydam
df5cf42fdc Revert: circular dependencies of header files on Windows 2016-03-08 17:44:35 +00:00
Bay Dam
41264505eb Fix circular dependencies of header files on Windows 2016-03-08 17:57:47 +01:00
baydam
fce79952c1 Add check state indicator on mapping layers 2016-03-07 18:18:27 +00:00
baydam
92edc569bf Remove margin from source ans destination panel 2016-03-07 13:05:24 +00:00
Tats
4c71e0a707 Fixed bug: paint names were not preserved on filesave. 2016-03-06 12:24:12 -05:00
Tats
7896c24bf5 Fixed problem wrt reordering of layers. 2016-03-06 04:15:06 -05:00
Tats
84ebb9d3ad Moved the zoom toolbar into a separate widget class, added them in the right spots and made them correctly interoperate with the canvases. 2016-03-06 01:22:34 -05:00
Tats
28261033c6 Removed DestinationGLCanvas and SourceGLCanvas which were not doing much: integrated them directly in MapperGLCanvas. 2016-03-06 00:43:01 -05:00
Tats
35cbe281c0 Fixed segfault when loading a file: trying to call setLocked() on a non-existing shape. 2016-03-06 00:24:43 -05:00
Tats
64f2874a14 Found a temporary workaround to support reordering of mappings. 2016-03-06 00:23:58 -05:00
Tats
689dc0b306 Rename MM::MuteColunm to MM::HideColumn. 2016-03-06 00:23:29 -05:00
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
Tats
9644b636be Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 
# Conflicts:
#	VideoImpl.cpp
 2016-03-05 21:47:39 -05:00
Tats
fd92154e95 Small cleanup. 2016-03-05 21:42:00 -05:00
Tats
bddcf15c0b Cleanup (including passing gstreamer and std::cout printouts to QDebug). 2016-03-05 21:41:45 -05:00
baydam
afaccacd26 Fix shortcut propagation 2016-03-06 02:41:22 +00:00
baydam
30db5dcc72 Fix: #143 "The output window should provide the same menus and shortcuts as the main window" 2016-03-06 01:36:14 +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
61de7911b7 Decrease verbosity in VideoImpl.cpp 2016-03-05 20:04:34 -05:00
Tats
e7b95cd8f4 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2016-03-05 19:46:04 -05:00
Tats
0c2de092bd Fixed compilation error wrt shortcuts. 2016-03-05 19:45:58 -05: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
2429728e49 Removed drawControls*() methods in Utils.h which are not used anymore. 2016-03-05 18:16:49 -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
fcbc1b3aef Arranged name properties in Element.cpp. 2016-03-05 16:56:31 -05:00
Tats
f6ec081334 Save id in attributes in state saving. 2016-03-05 15:12:46 -05:00
Tats
35b74c8d1f Renamed source and destination tags to appropriate names. 2016-03-05 15:09:56 -05:00
Tats
a41b05693a Compilation error fix. 2016-03-05 14:12:12 -05:00