Not against latest master, but I made it apply :-)

/D

On Mon, Feb 08, 2016 at 07:38:24AM +0200, Miika Turkia wrote:
> Since we currently only have preferences that affect the GPS
> functionality, it might be more logical to have the preferences under
> GPS menu.
> 
> Signed-off-by: Miika Turkia <[email protected]>
> ---
>  qt-mobile/qml/main.qml | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/qt-mobile/qml/main.qml b/qt-mobile/qml/main.qml
> index 8a53479..a810b1d 100644
> --- a/qt-mobile/qml/main.qml
> +++ b/qt-mobile/qml/main.qml
> @@ -47,13 +47,6 @@ MobileComponents.ApplicationWindow {
>                                       endEditMode()
>                               }
>                       },
> -                     Action {
> -                             text: "Preferences"
> -                             onTriggered: {
> -                                     stackView.push(prefsWindow)
> -                                     endEditMode()
> -                             }
> -                     },
>                       MobileComponents.ActionGroup {
>                               text: "Manage dives"
>                               Action {
> @@ -136,6 +129,13 @@ MobileComponents.ApplicationWindow {
>                                               manager.clearGpsData();
>                                       }
>                               }
> +                             Action {
> +                                     text: "Preferences"
> +                                     onTriggered: {
> +                                             stackView.push(prefsWindow)
> +                                             endEditMode()
> +                                     }
> +                             }
>                       },
>  
>                       MobileComponents.ActionGroup {
> -- 
> 2.5.0
> 
> _______________________________________________
> subsurface mailing list
> [email protected]
> http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
_______________________________________________
subsurface mailing list
[email protected]
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface

Reply via email to