diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-11-05 21:01:23 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-11-19 12:09:25 +0100 |
commit | 97bbffc917deba872090667e9dc096ecec99d557 (patch) | |
tree | 672bff54843461ff30270a11b726c1a48eea50cd /cui/source/tabpages | |
parent | 5b3592a42cc88a225237efadcc4d110be307303e (diff) |
weld TreeView
a) use GtkTreeStores for GtkTreeViews
b) ironically can't store GtkTreeStore contents in .ui apparently
c) set show_expanders for all non-trees and unconverted cases
d) on-demand subtrees
Change-Id: I3c1036a222daba2c129b1a22ffeb3fe35005ae31
Reviewed-on: https://gerrit.libreoffice.org/63336
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui/source/tabpages')
-rw-r--r-- | cui/source/tabpages/chardlg.cxx | 6 | ||||
-rw-r--r-- | cui/source/tabpages/chardlg.h | 7 | ||||
-rw-r--r-- | cui/source/tabpages/numfmt.cxx | 4 |
3 files changed, 10 insertions, 7 deletions
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index a49714eb2cd1..8ac253999f85 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -66,6 +66,7 @@ #include <officecfg/Office/Common.hxx> #include <svx/svxdlg.hxx> #include <strings.hrc> +#include <twolines.hrc> #include <svl/intitem.hxx> #include <sfx2/request.hxx> #include <svx/flagsdef.hxx> @@ -3060,6 +3061,11 @@ SvxCharTwoLinesPage::SvxCharTwoLinesPage(TabPageParent pParent, const SfxItemSet , m_xStartBracketLB(m_xBuilder->weld_tree_view("startbracket")) , m_xEndBracketLB(m_xBuilder->weld_tree_view("endbracket")) { + for (size_t i = 0; i < SAL_N_ELEMENTS(TWOLINE_OPEN); ++i) + m_xStartBracketLB->append(OUString::number(TWOLINE_OPEN[i].second), CuiResId(TWOLINE_OPEN[i].first)); + for (size_t i = 0; i < SAL_N_ELEMENTS(TWOLINE_CLOSE); ++i) + m_xEndBracketLB->append(OUString::number(TWOLINE_CLOSE[i].second), CuiResId(TWOLINE_CLOSE[i].first)); + m_xPreviewWin.reset(new weld::CustomWeld(*m_xBuilder, "preview", m_aPreviewWin)); Initialize(); } diff --git a/cui/source/tabpages/chardlg.h b/cui/source/tabpages/chardlg.h index 57751b6cfd37..b72beae2e8fc 100644 --- a/cui/source/tabpages/chardlg.h +++ b/cui/source/tabpages/chardlg.h @@ -21,13 +21,6 @@ // define ---------------------------------------------------------------- -#define CHRDLG_ENCLOSE_NONE 0 -#define CHRDLG_ENCLOSE_ROUND 1 -#define CHRDLG_ENCLOSE_SQUARE 2 -#define CHRDLG_ENCLOSE_POINTED 3 -#define CHRDLG_ENCLOSE_CURVED 4 -#define CHRDLG_ENCLOSE_SPECIAL_CHAR 5 - #define CHRDLG_POSITION_OVER 0 #define CHRDLG_POSITION_UNDER 1 diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index bbd756c7ca30..a13403059b88 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -30,6 +30,7 @@ #include <svx/dialogs.hrc> #include <svtools/colorcfg.hxx> +#include <numcategories.hrc> #include <strings.hrc> #include <svx/numinf.hxx> @@ -218,6 +219,9 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage(TabPageParent pParent, , m_xLbLanguage(new LanguageBox(m_xBuilder->weld_combo_box("languagelb"))) , m_xWndPreview(new weld::CustomWeld(*m_xBuilder, "preview", m_aWndPreview)) { + for (size_t i = 0; i < SAL_N_ELEMENTS(NUM_CATEGORIES); ++i) + m_xLbCategory->append_text(CuiResId(NUM_CATEGORIES[i])); + auto nWidth = approximate_char_width() * 26; m_xLbCategory->set_size_request(nWidth, m_xLbCategory->get_height_rows(7)); m_xLbFormat->set_size_request(nWidth, m_xLbFormat->get_height_rows(5)); |