From b8080429fc3b74d5d871f83be8084c15841cbae0 Mon Sep 17 00:00:00 2001
From: Lorenz Haas <lykurg@gmail.com>
Date: Mon, 17 Mar 2014 19:52:19 +0100
Subject: [PATCH] Beautifier: Replace $HOME with it's actual value

Instead of having options texts like "Use file $HOME/abc", $HOME is
eliminated in favor of the actual value of QDir::home().

Change-Id: I9ffe27d73e54a9d30e1f0d4a277fbfbb7969ed45
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 .../beautifier/artisticstyle/artisticstyleoptionspage.cpp      | 3 +++
 .../beautifier/artisticstyle/artisticstyleoptionspage.ui       | 2 +-
 src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp    | 3 +++
 src/plugins/beautifier/uncrustify/uncrustifyoptionspage.ui     | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp
index f6019fd59fb..59d28279d46 100644
--- a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp
+++ b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp
@@ -51,6 +51,9 @@ ArtisticStyleOptionsPageWidget::ArtisticStyleOptionsPageWidget(ArtisticStyleSett
     , m_settings(settings)
 {
     ui->setupUi(this);
+    ui->useHomeFile->setText(ui->useHomeFile->text().replace(
+                                 QLatin1String("HOME"),
+                                 QDir::toNativeSeparators(QDir::home().absolutePath())));
     ui->command->setExpectedKind(Utils::PathChooser::ExistingCommand);
     ui->command->setPromptDialogTitle(BeautifierPlugin::msgCommandPromptDialogTitle(
                                           QLatin1String(Constants::ArtisticStyle::DISPLAY_NAME)));
diff --git a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.ui b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.ui
index 2dba5d2f329..6eb50d954b3 100644
--- a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.ui
+++ b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.ui
@@ -49,7 +49,7 @@
       <item>
        <widget class="QCheckBox" name="useHomeFile">
         <property name="text">
-         <string>Use $HOME/.astylerc or $HOME/astylerc</string>
+         <string extracomment="HOME is replaced by the user's home directory">Use file .astylerc or astylerc in HOME</string>
         </property>
        </widget>
       </item>
diff --git a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp
index 64afa33dcca..8bc8833189b 100644
--- a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp
+++ b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp
@@ -51,6 +51,9 @@ UncrustifyOptionsPageWidget::UncrustifyOptionsPageWidget(UncrustifySettings *set
     , m_settings(settings)
 {
     ui->setupUi(this);
+    ui->useHomeFile->setText(ui->useHomeFile->text().replace(
+                                 QLatin1String("HOME"),
+                                 QDir::toNativeSeparators(QDir::home().absolutePath())));
     ui->command->setExpectedKind(Utils::PathChooser::ExistingCommand);
     ui->command->setPromptDialogTitle(BeautifierPlugin::msgCommandPromptDialogTitle(
                                           QLatin1String(Constants::Uncrustify::DISPLAY_NAME)));
diff --git a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.ui b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.ui
index 7a8c9242911..f73343b340f 100644
--- a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.ui
+++ b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.ui
@@ -49,7 +49,7 @@
       <item>
        <widget class="QCheckBox" name="useHomeFile">
         <property name="text">
-         <string>Use $HOME/uncrustify.cfg</string>
+         <string extracomment="HOME is replaced by the user's home directory">Use file uncrustify.cfg in HOME</string>
         </property>
        </widget>
       </item>