[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdenlive/Applications/16.12] src: Remove duplicate margin + extra widget
From:       Montel Laurent <montel () kde ! org>
Date:       2016-12-08 14:38:22
Message-ID: E1cEzq2-0001D5-6y () code ! kde ! org
[Download RAW message or body]

Git commit f0a92d7fb388bf1f3e8a850df9782da955c64942 by Montel Laurent.
Committed on 08/12/2016 at 14:38.
Pushed by mlaurent into branch 'Applications/16.12'.

Remove duplicate margin + extra widget

M  +2    -5    src/titler/unicodedialog.cpp
M  +13   -8    src/ui/unicodewidget_ui.ui

https://commits.kde.org/kdenlive/f0a92d7fb388bf1f3e8a850df9782da955c64942

diff --git a/src/titler/unicodedialog.cpp b/src/titler/unicodedialog.cpp
index 46120a6a0..72c14cf86 100644
--- a/src/titler/unicodedialog.cpp
+++ b/src/titler/unicodedialog.cpp
@@ -28,11 +28,8 @@ UnicodeDialog::UnicodeDialog(InputMethod inputMeth, QWidget \
*parent)  : QDialog(parent)
 {
     setWindowTitle( i18n("Details") );
-    QDialogButtonBox *buttonBox = new \
                QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
-    QWidget *mainWidget = new QWidget(this);
-    QVBoxLayout *mainLayout = new QVBoxLayout;
-    setLayout(mainLayout);
-    mainLayout->addWidget(mainWidget);
+    QDialogButtonBox *buttonBox = new \
QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel, this); +    \
QVBoxLayout *mainLayout = new QVBoxLayout(this);  QPushButton *okButton = \
buttonBox->button(QDialogButtonBox::Ok);  okButton->setDefault(true);
     okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
diff --git a/src/ui/unicodewidget_ui.ui b/src/ui/unicodewidget_ui.ui
index ad0599d77..bc5af98c1 100644
--- a/src/ui/unicodewidget_ui.ui
+++ b/src/ui/unicodewidget_ui.ui
@@ -20,6 +20,18 @@
    <string>Enter Unicode value</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
    <item row="0" column="0">
     <widget class="QFrame" name="frame">
      <property name="sizePolicy">
@@ -265,7 +277,7 @@
          <enum>QFrame::Plain</enum>
         </property>
         <property name="documentTitle">
-         <string notr="true"></string>
+         <string notr="true"/>
         </property>
         <property name="readOnly">
          <bool>true</bool>
@@ -319,13 +331,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>QLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>klineedit.h</header>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections/>
 </ui>


[prev in list] [next in list] [prev in thread] [next in thread]