Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

src/libs/utils/submiteditorwidget.cpp

@@ -147,6 +147,7 @@ SubmitEditorWidget::SubmitEditorWidget(QWidget *parent) :
     m_d->m_ui.setupUi(this);
     m_d->m_ui.description->setContextMenuPolicy(Qt::CustomContextMenu);
     m_d->m_ui.description->setLineWrapMode(QTextEdit::NoWrap);
+    m_d->m_ui.description->setWordWrapMode(QTextOption::WordWrap);
     connect(m_d->m_ui.description, SIGNAL(customContextMenuRequested(QPoint)),
             this, SLOT(editorCustomContextMenuRequested(QPoint)));
 
@@ -165,7 +166,7 @@ SubmitEditorWidget::~SubmitEditorWidget()
     delete m_d;
 }
 
-void SubmitEditorWidget::registerActions(QAction *editorUndoAction,  QAction *editorRedoAction,
+void SubmitEditorWidget::registerActions(QAction *editorUndoAction, QAction *editorRedoAction,
                          QAction *submitAction, QAction *diffAction)
 {
     if (editorUndoAction) {

src/plugins/vcsbase/vcsbasesettingspage.ui

@@ -38,6 +38,9 @@
            </item>
            <item>
             <widget class="QSpinBox" name="lineWrapSpinBox">
+             <property name="enabled">
+              <bool>false</bool>
+             </property>
              <property name="minimum">
               <number>40</number>
              </property>
@@ -79,7 +82,7 @@
           </widget>
          </item>
          <item row="0" column="1">
-          <widget class="Core::Utils::PathChooser" name="submitMessageCheckScriptChooser"/>
+          <widget class="Core::Utils::PathChooser" name="submitMessageCheckScriptChooser" native="true"/>
          </item>
          <item row="1" column="0">
           <widget class="QLabel" name="nickNameMailMapLabel">
@@ -93,7 +96,7 @@ name &lt;email&gt; alias &lt;email&gt;</string>
           </widget>
          </item>
          <item row="1" column="1">
-          <widget class="Core::Utils::PathChooser" name="nickNameMailMapChooser"/>
+          <widget class="Core::Utils::PathChooser" name="nickNameMailMapChooser" native="true"/>
          </item>
          <item row="2" column="0">
           <widget class="QLabel" name="nickNameFieldsFileLabel">
@@ -106,7 +109,7 @@ name &lt;email&gt; alias &lt;email&gt;</string>
           </widget>
          </item>
          <item row="2" column="1">
-          <widget class="Core::Utils::PathChooser" name="nickNameFieldsFileChooser"/>
+          <widget class="Core::Utils::PathChooser" name="nickNameFieldsFileChooser" native="true"/>
          </item>
         </layout>
        </item>
@@ -151,5 +154,22 @@ name &lt;email&gt; alias &lt;email&gt;</string>
   </customwidget>
  </customwidgets>
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>lineWrapCheckBox</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>lineWrapSpinBox</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>186</x>
+     <y>58</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>225</x>
+     <y>58</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>

src/plugins/vcsbase/vcsbasesubmiteditor.cpp

@@ -109,11 +109,11 @@ VCSBaseSubmitEditor::VCSBaseSubmitEditor(const VCSBaseSubmitEditorParameters *pa
                                          Core::Utils::SubmitEditorWidget *editorWidget) :
     m_d(new VCSBaseSubmitEditorPrivate(parameters, editorWidget, this))
 {
-    // message font according to settings
+    // Message font according to settings
     const TextEditor::FontSettings fs = TextEditor::TextEditorSettings::instance()->fontSettings();
     QFont font = editorWidget->descriptionEdit()->font();
     font.setFamily(fs.family());
-    font.setPointSize((fs.fontSize() * 4) / 5);
+    font.setPointSize(fs.fontSize());
     editorWidget->descriptionEdit()->setFont(font);
 
     m_d->m_file->setModified(false);