Author: jghali
Date: Thu Feb 18 19:44:49 2021
New Revision: 24512

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24512
Log:
#16481: Unify margins and spacing for dialogs, set 9 <bubu>

Modified:
    trunk/Scribus/scribus/ui/applytemplatedialog.cpp
    trunk/Scribus/scribus/ui/dcolor.cpp
    trunk/Scribus/scribus/ui/hyask.cpp
    trunk/Scribus/scribus/ui/polyprops.cpp
    trunk/Scribus/scribus/ui/search.cpp
    trunk/Scribus/scribus/ui/selfield.cpp
    trunk/Scribus/scribus/ui/smreplacedia.cpp
    trunk/Scribus/scribus/ui/smreplacedia.ui
    trunk/Scribus/scribus/ui/tabmanager.cpp

Modified: trunk/Scribus/scribus/ui/applytemplatedialog.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24512&path=/trunk/Scribus/scribus/ui/applytemplatedialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/applytemplatedialog.cpp    (original)
+++ trunk/Scribus/scribus/ui/applytemplatedialog.cpp    Thu Feb 18 19:44:49 2021
@@ -49,15 +49,15 @@
 ApplyMasterPageDialog::ApplyMasterPageDialog( QWidget* parent ) : QDialog( 
parent )
 {
        setModal(true);
-       setWindowTitle( tr( "Possible Hyphenation" ));
+       setWindowTitle( tr( "Apply Master Page" ));
        setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
        ApplyMasterPageDialogLayout = new QVBoxLayout(this);
-       ApplyMasterPageDialogLayout->setMargin(10);
-       ApplyMasterPageDialogLayout->setSpacing(5);
+       ApplyMasterPageDialogLayout->setContentsMargins(9, 9, 9, 9);
+       ApplyMasterPageDialogLayout->setSpacing(6);
 
        templateNameLayout = new QHBoxLayout;
-       templateNameLayout->setMargin(0);
-       templateNameLayout->setSpacing(5);
+       templateNameLayout->setContentsMargins(0, 0, 0, 0);
+       templateNameLayout->setSpacing(6);
 
        masterPageLabel = new QLabel( this );
        templateNameLayout->addWidget( masterPageLabel );
@@ -72,8 +72,8 @@
        applyToPageButtonGroup = new QGroupBox(this);
        applyToPageButtonGroup->setMinimumSize( QSize( 250, 0 ) );
        applyToPageButtonGroupLayout = new QVBoxLayout(applyToPageButtonGroup);
-       applyToPageButtonGroupLayout->setSpacing( 5 );
-       applyToPageButtonGroupLayout->setMargin( 10 );
+       applyToPageButtonGroupLayout->setSpacing(6);
+       applyToPageButtonGroupLayout->setContentsMargins(9, 9, 9, 9);
 
        currentPageRadioButton = new QRadioButton( applyToPageButtonGroup );
        currentPageRadioButton->setChecked( true );
@@ -89,8 +89,8 @@
        applyToPageButtonGroupLayout->addWidget( allPagesRadioButton );
 
        rangeLayout = new QHBoxLayout;
-       rangeLayout->setSpacing( 5 );
-       rangeLayout->setMargin( 0 );
+       rangeLayout->setSpacing(6);
+       rangeLayout->setContentsMargins(0, 0, 0, 0);
 
        useRangeCheckBox = new QCheckBox( applyToPageButtonGroup );
        useRangeCheckBox->setEnabled( false );  
@@ -118,8 +118,8 @@
        ApplyMasterPageDialogLayout->addWidget( applyToPageButtonGroup );
 
        layout8 = new QHBoxLayout;
-       layout8->setSpacing( 5 );
-       layout8->setMargin( 0 );
+       layout8->setSpacing(6);
+       layout8->setContentsMargins(0, 0, 0, 0);
        spacer1 = new QSpacerItem( 1, 1, QSizePolicy::Expanding, 
QSizePolicy::Minimum );
        layout8->addItem( spacer1 );
 
@@ -130,7 +130,7 @@
        layout8->addWidget( cancelButton );
        ApplyMasterPageDialogLayout->addLayout( layout8 );
        languageChange();
-       resize( QSize(272, 230).expandedTo(minimumSizeHint()) );
+       resize( QSize(268, 230).expandedTo(minimumSizeHint()) );
 
        // signals and slots connections
        connect( useRangeCheckBox, SIGNAL( toggled(bool) ), this, SLOT( 
enableRange(bool) ) );

Modified: trunk/Scribus/scribus/ui/dcolor.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24512&path=/trunk/Scribus/scribus/ui/dcolor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/dcolor.cpp (original)
+++ trunk/Scribus/scribus/ui/dcolor.cpp Thu Feb 18 19:44:49 2021
@@ -28,11 +28,11 @@
        setWindowTitle( tr( "Delete Color" ) );
        setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
        dialogLayout = new QVBoxLayout( this );
-       dialogLayout->setMargin(10);
-       dialogLayout->setSpacing(5);
+       dialogLayout->setContentsMargins(9, 9, 9, 9);
+       dialogLayout->setSpacing(6);
        delColorLayout = new QGridLayout;
-       delColorLayout->setSpacing( 5 );
-       delColorLayout->setMargin( 5 );
+       delColorLayout->setSpacing(6);
+       delColorLayout->setContentsMargins(0, 0, 0, 0);
        deleteLabel = new QLabel( tr( "Delete Color:" ), this );
        delColorLayout->addWidget( deleteLabel, 0, 0 );
        colorToDelLabel = new QLabel( colorName, this );
@@ -57,8 +57,8 @@
        dialogLayout->addLayout( delColorLayout );
 
        okCancelLayout = new QHBoxLayout;
-       okCancelLayout->setSpacing( 5 );
-       okCancelLayout->setMargin( 0 );
+       okCancelLayout->setSpacing(6);
+       okCancelLayout->setContentsMargins(0, 0, 0, 0);
        QSpacerItem* spacer = new QSpacerItem( 2, 2, QSizePolicy::Expanding, 
QSizePolicy::Minimum );
        okCancelLayout->addItem( spacer );
        okButton = new QPushButton( CommonStrings::tr_OK, this );

Modified: trunk/Scribus/scribus/ui/hyask.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24512&path=/trunk/Scribus/scribus/ui/hyask.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/hyask.cpp  (original)
+++ trunk/Scribus/scribus/ui/hyask.cpp  Thu Feb 18 19:44:49 2021
@@ -50,8 +50,8 @@
        setWindowTitle( tr( "Possible Hyphenation" ));
        setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
        HyAskLayout = new QVBoxLayout(this);
-       HyAskLayout->setMargin(10);
-       HyAskLayout->setSpacing(5);
+       HyAskLayout->setContentsMargins(9, 9, 9, 9);
+       HyAskLayout->setSpacing(6);
 
        Wort = new WortEdit ( this );
        Wort->setMinimumSize ( QSize ( 300, 0 ) );
@@ -60,20 +60,20 @@
        HyAskLayout->addWidget ( Wort );
 
        Layout1 = new QHBoxLayout;
-       Layout1->setMargin(0);
-       Layout1->setSpacing(5);
+       Layout1->setContentsMargins(0, 0, 0, 0);
+       Layout1->setSpacing(6);
 
        vboxLayout1 = new QVBoxLayout();
-       vboxLayout1->setSpacing(5);
-       vboxLayout1->setMargin(0);
+       vboxLayout1->setSpacing(6);
+       vboxLayout1->setContentsMargins(0, 0, 0, 0);
        OK = new QPushButton(this);
        OK->setText( tr("Accept"));
        OK->setToolTip(tr("Accept the proposed hyphenation"));
        OK->setDefault(true);
        vboxLayout1->addWidget(OK);
        hboxLayout1 = new QHBoxLayout();
-       hboxLayout1->setSpacing(0);
-       hboxLayout1->setMargin(0);
+       hboxLayout1->setSpacing(6);
+       hboxLayout1->setContentsMargins(0, 0, 0, 0);
        addToExceptionList = new QCheckBox(this);
        addToExceptionList->setToolTip(tr("Add edited hyphen to local 
hyphenation dictionary list"));
        hboxLayout1->addWidget(addToExceptionList);
@@ -87,14 +87,14 @@
        addToExceptionList->setChecked(false);
 
        vboxLayout2 = new QVBoxLayout();
-       vboxLayout2->setSpacing(5);
-       vboxLayout2->setMargin(0);
+       vboxLayout2->setSpacing(6);
+       vboxLayout2->setContentsMargins(0, 0, 0, 0);
        Skip = new QPushButton(this);
        Skip->setText( tr("Skip"));
        vboxLayout2->addWidget(Skip);
        hboxLayout2 = new QHBoxLayout();
-       hboxLayout2->setSpacing(0);
-       hboxLayout2->setMargin(0);
+       hboxLayout2->setSpacing(6);
+       hboxLayout2->setContentsMargins(0, 0, 0, 0);
        addToIgnoreList = new QCheckBox(this);
        addToIgnoreList->setToolTip(tr("Add edited word to words that should 
not be hyphenated"));
        hboxLayout2->addWidget(addToIgnoreList);
@@ -106,8 +106,8 @@
        addToIgnoreList->setChecked(false);
 
        vboxLayout3 = new QVBoxLayout();
-       vboxLayout3->setSpacing(5);
-       vboxLayout3->setMargin(0);
+       vboxLayout3->setSpacing(6);
+       vboxLayout3->setContentsMargins(0, 0, 0, 0);
        Cancel = new QPushButton(this);
        Cancel->setText( tr("Cancel"));
        Cancel->setToolTip(tr("Do not apply the proposed hyphenation"));

Modified: trunk/Scribus/scribus/ui/polyprops.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24512&path=/trunk/Scribus/scribus/ui/polyprops.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/polyprops.cpp      (original)
+++ trunk/Scribus/scribus/ui/polyprops.cpp      Thu Feb 18 19:44:49 2021
@@ -19,8 +19,8 @@
        setWindowTitle( tr( "Polygon Properties" ) );
        setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
        PolygonPropsLayout = new QVBoxLayout( this );
-       PolygonPropsLayout->setMargin(10);
-       PolygonPropsLayout->setSpacing(5);
+       PolygonPropsLayout->setContentsMargins(9, 9, 9, 9);
+       PolygonPropsLayout->setSpacing(6);
        polyWidget = new PolygonWidget(this, polyC, polyF, polyS, polyR, 
polyCurvature, polyInnerRot, polyOuterCurvature, true);
        PolygonPropsLayout->addWidget( polyWidget );
        // signals and slots connections
@@ -39,13 +39,13 @@
        setWindowTitle( tr( "Polygon Properties" ) );
        setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
        PolygonPropsLayout = new QVBoxLayout( this );
-       PolygonPropsLayout->setMargin(10);
-       PolygonPropsLayout->setSpacing(5);
+       PolygonPropsLayout->setContentsMargins(9, 9, 9, 9);
+       PolygonPropsLayout->setSpacing(6);
        polyWidget = new PolygonWidget(this, polyC, polyF, polyS, polyR, 
polyCurvature, polyInnerRot, polyOuterCurvature);
        PolygonPropsLayout->addWidget( polyWidget );
        Layout1 = new QHBoxLayout;
-       Layout1->setMargin(0);
-       Layout1->setSpacing(5);
+       Layout1->setContentsMargins(0, 0, 0, 0);
+       Layout1->setSpacing(6);
        QSpacerItem* spacer_2 = new QSpacerItem( 0, 0, QSizePolicy::Expanding, 
QSizePolicy::Minimum );
        Layout1->addItem( spacer_2 );
        okButton = new QPushButton(this);

Modified: trunk/Scribus/scribus/ui/search.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24512&path=/trunk/Scribus/scribus/ui/search.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/search.cpp (original)
+++ trunk/Scribus/scribus/ui/search.cpp Thu Feb 18 19:44:49 2021
@@ -55,16 +55,16 @@
        setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
 
        SearchReplaceLayout = new QVBoxLayout( this );
-       SearchReplaceLayout->setMargin(10);
-       SearchReplaceLayout->setSpacing(5);
+       SearchReplaceLayout->setContentsMargins(9, 9, 9, 9);
+       SearchReplaceLayout->setSpacing(6);
        SelLayout = new QHBoxLayout;
-       SelLayout->setMargin(0);
-       SelLayout->setSpacing(5);
+       SelLayout->setContentsMargins(0, 0, 0, 0);
+       SelLayout->setSpacing(6);
        Search = new QGroupBox( this );
        Search->setTitle( tr( "Search for:" ) );
        SearchLayout = new QGridLayout( Search );
-       SearchLayout->setMargin(5);
-       SearchLayout->setSpacing(2);
+       SearchLayout->setContentsMargins(9, 9, 9, 9);
+       SearchLayout->setSpacing(6);
        SearchLayout->setAlignment( Qt::AlignTop );
        SText = new QCheckBox( Search );
        SText->setText( tr( "Text" ) );
@@ -162,8 +162,8 @@
        Replace = new QGroupBox( this );
        Replace->setTitle( tr( "Replace with:" ) );
        ReplaceLayout = new QGridLayout( Replace );
-       ReplaceLayout->setSpacing( 2 );
-       ReplaceLayout->setMargin( 5 );
+       ReplaceLayout->setSpacing(6);
+       ReplaceLayout->setContentsMargins(9, 9, 9, 9);
        ReplaceLayout->setAlignment( Qt::AlignTop );
        RText = new QCheckBox( Replace );
        RText->setText( tr( "Text" ) );
@@ -258,8 +258,8 @@
        SearchReplaceLayout->addLayout( SelLayout );
 
        OptsLayout = new QHBoxLayout;
-       OptsLayout->setSpacing( 5 );
-       OptsLayout->setMargin( 0 );
+       OptsLayout->setSpacing(6);
+       OptsLayout->setContentsMargins(0, 0, 0, 0);
        Word = new QCheckBox( tr( "&Whole Word" ), this );
        if (mode)
                Word->setEnabled(false);
@@ -271,8 +271,8 @@
        SearchReplaceLayout->addLayout( OptsLayout );
 
        ButtonsLayout = new QHBoxLayout;
-       ButtonsLayout->setSpacing( 5 );
-       ButtonsLayout->setMargin( 0 );
+       ButtonsLayout->setSpacing(6);
+       ButtonsLayout->setContentsMargins(0, 0, 0, 0);
        DoSearch = new QPushButton( tr( "&Search" ), this );
        DoSearch->setDefault( true );
        ButtonsLayout->addWidget( DoSearch );

Modified: trunk/Scribus/scribus/ui/selfield.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24512&path=/trunk/Scribus/scribus/ui/selfield.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/selfield.cpp       (original)
+++ trunk/Scribus/scribus/ui/selfield.cpp       Thu Feb 18 19:44:49 2021
@@ -29,14 +29,14 @@
        setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
        FTyp = Art;
        SelectFieldsLayout = new QVBoxLayout( this );
-       SelectFieldsLayout->setMargin(10);
-       SelectFieldsLayout->setSpacing(5);
+       SelectFieldsLayout->setContentsMargins(9, 9, 9, 9);
+       SelectFieldsLayout->setSpacing(6);
        Layout5 = new QHBoxLayout;
-       Layout5->setMargin(0);
-       Layout5->setSpacing(5);
+       Layout5->setContentsMargins(0, 0, 0, 0);
+       Layout5->setSpacing(6);
        Layout1 = new QVBoxLayout;
-       Layout1->setMargin(0);
-       Layout1->setSpacing(5);
+       Layout1->setContentsMargins(0, 0, 0, 0);
+       Layout1->setSpacing(6);
 
        Text1 = new QLabel( tr( "Available Fields" ), this );
        Layout1->addWidget( Text1 );
@@ -76,8 +76,8 @@
        if (Art > 1)
        {
                Layout2 = new QVBoxLayout;
-               Layout2->setMargin(0);
-               Layout2->setSpacing(5);
+               Layout2->setContentsMargins(0, 0, 0, 0);
+               Layout2->setSpacing(6);
                QSpacerItem* spacer = new QSpacerItem( 0, 0, 
QSizePolicy::Minimum, QSizePolicy::Expanding );
                Layout2->addItem( spacer );
                ToSel = new QPushButton( tr( "&>>" ), this );
@@ -88,8 +88,8 @@
                Layout2->addItem( spacer_2 );
                Layout5->addLayout( Layout2 );
                Layout3 = new QVBoxLayout;
-               Layout3->setMargin(0);
-               Layout3->setSpacing(5);
+               Layout3->setContentsMargins(0, 0, 0, 0);
+               Layout3->setSpacing(6);
                Text2 = new QLabel( tr( "Selected Fields" ), this );
                Layout3->addWidget( Text2 );
                SelFields = new QListWidget( this );
@@ -112,8 +112,8 @@
        SelectFieldsLayout->addLayout( Layout5 );
        S_Fields = "";
        Layout4 = new QHBoxLayout;
-       Layout4->setMargin(0);
-       Layout4->setSpacing(5);
+       Layout4->setContentsMargins(0, 0, 0, 0);
+       Layout4->setSpacing(6);
        QSpacerItem* spacer_3 = new QSpacerItem( 0, 0, QSizePolicy::Expanding, 
QSizePolicy::Minimum );
        Layout4->addItem( spacer_3 );
        OK = new QPushButton( CommonStrings::tr_OK, this );

Modified: trunk/Scribus/scribus/ui/smreplacedia.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24512&path=/trunk/Scribus/scribus/ui/smreplacedia.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smreplacedia.cpp   (original)
+++ trunk/Scribus/scribus/ui/smreplacedia.cpp   Thu Feb 18 19:44:49 2021
@@ -15,8 +15,8 @@
 : QWidget(parent)
 {
        layout = new QHBoxLayout(this);
-       layout->setMargin(0);
-       layout->setSpacing(5);
+       layout->setContentsMargins(0, 0, 0, 0);
+       layout->setSpacing(6);
        deleteLabel = new QLabel(toBeDeleted, this);
        layout->addWidget(deleteLabel);
        optionsCombo = new QComboBox(this);
@@ -58,10 +58,10 @@
        }
 
        layout = new QVBoxLayout(mainFrame);
-       layout->setMargin(0);
-       layout->setSpacing(5);
+       layout->setContentsMargins(0, 0, 0, 0);
+       layout->setSpacing(6);
        headerLayout = new QHBoxLayout();
-       headerLayout->setMargin(5);
+       headerLayout->setContentsMargins(0, 0, 0, 0);
        deleteHeader = new QLabel("<b>" + tr("Remove") + "</b>", mainFrame);
        optionsHeader = new QLabel("<b>" + tr("Replace with") + "</b>", 
mainFrame);
        headerLayout->addWidget(deleteHeader);

Modified: trunk/Scribus/scribus/ui/smreplacedia.ui
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24512&path=/trunk/Scribus/scribus/ui/smreplacedia.ui
==============================================================================
--- trunk/Scribus/scribus/ui/smreplacedia.ui    (original)
+++ trunk/Scribus/scribus/ui/smreplacedia.ui    Thu Feb 18 19:44:49 2021
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>SMReplaceDia</class>
- <widget class="QDialog" name="SMReplaceDia" >
-  <property name="geometry" >
+ <widget class="QDialog" name="SMReplaceDia">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,49 +10,61 @@
     <height>271</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Delete Styles</string>
   </property>
-  <property name="sizeGripEnabled" >
+  <property name="sizeGripEnabled">
    <bool>false</bool>
   </property>
-  <layout class="QVBoxLayout" >
-   <property name="margin" >
-    <number>5</number>
+  <layout class="QVBoxLayout">
+   <property name="leftMargin">
+    <number>9</number>
    </property>
-   <property name="spacing" >
-    <number>5</number>
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
    </property>
    <item>
-    <widget class="QFrame" name="mainFrame" >
-     <property name="frameShape" >
+    <widget class="QFrame" name="mainFrame">
+     <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
-     <property name="frameShadow" >
+     <property name="frameShadow">
       <enum>QFrame::Plain</enum>
      </property>
-     <property name="lineWidth" >
+     <property name="lineWidth">
       <number>0</number>
      </property>
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
+    <layout class="QHBoxLayout">
+     <property name="leftMargin">
       <number>0</number>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
      </property>
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeType" >
+       <property name="sizeType">
         <enum>QSizePolicy::Expanding</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint">
         <size>
          <width>20</width>
          <height>20</height>
@@ -60,30 +73,30 @@
       </spacer>
      </item>
      <item>
-      <widget class="QPushButton" name="buttonOk" >
-       <property name="text" >
+      <widget class="QPushButton" name="buttonOk">
+       <property name="text">
         <string>&amp;OK</string>
        </property>
-       <property name="shortcut" >
+       <property name="shortcut">
         <string/>
        </property>
-       <property name="autoDefault" >
+       <property name="autoDefault">
         <bool>true</bool>
        </property>
-       <property name="default" >
+       <property name="default">
         <bool>true</bool>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="buttonCancel" >
-       <property name="text" >
+      <widget class="QPushButton" name="buttonCancel">
+       <property name="text">
         <string>Ca&amp;ncel</string>
        </property>
-       <property name="shortcut" >
+       <property name="shortcut">
         <string>Alt+N</string>
        </property>
-       <property name="autoDefault" >
+       <property name="autoDefault">
         <bool>true</bool>
        </property>
       </widget>
@@ -92,9 +105,6 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
- <customwidgets>
- </customwidgets>
  <resources/>
  <connections>
   <connection>
@@ -103,11 +113,11 @@
    <receiver>SMReplaceDia</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>20</x>
      <y>20</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -119,11 +129,11 @@
    <receiver>SMReplaceDia</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>20</x>
      <y>20</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>

Modified: trunk/Scribus/scribus/ui/tabmanager.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24512&path=/trunk/Scribus/scribus/ui/tabmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/tabmanager.cpp     (original)
+++ trunk/Scribus/scribus/ui/tabmanager.cpp     Thu Feb 18 19:44:49 2021
@@ -25,13 +25,13 @@
        m_docUnitRatio = unitGetRatioFromIndex(dEin);
        m_tabList = inTab;
        TabManagerLayout = new QVBoxLayout( this );
-       TabManagerLayout->setMargin(5);
-       TabManagerLayout->setSpacing(5);
+       TabManagerLayout->setContentsMargins(9, 9, 9, 9);
+       TabManagerLayout->setSpacing(6);
        TabList = new Tabruler(this, false, dEin, inTab, -1);
        TabManagerLayout->addWidget( TabList );
        layout10 = new QHBoxLayout;
-       layout10->setSpacing( 5 );
-       layout10->setMargin( 0 );
+       layout10->setSpacing(6);
+       layout10->setContentsMargins(0, 0, 0, 0);
        QSpacerItem* spacer = new QSpacerItem( 2, 2, QSizePolicy::Expanding, 
QSizePolicy::Minimum );
        layout10->addItem( spacer );
        OKButton = new QPushButton( CommonStrings::tr_OK, this);


_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit

Reply via email to