diff options
| author | Muhammet Kara <muhammet.kara@pardus.org.tr> | 2016-06-07 10:52:25 +0300 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2016-06-10 13:54:37 +0000 |
| commit | 67868423378130c0e88eed99a6921e81fe94352c (patch) | |
| tree | 0d509b491acfc76454586ec6d40f626fe96479c2 /sfx2 | |
| parent | 8132d7f9d71d9f6418855d2d6241dae804beeb8b (diff) | |
Move accessibility relations to .ui files, Part 8: tdf#87026
By removing unnecessary variables/strings/function calls,
and making proper changes in the related .ui files.
Change-Id: I04244b360b4bb32ccbbe5bde4756a9166ae1fcaf
Reviewed-on: https://gerrit.libreoffice.org/26018
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/sfx.src | 5 | ||||
| -rw-r--r-- | sfx2/source/dialog/passwd.cxx | 2 | ||||
| -rw-r--r-- | sfx2/uiconfig/ui/password.ui | 19 |
3 files changed, 12 insertions, 14 deletions
diff --git a/sfx2/source/appl/sfx.src b/sfx2/source/appl/sfx.src index 11467c866e70..5ece515ab104 100644 --- a/sfx2/source/appl/sfx.src +++ b/sfx2/source/appl/sfx.src @@ -39,11 +39,6 @@ String STR_PASSWD_EMPTY Text [ en-US ] = "(The password can be empty)" ; }; -String STR_PASSWD -{ - Text [ en-US ] = "Password" ; -}; - String STR_MODULENOTINSTALLED { Text [ en-US ] = "The action could not be executed. The %PRODUCTNAME program module needed for this action is currently not installed."; diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx index 9aff690b72ac..97e0e259a4da 100644 --- a/sfx2/source/dialog/passwd.cxx +++ b/sfx2/source/dialog/passwd.cxx @@ -109,8 +109,6 @@ SfxPasswordDialog::SfxPasswordDialog(vcl::Window* pParent, const OUString* pGrou get(mpOKBtn, "ok"); - mpPassword1ED->SetAccessibleName(SFX2_RESSTR(STR_PASSWD)); - Link<Edit&,void> aLink = LINK( this, SfxPasswordDialog, EditModifyHdl ); mpPassword1ED->SetModifyHdl( aLink ); mpPassword2ED->SetModifyHdl( aLink ); diff --git a/sfx2/uiconfig/ui/password.ui b/sfx2/uiconfig/ui/password.ui index ab6d5d2c2071..259b7faa8c79 100644 --- a/sfx2/uiconfig/ui/password.ui +++ b/sfx2/uiconfig/ui/password.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.18.3 --> +<!-- Generated with glade 3.20.0 --> <interface> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="PasswordDialog"> @@ -97,10 +97,10 @@ <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="use_underline">True</property> <property name="mnemonic_widget">usered</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -111,10 +111,10 @@ <object class="GtkLabel" id="pass1ft"> <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="use_underline">True</property> <property name="mnemonic_widget">pass1ed</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -125,10 +125,10 @@ <object class="GtkLabel" id="confirm1ft"> <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="use_underline">True</property> <property name="mnemonic_widget">confirm1ed</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -153,6 +153,11 @@ <property name="hexpand">True</property> <property name="visibility">False</property> <property name="invisible_char">●</property> + <child internal-child="accessible"> + <object class="AtkObject" id="pass1ed-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Password</property> + </object> + </child> </object> <packing> <property name="left_attach">1</property> @@ -215,10 +220,10 @@ <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="use_underline">True</property> <property name="mnemonic_widget">pass2ed</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -229,10 +234,10 @@ <object class="GtkLabel" id="confirm2ft"> <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="use_underline">True</property> <property name="mnemonic_widget">confirm2ed</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -290,8 +295,8 @@ <object class="GtkLabel" id="minlenft"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="xpad">6</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> |