diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-11-17 21:37:50 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-11-22 09:55:16 +0100 |
| commit | 4b7cbb569e52e483a5edda8afe27d423e428edbb (patch) | |
| tree | b767f526b821002d1b71d49e0e205d9e3dcab8fa /basctl | |
| parent | b9b62d96f6de8908ddf69f5b56eb58fe82013a24 (diff) | |
weld SwCondCollPage
and put back original SvTreeListBox a11y factory use
Change-Id: I4ad8ce29d8fed6ec5d44e9a1d641919a89226b79
Reviewed-on: https://gerrit.libreoffice.org/63501
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 47897fdd936d9b6e9ac8cb6110c79352ab080df7)
Reviewed-on: https://gerrit.libreoffice.org/63770
Diffstat (limited to 'basctl')
| -rw-r--r-- | basctl/source/basicide/baside2.hxx | 4 | ||||
| -rw-r--r-- | basctl/source/basicide/moduldlg.hxx | 2 | ||||
| -rw-r--r-- | basctl/uiconfig/basicide/ui/basicmacrodialog.ui | 22 |
3 files changed, 10 insertions, 18 deletions
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index ab46e7de04d2..e0fcac4fa8af 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -27,8 +27,8 @@ #include "breakpoint.hxx" #include "linenumberwindow.hxx" -#include <svtools/svtabbx.hxx> -#include <svtools/headbar.hxx> +#include <vcl/svtabbx.hxx> +#include <vcl/headbar.hxx> #include <vcl/button.hxx> #include <basic/sbmod.hxx> diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx index 3da0ff1a9d2e..38715d017e42 100644 --- a/basctl/source/basicide/moduldlg.hxx +++ b/basctl/source/basicide/moduldlg.hxx @@ -21,7 +21,7 @@ #define INCLUDED_BASCTL_SOURCE_BASICIDE_MODULDLG_HXX #include <bastype2.hxx> -#include <svtools/svtabbx.hxx> +#include <vcl/svtabbx.hxx> #include <vcl/layout.hxx> #include <vcl/lstbox.hxx> #include <vcl/tabctrl.hxx> diff --git a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui index 9548679d2c47..4fbaa0ff41c3 100644 --- a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui +++ b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui @@ -4,16 +4,12 @@ <requires lib="gtk+" version="3.18"/> <object class="GtkTreeStore" id="liststore1"> <columns> + <!-- column-name expander --> + <column type="GdkPixbuf"/> <!-- column-name text --> <column type="gchararray"/> <!-- column-name id --> <column type="gchararray"/> - <!-- column-name image --> - <column type="GdkPixbuf"/> - <!-- column-name surface --> - <column type="CairoSurface"/> - <!-- column-name expander --> - <column type="GdkPixbuf"/> </columns> </object> <object class="GtkTreeStore" id="liststore2"> @@ -22,12 +18,6 @@ <column type="gchararray"/> <!-- column-name id --> <column type="gchararray"/> - <!-- column-name image --> - <column type="GdkPixbuf"/> - <!-- column-name surface --> - <column type="CairoSurface"/> - <!-- column-name expander --> - <column type="GdkPixbuf"/> </columns> </object> <object class="GtkDialog" id="BasicMacroDialog"> @@ -174,6 +164,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes" context="basicmacrodialog|existingmacrosft">Existing Macros In:</property> + <property name="ellipsize">end</property> <property name="track_visited_links">False</property> <attributes> <attribute name="weight" value="bold"/> @@ -218,7 +209,8 @@ <property name="vexpand">True</property> <property name="model">liststore1</property> <property name="headers_visible">False</property> - <property name="search_column">0</property> + <property name="search_column">1</property> + <property name="show_expanders">True</property> <property name="enable_tree_lines">True</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="Macro Library List-selection1"/> @@ -229,13 +221,13 @@ <child> <object class="GtkCellRendererPixbuf" id="cellrenderertext4"/> <attributes> - <attribute name="pixbuf">4</attribute> + <attribute name="pixbuf">0</attribute> </attributes> </child> <child> <object class="GtkCellRendererText" id="cellrenderertext2"/> <attributes> - <attribute name="text">0</attribute> + <attribute name="text">1</attribute> </attributes> </child> </object> |