Merge pull request #58 from gperciva/setup-aside-revise

Setup: revise formatting of "aside" comments
Tarsnap · May 6, 2016 · 664bb4a · 664bb4a
2 parents bd7e9d6 + 19d0c5b
commit 664bb4a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/forms/setupdialog.ui b/forms/setupdialog.ui
@@ -280,8 +280,13 @@ min-width: 200px;
            <italic>true</italic>
           </font>
          </property>
+         <property name="styleSheet">
+          <string notr="true">QLabel {
+	margin-left: 1em;
+}</string>
+         </property>
          <property name="text">
-          <string>(You can also skip this wizard and set up everything inside the application.)</string>
+          <string>You can also skip this wizard and set up everything inside the application.</string>
          </property>
          <property name="wordWrap">
           <bool>true</bool>
@@ -733,8 +738,13 @@ border: none;
            <italic>true</italic>
           </font>
          </property>
+         <property name="styleSheet">
+          <string notr="true">QLabel {
+	margin-left: 1em;
+}</string>
+         </property>
          <property name="text">
-          <string>(If so, you can save time and money by using the same machine key, which allows Tarsnap to access the previously uploaded data.)</string>
+          <string>If so, you can save time and money by using the same machine key, which allows Tarsnap to access the previously uploaded data.</string>
          </property>
          <property name="wordWrap">
           <bool>true</bool>
@@ -879,8 +889,13 @@ border: none;
            <italic>true</italic>
           </font>
          </property>
+         <property name="styleSheet">
+          <string notr="true">QLabel {
+	margin-left: 1em;
+}</string>
+         </property>
          <property name="text">
-          <string>(Don't have an account? Register on &lt;a href=&quot;http://tarsnap.com&quot;&gt;tarsnap.com&lt;/a&gt;, then come back.)</string>
+          <string>Don't have an account? Register on &lt;a href=&quot;http://tarsnap.com&quot;&gt;tarsnap.com&lt;/a&gt;, then come back.</string>
          </property>
          <property name="wordWrap">
           <bool>true</bool>

diff --git a/src/widgets/setupdialog.cpp b/src/widgets/setupdialog.cpp
@@ -249,9 +249,9 @@ void SetupDialog::restoreNo()
            "credentials to register this machine with the service "
 	   "and create a local key for this machine."));
     _ui->registerPageInfoLabelAside->setText(
-        tr("(Don't have an account? Register on "
+        tr("Don't have an account? Register on "
 	    "<a href=\"http://tarsnap.com\">tarsnap.com</a>, "
-	    "then come back.)"));
+	    "then come back."));
     _ui->errorLabel->clear();
     setNextPage();
 }
@@ -270,9 +270,9 @@ void SetupDialog::restoreYes()
         tr("Please use your existing machine key "
            "and choose a machine name. "));
     _ui->registerPageInfoLabelAside->setText(
-        tr("(The registration will also "
+        tr("The registration will also "
            "verify the archive integrity and consistency, "
-           "so please be patient.)"));
+           "so please be patient."));
     _ui->errorLabel->clear();
     _ui->machineKeyCombo->clear();
     foreach(QFileInfo file, Utils::findKeysInPath(_appDataDir))