mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make query set ins mode dialog async

Browse Source 
Change-Id: I1951abc34cca59aaffb85540d38e2f002ddc3f09
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170256
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Tested-by: Jenkins
This commit is contained in:
Caolán McNamara
2024-07-09 20:45:21 +01:00
parent cda866cff5
commit 8b84691d5e
2 changed files with 48 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sw/source/uibase/inc/wrtsh.hxx
View File

@@ -640,6 +640,8 @@ private:
bool bSelect, bool bDontMoveRegion = false); bool bSelect, bool bDontMoveRegion = false);
bool GoEnd(bool KeepArea = false, const bool * = nullptr); bool GoEnd(bool KeepArea = false, const bool * = nullptr);
SAL_DLLPRIVATE void ImplSetInsMode(bool bOn);
enum BookMarkMove enum BookMarkMove
{ {
BOOKMARK_INDEX, BOOKMARK_INDEX,

66
sw/source/uibase/wrtsh/select.cxx
View File

@@ -713,27 +713,8 @@ void SwWrtShell::LeaveBlockMode()
// Insert mode // Insert mode
void SwWrtShell::SetInsMode( bool bOn ) void SwWrtShell::ImplSetInsMode(bool bOn)
{ {
const bool bDoAsk = officecfg::Office::Common::Misc::QuerySetInsMode::get();
if (!bOn && bDoAsk) {
std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(GetView().GetFrameWeld(), u"cui/ui/querysetinsmodedialog.ui"_ustr));
std::unique_ptr<weld::Dialog> xQuery(xBuilder->weld_dialog(u"SetInsModeDialog"_ustr));
std::unique_ptr<weld::Image> xImage(xBuilder->weld_image(u"imSetInsMode"_ustr));
std::unique_ptr<weld::CheckButton> xCheckBox(xBuilder->weld_check_button(u"cbDontShowAgain"_ustr));
xImage->set_from_icon_name(RID_BMP_QUERYINSMODE);
const int nResult = xQuery->run();
std::shared_ptr<comphelper::ConfigurationChanges> xChanges(
comphelper::ConfigurationChanges::create());
officecfg::Office::Common::Misc::QuerySetInsMode::set(!xCheckBox->get_active(), xChanges);
xChanges->commit();
if ( nResult == static_cast<int>(RET_NO) )
return;
}
m_bIns = bOn; m_bIns = bOn;
SwCursorShell::SetOverwriteCursor( !m_bIns ); SwCursorShell::SetOverwriteCursor( !m_bIns );
const SfxBoolItem aTmp( SID_ATTR_INSERT, m_bIns ); const SfxBoolItem aTmp( SID_ATTR_INSERT, m_bIns );
@@ -742,6 +723,51 @@ void SwWrtShell::SetInsMode( bool bOn )
EndAction(); EndAction();
Invalidate(); Invalidate();
} }
namespace
{
class QuerySetInsModeDialog : public weld::GenericDialogController
{
std::unique_ptr<weld::Image> m_xImage;
std::unique_ptr<weld::CheckButton> m_xCheckBox;
public:
QuerySetInsModeDialog(weld::Window* pParent)
: GenericDialogController(pParent, u"cui/ui/querysetinsmodedialog.ui"_ustr, u"SetInsModeDialog"_ustr)
, m_xImage(m_xBuilder->weld_image(u"imSetInsMode"_ustr))
, m_xCheckBox(m_xBuilder->weld_check_button(u"cbDontShowAgain"_ustr))
{
m_xImage->set_from_icon_name(RID_BMP_QUERYINSMODE);
}
bool GetDoNotShowAgain() const
{
return m_xCheckBox->get_active();
}
};
}
void SwWrtShell::SetInsMode( bool bOn )
{
const bool bDoAsk = officecfg::Office::Common::Misc::QuerySetInsMode::get();
if (!bOn && bDoAsk)
{
auto xDialog = std::make_shared<QuerySetInsModeDialog>(GetView().GetFrameWeld());
weld::DialogController::runAsync(xDialog, [this, bOn, xDialog](sal_Int32 nResult){
std::shared_ptr<comphelper::ConfigurationChanges> xChanges(
comphelper::ConfigurationChanges::create());
officecfg::Office::Common::Misc::QuerySetInsMode::set(!xDialog->GetDoNotShowAgain(), xChanges);
xChanges->commit();
if ( nResult == static_cast<int>(RET_NO) )
return;
ImplSetInsMode(bOn);
});
return;
}
ImplSetInsMode(bOn);
}
//Overwrite mode is incompatible with red-lining //Overwrite mode is incompatible with red-lining
void SwWrtShell::SetRedlineFlagsAndCheckInsMode( RedlineFlags eMode ) void SwWrtShell::SetRedlineFlagsAndCheckInsMode( RedlineFlags eMode )
{ {