20502992b8
This change makes it so that, rather than leaving edit mode, enter and tab keep editing the new cell when they have moved. This is important on devices with an onscreen keyboard (e.g. iPads, Android tablets, Convertible Laptops, etc.), particularly in Collabora Online, as exiting edit mode hides the onscreen keyboard. It is not desirable to enable this by default, as arrow keys cannot move around the document when we are in edit mode (they move within the cell). Therefore, this commit also adds an .uno command so that we can activate or deactivate the option. In LibreOfficeKit we want to make sure not to share this setting among different users, so we also add this option in the view shell and switch which one we care about based on whether Kit is active. Change-Id: I5e6c93c64af0d201a8ec045fea5546e189baca74 Signed-off-by: Skyler Grey <skyler.grey@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160313 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161696 Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
93 lines
4.1 KiB
C++
93 lines
4.1 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <unotools/configitem.hxx>
|
|
|
|
class ScInputOptions
|
|
{
|
|
private:
|
|
sal_uInt16 nMoveDir; // enum ScDirection
|
|
bool bMoveSelection;
|
|
bool bMoveKeepEdit;
|
|
bool bEnterEdit;
|
|
bool bExtendFormat;
|
|
bool bRangeFinder;
|
|
bool bExpandRefs;
|
|
bool mbSortRefUpdate;
|
|
bool bMarkHeader;
|
|
bool bUseTabCol;
|
|
bool bTextWysiwyg;
|
|
bool bReplCellsWarn;
|
|
bool bLegacyCellSelection;
|
|
bool bEnterPasteMode;
|
|
|
|
public:
|
|
ScInputOptions();
|
|
|
|
void SetMoveDir(sal_uInt16 nNew) { nMoveDir = nNew; }
|
|
sal_uInt16 GetMoveDir() const { return nMoveDir; }
|
|
void SetMoveSelection(bool bSet) { bMoveSelection = bSet; }
|
|
bool GetMoveSelection() const { return bMoveSelection; }
|
|
void SetEnterEdit(bool bSet) { bEnterEdit = bSet; }
|
|
bool GetEnterEdit() const { return bEnterEdit; }
|
|
void SetMoveKeepEdit(bool bSet) { bMoveKeepEdit = bSet; }
|
|
bool GetMoveKeepEdit() const { return bMoveKeepEdit; }
|
|
void SetExtendFormat(bool bSet) { bExtendFormat = bSet; }
|
|
bool GetExtendFormat() const { return bExtendFormat; }
|
|
void SetRangeFinder(bool bSet) { bRangeFinder = bSet; }
|
|
bool GetRangeFinder() const { return bRangeFinder; }
|
|
void SetExpandRefs(bool bSet) { bExpandRefs = bSet; }
|
|
bool GetExpandRefs() const { return bExpandRefs; }
|
|
void SetSortRefUpdate(bool bSet) { mbSortRefUpdate = bSet; }
|
|
bool GetSortRefUpdate() const { return mbSortRefUpdate; }
|
|
void SetMarkHeader(bool bSet) { bMarkHeader = bSet; }
|
|
bool GetMarkHeader() const { return bMarkHeader; }
|
|
void SetUseTabCol(bool bSet) { bUseTabCol = bSet; }
|
|
bool GetUseTabCol() const { return bUseTabCol; }
|
|
void SetTextWysiwyg(bool bSet) { bTextWysiwyg = bSet; }
|
|
bool GetTextWysiwyg() const { return bTextWysiwyg; }
|
|
void SetReplaceCellsWarn(bool bSet) { bReplCellsWarn = bSet; }
|
|
bool GetReplaceCellsWarn() const { return bReplCellsWarn; }
|
|
void SetLegacyCellSelection(bool bSet) { bLegacyCellSelection = bSet; }
|
|
bool GetLegacyCellSelection() const { return bLegacyCellSelection; }
|
|
void SetEnterPasteMode(bool bSet) { bEnterPasteMode = bSet; }
|
|
bool GetEnterPasteMode() const { return bEnterPasteMode; }
|
|
};
|
|
|
|
// CfgItem for input options
|
|
|
|
class ScInputCfg final : private ScInputOptions,
|
|
public utl::ConfigItem
|
|
{
|
|
static css::uno::Sequence<OUString> GetPropertyNames();
|
|
void ReadCfg();
|
|
virtual void ImplCommit() override;
|
|
|
|
public:
|
|
ScInputCfg();
|
|
|
|
const ScInputOptions& GetOptions() const { return *this; }
|
|
void SetOptions( const ScInputOptions& rNew );
|
|
|
|
virtual void Notify( const css::uno::Sequence<OUString>& aPropertyNames ) override;
|
|
};
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|