diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 10:28:55 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-01 14:26:25 +0200 |
| commit | c1a9f4434c2c00a643a8a6ad330138022f2b7701 (patch) | |
| tree | db08cc923643f44e73a82f20e929b47c043218fe | |
| parent | b812b668566c33dd96fedda91541738ab5b4cf19 (diff) | |
tdf#87441: RemoveHiddenContent is indep. of ExternalMailer/Program R/O state
Change-Id: I7a479c85c2acbb750651b4c4211447bcb2a7346e
| -rw-r--r-- | cui/source/options/optinet2.cxx | 2 | ||||
| -rw-r--r-- | cui/uiconfig/ui/optemailpage.ui | 25 |
2 files changed, 22 insertions, 5 deletions
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 782523d50f61..7ca7c271db03 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -1131,7 +1131,7 @@ SvxEMailTabPage::SvxEMailTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage( pParent, "OptEmailPage", "cui/ui/optemailpage.ui", &rSet) , pImpl(new SvxEMailTabPage_Impl) { - get(m_pMailContainer, "OptEmailPage"); + get(m_pMailContainer, "program"); get(m_pMailerURLFI, "lockemail"); get(m_pMailerURLED, "url"); get(m_pMailerURLPB, "browse"); diff --git a/cui/uiconfig/ui/optemailpage.ui b/cui/uiconfig/ui/optemailpage.ui index 3b07f09b9804..4a2a913eded1 100644 --- a/cui/uiconfig/ui/optemailpage.ui +++ b/cui/uiconfig/ui/optemailpage.ui @@ -9,13 +9,12 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkBox" id="box1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="orientation">vertical</property> <child> - <object class="GtkGrid" id="grid1"> + <object class="GtkGrid" id="program"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="row_spacing">6</property> @@ -96,6 +95,19 @@ <property name="height">1</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkGrid" id="grid2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> <object class="GtkLabel" id="suppress"> <property name="visible">True</property> @@ -135,6 +147,11 @@ <placeholder/> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> </child> |