sc/UIConfig_scalc.mk | 1 sc/source/ui/condformat/condformatdlgentry.cxx | 2 sc/uiconfig/scalc/ui/conditionalentrymobile.ui | 455 ------------------------- 3 files changed, 1 insertion(+), 457 deletions(-)
New commits: commit eb862a9330f880f69459c1b9bc1892c98b250b6a Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Thu Jan 23 15:16:33 2020 +0000 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Fri Jan 24 13:21:18 2020 +0100 conditionalentrymobile doesn't work this is probably based on the non-mobile version, but by when it was initially integrated it was already out of sync with the non-mobile version and can't work as it is Change-Id: I480052230d2f893f540cacb2cc2c3b699f9cba1a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87283 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index 29131d219c60..323e8775caeb 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -100,7 +100,6 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/conditionalformatdialog \ sc/uiconfig/scalc/ui/conditionalformatdialogmobile \ sc/uiconfig/scalc/ui/conditionalentry \ - sc/uiconfig/scalc/ui/conditionalentrymobile \ sc/uiconfig/scalc/ui/conditionaliconset \ sc/uiconfig/scalc/ui/conflictsdialog \ sc/uiconfig/scalc/ui/consolidatedialog \ diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index f66f19274761..936e5b235a40 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -47,7 +47,7 @@ ScCondFrmtEntry::ScCondFrmtEntry(ScCondFormatList* pParent, ScDocument* pDoc, const ScAddress& rPos) : mpParent(pParent) - , mxBuilder(Application::CreateBuilder(pParent->GetContainer(), (comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView())?OUString("modules/scalc/ui/conditionalentrymobile.ui"):OUString("modules/scalc/ui/conditionalentry.ui")))) + , mxBuilder(Application::CreateBuilder(pParent->GetContainer(), "modules/scalc/ui/conditionalentry.ui")) , mxBorder(mxBuilder->weld_widget("border")) , mxGrid(mxBuilder->weld_container("grid")) , mxFtCondNr(mxBuilder->weld_label("number")) diff --git a/sc/uiconfig/scalc/ui/conditionalentrymobile.ui b/sc/uiconfig/scalc/ui/conditionalentrymobile.ui deleted file mode 100644 index 3b1cda8a5661..000000000000 --- a/sc/uiconfig/scalc/ui/conditionalentrymobile.ui +++ /dev/null @@ -1,455 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> -<interface domain="sc"> - <requires lib="gtk+" version="3.0"/> - <requires lib="LibreOffice" version="1.0"/> - <object class="GtkGrid" id="grid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="border_width">6</property> - <property name="orientation">vertical</property> - <property name="row_spacing">7</property> - <child> - <object class="GtkGrid" id="grid1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="column_spacing">2</property> - <child> - <object class="GtkLabel" id="number"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="condition"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkGrid" id="grid2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="resize_mode">immediate</property> - <property name="row_spacing">12</property> - <property name="column_homogeneous">True</property> - <child> - <object class="GtkComboBoxText" id="type"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">False</property> - <items> - <item translatable="yes" context="conditionalentrymobile|type">All Cells</item> - <item translatable="yes" context="conditionalentrymobile|type">Cell value is</item> - <item translatable="yes" context="conditionalentrymobile|type">Formula is</item> - <item translatable="yes" context="conditionalentrymobile|type">Date is</item> - </items> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="height">2</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="style"> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="conditionalentrymobile|style">New Style...</item> - </items> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">6</property> - </packing> - </child> - <child> - <object class="GtkButton" id="options"> - <property name="label" translatable="yes" context="conditionalentrymobile|options">More Options...</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">12</property> - </packing> - </child> - <child> - <object class="GtkDrawingArea" id="preview:border"> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes" context="conditionalentrymobile|preview|tooltip_text">Example</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">7</property> - </packing> - </child> - <child> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_homogeneous">True</property> - <child> - <object class="GtkComboBoxText" id="typeis"> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="conditionalentrymobile|typeis">equal to</item> - <item translatable="yes" context="conditionalentrymobile|typeis">less than</item> - <item translatable="yes" context="conditionalentrymobile|typeis">greater than</item> - <item translatable="yes" context="conditionalentrymobile|typeis">less than or equal to</item> - <item translatable="yes" context="conditionalentrymobile|typeis">greater than or equal to</item> - <item translatable="yes" context="conditionalentrymobile|typeis">not equal to</item> - <item translatable="yes" context="conditionalentrymobile|typeis">between</item> - <item translatable="yes" context="conditionalentrymobile|typeis">not between</item> - <item translatable="yes" context="conditionalentrymobile|typeis">duplicate</item> - <item translatable="yes" context="conditionalentrymobile|typeis">not duplicate</item> - <item translatable="yes" context="conditionalentrymobile|typeis">top 10 elements</item> - <item translatable="yes" context="conditionalentrymobile|typeis">bottom 10 elements</item> - <item translatable="yes" context="conditionalentrymobile|typeis">top 10 percent</item> - <item translatable="yes" context="conditionalentrymobile|typeis">bottom 10 percent</item> - <item translatable="yes" context="conditionalentrymobile|typeis">above average</item> - <item translatable="yes" context="conditionalentrymobile|typeis">below average</item> - <item translatable="yes" context="conditionalentrymobile|typeis">above or equal average</item> - <item translatable="yes" context="conditionalentrymobile|typeis">below or equal average</item> - <item translatable="yes" context="conditionalentrymobile|typeis">Error</item> - <item translatable="yes" context="conditionalentrymobile|typeis">No Error</item> - <item translatable="yes" context="conditionalentrymobile|typeis">Begins with</item> - <item translatable="yes" context="conditionalentrymobile|typeis">Ends with</item> - <item translatable="yes" context="conditionalentrymobile|typeis">Contains</item> - <item translatable="yes" context="conditionalentrymobile|typeis">Not Contains</item> - </items> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="datetype"> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="conditionalentrymobile|datetype">Today</item> - <item translatable="yes" context="conditionalentrymobile|datetype">Yesterday</item> - <item translatable="yes" context="conditionalentrymobile|datetype">Tomorrow</item> - <item translatable="yes" context="conditionalentrymobile|datetype">Last 7 days</item> - <item translatable="yes" context="conditionalentrymobile|datetype">This week</item> - <item translatable="yes" context="conditionalentrymobile|datetype">Last week</item> - <item translatable="yes" context="conditionalentrymobile|datetype">Next week</item> - <item translatable="yes" context="conditionalentrymobile|datetype">This month</item> - <item translatable="yes" context="conditionalentrymobile|datetype">Last month</item> - <item translatable="yes" context="conditionalentrymobile|datetype">Next month</item> - <item translatable="yes" context="conditionalentrymobile|datetype">This year</item> - <item translatable="yes" context="conditionalentrymobile|datetype">Last year</item> - <item translatable="yes" context="conditionalentrymobile|datetype">Next year</item> - </items> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="colorformat"> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="conditionalentrymobile|colorformat">Color Scale (2 Entries)</item> - <item translatable="yes" context="conditionalentrymobile|colorformat">Color Scale (3 Entries)</item> - <item translatable="yes" context="conditionalentrymobile|colorformat">Data Bar</item> - <item translatable="yes" context="conditionalentrymobile|colorformat">Icon Set</item> - </items> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="foruilo-RefEdit" id="formula"> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">12</property> - <property name="column_homogeneous">True</property> - <child> - <object class="foruilo-RefEdit" id="val1"> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="foruilo-RefEdit" id="val2"> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="iconsettype"> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="conditionalentrymobile|iconsettype">3 Arrows</item> - <item translatable="yes" context="conditionalentrymobile|iconsettype">3 Gray Arrows</item> - <item translatable="yes" context="conditionalentrymobile|iconsettype">3 Flags</item> - <item translatable="yes" context="conditionalentrymobile|iconsettype">3 Traffic Lights 1</item> - <item translatable="yes" context="conditionalentrymobile|iconsettype">3 Traffic Lights 2</item> - <item translatable="yes" context="conditionalentrymobile|iconsettype">3 Signs</item> - <item translatable="yes" context="conditionalentrymobile|iconsettype">3 Symbols 1</item> - <item translatable="yes" context="conditionalentrymobile|iconsettype">3 Symbols 2</item> - <item translatable="yes" context="conditionalentrymobile|iconsettype">3 Smileys</item> - <item translatable="yes" context="conditionalentrymobile|iconsettype">3 Stars</item> - <item translatable="yes" context="conditionalentrymobile|iconsettype">3 Triangles</item> - <item translatable="yes" context="conditionalentrymobile|iconsettype">3 Colored Smileys</item> - <item translatable="yes" context="conditionalentrymobile|iconsettype">4 Arrows</item> - <item translatable="yes" context="conditionalentrymobile|iconsettype">4 Gray Arrows</item> - <item translatable="yes" context="conditionalentrymobile|iconsettype">4 Circles Red to Black</item> - <item translatable="yes" context="conditionalentrymobile|iconsettype">4 Ratings</item> - <item translatable="yes" context="conditionalentrymobile|iconsettype">4 Traffic Lights</item> - <item translatable="yes" context="conditionalentrymobile|iconsettype">5 Arrows</item> - <item translatable="yes" context="conditionalentrymobile|iconsettype">5 Gray Arrows</item> - <item translatable="yes" context="conditionalentrymobile|iconsettype">5 Ratings</item> - <item translatable="yes" context="conditionalentrymobile|iconsettype">5 Quarters</item> - <item translatable="yes" context="conditionalentrymobile|iconsettype">5 Boxes</item> - </items> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="styleft"> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes" context="conditionalentrymobile|styleft">Apply Style:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">style</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> - </packing> - </child> - <child> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_homogeneous">True</property> - <child> - <object class="GtkComboBoxText" id="colscalemax"> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="conditionalentrymobile|colscalemax">Automatic</item> - <item translatable="yes" context="conditionalentrymobile|colscalemax">Min</item> - <item translatable="yes" context="conditionalentrymobile|colscalemax">Max</item> - <item translatable="yes" context="conditionalentrymobile|colscalemax">Percentile</item> - <item translatable="yes" context="conditionalentrymobile|colscalemax">Value</item> - <item translatable="yes" context="conditionalentrymobile|colscalemax">Percent</item> - <item translatable="yes" context="conditionalentrymobile|colscalemax">Formula</item> - </items> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="edcolscalemax"> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="svxcorelo-SvxColorListBox" id="lbcolmax"> - <property name="can_focus">False</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">11</property> - </packing> - </child> - <child> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_homogeneous">True</property> - <child> - <object class="GtkComboBoxText" id="colscalemiddle"> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="conditionalentrymobile|colscalemiddle">Automatic</item> - <item translatable="yes" context="conditionalentrymobile|colscalemiddle">Min</item> - <item translatable="yes" context="conditionalentrymobile|colscalemiddle">Max</item> - <item translatable="yes" context="conditionalentrymobile|colscalemiddle">Percentile</item> - <item translatable="yes" context="conditionalentrymobile|colscalemiddle">Value</item> - <item translatable="yes" context="conditionalentrymobile|colscalemiddle">Percent</item> - <item translatable="yes" context="conditionalentrymobile|colscalemiddle">Formula</item> - </items> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="height">2</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="edcolscalemiddle"> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="svxcorelo-SvxColorListBox" id="lbcolmiddle"> - <property name="can_focus">False</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">10</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="valueft"> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="conditionalentrymobile|valueft">Enter a value:</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">8</property> - </packing> - </child> - <child> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_homogeneous">True</property> - <child> - <object class="GtkComboBoxText" id="colscalemin"> - <property name="can_focus">False</property> - <items> - <item translatable="yes" context="conditionalentrymobile|colscalemin">Automatic</item> - <item translatable="yes" context="conditionalentrymobile|colscalemin">Min</item> - <item translatable="yes" context="conditionalentrymobile|colscalemin">Max</item> - <item translatable="yes" context="conditionalentrymobile|colscalemin">Percentile</item> - <item translatable="yes" context="conditionalentrymobile|colscalemin">Value</item> - <item translatable="yes" context="conditionalentrymobile|colscalemin">Percent</item> - <item translatable="yes" context="conditionalentrymobile|colscalemin">Formula</item> - </items> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="edcolscalemin"> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="svxcorelo-SvxColorListBox" id="lbcolmin"> - <property name="can_focus">False</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">9</property> - </packing> - </child> - <child> - <object class="GtkGrid" id="iconparent"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">12</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - </object> -</interface> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits