~jonsgough/opencpn-plugin-draw/+git/ocpn_draw_pi:textpoint

Last commit made on 2015-07-04
Get this branch:
git clone -b textpoint https://git.launchpad.net/~jonsgough/opencpn-plugin-draw/+git/ocpn_draw_pi

Branch merges

Branch information

Recent commits

3d84399... by Jon Gough

New icons for textpoint

df9a8e6... by Jon Gough

Updated to allow merge

8e6dbff... by Jon Gough

Merge remote-tracking branch 'origin/master' into textpoint

Conflicts:
 CMakeLists.txt
 Forms/ODPointPropertiesDialog.cpp
 Forms/ODPointPropertiesDialog.h
 Forms/ODPointPropterties.fbp
 Forms/ODPropertiesDialog.cpp
 Forms/ODPropertiesDialog.fbp
 Forms/ODPropertiesDialogDef.cpp
 include/ODPointPropertiesDialog.h
 include/ODToolbarImpl.h
 include/ocpn_draw_pi.h
 src/ODEventHandler.cpp
 src/ODPointPropertiesDialog.cpp
 src/ODPointPropertiesImpl.cpp
 src/ODPropertiesDialog.cpp
 src/ODPropertiesDialogDef.cpp
 src/ODPropertiesDialogImpl.cpp
 src/ODToolbarImpl.cpp
 src/ocpn_draw_pi.cpp

e1664d9... by Jon Gough

Implement Text Point

a2fc3e0... by Jon Gough

Create a text point using standard text.

8ee4614... by Jon Gough

Merge pull request #50 from jongough/fixups

Show icon for ODPoint in Point properties dialog

319f4c2... by Jon Gough

Show icon for ODPoint in Point properties dialog
Show icon for ODPoint in OD properties dialog
Fix destructor error when properties closed

ad2b030... by Jon Gough

Fixed tools not showing on toolbar under windows

3428ea1... by Jon Gough

Merge pull request #49 from jongough/floating-toolbar

Floating toolbar

bf0e248... by Jon Gough

Merge branch 'master' into floating-toolbar

Conflicts:
 CMakeLists.txt
 src/ocpn_draw_pi.cpp