Merge pull request #466 from Atheros1/master

fix #464

src/bitmessageqt/settings.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'settings.ui'
 #
-# Created: Tue Aug 27 22:23:38 2013
+# Created: Mon Sep 02 16:49:54 2013
 #      by: PyQt4 UI code generator 4.10.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -41,31 +41,34 @@ class Ui_settingsDialog(object):
         self.tabUserInterface.setObjectName(_fromUtf8("tabUserInterface"))
         self.gridLayout_5 = QtGui.QGridLayout(self.tabUserInterface)
         self.gridLayout_5.setObjectName(_fromUtf8("gridLayout_5"))
+        self.checkBoxStartOnLogon = QtGui.QCheckBox(self.tabUserInterface)
+        self.checkBoxStartOnLogon.setObjectName(_fromUtf8("checkBoxStartOnLogon"))
+        self.gridLayout_5.addWidget(self.checkBoxStartOnLogon, 0, 0, 1, 2)
+        self.checkBoxStartInTray = QtGui.QCheckBox(self.tabUserInterface)
+        self.checkBoxStartInTray.setObjectName(_fromUtf8("checkBoxStartInTray"))
+        self.gridLayout_5.addWidget(self.checkBoxStartInTray, 1, 0, 1, 2)
         self.checkBoxMinimizeToTray = QtGui.QCheckBox(self.tabUserInterface)
         self.checkBoxMinimizeToTray.setChecked(True)
         self.checkBoxMinimizeToTray.setObjectName(_fromUtf8("checkBoxMinimizeToTray"))
         self.gridLayout_5.addWidget(self.checkBoxMinimizeToTray, 2, 0, 1, 1)
-        spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
-        self.gridLayout_5.addItem(spacerItem, 10, 0, 1, 1)
-        self.checkBoxStartOnLogon = QtGui.QCheckBox(self.tabUserInterface)
-        self.checkBoxStartOnLogon.setObjectName(_fromUtf8("checkBoxStartOnLogon"))
-        self.gridLayout_5.addWidget(self.checkBoxStartOnLogon, 0, 0, 1, 1)
         self.checkBoxShowTrayNotifications = QtGui.QCheckBox(self.tabUserInterface)
         self.checkBoxShowTrayNotifications.setObjectName(_fromUtf8("checkBoxShowTrayNotifications"))
-        self.gridLayout_5.addWidget(self.checkBoxShowTrayNotifications, 3, 0, 1, 1)
+        self.gridLayout_5.addWidget(self.checkBoxShowTrayNotifications, 3, 0, 1, 2)
         self.checkBoxPortableMode = QtGui.QCheckBox(self.tabUserInterface)
         self.checkBoxPortableMode.setObjectName(_fromUtf8("checkBoxPortableMode"))
         self.gridLayout_5.addWidget(self.checkBoxPortableMode, 4, 0, 1, 1)
-        self.checkBoxStartInTray = QtGui.QCheckBox(self.tabUserInterface)
-        self.checkBoxStartInTray.setObjectName(_fromUtf8("checkBoxStartInTray"))
-        self.gridLayout_5.addWidget(self.checkBoxStartInTray, 1, 0, 1, 1)
         self.PortableModeDescription = QtGui.QLabel(self.tabUserInterface)
         self.PortableModeDescription.setWordWrap(True)
         self.PortableModeDescription.setObjectName(_fromUtf8("PortableModeDescription"))
-        self.gridLayout_5.addWidget(self.PortableModeDescription, 5, 0, 1, 2)
+        self.gridLayout_5.addWidget(self.PortableModeDescription, 5, 0, 1, 3)
         self.checkBoxWillinglySendToMobile = QtGui.QCheckBox(self.tabUserInterface)
         self.checkBoxWillinglySendToMobile.setObjectName(_fromUtf8("checkBoxWillinglySendToMobile"))
-        self.gridLayout_5.addWidget(self.checkBoxWillinglySendToMobile, 6, 0, 1, 2)
+        self.gridLayout_5.addWidget(self.checkBoxWillinglySendToMobile, 6, 0, 1, 3)
+        self.labelSettingsNote = QtGui.QLabel(self.tabUserInterface)
+        self.labelSettingsNote.setText(_fromUtf8(""))
+        self.labelSettingsNote.setWordWrap(True)
+        self.labelSettingsNote.setObjectName(_fromUtf8("labelSettingsNote"))
+        self.gridLayout_5.addWidget(self.labelSettingsNote, 7, 0, 1, 2)
         self.groupBox = QtGui.QGroupBox(self.tabUserInterface)
         self.groupBox.setObjectName(_fromUtf8("groupBox"))
         self.horizontalLayout_2 = QtGui.QHBoxLayout(self.groupBox)
@@ -83,7 +86,9 @@ class Ui_settingsDialog(object):
         self.languageComboBox.addItem(_fromUtf8(""))
         self.languageComboBox.addItem(_fromUtf8(""))
         self.horizontalLayout_2.addWidget(self.languageComboBox)
-        self.gridLayout_5.addWidget(self.groupBox, 10, 1, 1, 1)
+        self.gridLayout_5.addWidget(self.groupBox, 7, 2, 2, 1)
+        spacerItem = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        self.gridLayout_5.addItem(spacerItem, 8, 1, 1, 1)
         self.tabWidgetSettings.addTab(self.tabUserInterface, _fromUtf8(""))
         self.tabNetworkSettings = QtGui.QWidget()
         self.tabNetworkSettings.setObjectName(_fromUtf8("tabNetworkSettings"))
@@ -337,11 +342,11 @@ class Ui_settingsDialog(object):
 
     def retranslateUi(self, settingsDialog):
         settingsDialog.setWindowTitle(_translate("settingsDialog", "Settings", None))
-        self.checkBoxMinimizeToTray.setText(_translate("settingsDialog", "Minimize to tray", None))
         self.checkBoxStartOnLogon.setText(_translate("settingsDialog", "Start Bitmessage on user login", None))
+        self.checkBoxStartInTray.setText(_translate("settingsDialog", "Start Bitmessage in the tray (don\'t show main window)", None))
+        self.checkBoxMinimizeToTray.setText(_translate("settingsDialog", "Minimize to tray", None))
         self.checkBoxShowTrayNotifications.setText(_translate("settingsDialog", "Show notification when message received", None))
         self.checkBoxPortableMode.setText(_translate("settingsDialog", "Run in Portable Mode", None))
-        self.checkBoxStartInTray.setText(_translate("settingsDialog", "Start Bitmessage in the tray (don\'t show main window)", None))
         self.PortableModeDescription.setText(_translate("settingsDialog", "In Portable Mode, messages and config files are stored in the same directory as the program rather than the normal application-data folder. This makes it convenient to run Bitmessage from a USB thumb drive.", None))
         self.checkBoxWillinglySendToMobile.setText(_translate("settingsDialog", "Willingly include unencrypted destination address when sending to a mobile device", None))
         self.groupBox.setTitle(_translate("settingsDialog", "Interface Language", None))

src/bitmessageqt/settings.ui

@@ -37,6 +37,20 @@
        <string>User Interface</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_5">
+       <item row="0" column="0" colspan="2">
+        <widget class="QCheckBox" name="checkBoxStartOnLogon">
+         <property name="text">
+          <string>Start Bitmessage on user login</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0" colspan="2">
+        <widget class="QCheckBox" name="checkBoxStartInTray">
+         <property name="text">
+          <string>Start Bitmessage in the tray (don't show main window)</string>
+         </property>
+        </widget>
+       </item>
        <item row="2" column="0">
         <widget class="QCheckBox" name="checkBoxMinimizeToTray">
          <property name="text">
@@ -47,27 +61,7 @@
          </property>
         </widget>
        </item>
-       <item row="10" column="0">
-        <spacer name="verticalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="0" column="0">
-        <widget class="QCheckBox" name="checkBoxStartOnLogon">
-         <property name="text">
-          <string>Start Bitmessage on user login</string>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="0">
+       <item row="3" column="0" colspan="2">
         <widget class="QCheckBox" name="checkBoxShowTrayNotifications">
          <property name="text">
           <string>Show notification when message received</string>
@@ -81,14 +75,7 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="0">
-        <widget class="QCheckBox" name="checkBoxStartInTray">
-         <property name="text">
-          <string>Start Bitmessage in the tray (don't show main window)</string>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="0" colspan="2">
+       <item row="5" column="0" colspan="3">
         <widget class="QLabel" name="PortableModeDescription">
          <property name="text">
           <string>In Portable Mode, messages and config files are stored in the same directory as the program rather than the normal application-data folder. This makes it convenient to run Bitmessage from a USB thumb drive.</string>
@@ -98,14 +85,24 @@
          </property>
         </widget>
        </item>
-       <item row="6" column="0" colspan="2">
+       <item row="6" column="0" colspan="3">
         <widget class="QCheckBox" name="checkBoxWillinglySendToMobile">
          <property name="text">
           <string>Willingly include unencrypted destination address when sending to a mobile device</string>
          </property>
         </widget>
        </item>
-       <item row="10" column="1">
+       <item row="7" column="0" colspan="2">
+        <widget class="QLabel" name="labelSettingsNote">
+         <property name="text">
+          <string/>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="2" rowspan="2">
         <widget class="QGroupBox" name="groupBox">
          <property name="title">
           <string>Interface Language</string>
@@ -169,6 +166,19 @@
          </layout>
         </widget>
        </item>
+       <item row="8" column="1">
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tabNetworkSettings">