I attached two patches, one to show notification while converting xml logs to v2. and the other to add the maximum dive data to the dive view.
-- regards, Gehad
From f5a34cc3fdcdbdfc0234a99a27f0f3a4068500c4 Mon Sep 17 00:00:00 2001 From: Gehad elrobey <[email protected]> Date: Sat, 28 Feb 2015 00:42:07 +0200 Subject: [PATCH 1/2] Show notification message while logs are converted to v2 This is another long operation that needs showing a notification about importing the old format log files Signed-off-by: Gehad elrobey <[email protected]> --- qt-ui/mainwindow.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index 4166993..75dfe6d 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -1395,13 +1395,14 @@ void MainWindow::loadFiles(const QStringList fileNames) v2_question_shown = true; abort_read_of_old_file = false; showV2Dialog(); + getNotificationWidget()->showNotification(tr("Please Wait, Importing your files..."), KMessageWidget::Information); i--; // so we re-try this file continue; } failedParses.append(fileNames.at(i)); } } - + getNotificationWidget()->hideNotification(); process_dives(false, false); addRecentFile(fileNames); removeRecentFile(failedParses); -- 2.1.0
From 3af42b230c161a8094546a5d8b7756003e112440 Mon Sep 17 00:00:00 2001 From: Gehad elrobey <[email protected]> Date: Sat, 28 Feb 2015 01:49:34 +0200 Subject: [PATCH 2/2] HTML: Add Max. depth to dive view. Add Max. Depth feild to the expanded and main dive views. Signed-off-by: Gehad elrobey <[email protected]> --- theme/list_lib.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/theme/list_lib.js b/theme/list_lib.js index b44ffb1..72880dc 100644 --- a/theme/list_lib.js +++ b/theme/list_lib.js @@ -214,7 +214,7 @@ function getExpanded(dive) '</td></tr></table>' + '<table><tr><td class="words">' + translate.Air_Temp + ': </td><td>' + dive.temperature.air + '</td><td class="words"> ' + translate.Water_Temp + ': </td><td>' + dive.temperature.water + - '</td></tr></table><table><tr><td class="words">' + translate.Duration + ': </td><td>' + dive.dive_duration + + '</td></tr></table><table><tr><td class="words">' + translate.Max_Depth + ': </td><td>' + put_depth_unit(dive.maxdepth) + " " + depth_unit + '</td></tr><tr><td class="words">' + translate.Duration + ': </td><td>' + dive.dive_duration + '</td></tr><tr><td class="words">' + translate.DiveMaster + ': </td><td>' + dive.divemaster + '</td></tr><tr><td class="words"><p>' + translate.Buddy + ': </p></td><td>' + dive.buddy + '</td></tr><tr><td class="words">' + translate.Suit + ': </td><td>' + dive.suit + @@ -940,7 +940,7 @@ function get_dive_HTML(dive) '</td></tr></table>' + '<table><tr><td class="words">' + translate.Air_Temp + ': </td><td>' + dive.temperature.air + '</td><td class="words"> ' + translate.Water_Temp + ': </td><td>' + dive.temperature.water + - '</td></tr></table><table><tr><td class="words">' + translate.Duration + ': </td><td>' + dive.dive_duration + + '</td></tr></table><table><tr><td class="words">' + translate.Max_Depth + ': </td><td>' + put_depth_unit(dive.maxdepth) + " " + depth_unit + '</td></tr><tr><td class="words">' + translate.Duration + ': </td><td>' + dive.dive_duration + '</td></tr><tr><td class="words">' + translate.DiveMaster + ': </td><td>' + dive.divemaster + '</td></tr><tr><td class="words"><p>' + translate.Buddy + ': </p></td><td>' + dive.buddy + '</td></tr><tr><td class="words">' + translate.Suit + ': </td><td>' + dive.suit + -- 2.1.0
_______________________________________________ subsurface mailing list [email protected] http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
