diff options
author | andreas kainz <kainz.a@gmail.com> | 2018-09-24 13:35:00 +0200 |
---|---|---|
committer | andreas_kainz <kainz.a@gmail.com> | 2018-09-24 23:52:09 +0200 |
commit | 9927a3ab9edec7ae9f41ecaa8025a2a920321997 (patch) | |
tree | 626e13b1f9848443a608ed3ba698ae12c3455f68 /cui | |
parent | tdf#42949 Fix IWYU warnings in include/comphelper/[a-l]* (diff) | |
download | core-9927a3ab9edec7ae9f41ecaa8025a2a920321997.tar.gz core-9927a3ab9edec7ae9f41ecaa8025a2a920321997.zip |
Personas: add 6 themes to the selection dialog
Change-Id: I1e8c28f477602c7578ca7e40bd7d14550dc1aaf8
Reviewed-on: https://gerrit.libreoffice.org/60930
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/options/personalization.cxx | 9 | ||||
-rw-r--r-- | cui/uiconfig/ui/personalization_tab.ui | 118 |
2 files changed, 99 insertions, 28 deletions
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index 6ac90e7fea3b..a398b84592ca 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -297,6 +297,15 @@ SvxPersonalizationTabPage::SvxPersonalizationTabPage( vcl::Window *pParent, cons get( m_vDefaultPersonaImages[2], "default3" ); m_vDefaultPersonaImages[2]->SetClickHdl( LINK( this, SvxPersonalizationTabPage, DefaultPersona ) ); + get( m_vDefaultPersonaImages[3], "default4" ); + m_vDefaultPersonaImages[3]->SetClickHdl( LINK( this, SvxPersonalizationTabPage, DefaultPersona ) ); + + get( m_vDefaultPersonaImages[4], "default5" ); + m_vDefaultPersonaImages[4]->SetClickHdl( LINK( this, SvxPersonalizationTabPage, DefaultPersona ) ); + + get( m_vDefaultPersonaImages[5], "default6" ); + m_vDefaultPersonaImages[5]->SetClickHdl( LINK( this, SvxPersonalizationTabPage, DefaultPersona ) ); + get( m_pPersonaList, "installed_personas" ); m_pPersonaList->SetSelectHdl( LINK( this, SvxPersonalizationTabPage, SelectInstalledPersona ) ); diff --git a/cui/uiconfig/ui/personalization_tab.ui b/cui/uiconfig/ui/personalization_tab.ui index a5990c1b1c8f..4edf02fcfe7c 100644 --- a/cui/uiconfig/ui/personalization_tab.ui +++ b/cui/uiconfig/ui/personalization_tab.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> +<!-- Generated with glade 3.18.3 --> <interface domain="cui"> <requires lib="gtk+" version="3.18"/> <object class="GtkVBox" id="PersonalizationTabPage"> @@ -64,43 +64,105 @@ <object class="GtkBox" id="box1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <child> - <object class="GtkButton" id="default1"> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> + <object class="GtkBox" id="box4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkButton" id="default1"> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="default2"> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="default3"> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkButton" id="default2"> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="default3"> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> + <object class="GtkBox" id="box3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkButton" id="default4"> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="default5"> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="default6"> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> </object> @@ -135,7 +197,7 @@ </child> <child> <object class="GtkLinkButton" id="applied_theme_link"> - <property name="label" translatable="no">Applied persona's name and URL</property> + <property name="label">Applied persona's name and URL</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="relief">none</property> |