Kaydet (Commit) 9927a3ab authored tarafından andreas kainz's avatar andreas kainz Kaydeden (comit) andreas_kainz

Personas: add 6 themes to the selection dialog

Change-Id: I1e8c28f477602c7578ca7e40bd7d14550dc1aaf8
Reviewed-on: https://gerrit.libreoffice.org/60930
Tested-by: Jenkins
Reviewed-by: 's avatarandreas_kainz <kainz.a@gmail.com>
üst 8df9935d
...@@ -297,6 +297,15 @@ SvxPersonalizationTabPage::SvxPersonalizationTabPage( vcl::Window *pParent, cons ...@@ -297,6 +297,15 @@ SvxPersonalizationTabPage::SvxPersonalizationTabPage( vcl::Window *pParent, cons
get( m_vDefaultPersonaImages[2], "default3" ); get( m_vDefaultPersonaImages[2], "default3" );
m_vDefaultPersonaImages[2]->SetClickHdl( LINK( this, SvxPersonalizationTabPage, DefaultPersona ) ); 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" ); get( m_pPersonaList, "installed_personas" );
m_pPersonaList->SetSelectHdl( LINK( this, SvxPersonalizationTabPage, SelectInstalledPersona ) ); m_pPersonaList->SetSelectHdl( LINK( this, SvxPersonalizationTabPage, SelectInstalledPersona ) );
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 --> <!-- Generated with glade 3.18.3 -->
<interface domain="cui"> <interface domain="cui">
<requires lib="gtk+" version="3.18"/> <requires lib="gtk+" version="3.18"/>
<object class="GtkVBox" id="PersonalizationTabPage"> <object class="GtkVBox" id="PersonalizationTabPage">
...@@ -64,43 +64,105 @@ ...@@ -64,43 +64,105 @@
<object class="GtkBox" id="box1"> <object class="GtkBox" id="box1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child> <child>
<object class="GtkButton" id="default1"> <object class="GtkBox" id="box4">
<property name="can_focus">True</property> <property name="visible">True</property>
<property name="receives_default">True</property> <property name="can_focus">False</property>
<property name="hexpand">True</property> <child>
<property name="vexpand">True</property> <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> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkButton" id="default2"> <object class="GtkBox" id="box3">
<property name="can_focus">True</property> <property name="visible">True</property>
<property name="receives_default">True</property> <property name="can_focus">False</property>
<property name="hexpand">True</property> <child>
<property name="vexpand">True</property> <object class="GtkButton" id="default4">
</object> <property name="can_focus">True</property>
<packing> <property name="receives_default">True</property>
<property name="expand">False</property> <property name="hexpand">True</property>
<property name="fill">True</property> <property name="vexpand">True</property>
<property name="position">1</property> </object>
</packing> <packing>
</child> <property name="expand">False</property>
<child> <property name="fill">True</property>
<object class="GtkButton" id="default3"> <property name="position">0</property>
<property name="can_focus">True</property> </packing>
<property name="receives_default">True</property> </child>
<property name="hexpand">True</property> <child>
<property name="vexpand">True</property> <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> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">2</property> <property name="position">3</property>
</packing> </packing>
</child> </child>
</object> </object>
...@@ -135,7 +197,7 @@ ...@@ -135,7 +197,7 @@
</child> </child>
<child> <child>
<object class="GtkLinkButton" id="applied_theme_link"> <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="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="relief">none</property> <property name="relief">none</property>
......
...@@ -387,6 +387,9 @@ cui/uiconfig/ui/percentdialog.ui://GtkSpinButton[@id='margin'] no-labelled-by ...@@ -387,6 +387,9 @@ cui/uiconfig/ui/percentdialog.ui://GtkSpinButton[@id='margin'] no-labelled-by
cui/uiconfig/ui/personalization_tab.ui://GtkButton[@id='default1'] button-no-label cui/uiconfig/ui/personalization_tab.ui://GtkButton[@id='default1'] button-no-label
cui/uiconfig/ui/personalization_tab.ui://GtkButton[@id='default2'] button-no-label cui/uiconfig/ui/personalization_tab.ui://GtkButton[@id='default2'] button-no-label
cui/uiconfig/ui/personalization_tab.ui://GtkButton[@id='default3'] button-no-label cui/uiconfig/ui/personalization_tab.ui://GtkButton[@id='default3'] button-no-label
cui/uiconfig/ui/personalization_tab.ui://GtkButton[@id='default4'] button-no-label
cui/uiconfig/ui/personalization_tab.ui://GtkButton[@id='default5'] button-no-label
cui/uiconfig/ui/personalization_tab.ui://GtkButton[@id='default6'] button-no-label
cui/uiconfig/ui/personalization_tab.ui://GtkLabel[@id='applied_theme'] orphan-label cui/uiconfig/ui/personalization_tab.ui://GtkLabel[@id='applied_theme'] orphan-label
cui/uiconfig/ui/personalization_tab.ui://GtkLabel[@id='extensions_label'] orphan-label cui/uiconfig/ui/personalization_tab.ui://GtkLabel[@id='extensions_label'] orphan-label
cui/uiconfig/ui/personalization_tab.ui://GtkTreeView[@id='installed_personas:border'] no-labelled-by cui/uiconfig/ui/personalization_tab.ui://GtkTreeView[@id='installed_personas:border'] no-labelled-by
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment