cui/source/options/personalization.cxx | 9 --
cui/uiconfig/ui/personalization_tab.ui | 118 +++++++--------------------------
solenv/sanitizers/ui/cui.suppr | 3
3 files changed, 28 insertions(+), 102 deletions(-)
New commits:
commit c494273adea0293bbcfc022adc0ea13d5c21e18d
Author: Muhammet Kara <muhammet.k...@pardus.org.tr>
AuthorDate: Thu Sep 27 20:57:53 2018 +0200
Commit: Muhammet Kara <muhammet.k...@pardus.org.tr>
CommitDate: Fri Sep 28 20:01:34 2018 +0200
Revert "Personas: add 6 themes to the selection dialog"
This reverts commit 9927a3ab9edec7ae9f41ecaa8025a2a920321997.
Change-Id: I7282bb5734c4cad2cf2d375d4a6bfc03a759ce19
Reviewed-on: https://gerrit.libreoffice.org/61055
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <tietze.he...@gmail.com>
diff --git a/cui/source/options/personalization.cxx
b/cui/source/options/personalization.cxx
index a398b84592ca..6ac90e7fea3b 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -297,15 +297,6 @@ 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 43ef274483b0..588583ab4328 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.18.3 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="cui">
<requires lib="gtk+" version="3.18"/>
<object class="GtkVBox" id="PersonalizationTabPage">
@@ -64,105 +64,43 @@
<object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
<child>
- <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 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">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <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 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">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</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>
@@ -197,7 +135,7 @@
</child>
<child>
<object class="GtkLinkButton" id="applied_theme_link">
- <property name="label">Applied persona's name and
URL</property>
+ <property name="label" translatable="no">Applied
persona's name and URL</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="relief">none</property>
diff --git a/solenv/sanitizers/ui/cui.suppr b/solenv/sanitizers/ui/cui.suppr
index 4a67846b7212..f084489e8c2d 100644
--- a/solenv/sanitizers/ui/cui.suppr
+++ b/solenv/sanitizers/ui/cui.suppr
@@ -387,9 +387,6 @@
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='default2']
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='extensions_label']
orphan-label
cui/uiconfig/ui/personalization_tab.ui://GtkTreeView[@id='installed_personas:border']
no-labelled-by
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
