[Libreoffice-commits] core.git: 3 commits - cui/AllLangResTarget_cui.mk cui/source cui/uiconfig sfx2/uiconfig sw/uiconfig uui/AllLangResTarget_uui.mk uui/source uui/uiconfig uui/UI_uui.mk
Caolán McNamara
caolanm at redhat.com
Fri Feb 15 02:39:18 PST 2013
cui/AllLangResTarget_cui.mk | 1
cui/source/options/securityoptions.cxx | 46 ++--
cui/source/options/securityoptions.hrc | 71 -------
cui/source/options/securityoptions.hxx | 35 +--
cui/source/options/securityoptions.src | 160 ----------------
cui/uiconfig/ui/securityoptionsdialog.ui | 258 +++++++++++++++++++--------
sfx2/uiconfig/ui/checkin.ui | 11 -
sfx2/uiconfig/ui/custominfopage.ui | 3
sfx2/uiconfig/ui/descriptioninfopage.ui | 3
sfx2/uiconfig/ui/documentpropertiesdialog.ui | 4
sfx2/uiconfig/ui/internetinfopage.ui | 4
sfx2/uiconfig/ui/password.ui | 38 ++-
sfx2/uiconfig/ui/printeroptionsdialog.ui | 10 -
sfx2/uiconfig/ui/securityinfopage.ui | 11 -
sfx2/uiconfig/ui/singletabdialog.ui | 2
sw/uiconfig/swriter/ui/setmasterpassword.ui | 172 ------------------
uui/AllLangResTarget_uui.mk | 1
uui/UI_uui.mk | 1
uui/source/ids.hrc | 1
uui/source/masterpasscrtdlg.cxx | 139 +-------------
uui/source/masterpasscrtdlg.hrc | 63 ------
uui/source/masterpasscrtdlg.hxx | 23 --
uui/source/masterpasscrtdlg.src | 101 ----------
uui/uiconfig/ui/masterpassworddlg.ui | 1
uui/uiconfig/ui/setmasterpassworddlg.ui | 179 ++++++++++++++++++
25 files changed, 465 insertions(+), 873 deletions(-)
New commits:
commit b5abb829ed5bb151dfbce595c6cd86b45e373f38
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Feb 15 10:38:15 2013 +0000
various efforts to consistently apply HIG rules
Change-Id: I0bd09c023be622ced9d3fa508e5e3463a3a5e5b2
diff --git a/sfx2/uiconfig/ui/checkin.ui b/sfx2/uiconfig/ui/checkin.ui
index 8215c59..7128519 100644
--- a/sfx2/uiconfig/ui/checkin.ui
+++ b/sfx2/uiconfig/ui/checkin.ui
@@ -3,7 +3,7 @@
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="CheckinDialog">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Check-In</property>
<property name="modal">True</property>
<property name="window_position">center-on-parent</property>
@@ -12,7 +12,7 @@
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">2</property>
+ <property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
@@ -20,11 +20,9 @@
<child>
<object class="GtkButton" id="cancel">
<property name="label">gtk-cancel</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>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -36,13 +34,11 @@
<child>
<object class="GtkButton" id="ok">
<property name="label">gtk-ok</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -65,14 +61,13 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
+ <property name="row_spacing">6</property>
<child>
<object class="GtkCheckButton" id="MajorVersion">
<property name="label" translatable="yes">New major version</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="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
diff --git a/sfx2/uiconfig/ui/custominfopage.ui b/sfx2/uiconfig/ui/custominfopage.ui
index 0cc0612..15a7c96 100644
--- a/sfx2/uiconfig/ui/custominfopage.ui
+++ b/sfx2/uiconfig/ui/custominfopage.ui
@@ -6,6 +6,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
+ <property name="border_width">6</property>
<property name="row_spacing">12</property>
<child>
<object class="GtkLabel" id="label56">
@@ -25,12 +26,10 @@
<child>
<object class="GtkButton" id="add">
<property name="label">gtk-add</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>
<property name="halign">end</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
diff --git a/sfx2/uiconfig/ui/descriptioninfopage.ui b/sfx2/uiconfig/ui/descriptioninfopage.ui
index 88f21d5..c257d31 100644
--- a/sfx2/uiconfig/ui/descriptioninfopage.ui
+++ b/sfx2/uiconfig/ui/descriptioninfopage.ui
@@ -6,8 +6,9 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
+ <property name="border_width">6</property>
<property name="row_spacing">6</property>
- <property name="column_spacing">18</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="label27">
<property name="visible">True</property>
diff --git a/sfx2/uiconfig/ui/documentpropertiesdialog.ui b/sfx2/uiconfig/ui/documentpropertiesdialog.ui
index e505cf0..9012aaf 100644
--- a/sfx2/uiconfig/ui/documentpropertiesdialog.ui
+++ b/sfx2/uiconfig/ui/documentpropertiesdialog.ui
@@ -3,14 +3,14 @@
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="DocumentPropertiesDialog">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Properties of </property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">2</property>
+ <property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
diff --git a/sfx2/uiconfig/ui/internetinfopage.ui b/sfx2/uiconfig/ui/internetinfopage.ui
index 28c4e19..aad0e6a 100644
--- a/sfx2/uiconfig/ui/internetinfopage.ui
+++ b/sfx2/uiconfig/ui/internetinfopage.ui
@@ -19,6 +19,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
+ <property name="border_width">6</property>
<property name="row_spacing">12</property>
<property name="column_spacing">6</property>
<child>
@@ -165,6 +166,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkEntry" id="forwarded">
<property name="visible">True</property>
@@ -208,6 +210,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkSpinButton" id="afternf">
<property name="visible">True</property>
@@ -250,6 +253,7 @@
<object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkSpinButton" id="reloadnf">
<property name="visible">True</property>
diff --git a/sfx2/uiconfig/ui/password.ui b/sfx2/uiconfig/ui/password.ui
index dc14bd2..ae9fd22 100644
--- a/sfx2/uiconfig/ui/password.ui
+++ b/sfx2/uiconfig/ui/password.ui
@@ -3,14 +3,14 @@
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="PasswordDialog">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Enter Password</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">2</property>
+ <property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
@@ -18,11 +18,9 @@
<child>
<object class="GtkButton" id="help">
<property name="label">gtk-help</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>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -34,13 +32,11 @@
<child>
<object class="GtkButton" id="ok">
<property name="label">gtk-ok</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -52,11 +48,9 @@
<child>
<object class="GtkButton" id="cancel">
<property name="label">gtk-cancel</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>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -78,7 +72,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkFrame" id="password1frame">
<property name="visible">True</property>
@@ -89,19 +83,22 @@
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="userft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">User</property>
+ <property name="label" translatable="yes">User:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">usered</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -115,7 +112,9 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Password</property>
+ <property name="label" translatable="yes">Password:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">pass1ed</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -129,7 +128,9 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Confirm</property>
+ <property name="label" translatable="yes">Confirm:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">confirm1ed</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -214,19 +215,22 @@
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="top_padding">6</property>
<property name="left_padding">12</property>
<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">6</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="pass2ft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Password</property>
+ <property name="label" translatable="yes">Password:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">pass2ed</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -240,7 +244,9 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Confirm</property>
+ <property name="label" translatable="yes">Confirm:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">confirm2ed</property>
</object>
<packing>
<property name="left_attach">0</property>
diff --git a/sfx2/uiconfig/ui/printeroptionsdialog.ui b/sfx2/uiconfig/ui/printeroptionsdialog.ui
index c12aee5..0b9eef7 100644
--- a/sfx2/uiconfig/ui/printeroptionsdialog.ui
+++ b/sfx2/uiconfig/ui/printeroptionsdialog.ui
@@ -3,14 +3,14 @@
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="PrinterOptionsDialog">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Printer Options</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">2</property>
+ <property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
@@ -18,11 +18,9 @@
<child>
<object class="GtkButton" id="ok">
<property name="label">gtk-ok</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>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -34,11 +32,9 @@
<child>
<object class="GtkButton" id="cancel">
<property name="label">gtk-cancel</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>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -50,11 +46,9 @@
<child>
<object class="GtkButton" id="help">
<property name="label">gtk-help</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>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
diff --git a/sfx2/uiconfig/ui/securityinfopage.ui b/sfx2/uiconfig/ui/securityinfopage.ui
index bb292b2..d601c5f 100644
--- a/sfx2/uiconfig/ui/securityinfopage.ui
+++ b/sfx2/uiconfig/ui/securityinfopage.ui
@@ -6,6 +6,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
+ <property name="border_width">6</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
@@ -24,17 +25,15 @@
<property name="valign">end</property>
<property name="hexpand">True</property>
<property name="row_spacing">12</property>
- <property name="column_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="readonly">
<property name="label" translatable="yes">_Open file read-only</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="halign">start</property>
<property name="valign">end</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -49,11 +48,9 @@
<child>
<object class="GtkCheckButton" id="recordchanges">
<property name="label" translatable="yes">Record _changes</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="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -74,12 +71,10 @@
<child>
<object class="GtkButton" id="protect">
<property name="label" translatable="yes">Protect...</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>
<property name="halign">end</property>
- <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -90,12 +85,10 @@
<child>
<object class="GtkButton" id="unprotect">
<property name="label" translatable="yes">_Unprotect...</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>
<property name="halign">end</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
</object>
<packing>
diff --git a/sfx2/uiconfig/ui/singletabdialog.ui b/sfx2/uiconfig/ui/singletabdialog.ui
index fca8957..8ad458f 100644
--- a/sfx2/uiconfig/ui/singletabdialog.ui
+++ b/sfx2/uiconfig/ui/singletabdialog.ui
@@ -3,7 +3,7 @@
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="SingleTabDialog">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
diff --git a/uui/uiconfig/ui/masterpassworddlg.ui b/uui/uiconfig/ui/masterpassworddlg.ui
index ce9daa0..b03a85a 100644
--- a/uui/uiconfig/ui/masterpassworddlg.ui
+++ b/uui/uiconfig/ui/masterpassworddlg.ui
@@ -10,6 +10,7 @@
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
commit 181403c23e3f0abe3f8674b173c8c998c3c9c57a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Feb 15 09:51:23 2013 +0000
move set master password dialog to uui and adapt code
Change-Id: Ic23b7589f48f7b2fc4b8f6e4bc285364b8819081
diff --git a/sw/uiconfig/swriter/ui/setmasterpassword.ui b/sw/uiconfig/swriter/ui/setmasterpassword.ui
deleted file mode 100644
index 8b58745..0000000
--- a/sw/uiconfig/swriter/ui/setmasterpassword.ui
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
- <!-- interface-requires gtk+ 3.0 -->
- <object class="GtkDialog" id="dialog1">
- <property name="can_focus">False</property>
- <property name="border_width">5</property>
- <property name="type_hint">dialog</property>
- <child internal-child="vbox">
- <object class="GtkBox" id="dialog-vbox1">
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area1">
- <property name="can_focus">False</property>
- <property name="layout_style">spread</property>
- <child>
- <object class="GtkButton" id="help">
- <property name="label">gtk-help</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>
- <property name="use_action_appearance">False</property>
- <property name="use_stock">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="ok">
- <property name="label">gtk-ok</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>
- <property name="use_action_appearance">False</property>
- <property name="use_stock">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="cancel">
- <property name="label">gtk-cancel</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>
- <property name="use_action_appearance">False</property>
- <property name="use_stock">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="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Passwords for web connections are protected by a master
-password. You will be asked to enter it once per session, if
-LibreOffice retrieves a password from the protected password
-list.</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="xpad">1</property>
- <property name="label" translatable="yes">~Enter password</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="entry1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">~Reenter password</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="entry2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Caution:If you forget the master password,you will be unable to access any of the information protected by it. Passwords are case-sensitive.</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">5</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- <action-widgets>
- <action-widget response="0">help</action-widget>
- <action-widget response="0">ok</action-widget>
- <action-widget response="0">cancel</action-widget>
- </action-widgets>
- </object>
-</interface>
diff --git a/uui/AllLangResTarget_uui.mk b/uui/AllLangResTarget_uui.mk
index 646e311..66694b0 100644
--- a/uui/AllLangResTarget_uui.mk
+++ b/uui/AllLangResTarget_uui.mk
@@ -52,7 +52,6 @@ $(eval $(call gb_SrsTarget_add_files,uui/res,\
uui/source/ids.src \
uui/source/lockfailed.src \
uui/source/logindlg.src \
- uui/source/masterpasscrtdlg.src \
uui/source/nameclashdlg.src \
uui/source/newerverwarn.src \
uui/source/openlocked.src \
diff --git a/uui/UI_uui.mk b/uui/UI_uui.mk
index 114725a..826b4ed 100644
--- a/uui/UI_uui.mk
+++ b/uui/UI_uui.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_UI_UI,uui))
$(eval $(call gb_UI_add_uifiles,uui,\
uui/uiconfig/ui/masterpassworddlg \
+ uui/uiconfig/ui/setmasterpassworddlg \
))
# vim: set noet sw=4 ts=4:
diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc
index a8bd487..ae175e8 100644
--- a/uui/source/ids.hrc
+++ b/uui/source/ids.hrc
@@ -155,7 +155,6 @@
#define TITLE_UUI_SSLWARN_INVALID (ERRCODE_AREA_UUI_UNKNOWNAUTH + SSLWARN_TYPE_INVALID + 3)
#define HID_DLG_LOGIN "UUI_HID_DLG_LOGIN"
-#define HID_DLG_MASTERPASSWORD_CRT "UUI_HID_DLG_MASTERPASSWORD_CRT"
#define HID_DLG_FILTER_SELECT "UUI_HID_DLG_FILTER_SELECT"
#define HID_DLG_PASSWORD_UUI "UUI_HID_DLG_PASSWORD_UUI"
#define HID_DLG_UNKNOWNAUTH_UUI "UUI_HID_DLG_UNKNOWNAUTH_UUI"
diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx
index e79b834..345ab0d 100644
--- a/uui/source/masterpasscrtdlg.cxx
+++ b/uui/source/masterpasscrtdlg.cxx
@@ -21,7 +21,6 @@
#include <vcl/msgbox.hxx>
#include <ids.hrc>
-#include <masterpasscrtdlg.hrc>
#include <masterpasscrtdlg.hxx>
// MasterPasswordCreateDialog---------------------------------------------------
@@ -30,7 +29,7 @@
IMPL_LINK_NOARG(MasterPasswordCreateDialog, EditHdl_Impl)
{
- aOKBtn.Enable( aEDMasterPasswordCrt.GetText().getLength() >= nMinLen );
+ m_pOKBtn->Enable( m_pEDMasterPasswordCrt->GetText().getLength() >= nMinLen );
return 0;
}
@@ -39,141 +38,33 @@ IMPL_LINK_NOARG(MasterPasswordCreateDialog, EditHdl_Impl)
IMPL_LINK_NOARG(MasterPasswordCreateDialog, OKHdl_Impl)
{
// compare both passwords and show message box if there are not equal!!
- if( aEDMasterPasswordCrt.GetText() == aEDMasterPasswordRepeat.GetText() )
+ if( m_pEDMasterPasswordCrt->GetText() == m_pEDMasterPasswordRepeat->GetText() )
EndDialog( RET_OK );
else
{
String aErrorMsg( ResId( STR_ERROR_PASSWORDS_NOT_IDENTICAL, *pResourceMgr ));
ErrorBox aErrorBox( this, WB_OK, aErrorMsg );
aErrorBox.Execute();
- aEDMasterPasswordCrt.SetText( String() );
- aEDMasterPasswordRepeat.SetText( String() );
- aEDMasterPasswordCrt.GrabFocus();
+ m_pEDMasterPasswordCrt->SetText( String() );
+ m_pEDMasterPasswordRepeat->SetText( String() );
+ m_pEDMasterPasswordCrt->GrabFocus();
}
return 1;
}
// -----------------------------------------------------------------------
-MasterPasswordCreateDialog::MasterPasswordCreateDialog
-(
- Window* pParent,
- ResMgr* pResMgr
-) :
-
- ModalDialog( pParent, ResId( DLG_UUI_MASTERPASSWORD_CRT, *pResMgr ) ),
-
- aFTInfoText ( this, ResId( FT_INFOTEXT, *pResMgr ) ),
- aFLInfoText ( this, ResId( FL_INFOTEXT, *pResMgr ) ),
-
- aFTMasterPasswordCrt ( this, ResId( FT_MASTERPASSWORD_CRT, *pResMgr ) ),
- aEDMasterPasswordCrt ( this, ResId( ED_MASTERPASSWORD_CRT, *pResMgr ) ),
- aFTMasterPasswordRepeat ( this, ResId( FT_MASTERPASSWORD_REPEAT, *pResMgr ) ),
- aEDMasterPasswordRepeat ( this, ResId( ED_MASTERPASSWORD_REPEAT, *pResMgr ) ),
-
- aFTCautionText ( this, ResId( FT_CAUTIONTEXT, *pResMgr ) ),
- aFLCautionText ( this, ResId( FL_CAUTIONTEXT, *pResMgr ) ),
-
- aFTMasterPasswordWarning ( this, ResId( FT_MASTERPASSWORD_WARNING, *pResMgr ) ),
- aFL ( this, ResId( FL_FIXED_LINE, *pResMgr ) ),
- aOKBtn ( this, ResId( BTN_MASTERPASSCRT_OK, *pResMgr ) ),
- aCancelBtn ( this, ResId( BTN_MASTERPASSCRT_CANCEL, *pResMgr ) ),
- aHelpBtn ( this, ResId( BTN_MASTERPASSCRT_HELP, *pResMgr ) ),
-
- pResourceMgr ( pResMgr ),
- nMinLen ( 1 )
-{
- FreeResource();
-
- aOKBtn.Enable( sal_False );
- aOKBtn.SetClickHdl( LINK( this, MasterPasswordCreateDialog, OKHdl_Impl ) );
- aEDMasterPasswordCrt.SetModifyHdl( LINK( this, MasterPasswordCreateDialog, EditHdl_Impl ) );
-
- CalculateTextHeight();
-
- long nLableWidth = aFTMasterPasswordWarning.GetSizePixel().Width();
- long nLabelHeight = aFTMasterPasswordWarning.GetSizePixel().Height();
- long nTextWidth = aFTMasterPasswordWarning.GetCtrlTextWidth( aFTMasterPasswordWarning.GetText() );
- long nTextHeight = aFTMasterPasswordWarning.GetTextHeight();
-
- Rectangle aLabelRect( aFTMasterPasswordWarning.GetPosPixel(), aFTMasterPasswordWarning.GetSizePixel() );
- Rectangle aRect = aFTMasterPasswordWarning.GetTextRect( aLabelRect, aFTMasterPasswordWarning.GetText() );
-
- long nNewLabelHeight = 0;
- if ( nTextWidth > 0 )
- {
- for( nNewLabelHeight = ( nTextWidth / nLableWidth + 1 ) * nTextHeight;
- nNewLabelHeight < aRect.GetHeight();
- nNewLabelHeight += nTextHeight ) {};
- }
-
- long nDelta = nNewLabelHeight - nLabelHeight;
- Size aNewDlgSize = GetSizePixel();
- aNewDlgSize.Height() += nDelta;
- SetSizePixel( aNewDlgSize );
-
- Size aNewWarningSize = aFTMasterPasswordWarning.GetSizePixel();
- aNewWarningSize.Height() = nNewLabelHeight;
- aFTMasterPasswordWarning.SetPosSizePixel( aFTMasterPasswordWarning.GetPosPixel(), aNewWarningSize );
-
- Window* pControls[] = { &aFL, &aOKBtn, &aCancelBtn, &aHelpBtn };
- const sal_Int32 nCCount = sizeof( pControls ) / sizeof( pControls[0] );
- for ( int i = 0; i < nCCount; ++i )
- {
- Point aNewPos =(*pControls[i]).GetPosPixel();
- aNewPos.Y() += nDelta;
- pControls[i]->SetPosSizePixel( aNewPos, pControls[i]->GetSizePixel() );
- }
-};
-
-void MasterPasswordCreateDialog::CalculateTextHeight()
+MasterPasswordCreateDialog::MasterPasswordCreateDialog(Window* pParent, ResMgr* pResMgr)
+ : ModalDialog(pParent, "SetMasterPasswordDialog", "uui/ui/setmasterpassworddlg.ui")
+ , pResourceMgr(pResMgr)
+ , nMinLen(1)
{
- Size aSize = aFTInfoText.GetSizePixel();
- Size aMinSize = aFTInfoText.CalcMinimumSize( aSize.Width() );
- long nDelta = 0;
-
- if ( aSize.Height() > aMinSize.Height() )
- {
- aFTInfoText.SetSizePixel( aMinSize );
- nDelta = aSize.Height() - aMinSize.Height();
- Window* pWins[] = { &aFLInfoText, &aFTMasterPasswordCrt, &aEDMasterPasswordCrt,
- &aFTMasterPasswordRepeat, &aEDMasterPasswordRepeat, &aFTCautionText,
- &aFLCautionText, &aOKBtn, &aCancelBtn, &aHelpBtn };
- Window** pWindow = pWins;
- const sal_Int32 nCount = sizeof( pWins ) / sizeof( pWins[0] );
- for ( sal_Int32 i = 0; i < nCount; ++i, ++pWindow )
- {
- Point aNewPos = (*pWindow)->GetPosPixel();
- aNewPos.Y() -= nDelta;
- (*pWindow)->SetPosPixel( aNewPos );
- }
- }
-
- aSize = aFTCautionText.GetSizePixel();
- aMinSize = aFTCautionText.CalcMinimumSize( aSize.Width() );
-
- if ( aSize.Height() > aMinSize.Height() )
- {
- aFTCautionText.SetSizePixel( aMinSize );
- long nTemp = aSize.Height() - aMinSize.Height();
- nDelta += nTemp;
- Window* pWins[] = { &aFLCautionText, &aOKBtn, &aCancelBtn, &aHelpBtn };
- Window** pWindow = pWins;
- const sal_Int32 nCount = sizeof( pWins ) / sizeof( pWins[0] );
- for ( sal_Int32 i = 0; i < nCount; ++i, ++pWindow )
- {
- Point aNewPos = (*pWindow)->GetPosPixel();
- aNewPos.Y() -= nTemp;
- (*pWindow)->SetPosPixel( aNewPos );
- }
- }
-
- if ( nDelta > 0 )
- {
- Size aDlgSize = GetOutputSizePixel();
- aDlgSize.Height() -= nDelta;
- SetSizePixel( aDlgSize );
- }
+ get(m_pEDMasterPasswordCrt, "password1");
+ get(m_pEDMasterPasswordRepeat, "password2");
+ get(m_pOKBtn, "ok");
+ m_pOKBtn->Enable( sal_False );
+ m_pOKBtn->SetClickHdl( LINK( this, MasterPasswordCreateDialog, OKHdl_Impl ) );
+ m_pEDMasterPasswordCrt->SetModifyHdl( LINK( this, MasterPasswordCreateDialog, EditHdl_Impl ) );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/masterpasscrtdlg.hrc b/uui/source/masterpasscrtdlg.hrc
deleted file mode 100644
index 1d14e57..0000000
--- a/uui/source/masterpasscrtdlg.hrc
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef UUI_MASTERPASSCRT_HRC
-#define UUI_MASTERPASSCRT_HRC
-
-#include <svtools/controldims.hrc>
-
-//============================================================================
-
-#define FT_INFOTEXT 10
-#define FL_INFOTEXT 11
-
-#define FT_MASTERPASSWORD_CRT 20
-#define ED_MASTERPASSWORD_CRT 21
-#define FT_MASTERPASSWORD_REPEAT 22
-#define ED_MASTERPASSWORD_REPEAT 23
-#define FT_MASTERPASSWORD_WARNING 24
-#define FL_FIXED_LINE 30
-
-#define FT_CAUTIONTEXT 30
-#define FL_CAUTIONTEXT 31
-
-#define BTN_MASTERPASSCRT_OK 50
-#define BTN_MASTERPASSCRT_CANCEL 51
-#define BTN_MASTERPASSCRT_HELP 52
-
-#define ROW_0 (RSC_SP_FLGR_INNERBORDER_TOP)
-#define ROW_1 (ROW_0+7*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_Y)
-#define ROW_2 (ROW_1+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_DESC_Y)
-#define ROW_3 (ROW_2+RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_Y)
-#define ROW_4 (ROW_3+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_CTRL_DESC_Y)
-#define ROW_5 (ROW_4+RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_Y)
-#define ROW_6 (ROW_5+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_CTRL_X)
-#define ROW_7 (ROW_6+8*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_Y)
-#define ROW_8 (ROW_7+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_DESC_Y)
-#define ROW_9 (ROW_8+RSC_CD_PUSHBUTTON_HEIGHT+RSC_SP_CTRL_X)
-
-#define COL_0 (RSC_SP_FLGR_INNERBORDER_LEFT)
-#define COL_2 (DLG_WIDTH-RSC_SP_FLGR_INNERBORDER_LEFT-RSC_CD_PUSHBUTTON_WIDTH)
-#define COL_1 (COL_2-RSC_SP_CTRL_GROUP_X-RSC_CD_PUSHBUTTON_WIDTH)
-
-#define DLG_WIDTH 180
-#define CTRL_WIDTH (DLG_WIDTH-2*RSC_SP_FLGR_INNERBORDER_LEFT)
-#define DLG_HEIGHT (ROW_9)
-
-#endif // UUI_MASTERPASSCRT_HRC
-
diff --git a/uui/source/masterpasscrtdlg.hxx b/uui/source/masterpasscrtdlg.hxx
index dfc3daa..0d6ee30 100644
--- a/uui/source/masterpasscrtdlg.hxx
+++ b/uui/source/masterpasscrtdlg.hxx
@@ -32,22 +32,9 @@
class MasterPasswordCreateDialog : public ModalDialog
{
private:
- FixedText aFTInfoText;
- FixedLine aFLInfoText;
-
- FixedText aFTMasterPasswordCrt;
- Edit aEDMasterPasswordCrt;
- FixedText aFTMasterPasswordRepeat;
- Edit aEDMasterPasswordRepeat;
-
- FixedText aFTCautionText;
- FixedLine aFLCautionText;
-
- FixedText aFTMasterPasswordWarning;
- FixedLine aFL;
- OKButton aOKBtn;
- CancelButton aCancelBtn;
- HelpButton aHelpBtn;
+ Edit* m_pEDMasterPasswordCrt;
+ Edit* m_pEDMasterPasswordRepeat;
+ OKButton* m_pOKBtn;
DECL_LINK(OKHdl_Impl, void *);
@@ -56,13 +43,11 @@ private:
public:
MasterPasswordCreateDialog( Window* pParent, ResMgr * pResMgr );
- String GetMasterPassword() const { return aEDMasterPasswordCrt.GetText(); }
+ OUString GetMasterPassword() const { return m_pEDMasterPasswordCrt->GetText(); }
private:
ResMgr* pResourceMgr;
sal_uInt16 nMinLen;
-
- void CalculateTextHeight();
};
#endif // UUI_MASTERPASSCRTDLG_HXX
diff --git a/uui/source/masterpasscrtdlg.src b/uui/source/masterpasscrtdlg.src
deleted file mode 100644
index e3b1990..0000000
--- a/uui/source/masterpasscrtdlg.src
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#define __RSC
-
-#include <ids.hrc>
-#include <masterpasscrtdlg.hrc>
-
-ModalDialog DLG_UUI_MASTERPASSWORD_CRT
-{
- HelpId = HID_DLG_MASTERPASSWORD_CRT ;
- Border = TRUE ;
- Moveable = TRUE ;
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( DLG_WIDTH , DLG_HEIGHT ) ;
- Text [ en-US ] = "Set Master Password";
- FixedText FT_INFOTEXT
- {
- Pos = MAP_APPFONT ( COL_0 , ROW_0 ) ;
- Size = MAP_APPFONT ( CTRL_WIDTH , 7*RSC_CD_FIXEDTEXT_HEIGHT ) ;
- WordBreak = TRUE ;
- Text [ en-US ] = "Passwords for web connections are protected by a master password. You will be asked to enter it once per session, if %PRODUCTNAME retrieves a password from the protected password list.";
- };
- FixedLine FL_INFOTEXT
- {
- Pos = MAP_APPFONT ( 0 , ROW_1 ) ;
- Size = MAP_APPFONT ( DLG_WIDTH , RSC_CD_FIXEDLINE_HEIGHT ) ;
- };
- FixedText FT_MASTERPASSWORD_CRT
- {
- Pos = MAP_APPFONT ( COL_0 , ROW_2 ) ;
- Size = MAP_APPFONT ( CTRL_WIDTH , RSC_CD_FIXEDLINE_HEIGHT ) ;
- Text [ en-US ] = "~Enter password";
- };
- Edit ED_MASTERPASSWORD_CRT
- {
- HelpID = "uui:Edit:DLG_UUI_MASTERPASSWORD_CRT:ED_MASTERPASSWORD_CRT";
- Pos = MAP_APPFONT ( COL_0 , ROW_3 ) ;
- Size = MAP_APPFONT ( CTRL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ;
- Border = TRUE ;
- PassWord = TRUE ;
- };
- FixedText FT_MASTERPASSWORD_REPEAT
- {
- Pos = MAP_APPFONT ( COL_0 , ROW_4 ) ;
- Size = MAP_APPFONT ( CTRL_WIDTH , RSC_CD_FIXEDLINE_HEIGHT ) ;
- Text [ en-US ] = "~Reenter password";
- };
- Edit ED_MASTERPASSWORD_REPEAT
- {
- HelpID = "uui:Edit:DLG_UUI_MASTERPASSWORD_CRT:ED_MASTERPASSWORD_REPEAT";
- Pos = MAP_APPFONT ( COL_0 , ROW_5 ) ;
- Size = MAP_APPFONT ( CTRL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ;
- Border = TRUE ;
- PassWord = TRUE ;
- };
- FixedText FT_CAUTIONTEXT
- {
- Pos = MAP_APPFONT ( COL_0 , ROW_6 ) ;
- Size = MAP_APPFONT ( CTRL_WIDTH , 8*RSC_CD_FIXEDTEXT_HEIGHT ) ;
- WordBreak = TRUE ;
- Text [ en-US ] = "Caution: If you forget the master password, you will be unable to access any of the information protected by it. Passwords are case-sensitive.";
- };
- FixedLine FL_CAUTIONTEXT
- {
- Pos = MAP_APPFONT ( 0 , ROW_7 ) ;
- Size = MAP_APPFONT ( DLG_WIDTH , RSC_CD_FIXEDLINE_HEIGHT ) ;
- };
- HelpButton BTN_MASTERPASSCRT_HELP
- {
- Pos = MAP_APPFONT ( COL_0 , ROW_8 ) ;
- Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
- };
- OKButton BTN_MASTERPASSCRT_OK
- {
- Pos = MAP_APPFONT ( COL_1 , ROW_8 ) ;
- Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
- DefButton = TRUE ;
- };
- CancelButton BTN_MASTERPASSCRT_CANCEL
- {
- Pos = MAP_APPFONT ( COL_2 , ROW_8 ) ;
- Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
- };
-};
diff --git a/uui/uiconfig/ui/setmasterpassworddlg.ui b/uui/uiconfig/ui/setmasterpassworddlg.ui
new file mode 100644
index 0000000..a5670a7
--- /dev/null
+++ b/uui/uiconfig/ui/setmasterpassworddlg.ui
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="SetMasterPasswordDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Set Master Password</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ <property name="secondary">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">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="cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">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="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Passwords for web connections are protected by a master password. You will be asked to enter it once per session, if %PRODUCTNAME retrieves a password from the protected password list.</property>
+ <property name="wrap">True</property>
+ <property name="max_width_chars">62</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Enter password:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">password1</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="password1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
+ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Reenter password:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">password2</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="password2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
+ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Caution: If you forget the master password, you will be unable to access any of the information protected by it. Passwords are case sensitive.</property>
+ <property name="wrap">True</property>
+ <property name="width_chars">56</property>
+ <property name="max_width_chars">62</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">help</action-widget>
+ <action-widget response="0">ok</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ </action-widgets>
+ </object>
+</interface>
commit 27b041318f7b1c3fcd890d2935c35237e993bbe1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Feb 15 09:41:45 2013 +0000
fully convert security options to .ui format
Change-Id: I119b38f96ebdd6af19b9dce926a684398b4f72f8
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 09eb0d6..a5bb239 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -97,7 +97,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/options/optsave.src \
cui/source/options/optupdt.src \
cui/source/options/readonlyimage.src \
- cui/source/options/securityoptions.src \
cui/source/options/treeopt.src \
cui/source/options/webconninfo.src \
cui/source/tabpages/align.src \
diff --git a/cui/source/options/securityoptions.cxx b/cui/source/options/securityoptions.cxx
index d0196d3..e95bb19 100644
--- a/cui/source/options/securityoptions.cxx
+++ b/cui/source/options/securityoptions.cxx
@@ -22,7 +22,6 @@
#include <dialmgr.hxx>
#include <cuires.hrc>
#include "securityoptions.hxx"
-#include "securityoptions.hrc"
namespace
{
@@ -45,32 +44,29 @@ namespace svx
SecurityOptionsDialog::SecurityOptionsDialog(Window* pParent, SvtSecurityOptions* pOptions)
: ModalDialog(pParent, "SecurityOptionsDialog", "cui/ui/securityoptionsdialog.ui")
-
- ,m_aSaveOrSendDocsFI( this, CUI_RES( FI_SAVESENDDOCS ) )
- ,m_aSaveOrSendDocsCB( this, CUI_RES( CB_SAVESENDDOCS ) )
- ,m_aSignDocsFI ( this, CUI_RES( FI_SIGNDOCS ) )
- ,m_aSignDocsCB ( this, CUI_RES( CB_SIGNDOCS ) )
- ,m_aPrintDocsFI ( this, CUI_RES( FI_PRINTDOCS ) )
- ,m_aPrintDocsCB ( this, CUI_RES( CB_PRINTDOCS ) )
- ,m_aCreatePdfFI ( this, CUI_RES( FI_CREATEPDF ) )
- ,m_aCreatePdfCB ( this, CUI_RES( CB_CREATEPDF ) )
- ,m_aRemovePersInfoFI( this, CUI_RES( FI_REMOVEINFO ) )
- ,m_aRemovePersInfoCB( this, CUI_RES( CB_REMOVEINFO ) )
- ,m_aRecommPasswdFI ( this, CUI_RES( FI_RECOMMENDPWD ) )
- ,m_aRecommPasswdCB ( this, CUI_RES( CB_RECOMMENDPWD ) )
- ,m_aCtrlHyperlinkFI ( this, CUI_RES( FI_CTRLHYPERLINK ) )
- ,m_aCtrlHyperlinkCB ( this, CUI_RES( CB_CTRLHYPERLINK ) )
-
{
-
DBG_ASSERT( pOptions, "SecurityOptionsDialog::SecurityOptionsDialog(): invalid SvtSecurityOptions" );
- enableAndSet( *pOptions, SvtSecurityOptions::E_DOCWARN_SAVEORSEND, m_aSaveOrSendDocsCB, m_aSaveOrSendDocsFI );
- enableAndSet( *pOptions, SvtSecurityOptions::E_DOCWARN_SIGNING, m_aSignDocsCB, m_aSignDocsFI );
- enableAndSet( *pOptions, SvtSecurityOptions::E_DOCWARN_PRINT, m_aPrintDocsCB, m_aPrintDocsFI );
- enableAndSet( *pOptions, SvtSecurityOptions::E_DOCWARN_CREATEPDF, m_aCreatePdfCB, m_aCreatePdfFI );
- enableAndSet( *pOptions, SvtSecurityOptions::E_DOCWARN_REMOVEPERSONALINFO, m_aRemovePersInfoCB, m_aRemovePersInfoFI );
- enableAndSet( *pOptions, SvtSecurityOptions::E_DOCWARN_RECOMMENDPASSWORD, m_aRecommPasswdCB, m_aRecommPasswdFI );
- enableAndSet( *pOptions, SvtSecurityOptions::E_CTRLCLICK_HYPERLINK, m_aCtrlHyperlinkCB, m_aCtrlHyperlinkFI );
+ get(m_pSaveOrSendDocsCB, "savesenddocs");
+ enableAndSet(*pOptions, SvtSecurityOptions::E_DOCWARN_SAVEORSEND, *m_pSaveOrSendDocsCB,
+ *get<FixedImage>("locksavesenddocs"));
+ get(m_pSignDocsCB, "whensigning");
+ enableAndSet(*pOptions, SvtSecurityOptions::E_DOCWARN_SIGNING, *m_pSignDocsCB,
+ *get<FixedImage>("lockwhensigning"));
+ get(m_pPrintDocsCB, "whenprinting");
+ enableAndSet(*pOptions, SvtSecurityOptions::E_DOCWARN_PRINT, *m_pPrintDocsCB,
+ *get<FixedImage>("lockwhenprinting"));
+ get(m_pCreatePdfCB, "whenpdf");
+ enableAndSet(*pOptions, SvtSecurityOptions::E_DOCWARN_CREATEPDF, *m_pCreatePdfCB,
+ *get<FixedImage>("lockwhenpdf"));
+ get(m_pRemovePersInfoCB, "removepersonal");
+ enableAndSet(*pOptions, SvtSecurityOptions::E_DOCWARN_REMOVEPERSONALINFO, *m_pRemovePersInfoCB,
+ *get<FixedImage>("lockremovepersonal"));
+ get(m_pRecommPasswdCB, "password");
+ enableAndSet(*pOptions, SvtSecurityOptions::E_DOCWARN_RECOMMENDPASSWORD, *m_pRecommPasswdCB,
+ *get<FixedImage>("lockpassword"));
+ get(m_pCtrlHyperlinkCB, "ctrlclick");
+ enableAndSet(*pOptions, SvtSecurityOptions::E_CTRLCLICK_HYPERLINK, *m_pCtrlHyperlinkCB,
+ *get<FixedImage>("lockctrlclick"));
}
SecurityOptionsDialog::~SecurityOptionsDialog()
diff --git a/cui/source/options/securityoptions.hrc b/cui/source/options/securityoptions.hrc
deleted file mode 100644
index 1c86114..0000000
--- a/cui/source/options/securityoptions.hrc
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _SVX_SECURITYOPTIONS_HRC
-#define _SVX_SECURITYOPTIONS_HRC
-
-#define FL_WARNINGS 10
-#define FI_WARNINGS 11
-#define FI_SAVESENDDOCS 12
-#define CB_SAVESENDDOCS 13
-#define FI_SIGNDOCS 14
-#define CB_SIGNDOCS 15
-#define FI_PRINTDOCS 16
-#define CB_PRINTDOCS 17
-#define FI_CREATEPDF 18
-#define CB_CREATEPDF 19
-#define FL_OPTIONS 20
-#define FI_REMOVEINFO 21
-#define CB_REMOVEINFO 22
-#define FI_RECOMMENDPWD 23
-#define CB_RECOMMENDPWD 24
-#define FI_CTRLHYPERLINK 25
-#define CB_CTRLHYPERLINK 26
-#define FL_BUTTONS 27
-#define PB_OK 28
-#define PB_CANCEL 29
-#define PB_HELP 30
-
-#define DLG_WIDTH 260
-
-#define COL_0 (RSC_SP_DLG_INNERBORDER_LEFT)
-#define COL_1 (COL_0+RSC_SP_FLGR_SPACE_X)
-#define COL_2 (COL_1+RSC_SP_CHK_TEXTINDENT)
-#define COL_4 (DLG_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT)
-#define COL_3 (COL_4-RSC_SP_FLGR_SPACE_X)
-
-#define COL_C (COL_4-RSC_CD_PUSHBUTTON_WIDTH)
-#define COL_B (COL_C-RSC_SP_CTRL_X-RSC_CD_PUSHBUTTON_WIDTH)
-#define COL_A (COL_B-RSC_SP_CTRL_GROUP_X-RSC_CD_PUSHBUTTON_WIDTH)
-
-#define CHECKBOX_WIDTH ((COL_3-COL_2-RSC_SP_CTRL_X)/2)
-
-#define ROW_0 (RSC_SP_DLG_INNERBORDER_TOP)
-#define ROW_1 (ROW_0+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_SPACE_Y)
-#define ROW_2 (ROW_1+2*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_FLGR_SPACE_Y)
-#define ROW_3 (ROW_2+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y)
-#define ROW_4 (ROW_3+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y)
-#define ROW_5 (ROW_4+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_SPACE_Y)
-#define ROW_6 (ROW_5+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y)
-#define ROW_7 (ROW_6+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y)
-#define ROW_8 (ROW_7+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_FLGR_SPACE_Y)
-#define ROW_9 (ROW_8+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_FLGR_SPACE_Y)
-#define ROW_10 (ROW_9+RSC_CD_PUSHBUTTON_HEIGHT+RSC_SP_DLG_INNERBORDER_BOTTOM)
-
-#endif // #ifndef _SVX_SECURITYOPTIONS_HRC
-
diff --git a/cui/source/options/securityoptions.hxx b/cui/source/options/securityoptions.hxx
index dc9cd06..2b49d20 100644
--- a/cui/source/options/securityoptions.hxx
+++ b/cui/source/options/securityoptions.hxx
@@ -38,34 +38,27 @@ namespace svx
class SecurityOptionsDialog : public ModalDialog
{
private:
- ReadOnlyImage m_aSaveOrSendDocsFI;
- CheckBox m_aSaveOrSendDocsCB;
- ReadOnlyImage m_aSignDocsFI;
- CheckBox m_aSignDocsCB;
- ReadOnlyImage m_aPrintDocsFI;
- CheckBox m_aPrintDocsCB;
- ReadOnlyImage m_aCreatePdfFI;
- CheckBox m_aCreatePdfCB;
+ CheckBox* m_pSaveOrSendDocsCB;
+ CheckBox* m_pSignDocsCB;
+ CheckBox* m_pPrintDocsCB;
+ CheckBox* m_pCreatePdfCB;
- ReadOnlyImage m_aRemovePersInfoFI;
- CheckBox m_aRemovePersInfoCB;
- ReadOnlyImage m_aRecommPasswdFI;
- CheckBox m_aRecommPasswdCB;
- ReadOnlyImage m_aCtrlHyperlinkFI;
- CheckBox m_aCtrlHyperlinkCB;
+ CheckBox* m_pRemovePersInfoCB;
+ CheckBox* m_pRecommPasswdCB;
+ CheckBox* m_pCtrlHyperlinkCB;
public:
SecurityOptionsDialog( Window* pParent, SvtSecurityOptions* pOptions );
~SecurityOptionsDialog();
- inline bool IsSaveOrSendDocsChecked() const { return m_aSaveOrSendDocsCB.IsChecked() != sal_False; }
- inline bool IsSignDocsChecked() const { return m_aSignDocsCB.IsChecked() != sal_False; }
- inline bool IsPrintDocsChecked() const { return m_aPrintDocsCB.IsChecked() != sal_False; }
- inline bool IsCreatePdfChecked() const { return m_aCreatePdfCB.IsChecked() != sal_False; }
- inline bool IsRemovePersInfoChecked() const { return m_aRemovePersInfoCB.IsChecked() != sal_False; }
- inline bool IsRecommPasswdChecked() const { return m_aRecommPasswdCB.IsChecked() != sal_False; }
- inline bool IsCtrlHyperlinkChecked() const { return m_aCtrlHyperlinkCB.IsChecked() != sal_False; }
+ bool IsSaveOrSendDocsChecked() const { return m_pSaveOrSendDocsCB->IsChecked() != sal_False; }
+ bool IsSignDocsChecked() const { return m_pSignDocsCB->IsChecked() != sal_False; }
+ bool IsPrintDocsChecked() const { return m_pPrintDocsCB->IsChecked() != sal_False; }
+ bool IsCreatePdfChecked() const { return m_pCreatePdfCB->IsChecked() != sal_False; }
+ bool IsRemovePersInfoChecked() const { return m_pRemovePersInfoCB->IsChecked() != sal_False; }
+ bool IsRecommPasswdChecked() const { return m_pRecommPasswdCB->IsChecked() != sal_False; }
+ bool IsCtrlHyperlinkChecked() const { return m_pCtrlHyperlinkCB->IsChecked() != sal_False; }
};
//........................................................................
diff --git a/cui/source/options/securityoptions.src b/cui/source/options/securityoptions.src
deleted file mode 100644
index 956f093..0000000
--- a/cui/source/options/securityoptions.src
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <svtools/controldims.hrc>
-#include "securityoptions.hrc"
-#include <cuires.hrc>
-#include "helpid.hrc"
-
-ModalDialog RID_SVXDLG_SECURITY_OPTIONS
-{
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( DLG_WIDTH , ROW_10 ) ;
- Moveable = TRUE ;
- Closeable = TRUE ;
- Text [ en-US ] = "Security options and warnings" ;
- FixedLine FL_WARNINGS
- {
- Pos = MAP_APPFONT( COL_0, ROW_0 );
- Size = MAP_APPFONT( COL_4-COL_0, RSC_CD_FIXEDLINE_HEIGHT );
- Text [ en-US ] = "Security warnings";
- };
- FixedText FI_WARNINGS
- {
- Pos = MAP_APPFONT( COL_1, ROW_1 );
- Size = MAP_APPFONT( COL_3-COL_1, 2*RSC_CD_FIXEDLINE_HEIGHT );
- Wordbreak = TRUE;
- Text [ en-US ] = "Warn if document contains recorded changes, versions, hidden information or notes:";
- };
- FixedImage FI_SAVESENDDOCS
- {
- Pos = MAP_APPFONT( COL_2 - 7, ROW_2 + 2 );
- Size = MAP_APPFONT( 6, 6 );
- };
- CheckBox CB_SAVESENDDOCS
- {
- HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_SAVESENDDOCS";
- Pos = MAP_APPFONT( COL_2, ROW_2 );
- Size = MAP_APPFONT( CHECKBOX_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
- Text [ en-US ] = "When saving or sending";
- };
- FixedImage FI_SIGNDOCS
- {
- Pos = MAP_APPFONT( COL_2 + CHECKBOX_WIDTH + RSC_SP_CTRL_X - 7, ROW_2 + 2 );
- Size = MAP_APPFONT( 6, 6 );
- };
- CheckBox CB_SIGNDOCS
- {
- HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_SIGNDOCS";
- Pos = MAP_APPFONT( COL_2 + CHECKBOX_WIDTH + RSC_SP_CTRL_X, ROW_2 );
- Size = MAP_APPFONT( CHECKBOX_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
- Text [ en-US ] = "When signing";
- };
- FixedImage FI_PRINTDOCS
- {
- Pos = MAP_APPFONT( COL_2 - 7, ROW_3 + 2 );
- Size = MAP_APPFONT( 6, 6 );
- };
- CheckBox CB_PRINTDOCS
- {
- HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_PRINTDOCS";
- Pos = MAP_APPFONT( COL_2, ROW_3 );
- Size = MAP_APPFONT( CHECKBOX_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
- Text [ en-US ] = "When printing";
- };
- FixedImage FI_CREATEPDF
- {
- Pos = MAP_APPFONT( COL_2 + CHECKBOX_WIDTH + RSC_SP_CTRL_X - 7, ROW_3 + 2 );
- Size = MAP_APPFONT( 6, 6 );
- };
- CheckBox CB_CREATEPDF
- {
- HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_CREATEPDF";
- Pos = MAP_APPFONT( COL_2 + CHECKBOX_WIDTH + RSC_SP_CTRL_X, ROW_3 );
- Size = MAP_APPFONT( CHECKBOX_WIDTH, RSC_CD_CHECKBOX_HEIGHT );
- Text [ en-US ] = "When creating PDF files";
- };
- FixedLine FL_OPTIONS
- {
- Pos = MAP_APPFONT( COL_0, ROW_4 );
- Size = MAP_APPFONT( COL_4-COL_0, RSC_CD_FIXEDLINE_HEIGHT );
- Text [ en-US ] = "Security options";
- };
- FixedImage FI_REMOVEINFO
- {
- Pos = MAP_APPFONT( COL_1 - 7, ROW_5 + 2 );
- Size = MAP_APPFONT( 6, 6 );
- };
- CheckBox CB_REMOVEINFO
- {
- HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_REMOVEINFO";
- Pos = MAP_APPFONT( COL_1, ROW_5 );
- Size = MAP_APPFONT( COL_3-COL_1, RSC_CD_CHECKBOX_HEIGHT );
- Text [ en-US ] = "Remove personal information on saving";
- };
- FixedImage FI_RECOMMENDPWD
- {
- Pos = MAP_APPFONT( COL_1 - 7, ROW_6 + 2 );
- Size = MAP_APPFONT( 6, 6 );
- };
- CheckBox CB_RECOMMENDPWD
- {
- HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_RECOMMENDPWD";
- Pos = MAP_APPFONT( COL_1, ROW_6 );
- Size = MAP_APPFONT( COL_3-COL_1, RSC_CD_CHECKBOX_HEIGHT );
- Text [ en-US ] = "Recommend password protection on saving";
- };
- FixedImage FI_CTRLHYPERLINK
- {
- Pos = MAP_APPFONT( COL_1 - 7, ROW_6 + 2 );
- Size = MAP_APPFONT( 6, 6 );
- };
- CheckBox CB_CTRLHYPERLINK
- {
- HelpID = "cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_CTRLHYPERLINK";
- Pos = MAP_APPFONT( COL_1, ROW_7 );
- Size = MAP_APPFONT( COL_3-COL_1, RSC_CD_CHECKBOX_HEIGHT );
- Text [ en-US ] = "Ctrl-click required to follow hyperlinks";
- };
- FixedLine FL_BUTTONS
- {
- Pos = MAP_APPFONT( 0, ROW_8 );
- Size = MAP_APPFONT( DLG_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
- };
- OKButton PB_OK
- {
- Pos = MAP_APPFONT ( COL_A , ROW_9 ) ;
- Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
- TabStop = TRUE ;
- DefButton = TRUE ;
- };
- CancelButton PB_CANCEL
- {
- Pos = MAP_APPFONT ( COL_B , ROW_9 ) ;
- Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
- TabStop = TRUE ;
- };
- HelpButton PB_HELP
- {
- Pos = MAP_APPFONT ( COL_C , ROW_9 ) ;
- Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
- TabStop = TRUE ;
- };
-};
-
diff --git a/cui/uiconfig/ui/securityoptionsdialog.ui b/cui/uiconfig/ui/securityoptionsdialog.ui
index 53b6bf4..b24de59 100644
--- a/cui/uiconfig/ui/securityoptionsdialog.ui
+++ b/cui/uiconfig/ui/securityoptionsdialog.ui
@@ -77,6 +77,7 @@
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
@@ -86,20 +87,144 @@
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkGrid" id="grid2">
+ <object class="GtkGrid" id="grid1">
<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="GtkCheckButton" id="checkbutton1">
- <property name="label" translatable="yes">_When saving or sending</property>
+ <object class="GtkGrid" id="grid2">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkCheckButton" id="savesenddocs">
+ <property name="label" translatable="yes">_When saving or sending</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="whensigning">
+ <property name="label" translatable="yes">When _signing</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="whenprinting">
+ <property name="label" translatable="yes">When _printing</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="whenpdf">
+ <property name="label" translatable="yes">When creating PDF _files</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="lockwhenprinting">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="pixbuf">res/lock.png</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="locksavesenddocs">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="pixbuf">res/lock.png</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="lockwhensigning">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="pixbuf">res/lock.png</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="lockwhenpdf">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="pixbuf">res/lock.png</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -109,66 +234,17 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="checkbutton2">
- <property name="label" translatable="yes">When _signing</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton3">
- <property name="label" translatable="yes">When _printing</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton4">
- <property name="label" translatable="yes">When creating PDF _files</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
<property name="label" translatable="yes">Warn if document contains recorded changes, versions, hidden information or notes:</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">2</property>
+ <property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
@@ -197,6 +273,7 @@
<object class="GtkFrame" id="frame2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
@@ -210,51 +287,98 @@
<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="GtkCheckButton" id="checkbutton5">
+ <object class="GtkCheckButton" id="removepersonal">
<property name="label" translatable="yes">_Remove personal information on saving</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="hexpand">True</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
+ <property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="checkbutton6">
- <property name="label" translatable="yes">Recommend password protection on sa_ving</property>
+ <object class="GtkCheckButton" id="password">
+ <property name="label" translatable="yes">Recommend password protection on sa_ving</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="hexpand">True</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
+ <property name="left_attach">1</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="checkbutton7">
+ <object class="GtkCheckButton" id="ctrlclick">
<property name="label" translatable="yes">Ctrl-click required _to follow hyperlinks</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="hexpand">True</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="lockremovepersonal">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="pixbuf">res/lock.png</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="lockpassword">
+ <property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="pixbuf">res/lock.png</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="lockctrlclick">
+ <property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="pixbuf">res/lock.png</property>
+ </object>
+ <packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="width">1</property>
More information about the Libreoffice-commits
mailing list