summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-09-18Pull latest translationsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-09-18Switch some columns to right alignment in divelistGravatar Anton Lundin
Some columns in the dive list makes more sense to have right aligned than left aligned. This switches the numeric columns to right alignment so they is more easily compared visually. But, we keep the NR-column left-aligned because we use its left indentation as dive-in-a-trip marker. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-09-18Add recently changed texts to the translation source fileGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-09-18Slight change to info tab layoutGravatar Dirk Hohndel
This keeps max depth and average depth next to each other and instead moves air pressure up one row. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-09-18HTML: Cursor is on top of graph tooltipGravatar Gehad elrobey
-change the color of the depth graph slightly to be more readable. -change the tooltip of the depth graph to NW-corner of the cursor. -change the opacity of the tooltip for readability. Fixes #724 Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-09-18HTML: fix typo in dive counterGravatar Gehad Elrobey
adds a missing space to dive counter. Fixes #722 Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-09-18Bring save html capitalisation in lineGravatar Tim Wootton
Converted save html to use same capitalisation style as the rest of the application Changed references to equipments to equipment. Signed-off-by: Tim Wootton <tim@tee-jay.demon.co.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-09-18Futher capitalisation standardisationGravatar Tim Wootton
Signed-off-by: Tim Wootton <tim@tee-jay.demon.co.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-09-18TyposGravatar Salvo Tomaselli
This fixes two typos found by lintian. I guess a bunch of translations will need to be updated or something, I am not sure how they work so I didn't touch them. I presume in the worst case they will need to be re-translated at the next iteration -- Salvo Tomaselli "Io non mi sento obbligato a credere che lo stesso Dio che ci ha dotato di senso, ragione ed intelletto intendesse che noi ne facessimo a meno." -- Galileo Galilei http://ltworf.github.io/ltworf/ From a0e5f48349557fcccd82ba8c7555043de140835c Mon Sep 17 00:00:00 2001 From: Salvo 'LtWorf' Tomaselli <tiposchi@tiscali.it> Signed-off-by: Salvo 'LtWorf' Tomaselli <tiposchi@tiscali.it> Date: Fri, 12 Sep 2014 18:25:20 +0200 Subject: [PATCH] Fix typos reported by lintian Fixes two typos reported by lintian. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-09-18Helper function for partial pressure calculationGravatar Robert C. Helling
This patch introduces a new structure holding partial pressures (doubles in bar) for all three gases and a helper function to compute them from gasmix (which holds fractions) and ambient pressure. Currentlty this works for OC and CCR, to be extended later to PSCR. Currently the dive_comp_type argument is unused. Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-09-18Report CNS in dive info tabGravatar Gaetan Bisson
This adds a maxcnsText widget under infoTab and populates it. Note that I manually edited maintab.ui to display CNS and OTU next to each other and right after gas data. Signed-off-by: Gaetan Bisson <bisson@archlinux.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-09-17Fix crash at startupGravatar Dirk Hohndel
Not sure this is the right fix, but at least it doesn't crash any more. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-09-17Random whitespace updateGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-09-17Unused signature removed.Gravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-09-17Show everything by default.Gravatar Tomaz Canabrava
We should show all dives by default. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-09-17Better filtering of dives with no tags.Gravatar Tomaz Canabrava
New rules for them, a new item on the model with the text "Empty Tags" should be marked if the user wants it to be displayed. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-09-17Implement trip-filtering.Gravatar Tomaz Canabrava
Trips will be filtered if it doesn't find any tags for dives. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-09-17Correctly filter dives. (trips are always shown)Gravatar Tomaz Canabrava
This patch correctly filter dives based on tags, but it will also keep showing all the empty trips. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-09-17Create the sorting method.Gravatar Tomaz Canabrava
This method should remove a row on the dive list model visualization if none of the tags that it have are marked as 'visible'. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-09-17Implement the TagFilter model.Gravatar Tomaz Canabrava
This model accepts check / unchedk. Now, I need to also plug the result of the check / uncheck to the list model. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-09-17Trigger the log->filter by tag to open the tag filter.Gravatar Tomaz Canabrava
You can't really close it for now. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-09-17Add the Tag Widget on the MainWindowGravatar Tomaz Canabrava
Place the TagWidget on the correct place on the main window. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-09-17Remove unused method signature.Gravatar Tomaz Canabrava
This was declared on a class definition, but never implemented. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-09-17Add skeleton to the Tag Filtering.Gravatar Tomaz Canabrava
Just the ui file and a empty class to start playing with it. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-09-17Fix compilation with C99Gravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-09-11Add latest strings for translationGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-09-11CCR patch: adapt code for diluent cylinder pressures (3)Gravatar willem ferguson
This patch implements the cylinder pressure calculations for diluent gas in CCR dive computers. This is the third patch for achieving this. The following were performed: 1) Add two lines to try_to_fill_sample() in parse-xml so that diluent cylinder pressures are stored from XML dive log file into structures of sample. 2) Add one line to populate_plot_entries() in profile.c so that the diluent cylinder pressures are copied from structures of sample to structures of plot_info. 3) add three constant #defines in profile.h 4) change populate_pressure_information() in gaspressures.c in order to take into account pressure calculations for the diluent cylinder, calling subordinate functions in the appropriate way. 5) change create_plot_info_new() in profile.c in order to initiate the pressure calculations for the diluent cylinder. 6) Implement two debugging functions (one in profile.c, another in gaspressures.c). These debugging functions are activated by means of #defines. Two function calls dealing with oxygen pressure are currently commented out. They will be activated in the following patch that attends to CCR oxygen partial pressure calculation. [Dirk Hohndel: rather massive whitespace cleanup] Signed-off-by: willem ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-09-11User manual update: Replan, Copy and Paste components.Gravatar willem ferguson
This patch adds detail to the sections that deal with the modification of existing dive plans as well as for the copy and paste of dive information from one dive into other dives. Signed-off-by: willem ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-09-11Use US spelling of colo(u)r in Config DC dialogGravatar Tim Wootton
Application's default lang is US english, translation to UK spelling should be done in transifex. Signed-off-by: Tim Wootton <tim@tee-jay.demon.co.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-09-11Makes new DC config dialog follow existing UI txt styleGravatar Tim Wootton
Sets text strings to follow the style of existing UI components in use of capitalisation and use of : Signed-off-by: Tim Wootton <tim@tee-jay.demon.co.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-09-11Undo unintentional string changesGravatar Dirk Hohndel
Previous commits undid these by mistake Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-09-11Fix typosGravatar Florian Klink
Reported-by: Davide DB <dbdavide@gmail.com> Signed-off-by: Florian Klink <flokli@flokli.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-09-02Redesign Dive Computer configuration dialogGravatar Joseph W. Joshua
The dive computer configuration dialog was a bit cluttered. This change adds a tabbed interface separating the basic settings from the gas, dilutent and set point settings Signed-off-by: Joseph W. Joshua <joejoshw@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-08-29QT += concurrent is a Qt 5 thingGravatar Thiago Macieira
In Qt 4, QtConcurrent is part of QtCore. Signed-off-by: Thiago Macieira <thiago@macieira.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-08-29Revert hacks now that we use Qt5 on MacGravatar Dirk Hohndel
Commits a24eb8ac120bf and 0b0860d24a81b introduced a nasty hack that was needed back then to make tank and weight selection work on the Mac. But it caused other unpleasant issues (as mentioned in the commit messages). I re-tested this with the current Qt5.3 based builds on Mac and this hack is no longer needed. Fixes #638 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-08-29Latest Portuguese translationsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-08-28Fix water temperature on Suunto SDM importGravatar Miika Turkia
Seems that Suunto stores temperature value of 0 when there is no temperature reading (I guess). Thus this patch ignores temperature samples that are zero. Otherwise, Subsurface looks into the samples and grabs the lowest number as water temperature. See #720 Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-08-28CCR patch: Adapt pressure interpolation for CCR (2)Gravatar willem ferguson
This is the second pathch in this series of four, allowing the calculation of cylinder pressures for CCR equipment. Change function fill_missing_tank_pressures in order to enable working with the diuent gas, comprising a complete set of pressures kept separate from all other tank pressures. Flag diluent_flag indicates calculations for the diluent cylinder. [Dirk Hohndel: serious whitespace cleanup] Signed-off-by: willem ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-08-28HTML: Changing the files extensions to jsGravatar Gehad elrobey
These are actually javascript files containing js objects and not json files. Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-08-28HTML: export valid JSON.Gravatar Gehad elrobey
Remove the trailing commas from the exported JSON file as some json parsers just don't like it. The file 'file.json' is valid acording to the JSON spesification. Note: its a javascript file containing a JS variable 'trips' and not a JSON file. Because loading a pure JSON file from local disk is not accepted by the web-browsers itself. Actually I think changing the file extension to .js is now makes more sense. Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-08-27Updated translationsGravatar Dirk Hohndel
The change in the French translations fixes the bug where Subsurface couldn't find images when run in the French locale - the problem was an incomplete translation string. Fixes #708 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-08-27Use compilation flags.Gravatar Salvo 'LtWorf' Tomaselli
This makes qmake aware of CFLAGS, CXXFLAGS, LDFLAGS, CPPFLAGS. This is helpful to easily add flags to the compilation (such as hardening flags). Signed-off-by: Salvo 'LtWorf' Tomaselli <tiposchi@tiscali.it> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-08-27Define PATH_MAX if it's not definedGravatar Salvo 'LtWorf' Tomaselli
Fixes FTBFS on Hurd. [Dirk Hohndel: changed PATH_MAX to 4096 for consistency with Linux] Signed-off-by: Salvo 'LtWorf' Tomaselli <tiposchi@tiscali.it> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-08-27Preferences: only save settings that are changedGravatar Dirk Hohndel
This continues the effort started earlier to only save things that aren't the default. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-08-27Use one consistent font size throughout the appGravatar Dirk Hohndel
Let's see how much people notice it / hate it. Fixes #712 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-08-27Don't set up fonts twiceGravatar Dirk Hohndel
Turns out that the mainwindow reads the settings and sets up things - except that this has already happened in the constructor of the static PreferencesDialog. So only keep those parts that aren't handled there. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-08-27Default font: more fine tuningGravatar Dirk Hohndel
In order to get rid of the old default font on Windows (Calibri) we are going to near ridiculous length. The reason for this is that we in the past always saved the default font in the settings (how stupid was that!) and so now even with a new default font in place, since there is an explicit font in the settings we take that instead of the default. Instead of requiring our existing users to use a registry cleaner to get the correct default font on Windows 7 and later (the VAST majority of our Windows users at this stage), we simply explicitly ignore that old default font. There is one very nasty side effect. A user cannot set Calibri as their font of choice on Windows 7 or later (because we always force them back onto Segoe). Given how much nicer Segoe looks I think this is an acceptable flaw - let's hope this doesn't come back to bite me in the future. At the same time this changes the default font size handling. We try to get the default font size of the OS so the app looks "right". This seems to not give me the expected result on Linux with KDE, but maybe I'm doing it wrong? Looks good when testing on Windows. See #712 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-08-27Add gaspressures to cmakeGravatar Dirk Hohndel
Ignoring the fact that cmake is a disgusting pile of crap, let's at least track the files in our project for the people who want to use it. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-08-27HTML: Save divecomputer data to the HTML exportsGravatar Gehad elrobey
Save divecomputers data to the JSON files. and show them in the HTML dive detailed view. Fixes #711 Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-08-27Add uncompressed Poseidon CCR XML dive log to the directory subsurface/dives.Gravatar willem ferguson
This file is not in the original unformatted style of Posedon but in an intermediate XML for developing the Qt interface. At the end of development this file will be replaced by the original unformatted dive log. Signed-off-by: willem ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>