#596: Links opening browser now (QTextBrowser, openExternalLinks = true)

Focus always on unicode input field

svn path=/trunk/kdenlive/; revision=3619

diff --git a/src/unicodedialog.cpp b/src/unicodedialog.cpp
index a470b542a58a3f23763234803ec6618cd86e685b..243bd1144ab86db8107543243ce9c7c52e66c087 100644 (file)
--- a/src/unicodedialog.cpp
+++ b/src/unicodedialog.cpp
@@ -53,6 +53,15 @@ UnicodeDialog::~UnicodeDialog()
 }
 
 
+/// PUBLIC SLOTS
+
+int UnicodeDialog::exec()
+{
+    unicodeNumber->setFocus();
+    return QDialog::exec();
+}
+
+
 /// METHODS
 
 void UnicodeDialog::showLastUnicode()

diff --git a/src/unicodedialog.h b/src/unicodedialog.h
index eba5e40220c696afc7761dd47c5cf6adc54875bf..117995884e3e2a4c9fc0287dd3592125de9b5fb3 100644 (file)
--- a/src/unicodedialog.h
+++ b/src/unicodedialog.h
@@ -28,6 +28,10 @@ public:
 
     void showLastUnicode();
 
+public slots:
+    /** \brief Override QDialog::exec() to assure the focus being on the unicode input field */
+    int exec();
+
 private:
     Ui::UnicodeDialog_UI m_view;
 

diff --git a/src/widgets/unicodedialog_ui.ui b/src/widgets/unicodedialog_ui.ui
index f1b4a75ee06eb83fb5399f5bbc1027d7d6737882..b022c9af347ca0f7c12272467371ced85c16c332 100644 (file)
--- a/src/widgets/unicodedialog_ui.ui
+++ b/src/widgets/unicodedialog_ui.ui
@@ -205,6 +205,9 @@
         <property name="wordWrap">
          <bool>true</bool>
         </property>
+        <property name="openExternalLinks">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
       <item row="0" column="0">
@@ -237,7 +240,7 @@
        </widget>
       </item>
       <item row="2" column="0">
-       <widget class="QTextEdit" name="labelInfoText">
+       <widget class="QTextBrowser" name="labelInfoText">
         <property name="frameShadow">
          <enum>QFrame::Plain</enum>
         </property>
@@ -247,6 +250,12 @@
         <property name="readOnly">
          <bool>true</bool>
         </property>
+        <property name="openExternalLinks">
+         <bool>true</bool>
+        </property>
+        <property name="openLinks">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
      </layout>