diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-10-28 13:37:33 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-11-04 17:14:26 +0000 |
commit | 43bc3031483d172eccd72c3804e2d4fc2ef37de4 (patch) | |
tree | 991d98e8e61fae47ada28ba7a0b02e1d6c8e443f /cui/uiconfig | |
parent | 44523738f094ff3987e85ea0c47b8c636bbe5786 (diff) |
unify color selectors
Note: this removes the use of auto-color from writer's asian text grid, because
its always invisible as far as I can see in practice.
Change-Id: Ie850790d740a4d56c43015e493e093678cef3b4e
Diffstat (limited to 'cui/uiconfig')
-rw-r--r-- | cui/uiconfig/ui/borderpage.ui | 4 | ||||
-rw-r--r-- | cui/uiconfig/ui/colorconfigwin.ui | 92 | ||||
-rw-r--r-- | cui/uiconfig/ui/effectspage.ui | 6 | ||||
-rw-r--r-- | cui/uiconfig/ui/gradientpage.ui | 4 | ||||
-rw-r--r-- | cui/uiconfig/ui/hatchpage.ui | 4 | ||||
-rw-r--r-- | cui/uiconfig/ui/linetabpage.ui | 2 | ||||
-rw-r--r-- | cui/uiconfig/ui/numberingoptionspage.ui | 2 | ||||
-rw-r--r-- | cui/uiconfig/ui/patterntabpage.ui | 4 | ||||
-rw-r--r-- | cui/uiconfig/ui/shadowtabpage.ui | 2 |
9 files changed, 60 insertions, 60 deletions
diff --git a/cui/uiconfig/ui/borderpage.ui b/cui/uiconfig/ui/borderpage.ui index c783d268396a..2a3265cde146 100644 --- a/cui/uiconfig/ui/borderpage.ui +++ b/cui/uiconfig/ui/borderpage.ui @@ -233,7 +233,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="linecolorlb"> + <object class="svxlo-SvxColorListBox" id="linecolorlb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -505,7 +505,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="shadowcolorlb"> + <object class="svxlo-SvxColorListBox" id="shadowcolorlb"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> diff --git a/cui/uiconfig/ui/colorconfigwin.ui b/cui/uiconfig/ui/colorconfigwin.ui index d03daf7c34fd..f4dd177a3c3d 100644 --- a/cui/uiconfig/ui/colorconfigwin.ui +++ b/cui/uiconfig/ui/colorconfigwin.ui @@ -38,7 +38,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="doccolor_lb"> + <object class="svxlo-SvxColorListBox" id="doccolor_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -72,7 +72,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="docboundaries_lb"> + <object class="svxlo-SvxColorListBox" id="docboundaries_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -98,7 +98,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="appback_lb"> + <object class="svxlo-SvxColorListBox" id="appback_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -148,7 +148,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="objboundaries_lb"> + <object class="svxlo-SvxColorListBox" id="objboundaries_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -185,7 +185,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="tblboundaries_lb"> + <object class="svxlo-SvxColorListBox" id="tblboundaries_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -220,7 +220,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="font_lb"> + <object class="svxlo-SvxColorListBox" id="font_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -257,7 +257,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="unvisitedlinks_lb"> + <object class="svxlo-SvxColorListBox" id="unvisitedlinks_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -294,7 +294,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="visitedlinks_lb"> + <object class="svxlo-SvxColorListBox" id="visitedlinks_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -354,7 +354,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="autospellcheck_lb"> + <object class="svxlo-SvxColorListBox" id="autospellcheck_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -364,7 +364,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="shadows_lb"> + <object class="svxlo-SvxColorListBox" id="shadows_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -374,7 +374,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="smarttags_lb"> + <object class="svxlo-SvxColorListBox" id="smarttags_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -400,7 +400,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="writergrid_lb"> + <object class="svxlo-SvxColorListBox" id="writergrid_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -435,7 +435,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="field_lb"> + <object class="svxlo-SvxColorListBox" id="field_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -457,7 +457,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="index_lb"> + <object class="svxlo-SvxColorListBox" id="index_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -479,7 +479,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="script_lb"> + <object class="svxlo-SvxColorListBox" id="script_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -559,7 +559,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="section_lb"> + <object class="svxlo-SvxColorListBox" id="section_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -581,7 +581,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="hdft_lb"> + <object class="svxlo-SvxColorListBox" id="hdft_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -616,7 +616,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="pagebreak_lb"> + <object class="svxlo-SvxColorListBox" id="pagebreak_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -651,7 +651,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="direct_lb"> + <object class="svxlo-SvxColorListBox" id="direct_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -702,7 +702,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="sgml_lb"> + <object class="svxlo-SvxColorListBox" id="sgml_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -737,7 +737,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="htmlcomment_lb"> + <object class="svxlo-SvxColorListBox" id="htmlcomment_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -772,7 +772,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="htmlkeyword_lb"> + <object class="svxlo-SvxColorListBox" id="htmlkeyword_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -807,7 +807,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="unknown_lb"> + <object class="svxlo-SvxColorListBox" id="unknown_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -858,7 +858,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="calcgrid_lb"> + <object class="svxlo-SvxColorListBox" id="calcgrid_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -893,7 +893,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="brk_lb"> + <object class="svxlo-SvxColorListBox" id="brk_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -928,7 +928,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="brkmanual_lb"> + <object class="svxlo-SvxColorListBox" id="brkmanual_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -963,7 +963,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="brkauto_lb"> + <object class="svxlo-SvxColorListBox" id="brkauto_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -998,7 +998,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="det_lb"> + <object class="svxlo-SvxColorListBox" id="det_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -1033,7 +1033,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="deterror_lb"> + <object class="svxlo-SvxColorListBox" id="deterror_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -1068,7 +1068,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="ref_lb"> + <object class="svxlo-SvxColorListBox" id="ref_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -1103,7 +1103,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="notes_lb"> + <object class="svxlo-SvxColorListBox" id="notes_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -1154,7 +1154,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="drawgrid_lb"> + <object class="svxlo-SvxColorListBox" id="drawgrid_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -1205,7 +1205,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="basicid_lb"> + <object class="svxlo-SvxColorListBox" id="basicid_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -1240,7 +1240,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="basiccomment_lb"> + <object class="svxlo-SvxColorListBox" id="basiccomment_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -1275,7 +1275,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="basicnumber_lb"> + <object class="svxlo-SvxColorListBox" id="basicnumber_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -1310,7 +1310,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="basicstring_lb"> + <object class="svxlo-SvxColorListBox" id="basicstring_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -1345,7 +1345,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="basicop_lb"> + <object class="svxlo-SvxColorListBox" id="basicop_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -1380,7 +1380,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="basickeyword_lb"> + <object class="svxlo-SvxColorListBox" id="basickeyword_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -1415,7 +1415,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="error_lb"> + <object class="svxlo-SvxColorListBox" id="error_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -1466,7 +1466,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="sqlid_lb"> + <object class="svxlo-SvxColorListBox" id="sqlid_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -1501,7 +1501,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="sqlnumber_lb"> + <object class="svxlo-SvxColorListBox" id="sqlnumber_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -1536,7 +1536,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="sqlstring_lb"> + <object class="svxlo-SvxColorListBox" id="sqlstring_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -1571,7 +1571,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="sqlop_lb"> + <object class="svxlo-SvxColorListBox" id="sqlop_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -1606,7 +1606,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="sqlkeyword_lb"> + <object class="svxlo-SvxColorListBox" id="sqlkeyword_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -1641,7 +1641,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="sqlparam_lb"> + <object class="svxlo-SvxColorListBox" id="sqlparam_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -1676,7 +1676,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="sqlcomment_lb"> + <object class="svxlo-SvxColorListBox" id="sqlcomment_lb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> diff --git a/cui/uiconfig/ui/effectspage.ui b/cui/uiconfig/ui/effectspage.ui index 1e9171cae8ad..46a42cd15e09 100644 --- a/cui/uiconfig/ui/effectspage.ui +++ b/cui/uiconfig/ui/effectspage.ui @@ -324,7 +324,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="fontcolorlb"> + <object class="svxlo-SvxColorListBox" id="fontcolorlb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -389,7 +389,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="underlinecolorlb"> + <object class="svxlo-SvxColorListBox" id="underlinecolorlb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -399,7 +399,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="overlinecolorlb"> + <object class="svxlo-SvxColorListBox" id="overlinecolorlb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> diff --git a/cui/uiconfig/ui/gradientpage.ui b/cui/uiconfig/ui/gradientpage.ui index 8ab982badffd..b36b8d7aa678 100644 --- a/cui/uiconfig/ui/gradientpage.ui +++ b/cui/uiconfig/ui/gradientpage.ui @@ -450,7 +450,7 @@ </packing> </child> <child> - <object class="svxlo-ColorLB" id="colorfromlb"> + <object class="svxlo-SvxColorListBox" id="colorfromlb"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="entry_text_column">0</property> @@ -496,7 +496,7 @@ <property name="row_spacing">3</property> <property name="column_spacing">6</property> <child> - <object class="svxlo-ColorLB" id="colortolb"> + <object class="svxlo-SvxColorListBox" id="colortolb"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="entry_text_column">0</property> diff --git a/cui/uiconfig/ui/hatchpage.ui b/cui/uiconfig/ui/hatchpage.ui index fd12b3e547f7..f3098001b63a 100644 --- a/cui/uiconfig/ui/hatchpage.ui +++ b/cui/uiconfig/ui/hatchpage.ui @@ -266,7 +266,7 @@ </packing> </child> <child> - <object class="svxlo-ColorLB" id="linecolorlb"> + <object class="svxlo-SvxColorListBox" id="linecolorlb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> @@ -292,7 +292,7 @@ </packing> </child> <child> - <object class="svxlo-ColorLB" id="backgroundcolorlb"> + <object class="svxlo-SvxColorListBox" id="backgroundcolorlb"> <property name="visible">True</property> <property name="can_focus">False</property> </object> diff --git a/cui/uiconfig/ui/linetabpage.ui b/cui/uiconfig/ui/linetabpage.ui index 0060a6fef564..a70a0ae7bed9 100644 --- a/cui/uiconfig/ui/linetabpage.ui +++ b/cui/uiconfig/ui/linetabpage.ui @@ -156,7 +156,7 @@ </packing> </child> <child> - <object class="svxlo-ColorLB" id="LB_COLOR"> + <object class="svxlo-SvxColorListBox" id="LB_COLOR"> <property name="visible">True</property> <property name="can_focus">False</property> </object> diff --git a/cui/uiconfig/ui/numberingoptionspage.ui b/cui/uiconfig/ui/numberingoptionspage.ui index 71f392aab6df..76b609fba613 100644 --- a/cui/uiconfig/ui/numberingoptionspage.ui +++ b/cui/uiconfig/ui/numberingoptionspage.ui @@ -485,7 +485,7 @@ </packing> </child> <child> - <object class="svtlo-ColorListBox" id="color"> + <object class="svxlo-SvxColorListBox" id="color"> <property name="visible">True</property> <property name="can_focus">False</property> </object> diff --git a/cui/uiconfig/ui/patterntabpage.ui b/cui/uiconfig/ui/patterntabpage.ui index 03bfe52c374e..07edfc9e1f22 100644 --- a/cui/uiconfig/ui/patterntabpage.ui +++ b/cui/uiconfig/ui/patterntabpage.ui @@ -185,7 +185,7 @@ </packing> </child> <child> - <object class="svxlo-ColorLB" id="LB_COLOR"> + <object class="svxlo-SvxColorListBox" id="LB_COLOR"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> @@ -223,7 +223,7 @@ </packing> </child> <child> - <object class="svxlo-ColorLB" id="LB_BACKGROUND_COLOR"> + <object class="svxlo-SvxColorListBox" id="LB_BACKGROUND_COLOR"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> diff --git a/cui/uiconfig/ui/shadowtabpage.ui b/cui/uiconfig/ui/shadowtabpage.ui index de63629337d3..74ad9de4df4a 100644 --- a/cui/uiconfig/ui/shadowtabpage.ui +++ b/cui/uiconfig/ui/shadowtabpage.ui @@ -99,7 +99,7 @@ </packing> </child> <child> - <object class="svxlo-ColorLB" id="LB_SHADOW_COLOR"> + <object class="svxlo-SvxColorListBox" id="LB_SHADOW_COLOR"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> |