strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tdf#163419 Save import dialog window size and skip resizing separator options

Browse source 
Signed-off-by: Avramoniu Calin <clavramoniu@gmail.com>
Change-Id: Ib894b61edc15d4a89e7a83bb990a2819084879f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177397
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Tested-by: Jenkins
This commit is contained in:
Avramoniu Calin 2024-11-27 11:16:04 +02:00 committed by Gabriel Masei
parent ad5e52d266
commit eea90af52e
2 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sc/source/ui/dbgui/scuiasciiopt.cxx
View file

@ -43,6 +43,7 @@
#include <unicode/ucsdet.h> #include <unicode/ucsdet.h>
#include <sfx2/objsh.hxx> #include <sfx2/objsh.hxx>
#include <svx/txenctab.hxx> #include <svx/txenctab.hxx>
#include <unotools/viewoptions.hxx>
//! TODO make dynamic //! TODO make dynamic
const SCSIZE ASCIIDLG_MAXROWS = MAXROWCOUNT; const SCSIZE ASCIIDLG_MAXROWS = MAXROWCOUNT;
@ -373,6 +374,10 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent, std::u16string_view aD
, mxAltTitle(m_xBuilder->weld_label(u"textalttitle"_ustr)) , mxAltTitle(m_xBuilder->weld_label(u"textalttitle"_ustr))
, mxTableBox(new ScCsvTableBox(*m_xBuilder)) , mxTableBox(new ScCsvTableBox(*m_xBuilder))
{ {
SvtViewOptions aDlgOpt(EViewType::Dialog, "TextImportCsvDialog");
if (aDlgOpt.Exists())
m_xDialog->set_window_state(aDlgOpt.GetWindowState());
OUString aName = m_xDialog->get_title(); OUString aName = m_xDialog->get_title();
switch (meCall) switch (meCall)
{ {
@ -591,6 +596,8 @@ IMPL_STATIC_LINK_NOARG(ScImportAsciiDlg, InstallLOKNotifierHdl, void*, vcl::ILib
ScImportAsciiDlg::~ScImportAsciiDlg() ScImportAsciiDlg::~ScImportAsciiDlg()
{ {
SvtViewOptions aDlgOpt(EViewType::Dialog, "TextImportCsvDialog");
aDlgOpt.SetWindowState(m_xDialog->get_window_state(vcl::WindowDataMask::PosSize));
} }
bool ScImportAsciiDlg::GetLine( sal_uLong nLine, OUString &rText, sal_Unicode& rcDetectSep ) bool ScImportAsciiDlg::GetLine( sal_uLong nLine, OUString &rText, sal_Unicode& rcDetectSep )

31
sc/uiconfig/scalc/ui/textimportcsv.ui
View file

@ -238,7 +238,7 @@
<object class="GtkFrame" id="frame2"> <object class="GtkFrame" id="frame2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="hexpand">True</property> <property name="hexpand">False</property>
<property name="label-xalign">0</property> <property name="label-xalign">0</property>
<property name="shadow-type">none</property> <property name="shadow-type">none</property>
<child> <child>
@ -247,15 +247,16 @@
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-start">12</property> <property name="margin-start">12</property>
<property name="margin-top">6</property> <property name="margin-top">6</property>
<property name="hexpand">True</property> <property name="hexpand">False</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<object class="GtkBox" id="box6"> <object class="GtkBox" id="box6">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="hexpand">True</property> <property name="hexpand">False</property>
<property name="homogeneous">True</property> <property name="homogeneous">False</property>
<property name="spacing">12</property>
<child> <child>
<object class="GtkRadioButton" id="tofixedwidth"> <object class="GtkRadioButton" id="tofixedwidth">
<property name="label" translatable="yes" context="textimportcsv|tofixedwidth">_Fixed width</property> <property name="label" translatable="yes" context="textimportcsv|tofixedwidth">_Fixed width</property>
@ -332,7 +333,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-start">12</property> <property name="margin-start">12</property>
<property name="hexpand">True</property> <property name="hexpand">False</property>
<property name="row-spacing">6</property> <property name="row-spacing">6</property>
<property name="column-spacing">12</property> <property name="column-spacing">12</property>
<child> <child>
@ -341,7 +342,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">False</property> <property name="receives-default">False</property>
<property name="hexpand">True</property> <property name="hexpand">False</property>
<property name="use-underline">True</property> <property name="use-underline">True</property>
<property name="draw-indicator">True</property> <property name="draw-indicator">True</property>
<child internal-child="accessible"> <child internal-child="accessible">
@ -362,7 +363,7 @@
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">False</property> <property name="receives-default">False</property>
<property name="halign">start</property> <property name="halign">start</property>
<property name="hexpand">True</property> <property name="hexpand">False</property>
<property name="use-underline">True</property> <property name="use-underline">True</property>
<property name="draw-indicator">True</property> <property name="draw-indicator">True</property>
<child internal-child="accessible"> <child internal-child="accessible">
@ -384,7 +385,7 @@
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">False</property> <property name="receives-default">False</property>
<property name="halign">start</property> <property name="halign">start</property>
<property name="hexpand">True</property> <property name="hexpand">False</property>
<property name="use-underline">True</property> <property name="use-underline">True</property>
<property name="draw-indicator">True</property> <property name="draw-indicator">True</property>
<child internal-child="accessible"> <child internal-child="accessible">
@ -405,7 +406,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">False</property> <property name="receives-default">False</property>
<property name="hexpand">True</property> <property name="hexpand">False</property>
<property name="use-underline">True</property> <property name="use-underline">True</property>
<property name="draw-indicator">True</property> <property name="draw-indicator">True</property>
<child internal-child="accessible"> <child internal-child="accessible">
@ -425,7 +426,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">False</property> <property name="receives-default">False</property>
<property name="hexpand">True</property> <property name="hexpand">False</property>
<property name="use-underline">True</property> <property name="use-underline">True</property>
<property name="draw-indicator">True</property> <property name="draw-indicator">True</property>
<child internal-child="accessible"> <child internal-child="accessible">
@ -445,7 +446,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">False</property> <property name="receives-default">False</property>
<property name="hexpand">True</property> <property name="hexpand">False</property>
<property name="use-underline">True</property> <property name="use-underline">True</property>
<property name="draw-indicator">True</property> <property name="draw-indicator">True</property>
<child internal-child="accessible"> <child internal-child="accessible">
@ -464,7 +465,7 @@
<object class="GtkGrid" id="grid3"> <object class="GtkGrid" id="grid3">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="hexpand">True</property> <property name="hexpand">False</property>
<property name="column-spacing">12</property> <property name="column-spacing">12</property>
<child> <child>
<object class="GtkCheckButton" id="other"> <object class="GtkCheckButton" id="other">
@ -492,7 +493,7 @@
<object class="GtkEntry" id="inputother"> <object class="GtkEntry" id="inputother">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="hexpand">True</property> <property name="hexpand">False</property>
<property name="max-length">10</property> <property name="max-length">10</property>
<property name="activates-default">True</property> <property name="activates-default">True</property>
<property name="width-chars">3</property> <property name="width-chars">3</property>
@ -523,7 +524,7 @@
<object class="GtkGrid" id="grid4"> <object class="GtkGrid" id="grid4">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="hexpand">True</property> <property name="hexpand">False</property>
<property name="column-spacing">12</property> <property name="column-spacing">12</property>
<child> <child>
<object class="GtkLabel" id="texttextdelimiter"> <object class="GtkLabel" id="texttextdelimiter">
@ -543,7 +544,7 @@
<object class="GtkComboBoxText" id="textdelimiter"> <object class="GtkComboBoxText" id="textdelimiter">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="hexpand">True</property> <property name="hexpand">False</property>
<property name="has-entry">True</property> <property name="has-entry">True</property>
<child internal-child="entry"> <child internal-child="entry">
<object class="GtkEntry" id="comboboxtext-entry"> <object class="GtkEntry" id="comboboxtext-entry">