mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Planner: Re-enable using the new profile.

Browse source 
This correctly enables the planner on the new profile,
but it doesn't triggers the correct paint on the canvas.

[Dirk Hohndel: remove other remnants of the disabled planner as well]

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2014-05-25 14:16:43 -03:00 • committed by Dirk Hohndel
parent d1366257f0
commit feff22c222
9 changed files with 13 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Documentation/Makefile
View file

@ -15,10 +15,6 @@ A2X = a2x
BROWSER = firefox
THEME = compact_subsurface
PWD = $(realpath .)
ENABLE_PLANNER := 0
ifeq ($(ENABLE_PLANNER), 1)
ENABLE_PLANNER_ATTR=-a ENABLE_PLANNER=$(ENABLE_PLANNER)
endif
all: doc $(addprefix $(DOCNAME).,pdf text)
@ -33,11 +29,11 @@ $(OUT)$(DOCNAME).pdf: $(DOCSOURCE)
$(OUT)$(HTMLDOC): $(DOCSOURCE)
@echo "if asciidoc isn't found the html file included in the sources is copied"
$(ASCIIDOC) -a toc -a toclevels=3 -a themedir=$(PWD) -a theme=$(THEME) -a stylesdir=$(PWD) \
$(ENABLE_PLANNER_ATTR) -o $(OUT)$(HTMLDOC) $< || cp $(HTMLDOC).git $(OUT)$(HTMLDOC)
-o $(OUT)$(HTMLDOC) $< || cp $(HTMLDOC).git $(OUT)$(HTMLDOC)
# Alternatively::
$(OUT)$(DOCNAME).xhtml: $(DOCSOURCE)
$(A2X) $(ENABLE_PLANNER_ATTR) --icons -f xhtml $<
$(A2X) --icons -f xhtml $<
show: $(HTMLDOC)
$(BROWSER) $<

4
Documentation/user-manual.txt
View file

@ -1889,7 +1889,6 @@ language / country settings as the underlying OS. If this is for some reason
undesirable users can uncheck this checkbox and pick a language / country
combination from the list of included localizations.
ifdef::ENABLE_PLANNER[]
[[S_DivePlanner]]
== The Subsurface dive planner
The dive planner is accessed by selecting _Log -> Plan Dive_ from the main menu. This
@ -1983,7 +1982,6 @@ there is no provision for any reserve gas.
image::images/Planner2.jpg["FIGURE: Planning a dive: evaluation",align="center"]
This part of the software is in active development.
endif::ENABLE_PLANNER[]
== Description of the Subsurface Main Menu items
@ -2023,9 +2021,7 @@ from _www.Divelogs.de_.
- <<S_EnterData,_Add Dive_>> - Manually add a new dive to the *Dive List* panel.
- <<S_Renumber,_Renumber_>> - Renumber the dives listed in the *Dive List*
panel.
ifdef::ENABLE_PLANNER[]
-_Plan Dive_ - This experimental feature allows planning of simple dives.
endif::ENABLE_PLANNER[]
- <<S_Group,_Auto Group_>> - Group the dives in the *Dive List* panel into dive
trips.
- _Edit Device Names_ - Edit the names of dive computers.