aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-06-30User survey: don't ask more than once per invocationGravatar Dirk Hohndel
Otherwise when the user selects "Ask Again" they will get asked when they change preferences. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30Merge branch 'survey'Gravatar Dirk Hohndel
2014-06-30Fix Qt4 buildGravatar Dirk Hohndel
Strangely no problems on Qt5 without those declarations. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30User survey: actually collect and send the data to the backendGravatar Dirk Hohndel
This switches the QTextEdit fields to QPlainTextEdit (I don't see a reason why we should allow HTML here), no longer tries to have a default text but instead adds labels for the two fields, connects the UI so th data is collected and uses a bastardized WebServices subclass to send the data to our backend. Fixes #546 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30Small white space tune-up on JS fileGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30HTML: Show nice values when pressure is not availableGravatar Gehad elrobey
Show nice values instead of the undefined when the pressure is not available. Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com> Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30HTML: Fix listlib whitespace errors.Gravatar Gehad elrobey
Fix some code style and whitespace errors. [Dirk Hohndel: one hunk didn't apply as there was no such code...?] Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com> Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30HTML: Use jqplot to draw profile.Gravatar Gehad elrobey
Use jqplot to draw dive profile, Depth and pressure curves. add the library Javascript files under the theme directory and editing the exporter. Load them to the HTML template dynamically with synchronization as they are dependant on each other. Also Adding min version of JQuery that is needed by the library. Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com> Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30HTML: some css enhancmentGravatar Gehad elrobey
Detailed dive view needs more padding just to view normally. Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com> Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30HTML: Add temperature and pressure curves to the JSON data.Gravatar Gehad elrobey
Add more dive sample details to the JSON data. This is not so optimized some zero values can be ignored. Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com> Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30HTML: dive list must remember the last dive in displayGravatar Gehad elrobey
When switching between dives in detailed view, The dive list must be switched too. Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com> Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30HTML: export dive events to detailed viewGravatar Gehad elrobey
Add table of dive events to the dive detailed view. This should view each event, its type and the time this event took place. Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com> Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30Make the planner settings respond well to unit system changes.Gravatar Robert C. Helling
[Dirk Hohndel: removed printf/qDebug() debug output] Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-30User manual: Spelling, typosGravatar Willem Ferguson
The user manual was spell-checked against the Oxford Dictionary. Almost all the joined words, e.g. checkbox, dropdown, were kept, but divelog was changed to dive log. Quite a few tyops and spelling errors corrected. A short section on dive plan evaluation was deleted on Robert's suggestion. Signed-off-by: Willem Ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-29Image time shift dialog: remove the silly AMGravatar Dirk Hohndel
This is a time offset, not a time of day. Fixes #579 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-29Globe: don't show the location edit message after aborting planGravatar Dirk Hohndel
For some reason the isVisible() check failed, even though the message is, indeed, visible. But it doesn't seem to hurt to unconditionally hide the message, so I'm doing that instead. Fixes #576 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-29Parse git-format picture dataGravatar Linus Torvalds
This adds the loading of picture data from git repositories too. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-29git-format: save dive picture dataGravatar Linus Torvalds
This doesn't actually parse the data at load time yet, but I need a save file to do that.. The diff looks larger than it is because this moves the "mktree()" function up earlier to be used by the picture saving code. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-29Only calculate deco stops, TTS and NDL every 30sGravatar Anton Lundin
This introduces a limiter that we only calculate deco stop, TTS and NDL with a minimum of 30s intervall and just reused the values from the previous sample in other cases. I run my OSTC3 at 2s sample intervall so this is a 15x speedup in that case. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-29Calculate approx gas bill on divesGravatar Anton Lundin
This uses a bit of naive gas computations to figure out how much of different base gases you used up on the dives the statistics is done for. It's quite useful to get a minimum line about how big your gas bill is going to be after a dive trip. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-29Update of user manualGravatar Willem Ferguson
Several updates are implemented here. 1) Updates to the dive planner section, following excellent suggestions from Rob. 2) Updates reflecting the date picker, including hitting ESC to close the calendar. 3) The edit of device names. 4) Several small or typographic edits Signed-off-by: Willem Ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-29MainTab: make the tag widgets play nicer with large fontsGravatar Dirk Hohndel
Doing this I noticed that the dive list doesn't like huge fonts, either. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-29Maintab: make design more fluidGravatar Dirk Hohndel
I'm not sure I love the result just yet - the different fields don't quite stretch in a natural way (i.e., they don't stretch proportionally), but at least eventually they all stretch. Fixes #569 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-29Updates to user manual: Preferences and Main menuGravatar Willem Ferguson
This patch updates the section on Preferences to accommodate the newer additions to this Panel. (Three images removed, five images inserted) The section dealing with the desciption of all the main menu items is updated. One small change to the FAQ section. A few small typo edits elsewhere in manual. Signed-off-by: Willem Ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-29Fixed SAC in plannerGravatar Robert C. Helling
When I moved the settings for SAC's from the planner to the plannerSettings widget I forgot to move the corresponding methods from one class to the other. This fixes the display of the gas consumption in the planner Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-29Don't translate HTML tagsGravatar Henrik Brautaset Aronsen
We were sending HTML tags to translate() in worldmap-save.c Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-29Surface pressure is in mbar, not barGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-29Profile: show dive computer nickname instead of modelGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-28Profile: change event icon for gaschangeGravatar Dirk Hohndel
This is not ideal, but it gets us closer to what we need. Fixes #556 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-28Profile: remove old picture event handling codeGravatar Dirk Hohndel
We now handle pictures differently. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-28User manual: add more about dive log export.Gravatar Willem Ferguson
This patch updates the information about dive log export. Export to Worldmap, as well as to HTML are covered. Small typo corrections elsewhere in the manual. Signed-off-by: Willem Ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-28User manual: Load photographsGravatar Willem Ferguson
This patch adds text and figures to the user manual, explaining how to add photographs to the dive profile. A 2-sentence paragraph was added to the dive planner text, detailing planning for repetitive dives. Signed-off-by: Willem Ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-28User manual: add text for the dive plannerGravatar Willem Ferguson
Text for the dive planner has been added to the user manual. This includes two new images. Signed-off-by: Willem Ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-28Fix crash when cancelling a trip editGravatar Dirk Hohndel
We were comparing the wrong data and freeing things that shouldn't be freed. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-28Calendar Widget: make it modalGravatar Dirk Hohndel
Also fix the setWindowFlags calls - those are not incremental, so you need to call the method once and combine the flags. I would also like ESC to close the calendar widget, but haven't figured out how to do that... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-28Calendar Widget: get rid of week numberGravatar Dirk Hohndel
It puzzles me that this is the default. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-28Calendar Widget: set the locale appropriate first day of the weekGravatar Dirk Hohndel
Also adjust the minimum size, given I changed this in commit 26855234acef ("Make date widget easier to read"). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-28Make calendar stay on topGravatar Joakim Bygdell
This patch makes tha calendar stay on top at all times. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-28Planner: small fixes for the UIGravatar Dirk Hohndel
This way the calendar looks more "natural". And a typo fix. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-28Merge branch 'fixPlannerStartTime'Gravatar Dirk Hohndel
2014-06-28Planner: implement sane way to set the start time of the planned diveGravatar Dirk Hohndel
This uses the same widgets we use on the maintab. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-28Use date / time entry for start time of planned diveGravatar Dirk Hohndel
This is not hooked up, yet, just the UI change. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-28Rename slot to get rid of auto-connect warningGravatar Sergey Starosek
Signed-off-by: Sergey Starosek <sergey.starosek@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-28Fix date and time l10nGravatar Sergey Starosek
QDateTime::toString(const QString & format) uses system locale for month and day names. In order to get localized month and day names for user-choosen locale use QLocale::toString(const QDateTime & datetime, const QString & format) instead. Signed-off-by: Sergey Starosek <sergey.starosek@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-28Fallback to loading theme icons from resourcesGravatar Sergey Starosek
Since not all platforms support theme icons, we need to pack them into resources and fallback to that resource theme. There seems to be a bug in Qt (https://bugreports.qt-project.org/browse/QTBUG-16697), thus default theme name (hicolor) does not work. So we test for 'window-close' theme icon on startup and if not found, set theme name to 'subsurface' Signed-off-by: Sergey Starosek <sergey.starosek@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-27Fix dive picture positionGravatar Tomaz Canabrava
I was messing with the origin point, making the dive picture be a tiny bit to the right. This removes the rotation, but that was also not very good. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-27This is unecessary when calling methods.Gravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-27Open picture manager when clicking on the picture at the profileGravatar Tomaz Canabrava
This patch makes the click on pic == open picture browser works also on the profile instead of only on the list view.. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-27Remove unused variableGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-27Better date localizationGravatar Dirk Hohndel
Instead on relying on the translators to correctly format date and time we should be able to get all we need from QLocale. Sadly this takes a bit of hacky post-processing, but in my limited testing the results look good. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>