diff options
author | Jan Holesovsky <kendy@suse.cz> | 2012-11-29 13:05:39 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2012-11-30 17:18:57 +0100 |
commit | 4102ed7c5018c9fadb445d0ea49e29d1af75194a (patch) | |
tree | 6f4f082dc2c370a7cdba9d0cdee22a399e5b7ff9 | |
parent | 318e8eef3c9c6c44ba20f02560061614199e8d9f (diff) |
Personas: Introduce Tools -> Options... entry for Firefox Personas.
Change-Id: I95275a92ea607cce26f272044bc2de95de45d75b
-rw-r--r-- | cui/Library_cui.mk | 1 | ||||
-rw-r--r-- | cui/UI_cui.mk | 1 | ||||
-rw-r--r-- | cui/source/inc/cuires.hrc | 1 | ||||
-rw-r--r-- | cui/source/options/personalization.cxx | 29 | ||||
-rw-r--r-- | cui/source/options/personalization.hxx | 33 | ||||
-rw-r--r-- | cui/source/options/treeopt.cxx | 3 | ||||
-rw-r--r-- | cui/source/options/treeopt.src | 1 | ||||
-rw-r--r-- | cui/uiconfig/ui/personalization_tab.ui | 240 |
8 files changed, 309 insertions, 0 deletions
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index ec0c925c688e..404e72f6e0c4 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -164,6 +164,7 @@ $(eval $(call gb_Library_add_exception_objects,cui,\ cui/source/options/optpath \ cui/source/options/optsave \ cui/source/options/optupdt \ + cui/source/options/personalization \ cui/source/options/radiobtnbox \ cui/source/options/readonlyimage \ cui/source/options/sdbcdriverenum \ diff --git a/cui/UI_cui.mk b/cui/UI_cui.mk index 119f8d60ef4b..24138727fcda 100644 --- a/cui/UI_cui.mk +++ b/cui/UI_cui.mk @@ -19,6 +19,7 @@ $(eval $(call gb_UI_add_uifiles,cui,\ cui/uiconfig/ui/insertrowcolumn \ cui/uiconfig/ui/scriptorganizer \ cui/uiconfig/ui/macroselectordialog \ + cui/uiconfig/ui/personalization_tab \ cui/uiconfig/ui/positionpage \ cui/uiconfig/ui/specialcharacters \ cui/uiconfig/ui/thesaurus \ diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index 1e14f8238f1c..beabde5ad8d9 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -161,6 +161,7 @@ #define RID_OPTPAGE_CHART_DEFCOLORS (RID_SVX_START + 299) #define RID_OPTQB_COLOR_CHART_DELETE (RID_SVX_START + 296) #define RID_OPTSTR_COLOR_CHART_DELETE (RID_SVX_START + 289) +#define RID_SVXPAGE_PERSONALIZATION (RID_SVX_START + 247) #define RID_SVXPAGE_COLORCONFIG (RID_SVX_START + 249) #define RID_SVXQB_DELETE_COLOR_CONFIG (RID_SVX_START + 324) #define RID_SVXSTR_COLOR_CONFIG_SAVE1 (RID_SVX_START + 853) diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx new file mode 100644 index 000000000000..53891244eeb5 --- /dev/null +++ b/cui/source/options/personalization.cxx @@ -0,0 +1,29 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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/. + */ + +#include "personalization.hxx" + +#include <vcl/fixed.hxx> + +SvxPersonalizationTabPage::SvxPersonalizationTabPage( Window *pParent, const SfxItemSet &rSet ) + : SfxTabPage( pParent, "PersonalizationTabPage", "cui/ui/personalization_tab.ui", rSet ) +{ + get( m_pNoPersona, "no_persona" ); +} + +SvxPersonalizationTabPage::~SvxPersonalizationTabPage() +{ +} + +SfxTabPage* SvxPersonalizationTabPage::Create( Window *pParent, const SfxItemSet &rSet ) +{ + return new SvxPersonalizationTabPage( pParent, rSet ); +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx new file mode 100644 index 000000000000..72c3b6be6dd4 --- /dev/null +++ b/cui/source/options/personalization.hxx @@ -0,0 +1,33 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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 SVX_PERSONALIZATION_HXX +#define SVX_PERSONALIZATION_HXX + +#include <sfx2/tabdlg.hxx> + +class FixedText; + +class SvxPersonalizationTabPage : public SfxTabPage +{ + using SfxTabPage::DeactivatePage; + +private: + RadioButton *m_pNoPersona; ///< Just the default look, without any bitmap + +public: + SvxPersonalizationTabPage( Window *pParent, const SfxItemSet &rSet ); + ~SvxPersonalizationTabPage(); + + static SfxTabPage* Create( Window *pParent, const SfxItemSet &rSet ); +}; + +#endif // SVX_PERSONALIZATION_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index aafbc6838369..0a19a77ae51c 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -48,6 +48,7 @@ #include "optpath.hxx" #include "optsave.hxx" #include "optupdt.hxx" +#include "personalization.hxx" #include "treeopt.hxx" #include <com/sun/star/awt/XContainerWindowEventHandler.hpp> @@ -303,6 +304,7 @@ SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, Window* pParent, const SfxItem case RID_SVXPAGE_INET_PROXY: fnCreate = &SvxProxyTabPage::Create; break; case RID_SVXPAGE_INET_SECURITY: fnCreate = &SvxSecurityTabPage::Create; break; case RID_SVXPAGE_INET_MAIL: fnCreate = &SvxEMailTabPage::Create; break; + case RID_SVXPAGE_PERSONALIZATION: fnCreate = &SvxPersonalizationTabPage::Create; break; case RID_SVXPAGE_COLORCONFIG: fnCreate = &SvxColorOptionsTabPage::Create; break; case RID_OFAPAGE_HTMLOPT: fnCreate = &OfaHtmlTabPage::Create; break; case SID_OPTFILTER_MSOFFICE: fnCreate = &OfaMSFilterTabPage::Create; break; @@ -342,6 +344,7 @@ static OptionsMapping_Impl const OptionsMap_Impl[] = { "ProductName", "Colors", RID_SVXPAGE_COLOR }, { "ProductName", "Fonts", RID_SVX_FONT_SUBSTITUTION }, { "ProductName", "Security", RID_SVXPAGE_INET_SECURITY }, + { "ProductName", "Personalization", RID_SVXPAGE_PERSONALIZATION }, { "ProductName", "Appearance", RID_SVXPAGE_COLORCONFIG }, { "ProductName", "Accessibility", RID_SVXPAGE_ACCESSIBILITYCONFIG }, { "ProductName", "Java", RID_SVXPAGE_OPTIONS_JAVA }, diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src index 1c60cf79bcb5..47d0d66e9f45 100644 --- a/cui/source/options/treeopt.src +++ b/cui/source/options/treeopt.src @@ -95,6 +95,7 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES < "Colors" ; RID_SVXPAGE_COLOR; > ; < "Fonts" ; RID_SVX_FONT_SUBSTITUTION ; > ; < "Security" ; RID_SVXPAGE_INET_SECURITY ; > ; + < "Personalization" ; RID_SVXPAGE_PERSONALIZATION ; > ; < "Appearance" ; RID_SVXPAGE_COLORCONFIG ; > ; < "Accessibility" ; RID_SVXPAGE_ACCESSIBILITYCONFIG ; > ; < "Advanced" ; RID_SVXPAGE_OPTIONS_JAVA ; > ; diff --git a/cui/uiconfig/ui/personalization_tab.ui b/cui/uiconfig/ui/personalization_tab.ui new file mode 100644 index 000000000000..12acf493416e --- /dev/null +++ b/cui/uiconfig/ui/personalization_tab.ui @@ -0,0 +1,240 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <requires lib="gtk+" version="2.24"/> + <!-- interface-naming-policy project-wide --> + <object class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkFrame" id="frame1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="left_padding">12</property> + <child> + <object class="GtkVBox" id="vbox3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkRadioButton" id="no_background"> + <property name="label" translatable="yes">No background image</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">default_background</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="default_background"> + <property name="label" translatable="yes">Default background image</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">own_background</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkRadioButton" id="own_background"> + <property name="label" translatable="yes">Own image</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">no_background</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="select_background"> + <property name="label" translatable="yes">Select Backround Image</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Background Image</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="frame2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="left_padding">12</property> + <child> + <object class="GtkVBox" id="vbox2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkRadioButton" id="no_persona"> + <property name="label" translatable="yes">Do not use Persona</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">default_persona</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="default_persona"> + <property name="label" translatable="yes">Use default Persona</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">own_persona</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkRadioButton" id="own_persona"> + <property name="label" translatable="yes">Use own Persona</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">no_persona</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="select_persona"> + <property name="label" translatable="yes">Select Persona</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Firefox Personas</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">5</property> + <property name="position">1</property> + </packing> + </child> + <child> + <placeholder/> + </child> + </object> +</interface> |