comphelper/source/misc/backupfilehelper.cxx | 5 ++++
include/comphelper/backupfilehelper.hxx | 3 ++
svx/source/dialog/SafeModeDialog.cxx | 4 +++
svx/source/dialog/SafeModeDialog.hxx | 1
svx/uiconfig/ui/safemodedialog.ui | 33 +++++++++++++++++++++++++---
5 files changed, 43 insertions(+), 3 deletions(-)
New commits:
commit 69de2b4772e7f7c1b285cf0405f872423c3f88cd
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
Date: Mon Oct 31 16:20:47 2016 +0100
SafeModeDialog: Add link to user profile
Change-Id: I0096b3d7db51e28eb58c7209109c30b73b382478
Reviewed-on: https://gerrit.libreoffice.org/30448
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
diff --git a/comphelper/source/misc/backupfilehelper.cxx
b/comphelper/source/misc/backupfilehelper.cxx
index 6686d08..de03b0b 100644
--- a/comphelper/source/misc/backupfilehelper.cxx
+++ b/comphelper/source/misc/backupfilehelper.cxx
@@ -2202,6 +2202,11 @@ namespace comphelper
deleteDirRecursively(maUserConfigWorkURL);
}
+ const OUString& BackupFileHelper::getUserProfileURL()
+ {
+ return maUserConfigBaseURL;
+ }
+
/////////////////// helpers ///////////////////////
const rtl::OUString BackupFileHelper::getPackURL()
diff --git a/include/comphelper/backupfilehelper.hxx
b/include/comphelper/backupfilehelper.hxx
index 5d3173f..07cfb61 100644
--- a/include/comphelper/backupfilehelper.hxx
+++ b/include/comphelper/backupfilehelper.hxx
@@ -179,6 +179,9 @@ namespace comphelper
*/
static void tryResetUserProfile();
+ /** Return the profile url */
+ static const OUString& getUserProfileURL();
+
private:
// internal helper methods
static const rtl::OUString getPackURL();
diff --git a/svx/source/dialog/SafeModeDialog.cxx
b/svx/source/dialog/SafeModeDialog.cxx
index 9dd2d4d..4a3a835 100644
--- a/svx/source/dialog/SafeModeDialog.cxx
+++ b/svx/source/dialog/SafeModeDialog.cxx
@@ -62,6 +62,7 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent)
get(mpCBResetWholeUserProfile, "check_reset_whole_userprofile");
get(mpBugLink, "linkbutton_bugs");
+ get(mpUserProfileLink, "linkbutton_profile");
mpBtnContinue->SetClickHdl(LINK(this, SafeModeDialog, BtnHdl));
mpBtnQuit->SetClickHdl(LINK(this, SafeModeDialog, BtnHdl));
@@ -115,6 +116,8 @@ SafeModeDialog::SafeModeDialog(vcl::Window* pParent)
OUString sURL("http://hub.libreoffice.org/send-feedback/?LOversion="; +
utl::ConfigManager::getAboutBoxProductVersion() +
"&LOlocale=" + utl::ConfigManager::getLocale() + "&LOmodule=safemode");
mpBugLink->SetURL(sURL);
+
+
mpUserProfileLink->SetURL(comphelper::BackupFileHelper::getUserProfileURL());
}
SafeModeDialog::~SafeModeDialog()
@@ -138,6 +141,7 @@ void SafeModeDialog::dispose()
mpCBResetWholeUserProfile.clear();
mpBugLink.clear();
+ mpUserProfileLink.clear();
Dialog::dispose();
}
diff --git a/svx/source/dialog/SafeModeDialog.hxx
b/svx/source/dialog/SafeModeDialog.hxx
index 66a83b2..f770c53 100644
--- a/svx/source/dialog/SafeModeDialog.hxx
+++ b/svx/source/dialog/SafeModeDialog.hxx
@@ -46,6 +46,7 @@ private:
VclPtr<CheckBox> mpCBResetWholeUserProfile;
VclPtr<FixedHyperlink> mpBugLink;
+ VclPtr<FixedHyperlink> mpUserProfileLink;
// local BackupFileHelper for handling possible restores
comphelper::BackupFileHelper maBackupFileHelper;
diff --git a/svx/uiconfig/ui/safemodedialog.ui
b/svx/uiconfig/ui/safemodedialog.ui
index e28cac7..bc5226e 100644
--- a/svx/uiconfig/ui/safemodedialog.ui
+++ b/svx/uiconfig/ui/safemodedialog.ui
@@ -225,15 +225,14 @@ The offered possible changes get more radical from top to
bottom, so it is recom
<object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_left">12</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">If you
experience problems that are not resolved by using the Safe Mode, visit the
following link to get help or report a bug.
-
-You can also include the relevant parts of your User Profile. Beware that it
might contain personal data.</property>
+ <property name="label" translatable="yes">If you
experience problems that are not resolved by using the Safe Mode, visit the
following link to get help or report a bug.</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -256,6 +255,34 @@ You can also include the relevant parts of your User
Profile. Beware that it mig
<property name="position">1</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">You can also
include the relevant parts of your User Profile. Beware that it might contain
personal data.
+Your User Profile is located at:</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLinkButton" id="linkbutton_profile">
+ <property name="label" translatable="yes">Show User
Profile</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="relief">none</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
</object>
</child>
<child type="label">
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
