diff options
Diffstat (limited to 'cui')
25 files changed, 120 insertions, 112 deletions
diff --git a/cui/inc/numcategories.hrc b/cui/inc/numcategories.hrc new file mode 100644 index 000000000000..be72fce77ff1 --- /dev/null +++ b/cui/inc/numcategories.hrc @@ -0,0 +1,32 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef INCLUDED_CUI_INC_NUM_CATEGORIES_HRC +#define INCLUDED_CUI_INC_NUM_CATEGORIES_HRC + +#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String) + +const char* NUM_CATEGORIES[] = +{ + NC_("numberingformatpage|liststore1", "All"), + NC_("numberingformatpage|liststore1", "User-defined"), + NC_("numberingformatpage|liststore1", "Number"), + NC_("numberingformatpage|liststore1", "Percent"), + NC_("numberingformatpage|liststore1", "Currency"), + NC_("numberingformatpage|liststore1", "Date"), + NC_("numberingformatpage|liststore1", "Time"), + NC_("numberingformatpage|liststore1", "Scientific"), + NC_("numberingformatpage|liststore1", "Fraction"), + NC_("numberingformatpage|liststore1", "Boolean Value"), + NC_("numberingformatpage|liststore1", "Text") +}; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/cui/inc/twolines.hrc b/cui/inc/twolines.hrc new file mode 100644 index 000000000000..d77f9abc264e --- /dev/null +++ b/cui/inc/twolines.hrc @@ -0,0 +1,44 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef INCLUDED_CUI_INC_TWO_LINES_HRC +#define INCLUDED_CUI_INC_TWO_LINES_HRC + +#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String) + +#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 + +const std::pair<const char*, sal_uInt16> TWOLINE_OPEN[] = +{ + { NC_("twolinespage|liststore1", "(None)"), CHRDLG_ENCLOSE_NONE }, + { NC_("twolinespage|liststore1", "("), CHRDLG_ENCLOSE_ROUND }, + { NC_("twolinespage|liststore1", "["), CHRDLG_ENCLOSE_SQUARE }, + { NC_("twolinespage|liststore1", "<"), CHRDLG_ENCLOSE_POINTED }, + { NC_("twolinespage|liststore1", "{"), CHRDLG_ENCLOSE_CURVED }, + { NC_("twolinespage|liststore1", "Other Characters..."), CHRDLG_ENCLOSE_SPECIAL_CHAR } +}; + +const std::pair<const char*, sal_uInt16> TWOLINE_CLOSE[] = +{ + { NC_("twolinespage|liststore2", "(None)"), CHRDLG_ENCLOSE_NONE }, + { NC_("twolinespage|liststore2", ")"), CHRDLG_ENCLOSE_ROUND }, + { NC_("twolinespage|liststore2", "]"), CHRDLG_ENCLOSE_SQUARE }, + { NC_("twolinespage|liststore2", ">"), CHRDLG_ENCLOSE_POINTED }, + { NC_("twolinespage|liststore2", "}"), CHRDLG_ENCLOSE_CURVED }, + { NC_("twolinespage|liststore2", "Other Characters..."), CHRDLG_ENCLOSE_SPECIAL_CHAR } +}; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ 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)); diff --git a/cui/uiconfig/ui/acorexceptpage.ui b/cui/uiconfig/ui/acorexceptpage.ui index c7848cd19084..9fa20b556f6f 100644 --- a/cui/uiconfig/ui/acorexceptpage.ui +++ b/cui/uiconfig/ui/acorexceptpage.ui @@ -142,6 +142,7 @@ <property name="shadow_type">in</property> <child> <object class="GtkTreeView" id="abbrevlist:border"> + <property name="show_expanders">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> @@ -312,6 +313,7 @@ <property name="shadow_type">in</property> <child> <object class="GtkTreeView" id="doublelist:border"> + <property name="show_expanders">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui index 2f68c6a3db6a..25cfe43b6e68 100644 --- a/cui/uiconfig/ui/charnamepage.ui +++ b/cui/uiconfig/ui/charnamepage.ui @@ -2,7 +2,7 @@ <!-- Generated with glade 3.22.1 --> <interface domain="cui"> <requires lib="gtk+" version="3.18"/> - <object class="GtkListStore" id="liststore1"> + <object class="GtkTreeStore" id="liststore1"> <columns> <!-- column-name text --> <column type="gchararray"/> @@ -18,7 +18,7 @@ <property name="popup_set_width">False</property> <property name="popup_single_match">False</property> </object> - <object class="GtkListStore" id="liststore2"> + <object class="GtkTreeStore" id="liststore2"> <columns> <!-- column-name text --> <column type="gchararray"/> @@ -34,7 +34,7 @@ <property name="popup_set_width">False</property> <property name="popup_single_match">False</property> </object> - <object class="GtkListStore" id="liststore3"> + <object class="GtkTreeStore" id="liststore3"> <columns> <!-- column-name text --> <column type="gchararray"/> diff --git a/cui/uiconfig/ui/galleryfilespage.ui b/cui/uiconfig/ui/galleryfilespage.ui index c74a01182351..9fd436d697b7 100644 --- a/cui/uiconfig/ui/galleryfilespage.ui +++ b/cui/uiconfig/ui/galleryfilespage.ui @@ -67,6 +67,7 @@ <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <property name="show_expanders">False</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="treeview-selection1"> <property name="mode">multiple</property> diff --git a/cui/uiconfig/ui/hyperlinknewdocpage.ui b/cui/uiconfig/ui/hyperlinknewdocpage.ui index 865727682503..980c967b2f0e 100644 --- a/cui/uiconfig/ui/hyperlinknewdocpage.ui +++ b/cui/uiconfig/ui/hyperlinknewdocpage.ui @@ -139,6 +139,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="vexpand">True</property> + <property name="show_expanders">False</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="treeview-selection1"/> </child> diff --git a/cui/uiconfig/ui/insertoleobject.ui b/cui/uiconfig/ui/insertoleobject.ui index 711a1c2d1aa1..2a34863d0d2f 100644 --- a/cui/uiconfig/ui/insertoleobject.ui +++ b/cui/uiconfig/ui/insertoleobject.ui @@ -2,7 +2,7 @@ <!-- Generated with glade 3.20.4 --> <interface domain="cui"> <requires lib="gtk+" version="3.18"/> - <object class="GtkListStore" id="liststore1"> + <object class="GtkTreeStore" id="liststore1"> <columns> <!-- column-name text --> <column type="gchararray"/> diff --git a/cui/uiconfig/ui/javaclasspathdialog.ui b/cui/uiconfig/ui/javaclasspathdialog.ui index 7dd2d20145bf..130fd4bc4d7d 100644 --- a/cui/uiconfig/ui/javaclasspathdialog.ui +++ b/cui/uiconfig/ui/javaclasspathdialog.ui @@ -2,7 +2,7 @@ <!-- Generated with glade 3.20.4 --> <interface domain="cui"> <requires lib="gtk+" version="3.18"/> - <object class="GtkListStore" id="liststore1"> + <object class="GtkTreeStore" id="liststore1"> <columns> <!-- column-name text --> <column type="gchararray"/> diff --git a/cui/uiconfig/ui/javastartparametersdialog.ui b/cui/uiconfig/ui/javastartparametersdialog.ui index 14bdff1a45b9..f83d26178a1b 100644 --- a/cui/uiconfig/ui/javastartparametersdialog.ui +++ b/cui/uiconfig/ui/javastartparametersdialog.ui @@ -2,7 +2,7 @@ <!-- Generated with glade 3.22.1 --> <interface domain="cui"> <requires lib="gtk+" version="3.18"/> - <object class="GtkListStore" id="liststore1"> + <object class="GtkTreeStore" id="liststore1"> <columns> <!-- column-name text --> <column type="gchararray"/> diff --git a/cui/uiconfig/ui/movemenu.ui b/cui/uiconfig/ui/movemenu.ui index fdeb1ee117b3..0dc7c58f6ac6 100644 --- a/cui/uiconfig/ui/movemenu.ui +++ b/cui/uiconfig/ui/movemenu.ui @@ -12,7 +12,7 @@ <property name="can_focus">False</property> <property name="stock">gtk-go-down</property> </object> - <object class="GtkListStore" id="liststore1"> + <object class="GtkTreeStore" id="liststore1"> <columns> <!-- column-name text --> <column type="gchararray"/> diff --git a/cui/uiconfig/ui/numberingformatpage.ui b/cui/uiconfig/ui/numberingformatpage.ui index 060a02b442ab..e454bbdd2aa0 100644 --- a/cui/uiconfig/ui/numberingformatpage.ui +++ b/cui/uiconfig/ui/numberingformatpage.ui @@ -32,48 +32,21 @@ <property name="can_focus">False</property> <property name="icon_name">svx/res/nu03.png</property> </object> - <object class="GtkListStore" id="liststore1"> + <object class="GtkTreeStore" id="liststore1"> <columns> - <!-- column-name gchararray1 --> + <!-- column-name text --> + <column type="gchararray"/> + <!-- column-name id --> <column type="gchararray"/> + <!-- column-name image --> + <column type="GdkPixbuf"/> + <!-- column-name image --> + <column type="CairoSurface"/> + <!-- column-name textcolor --> + <column type="GdkRGBA"/> </columns> - <data> - <row> - <col id="0" translatable="yes" context="numberingformatpage|liststore1">All</col> - </row> - <row> - <col id="0" translatable="yes" context="numberingformatpage|liststore1">User-defined</col> - </row> - <row> - <col id="0" translatable="yes" context="numberingformatpage|liststore1">Number</col> - </row> - <row> - <col id="0" translatable="yes" context="numberingformatpage|liststore1">Percent</col> - </row> - <row> - <col id="0" translatable="yes" context="numberingformatpage|liststore1">Currency</col> - </row> - <row> - <col id="0" translatable="yes" context="numberingformatpage|liststore1">Date</col> - </row> - <row> - <col id="0" translatable="yes" context="numberingformatpage|liststore1">Time</col> - </row> - <row> - <col id="0" translatable="yes" context="numberingformatpage|liststore1">Scientific</col> - </row> - <row> - <col id="0" translatable="yes" context="numberingformatpage|liststore1">Fraction</col> - </row> - <row> - <col id="0" translatable="yes" context="numberingformatpage|liststore1">Boolean Value</col> - </row> - <row> - <col id="0" translatable="yes" context="numberingformatpage|liststore1">Text</col> - </row> - </data> </object> - <object class="GtkListStore" id="liststore3"> + <object class="GtkTreeStore" id="liststore3"> <columns> <!-- column-name text --> <column type="gchararray"/> diff --git a/cui/uiconfig/ui/numberingoptionspage.ui b/cui/uiconfig/ui/numberingoptionspage.ui index 7b64b2e6769e..3baf8618b039 100644 --- a/cui/uiconfig/ui/numberingoptionspage.ui +++ b/cui/uiconfig/ui/numberingoptionspage.ui @@ -58,7 +58,7 @@ </object> </child> </object> - <object class="GtkListStore" id="liststore1"> + <object class="GtkTreeStore" id="liststore1"> <columns> <!-- column-name text --> <column type="gchararray"/> diff --git a/cui/uiconfig/ui/numberingpositionpage.ui b/cui/uiconfig/ui/numberingpositionpage.ui index e369e683ddde..ce7b85b08933 100644 --- a/cui/uiconfig/ui/numberingpositionpage.ui +++ b/cui/uiconfig/ui/numberingpositionpage.ui @@ -33,7 +33,7 @@ <property name="step_increment">0.01</property> <property name="page_increment">10</property> </object> - <object class="GtkListStore" id="liststore1"> + <object class="GtkTreeStore" id="liststore1"> <columns> <!-- column-name text --> <column type="gchararray"/> diff --git a/cui/uiconfig/ui/optchartcolorspage.ui b/cui/uiconfig/ui/optchartcolorspage.ui index cb837242ff88..331eaffad025 100644 --- a/cui/uiconfig/ui/optchartcolorspage.ui +++ b/cui/uiconfig/ui/optchartcolorspage.ui @@ -31,6 +31,7 @@ <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <property name="show_expanders">False</property> </object> </child> </object> diff --git a/cui/uiconfig/ui/paratabspage.ui b/cui/uiconfig/ui/paratabspage.ui index c57876b22e24..cf7e369695c2 100644 --- a/cui/uiconfig/ui/paratabspage.ui +++ b/cui/uiconfig/ui/paratabspage.ui @@ -2,7 +2,7 @@ <!-- Generated with glade 3.22.1 --> <interface domain="cui"> <requires lib="gtk+" version="3.18"/> - <object class="GtkListStore" id="liststore1"> + <object class="GtkTreeStore" id="liststore1"> <columns> <!-- column-name text --> <column type="gchararray"/> diff --git a/cui/uiconfig/ui/pastespecial.ui b/cui/uiconfig/ui/pastespecial.ui index 8931e42e2944..6fd410d06f94 100644 --- a/cui/uiconfig/ui/pastespecial.ui +++ b/cui/uiconfig/ui/pastespecial.ui @@ -2,7 +2,7 @@ <!-- Generated with glade 3.20.4 --> <interface domain="cui"> <requires lib="gtk+" version="3.18"/> - <object class="GtkListStore" id="liststore1"> + <object class="GtkTreeStore" id="liststore1"> <columns> <!-- column-name text --> <column type="gchararray"/> diff --git a/cui/uiconfig/ui/personalization_tab.ui b/cui/uiconfig/ui/personalization_tab.ui index 36f41a4ef423..afa4c5ef9724 100644 --- a/cui/uiconfig/ui/personalization_tab.ui +++ b/cui/uiconfig/ui/personalization_tab.ui @@ -255,6 +255,7 @@ <child> <object class="GtkTreeView" id="installed_personas:border"> <property name="can_focus">True</property> + <property name="show_expanders">False</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="treeview-selection2"/> </child> diff --git a/cui/uiconfig/ui/selectpathdialog.ui b/cui/uiconfig/ui/selectpathdialog.ui index c8ac090ab7d6..0900c1fefc8f 100644 --- a/cui/uiconfig/ui/selectpathdialog.ui +++ b/cui/uiconfig/ui/selectpathdialog.ui @@ -2,7 +2,7 @@ <!-- Generated with glade 3.20.4 --> <interface domain="cui"> <requires lib="gtk+" version="3.18"/> - <object class="GtkListStore" id="liststore1"> + <object class="GtkTreeStore" id="liststore1"> <columns> <!-- column-name text --> <column type="gchararray"/> diff --git a/cui/uiconfig/ui/showcoldialog.ui b/cui/uiconfig/ui/showcoldialog.ui index 8d2d95199934..fb109b4a13d3 100644 --- a/cui/uiconfig/ui/showcoldialog.ui +++ b/cui/uiconfig/ui/showcoldialog.ui @@ -2,7 +2,7 @@ <!-- Generated with glade 3.22.1 --> <interface domain="cui"> <requires lib="gtk+" version="3.18"/> - <object class="GtkListStore" id="liststore2"> + <object class="GtkTreeStore" id="liststore2"> <columns> <!-- column-name text --> <column type="gchararray"/> diff --git a/cui/uiconfig/ui/spellingdialog.ui b/cui/uiconfig/ui/spellingdialog.ui index 0173391c970c..6ac62ae40e71 100644 --- a/cui/uiconfig/ui/spellingdialog.ui +++ b/cui/uiconfig/ui/spellingdialog.ui @@ -303,6 +303,7 @@ <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <property name="show_expanders">False</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="treeview-selection1"/> </child> diff --git a/cui/uiconfig/ui/tsaurldialog.ui b/cui/uiconfig/ui/tsaurldialog.ui index 5991ad210356..d1e330f25022 100644 --- a/cui/uiconfig/ui/tsaurldialog.ui +++ b/cui/uiconfig/ui/tsaurldialog.ui @@ -145,6 +145,7 @@ <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <property name="show_expanders">False</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="treeview-selection3"/> </child> diff --git a/cui/uiconfig/ui/twolinespage.ui b/cui/uiconfig/ui/twolinespage.ui index e5cb2f908de9..2f6f42834c4b 100644 --- a/cui/uiconfig/ui/twolinespage.ui +++ b/cui/uiconfig/ui/twolinespage.ui @@ -2,73 +2,21 @@ <!-- Generated with glade 3.20.4 --> <interface domain="cui"> <requires lib="gtk+" version="3.18"/> - <object class="GtkListStore" id="liststore1"> + <object class="GtkTreeStore" id="liststore1"> <columns> <!-- column-name text --> <column type="gchararray"/> <!-- column-name id --> <column type="gchararray"/> </columns> - <data> - <row> - <col id="0" translatable="yes" context="twolinespage|liststore1">(None)</col> - <col id="1">0</col> - </row> - <row> - <col id="0" translatable="yes" context="twolinespage|liststore1">(</col> - <col id="1">1</col> - </row> - <row> - <col id="0" translatable="yes" context="twolinespage|liststore1">[</col> - <col id="1">2</col> - </row> - <row> - <col id="0" translatable="yes" context="twolinespage|liststore1"><</col> - <col id="1">3</col> - </row> - <row> - <col id="0" translatable="yes" context="twolinespage|liststore1">{</col> - <col id="1">4</col> - </row> - <row> - <col id="0" translatable="yes" context="twolinespage|liststore1">Other Characters...</col> - <col id="1">5</col> - </row> - </data> </object> - <object class="GtkListStore" id="liststore2"> + <object class="GtkTreeStore" id="liststore2"> <columns> <!-- column-name text --> <column type="gchararray"/> <!-- column-name id --> <column type="gchararray"/> </columns> - <data> - <row> - <col id="0" translatable="yes" context="twolinespage|liststore2">(None)</col> - <col id="1">0</col> - </row> - <row> - <col id="0" translatable="yes" context="twolinespage|liststore2">)</col> - <col id="1">1</col> - </row> - <row> - <col id="0" translatable="yes" context="twolinespage|liststore2">]</col> - <col id="1">2</col> - </row> - <row> - <col id="0" translatable="yes" context="twolinespage|liststore2">></col> - <col id="1">3</col> - </row> - <row> - <col id="0" translatable="yes" context="twolinespage|liststore2">}</col> - <col id="1">4</col> - </row> - <row> - <col id="0" translatable="yes" context="twolinespage|liststore2">Other Characters...</col> - <col id="1">5</col> - </row> - </data> </object> <object class="GtkBox" id="TwoLinesPage"> <property name="visible">True</property> |