Author: jghali
Date: Fri Nov 8 12:43:58 2019
New Revision: 23346
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23346
Log:
#15910: Indigo UI: Move the group and table panes to the content palette and
create a page pane (ale)
Added:
trunk/Scribus/scribus/ui/contentpalette_default.cpp
trunk/Scribus/scribus/ui/contentpalette_default.h
trunk/Scribus/scribus/ui/contentpalette_defaultbase.ui
trunk/Scribus/scribus/ui/contentpalette_page.cpp
trunk/Scribus/scribus/ui/contentpalette_page.h
trunk/Scribus/scribus/ui/contentpalette_pagebase.ui
Modified:
trunk/Scribus/Scribus.pro
trunk/Scribus/scribus/CMakeLists.txt
trunk/Scribus/scribus/ui/contentpalette.cpp
trunk/Scribus/scribus/ui/contentpalette.h
trunk/Scribus/scribus/ui/propertiespalette.cpp
trunk/Scribus/scribus/ui/propertiespalette.h
trunk/Scribus/scribus/ui/propertiespalette_tablebase.ui
trunk/Scribus/win32/msvc2013/scribus-main/Scribus.vcxproj
trunk/Scribus/win32/msvc2013/scribus-main/Scribus.vcxproj.filters
trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj
trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters
Modified: trunk/Scribus/Scribus.pro
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23346&path=/trunk/Scribus/Scribus.pro
==============================================================================
--- trunk/Scribus/Scribus.pro (original)
+++ trunk/Scribus/Scribus.pro Fri Nov 8 12:43:58 2019
@@ -419,6 +419,9 @@
scribus/ui/colorlistbox.h \
scribus/ui/colorlistmodel.h \
scribus/ui/colorsandfills.h \
+ scribus/ui/contentpalette.h \
+ scribus/ui/contentpalette_default.h \
+ scribus/ui/contentpalette_page.h \
scribus/ui/contextmenu.h \
scribus/ui/copypagetomasterpagedialog.h \
scribus/ui/cpalette.h \
@@ -1030,6 +1033,8 @@
scribus/ui/cmykfwbase.ui \
scribus/ui/colorpalette.ui \
scribus/ui/colorsandfillsbase.ui \
+ scribus/ui/contentpalette_defaultbase.ui \
+ scribus/ui/contentpalette_pagebase.ui \
scribus/ui/copypagetomasterpage.ui \
scribus/ui/createrange.ui \
scribus/ui/cxfimportdialogbase.ui \
@@ -1542,6 +1547,9 @@
scribus/ui/colorlistbox.cpp \
scribus/ui/colorlistmodel.cpp \
scribus/ui/colorsandfills.cpp \
+ scribus/ui/contentpalette.cpp \
+ scribus/ui/contentpalette_default.cpp \
+ scribus/ui/contentpalette_page.cpp \
scribus/ui/contextmenu.cpp \
scribus/ui/copypagetomasterpagedialog.cpp \
scribus/ui/cpalette.cpp \
Modified: trunk/Scribus/scribus/CMakeLists.txt
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23346&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/CMakeLists.txt Fri Nov 8 12:43:58 2019
@@ -99,6 +99,8 @@
ui/cmykfwbase.ui
ui/colorpalette.ui
ui/colorsandfillsbase.ui
+ ui/contentpalette_defaultbase.ui
+ ui/contentpalette_pagebase.ui
ui/cxfimportdialogbase.ui
ui/downloadspalettebase.ui
ui/gradientaddedit.ui
@@ -339,6 +341,8 @@
ui/colorlistmodel.h
ui/colorsandfills.h
ui/contentpalette.h
+ ui/contentpalette_default.h
+ ui/contentpalette_page.h
ui/contextmenu.h
ui/cpalette.h
ui/cupsoptions.h
@@ -841,6 +845,8 @@
ui/colorlistmodel.cpp
ui/colorsandfills.cpp
ui/contentpalette.cpp
+ ui/contentpalette_default.cpp
+ ui/contentpalette_page.cpp
ui/contextmenu.cpp
ui/cpalette.cpp
ui/cupsoptions.cpp
Modified: trunk/Scribus/scribus/ui/contentpalette.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23346&path=/trunk/Scribus/scribus/ui/contentpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/contentpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/contentpalette.cpp Fri Nov 8 12:43:58 2019
@@ -11,7 +11,11 @@
#include "appmodehelper.h" // for AppModeChanged (if needed)
+#include "propertiespalette_group.h"
#include "propertiespalette_image.h"
+#include "contentpalette_default.h"
+#include "contentpalette_page.h"
+#include "propertiespalette_table.h"
#include "propertiespalette_text.h"
#include "pageitem_imageframe.h"
#include "pageitem_table.h"
@@ -32,15 +36,24 @@
stackedWidget = new QStackedWidget(this);
- auto emptyPal = new QWidget();
- stackedWidget->addWidget(emptyPal);
+ defaultPal = new ContentPalette_Default(this);
+ stackedWidget->addWidget(defaultPal);
+
+ groupPal = new PropertiesPalette_Group(this);
+ stackedWidget->addWidget(groupPal);
+
+ imagePal = new PropertiesPalette_Image(this);
+ stackedWidget->addWidget(imagePal);
+
+ pagePal = new ContentPalette_Page(this);
+ stackedWidget->addWidget(pagePal);
+
+ tablePal = new PropertiesPalette_Table(this);
+ stackedWidget->addWidget(tablePal);
textPal = new PropertiesPalette_Text(this);
stackedWidget->addWidget(textPal);
- imagePal = new PropertiesPalette_Image(this);
- stackedWidget->addWidget(imagePal);
-
setWidget(stackedWidget);
stackedWidget->setCurrentIndex((int) Panel::empty);
@@ -52,8 +65,11 @@
{
m_ScMW = mw;
+ defaultPal->setMainWindow(mw);
+ groupPal->setMainWindow(mw);
+ imagePal->setMainWindow(mw);
+ tablePal->setMainWindow(mw);
textPal->setMainWindow(mw);
- imagePal->setMainWindow(mw);
connect(m_ScMW->appModeHelper, &AppModeHelper::AppModeChanged, this,
&ContentPalette::AppModeChanged);
}
@@ -78,8 +94,11 @@
m_haveDoc = true;
m_haveItem = false;
+ defaultPal->setDoc(m_doc);
+ groupPal->setDoc(m_doc);
+ imagePal->setDoc(m_doc);
+ tablePal->setDocument(m_doc);
textPal->setDoc(m_doc);
- imagePal->setDoc(m_doc);
updateColorList();
@@ -104,12 +123,19 @@
m_doc=nullptr;
m_item = nullptr;
+ defaultPal->unsetItem();
+ defaultPal->unsetDoc();
+ groupPal->unsetItem();
+ groupPal->unsetDoc();
+ imagePal->unsetItem();
+ imagePal->unsetDoc();
+ tablePal->unsetItem();
+ tablePal->unsetDocument();
textPal->unsetItem();
textPal->unsetDoc();
- imagePal->unsetItem();
- imagePal->unsetDoc();
stackedWidget->setCurrentIndex((int) Panel::empty);
+ updatePanelTitle();
}
void ContentPalette::unsetItem()
@@ -117,7 +143,10 @@
m_haveItem = false;
m_item = nullptr;
+ defaultPal->unsetItem();
+ groupPal->unsetItem();
imagePal->unsetItem();
+ tablePal->unsetItem();
textPal->unsetItem();
handleSelectionChanged();
@@ -142,6 +171,12 @@
{
if (m_item->isTable())
{
+ // TODO: a.l.e: fix the table selection
+ // when a cell is selected it should show the table
pane for now
+ // you need to enter the text edit mode to format text.
+ // in the future we will probably add a multiple panes
at once
+ // (on top of each other? switching?)
+ // tablePal->setEnabled(m_doc->appMode ==
modeEditTable);
textPal->setEnabled(m_doc->appMode == modeEditTable);
if (m_doc->appMode == modeEditTable)
{
@@ -175,12 +210,17 @@
m_haveItem = true;
m_item = item;
+ tablePal->setItem(m_item);
+
// TODO: in PropertiesPalette there is a a funny if for the groups:
take care of it when adding the group panel
if (!sender() || (m_doc->appMode == modeEditTable))
{
+ defaultPal->handleSelectionChanged();
+ groupPal->handleSelectionChanged();
+ imagePal->handleSelectionChanged();
+ tablePal->handleSelectionChanged();
textPal->handleSelectionChanged();
- imagePal->handleSelectionChanged();
}
}
@@ -219,7 +259,10 @@
newPanel = Panel::text;
break;
case PageItem::Table:
- newPanel = m_doc->appMode == modeEditTable ?
Panel::text : Panel::empty;
+ newPanel = m_doc->appMode == modeEditTable &&
!static_cast<PageItem_Table*>(currItem)->hasSelection() ? Panel::text :
Panel::table;
+ break;
+ case PageItem::Group:
+ newPanel = Panel::group;
break;
default:
newPanel = Panel::empty;
@@ -247,8 +290,9 @@
m_unitRatio = m_doc->unitRatio();
m_unitIndex = m_doc->unitIndex();
+ groupPal->unitChange();
+ imagePal->unitChange();
textPal->unitChange();
- imagePal->unitChange();
m_haveItem = tmp;
}
@@ -258,6 +302,7 @@
if (!m_haveDoc || !m_ScMW || m_ScMW->scriptIsRunning())
return;
+ tablePal->updateColorList();
textPal->updateColorList();
assert (m_doc->PageColors.document());
@@ -285,20 +330,32 @@
case Panel::empty:
setWindowTitle( tr("Content Properties"));
break;
+ case Panel::group:
+ setWindowTitle( tr("Group Properties"));
+ break;
+ case Panel::image:
+ setWindowTitle( tr("Image Properties"));
+ break;
+ case Panel::page:
+ setWindowTitle( tr("Page Properties"));
+ break;
+ case Panel::table:
+ setWindowTitle( tr("Table Properties"));
+ break;
case Panel::text:
setWindowTitle( tr("Text Properties"));
break;
- case Panel::image:
- setWindowTitle( tr("Image Properties"));
- break;
}
}
void ContentPalette::languageChange()
{
updatePanelTitle();
+ defaultPal->languageChange();
+ groupPal->languageChange();
+ imagePal->languageChange();
+ tablePal->languageChange();
textPal->languageChange();
- imagePal->languageChange();
}
void ContentPalette::update(PageItem_ImageFrame* image)
Modified: trunk/Scribus/scribus/ui/contentpalette.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23346&path=/trunk/Scribus/scribus/ui/contentpalette.h
==============================================================================
--- trunk/Scribus/scribus/ui/contentpalette.h (original)
+++ trunk/Scribus/scribus/ui/contentpalette.h Fri Nov 8 12:43:58 2019
@@ -17,8 +17,12 @@
class ScribusDoc;
class PageItem;
+class ContentPalette_Default;
+class ContentPalette_Page;
+class PropertiesPalette_Group;
+class PropertiesPalette_Image;
+class PropertiesPalette_Table;
class PropertiesPalette_Text;
-class PropertiesPalette_Image;
class PageItem_TextFrame;
class PageItem_ImageFrame;
class ParagraphStyle;
@@ -70,17 +74,24 @@
double m_unitRatio{1.0};
int m_unitIndex{0};
- QStackedWidget* stackedWidget;
- PropertiesPalette_Text* textPal;
- PropertiesPalette_Image* imagePal;
+ QStackedWidget* stackedWidget{nullptr};
+ ContentPalette_Default* defaultPal{nullptr};
+ PropertiesPalette_Group* groupPal{nullptr};
+ PropertiesPalette_Image* imagePal{nullptr};
+ ContentPalette_Page* pagePal{nullptr};
+ PropertiesPalette_Table* tablePal{nullptr};
+ PropertiesPalette_Text* textPal{nullptr};
void updatePanelTitle();
// the order must match the insertion of the widgets in the
constructor
enum class Panel {
empty,
- text,
- image
+ group,
+ image,
+ page,
+ table,
+ text
};
};
Modified: trunk/Scribus/scribus/ui/propertiespalette.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23346&path=/trunk/Scribus/scribus/ui/propertiespalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette.cpp Fri Nov 8 12:43:58 2019
@@ -41,11 +41,9 @@
#include "cpalette.h"
#include "dasheditor.h"
#include "pageitem_table.h"
-#include "propertiespalette_group.h"
#include "propertiespalette_line.h"
#include "propertiespalette_shadow.h"
#include "propertiespalette_shape.h"
-#include "propertiespalette_table.h"
#include "propertiespalette_utils.h"
#include "propertiespalette_xyz.h"
#include "transparencypalette.h"
@@ -81,9 +79,6 @@
shapePal = new PropertiesPalette_Shape( this );
idShapeItem = TabStack->addItem( shapePal, "&Shape" );
- groupPal = new PropertiesPalette_Group( this );
- idGroupItem = TabStack->addItem(groupPal, "Groups");
-
linePal = new PropertiesPalette_Line(this);
idLineItem=TabStack->addItem( linePal, "&Line" );
@@ -92,9 +87,6 @@
transparencyPalette = new TransparencyPalette(this);
idTransparencyItem = TabStack->addItem(transparencyPalette,
"&Transparency" );
-
- tablePal = new PropertiesPalette_Table(this);
- idTableItem = TabStack->addItem(tablePal, "T&able" );
setWidget( TabStack );
@@ -145,9 +137,7 @@
this->xyzPal->setMainWindow(mw);
this->shadowPal->setMainWindow(mw);
this->shapePal->setMainWindow(mw);
- this->groupPal->setMainWindow(mw);
this->linePal->setMainWindow(mw);
- this->tablePal->setMainWindow(mw);
//connect(this->Cpal, SIGNAL(gradientChanged()), m_ScMW,
SLOT(updtGradFill()));
//connect(this->Cpal, SIGNAL(strokeGradientChanged()), m_ScMW,
SLOT(updtGradStroke()));
@@ -215,9 +205,7 @@
xyzPal->setDoc(m_doc);
shadowPal->setDoc(m_doc);
shapePal->setDoc(m_doc);
- groupPal->setDoc(m_doc);
linePal->setDoc(m_doc);
- tablePal->setDocument(m_doc);
updateColorList();
@@ -247,12 +235,8 @@
shadowPal->unsetDoc();
shapePal->unsetItem();
shapePal->unsetDoc();
- groupPal->unsetItem();
- groupPal->unsetDoc();
linePal->unsetItem();
linePal->unsetDoc();
- tablePal->unsetItem();
- tablePal->unsetDocument();
colorPalette->setCurrentItem(nullptr);
colorPalette->setDocument(nullptr);
@@ -272,10 +256,7 @@
m_item = nullptr;
colorPalette->setCurrentItem(nullptr);
transparencyPalette->setCurrentItem(nullptr);
- tablePal->unsetItem();
shapePal->unsetItem();
- groupPal->unsetItem();
- shadowPal->unsetItem();
linePal->unsetItem();
handleSelectionChanged();
}
@@ -300,6 +281,7 @@
return;
if ((m_haveDoc) && (m_haveItem))
{
+ // TODO: not sure that this is still needed...
if (m_item->isTable())
{
if (m_doc->appMode == modeEditTable)
@@ -338,7 +320,6 @@
m_haveItem = false;
m_item = item;
- tablePal->setItem(m_item);
transparencyPalette->setCurrentItem(m_item);
setTextFlowMode(m_item->textFlowMode());
@@ -353,14 +334,10 @@
TabStack->setItemEnabled(idXYZItem, true);
TabStack->setItemEnabled(idShadowItem, true);
TabStack->setItemEnabled(idShapeItem, true);
- TabStack->setItemEnabled(idGroupItem, true);
TabStack->setItemEnabled(idLineItem, false);
TabStack->setItemEnabled(idColorsItem, false);
TabStack->setItemEnabled(idTransparencyItem, true);
- TabStack->setItemEnabled(idTableItem, false);
- }
- else
- TabStack->setItemEnabled(idGroupItem, false);
+ }
m_haveItem = true;
@@ -376,9 +353,7 @@
xyzPal->handleSelectionChanged();
shadowPal->handleSelectionChanged();
shapePal->handleSelectionChanged();
- groupPal->handleSelectionChanged();
linePal->handleSelectionChanged();
- tablePal->handleSelectionChanged();
colorPalette->handleSelectionChanged();
}
@@ -387,23 +362,18 @@
TabStack->setItemEnabled(idXYZItem, true);
TabStack->setItemEnabled(idShadowItem, true);
TabStack->setItemEnabled(idShapeItem, true);
- TabStack->setItemEnabled(idGroupItem, false);
TabStack->setItemEnabled(idLineItem, false);
TabStack->setItemEnabled(idColorsItem, true);
- TabStack->setItemEnabled(idTableItem, false);
TabStack->setItemEnabled(idTransparencyItem, false);
- TabStack->setItemEnabled(idTableItem, false);
}
if (m_item->asSymbolFrame())
{
TabStack->setItemEnabled(idXYZItem, true);
TabStack->setItemEnabled(idShadowItem, true);
TabStack->setItemEnabled(idShapeItem, false);
- TabStack->setItemEnabled(idGroupItem, true);
TabStack->setItemEnabled(idLineItem, false);
TabStack->setItemEnabled(idColorsItem, false);
TabStack->setItemEnabled(idTransparencyItem, false);
- TabStack->setItemEnabled(idTableItem, false);
}
connect(TabStack, SIGNAL(currentChanged2(int)), this,
SLOT(SelTab(int)));
}
@@ -426,12 +396,6 @@
TabStack->setItemEnabled(idLineItem, true);
TabStack->setItemEnabled(idColorsItem, true);
TabStack->setItemEnabled(idTransparencyItem, true);
- TabStack->setItemEnabled(idTableItem, false); // At least not
for now.
- if (m_haveItem && m_item)
- {
- if ((m_item->isGroup()) && (!m_item->isSingleSel))
- TabStack->setItemEnabled(idGroupItem, true);
- }
}
else
{
@@ -443,7 +407,6 @@
TabStack->setItemEnabled(idXYZItem, true);
TabStack->setItemEnabled(idColorsItem, true);
TabStack->setItemEnabled(idTransparencyItem, true);
- TabStack->setItemEnabled(idTableItem, false);
switch (itemType)
{
case -1:
@@ -462,7 +425,6 @@
TabStack->setItemEnabled(idXYZItem, true);
TabStack->setItemEnabled(idShadowItem, true);
TabStack->setItemEnabled(idShapeItem, true);
- TabStack->setItemEnabled(idGroupItem, false);
TabStack->setItemEnabled(idLineItem, false);
TabStack->setItemEnabled(idColorsItem, true);
TabStack->setItemEnabled(idTransparencyItem,
false);
@@ -475,6 +437,9 @@
TabStack->setItemEnabled(idLineItem, true);
}
break;
+ case PageItem::Group:
+ case PageItem::Symbol:
+ case PageItem::Table:
case PageItem::TextFrame:
TabStack->setItemEnabled(idShadowItem, true);
TabStack->setItemEnabled(idShapeItem, true);
@@ -505,24 +470,6 @@
TabStack->setItemEnabled(idShapeItem, true);
TabStack->setItemEnabled(idLineItem, true);
break;
- case PageItem::Symbol:
- case PageItem::Group:
- TabStack->setItemEnabled(idShadowItem, true);
- TabStack->setItemEnabled(idShapeItem, true);
- TabStack->setItemEnabled(idLineItem, false);
- TabStack->setItemEnabled(idGroupItem, true);
- TabStack->setItemEnabled(idColorsItem, false);
- TabStack->setItemEnabled(idTransparencyItem, false);
- break;
- case PageItem::Table:
- TabStack->setItemEnabled(idTableItem, true);
- TabStack->setItemEnabled(idShadowItem, true);
- TabStack->setItemEnabled(idShapeItem, true);
- TabStack->setItemEnabled(idLineItem, false);
- TabStack->setItemEnabled(idGroupItem, false);
- TabStack->setItemEnabled(idColorsItem, false);
- TabStack->setItemEnabled(idTransparencyItem, true);
- break;
}
}
if (TabStack->isItemEnabled(currentTab) && (TabStack->currentIndex() !=
currentTab))
@@ -550,7 +497,6 @@
xyzPal->unitChange();
shadowPal->unitChange();
shapePal->unitChange();
- groupPal->unitChange();
linePal->unitChange();
colorPalette->unitChange(oldRatio, m_unitRatio, m_doc->unitIndex());
@@ -779,7 +725,6 @@
if (!m_haveDoc || !m_ScMW || m_ScMW->scriptIsRunning())
return;
- tablePal->updateColorList();
colorPalette->updateColorList();
transparencyPalette->updateColorList();
shadowPal->updateColorList();
@@ -811,17 +756,13 @@
TabStack->setItemText(idShapeItem, tr("&Shape"));
TabStack->setItemText(idLineItem, tr("&Line"));
TabStack->setItemText(idColorsItem, tr("&Colors"));
- TabStack->setItemText(idGroupItem, tr("&Group"));
TabStack->setItemText(idTransparencyItem, tr("&Transparency"));
- TabStack->setItemText(idTableItem, tr("T&able"));
xyzPal->languageChange();
shadowPal->languageChange();
shapePal->languageChange();
- groupPal->languageChange();
colorPalette->languageChange();
linePal->languageChange();
- tablePal->languageChange();
}
void PropertiesPalette::setGradientEditMode(bool on)
Modified: trunk/Scribus/scribus/ui/propertiespalette.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23346&path=/trunk/Scribus/scribus/ui/propertiespalette.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette.h (original)
+++ trunk/Scribus/scribus/ui/propertiespalette.h Fri Nov 8 12:43:58 2019
@@ -69,11 +69,9 @@
// and if in ScribusView a groupTransaction has been
started it must be also
// commmited
- PropertiesPalette_Group* groupPal {nullptr};
PropertiesPalette_Line* linePal {nullptr};
PropertiesPalette_Shadow* shadowPal {nullptr};
PropertiesPalette_Shape* shapePal {nullptr};
- PropertiesPalette_Table* tablePal {nullptr};
PropertiesPalette_XYZ* xyzPal {nullptr};
ColorPalette *colorPalette {nullptr};
TransparencyPalette *transparencyPalette {nullptr};
Modified: trunk/Scribus/scribus/ui/propertiespalette_tablebase.ui
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23346&path=/trunk/Scribus/scribus/ui/propertiespalette_tablebase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_tablebase.ui (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_tablebase.ui Fri Nov 8
12:43:58 2019
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>352</width>
- <height>464</height>
+ <height>398</height>
</rect>
</property>
<property name="windowTitle">
@@ -96,291 +96,6 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="bordersLayout">
- <property name="title">
- <string>Borders</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <layout class="QHBoxLayout" name="bordesLayout1">
- <item>
- <layout class="QVBoxLayout" name="bordersLayout1_1">
- <item>
- <widget class="QPushButton" name="addBorderLineButton">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="removeBorderLineButton">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="buttonSpacer">
- <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>
- </item>
- <item>
- <widget class="QListWidget" name="borderLineList">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>50</height>
- </size>
- </property>
- </widget>
- </item>
- <item>
- <widget class="TableSideSelector" name="sideSelector">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>80</width>
- <height>80</height>
- </size>
- </property>
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Sunken</enum>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="bordersLayout2" stretch="0,0">
- <item>
- <layout class="QFormLayout" name="bordersLayout2_1">
- <property name="fieldGrowthPolicy">
- <enum>QFormLayout::ExpandingFieldsGrow</enum>
- </property>
- <item row="0" column="0">
- <widget class="QLabel" name="borderLineWidthLabel">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Width:</string>
- </property>
- <property name="buddy">
- <cstring>borderLineWidth</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="borderLineColorLabel">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Color:</string>
- </property>
- <property name="buddy">
- <cstring>borderLineColor</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="ColorCombo" name="borderLineColor">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>100</width>
- <height>0</height>
- </size>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="ScrSpinBox" name="borderLineWidth">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>100</width>
- <height>0</height>
- </size>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QFormLayout" name="bordersLayout2_2">
- <item row="0" column="0">
- <widget class="QLabel" name="borderLineStyleLabel">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Type:</string>
- </property>
- <property name="buddy">
- <cstring>borderLineStyle</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="LineCombo" name="borderLineStyle">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>100</width>
- <height>0</height>
- </size>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="borderLineShadeLabel">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Shade:</string>
- </property>
- <property name="buddy">
- <cstring>borderLineShade</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="ScrSpinBox" name="borderLineShade">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>100</width>
- <height>0</height>
- </size>
- </property>
- <property name="suffix">
- <string> %</string>
- </property>
- <property name="decimals">
- <number>0</number>
- </property>
- <property name="maximum">
- <double>100.000000000000000</double>
- </property>
- <property name="value">
- <double>100.000000000000000</double>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </item>
- <item>
<widget class="QGroupBox" name="fillLayout">
<property name="title">
<string>Fill</string>
@@ -471,9 +186,317 @@
</layout>
</widget>
</item>
+ <item>
+ <widget class="QGroupBox" name="bordersLayout">
+ <property name="title">
+ <string>Borders</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <layout class="QHBoxLayout" name="bordesLayout1">
+ <item>
+ <layout class="QVBoxLayout" name="bordersLayout1_1">
+ <item alignment="Qt::AlignTop">
+ <widget class="QPushButton" name="addBorderLineButton">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item alignment="Qt::AlignTop">
+ <widget class="QPushButton" name="removeBorderLineButton">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="buttonSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Minimum</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QListWidget" name="borderLineList">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>50</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="TableSideSelector" name="sideSelector">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>80</width>
+ <height>80</height>
+ </size>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Sunken</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="bordersLayout2" stretch="0,0">
+ <item>
+ <layout class="QFormLayout" name="bordersLayout2_1">
+ <property name="fieldGrowthPolicy">
+ <enum>QFormLayout::ExpandingFieldsGrow</enum>
+ </property>
+ <item row="0" column="0">
+ <widget class="QLabel" name="borderLineWidthLabel">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Width:</string>
+ </property>
+ <property name="buddy">
+ <cstring>borderLineWidth</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="borderLineColorLabel">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Color:</string>
+ </property>
+ <property name="buddy">
+ <cstring>borderLineColor</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="ColorCombo" name="borderLineColor">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="ScrSpinBox" name="borderLineWidth">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QFormLayout" name="bordersLayout2_2">
+ <item row="0" column="0">
+ <widget class="QLabel" name="borderLineStyleLabel">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Type:</string>
+ </property>
+ <property name="buddy">
+ <cstring>borderLineStyle</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="LineCombo" name="borderLineStyle">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="borderLineShadeLabel">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Shade:</string>
+ </property>
+ <property name="buddy">
+ <cstring>borderLineShade</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="ScrSpinBox" name="borderLineShade">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="suffix">
+ <string> %</string>
+ </property>
+ <property name="decimals">
+ <number>0</number>
+ </property>
+ <property name="maximum">
+ <double>100.000000000000000</double>
+ </property>
+ <property name="value">
+ <double>100.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer">
+ <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>
<customwidgets>
+ <customwidget>
+ <class>ScrSpinBox</class>
+ <extends>QDoubleSpinBox</extends>
+ <header>ui/scrspinbox.h</header>
+ </customwidget>
+ <customwidget>
+ <class>LineCombo</class>
+ <extends>QComboBox</extends>
+ <header>ui/linecombo.h</header>
+ </customwidget>
<customwidget>
<class>TableSideSelector</class>
<extends>QFrame</extends>
@@ -481,19 +504,9 @@
<container>1</container>
</customwidget>
<customwidget>
- <class>LineCombo</class>
- <extends>QComboBox</extends>
- <header>ui/linecombo.h</header>
- </customwidget>
- <customwidget>
<class>ColorCombo</class>
<extends>QComboBox</extends>
<header>ui/colorcombo.h</header>
- </customwidget>
- <customwidget>
- <class>ScrSpinBox</class>
- <extends>QDoubleSpinBox</extends>
- <header>ui/scrspinbox.h</header>
</customwidget>
<customwidget>
<class>TableStyleComboBox</class>
Modified: trunk/Scribus/win32/msvc2013/scribus-main/Scribus.vcxproj
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23346&path=/trunk/Scribus/win32/msvc2013/scribus-main/Scribus.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2013/scribus-main/Scribus.vcxproj (original)
+++ trunk/Scribus/win32/msvc2013/scribus-main/Scribus.vcxproj Fri Nov 8
12:43:58 2019
@@ -605,6 +605,8 @@
<moc Include="..\..\..\scribus\ui\numformatcombo.h" />
<moc Include="..\..\..\scribus\ui\actionsearchdialog.h" />
<moc Include="..\..\..\scribus\ui\contentpalette.h" />
+ <moc Include="..\..\..\scribus\ui\contentpalette_page.h" />
+ <moc Include="..\..\..\scribus\ui\contentpalette_default.h" />
<ClInclude Include="..\..\..\scribus\ui\propertywidgetbase.h" />
<moc Include="..\..\..\scribus\pslib.h" />
<moc Include="..\..\..\scribus\ui\query.h" />
@@ -981,6 +983,8 @@
<ClCompile Include="..\..\..\scribus\ui\colorlistmodel.cpp" />
<ClCompile Include="..\..\..\scribus\ui\colorsandfills.cpp" />
<ClCompile Include="..\..\..\scribus\ui\contentpalette.cpp" />
+ <ClCompile Include="..\..\..\scribus\ui\contentpalette_default.cpp" />
+ <ClCompile Include="..\..\..\scribus\ui\contentpalette_page.cpp" />
<ClCompile Include="..\..\..\scribus\ui\contextmenu.cpp" />
<ClCompile Include="..\..\..\scribus\ui\copypagetomasterpagedialog.cpp" />
<ClCompile Include="..\..\..\scribus\ui\cpalette.cpp" />
@@ -1541,6 +1545,8 @@
<uic Include="..\..\..\scribus\ui\cmykfwbase.ui" />
<uic Include="..\..\..\scribus\ui\colorpalette.ui" />
<uic Include="..\..\..\scribus\ui\colorsandfillsbase.ui" />
+ <uic Include="..\..\..\scribus\ui\contentpalette_defaultbase.ui" />
+ <uic Include="..\..\..\scribus\ui\contentpalette_pagebase.ui" />
<uic Include="..\..\..\scribus\ui\copypagetomasterpage.ui" />
<uic Include="..\..\..\scribus\ui\createrange.ui" />
<uic Include="..\..\..\scribus\ui\cxfimportdialogbase.ui" />
Modified: trunk/Scribus/win32/msvc2013/scribus-main/Scribus.vcxproj.filters
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23346&path=/trunk/Scribus/win32/msvc2013/scribus-main/Scribus.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2013/scribus-main/Scribus.vcxproj.filters
(original)
+++ trunk/Scribus/win32/msvc2013/scribus-main/Scribus.vcxproj.filters Fri Nov
8 12:43:58 2019
@@ -800,6 +800,12 @@
<ClInclude Include="..\..\..\scribus\actionsearch.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\scribus\ui\contentpalette_page.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\scribus\ui\contentpalette_default.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\scribus\desaxe\digester.cpp">
@@ -2489,6 +2495,12 @@
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\scribus\ui\contentpalette.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\scribus\ui\contentpalette_page.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\scribus\ui\contentpalette_default.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
@@ -2872,6 +2884,12 @@
<uic Include="..\..\..\scribus\ui\actionsearchdialog.ui">
<Filter>Form Files</Filter>
</uic>
+ <uic Include="..\..\..\scribus\ui\contentpalette_pagebase.ui">
+ <Filter>Form Files</Filter>
+ </uic>
+ <uic Include="..\..\..\scribus\ui\contentpalette_defaultbase.ui">
+ <Filter>Form Files</Filter>
+ </uic>
</ItemGroup>
<ItemGroup>
<lrelease Include="..\..\..\resources\translations\scribus.af.ts">
Modified: trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23346&path=/trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj
==============================================================================
--- trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj (original)
+++ trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj Fri Nov 8
12:43:58 2019
@@ -605,6 +605,8 @@
<moc Include="..\..\..\scribus\ui\numformatcombo.h" />
<moc Include="..\..\..\scribus\ui\actionsearchdialog.h" />
<moc Include="..\..\..\scribus\ui\contentpalette.h" />
+ <moc Include="..\..\..\scribus\ui\contentpalette_page.h" />
+ <moc Include="..\..\..\scribus\ui\contentpalette_default.h" />
<ClInclude Include="..\..\..\scribus\ui\propertywidgetbase.h" />
<moc Include="..\..\..\scribus\pslib.h" />
<moc Include="..\..\..\scribus\ui\query.h" />
@@ -981,6 +983,8 @@
<ClCompile Include="..\..\..\scribus\ui\colorlistmodel.cpp" />
<ClCompile Include="..\..\..\scribus\ui\colorsandfills.cpp" />
<ClCompile Include="..\..\..\scribus\ui\contentpalette.cpp" />
+ <ClCompile Include="..\..\..\scribus\ui\contentpalette_default.cpp" />
+ <ClCompile Include="..\..\..\scribus\ui\contentpalette_page.cpp" />
<ClCompile Include="..\..\..\scribus\ui\contextmenu.cpp" />
<ClCompile Include="..\..\..\scribus\ui\copypagetomasterpagedialog.cpp" />
<ClCompile Include="..\..\..\scribus\ui\cpalette.cpp" />
@@ -1541,6 +1545,8 @@
<uic Include="..\..\..\scribus\ui\cmykfwbase.ui" />
<uic Include="..\..\..\scribus\ui\colorpalette.ui" />
<uic Include="..\..\..\scribus\ui\colorsandfillsbase.ui" />
+ <uic Include="..\..\..\scribus\ui\contentpalette_defaultbase.ui" />
+ <uic Include="..\..\..\scribus\ui\contentpalette_pagebase.ui" />
<uic Include="..\..\..\scribus\ui\copypagetomasterpage.ui" />
<uic Include="..\..\..\scribus\ui\createrange.ui" />
<uic Include="..\..\..\scribus\ui\cxfimportdialogbase.ui" />
Modified: trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23346&path=/trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters
==============================================================================
--- trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters
(original)
+++ trunk/Scribus/win32/msvc2015/scribus-main/Scribus.vcxproj.filters Fri Nov
8 12:43:58 2019
@@ -800,6 +800,12 @@
<ClInclude Include="..\..\..\scribus\actionsearch.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\scribus\ui\contentpalette_page.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\scribus\ui\contentpalette_default.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\scribus\desaxe\digester.cpp">
@@ -2489,6 +2495,12 @@
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\scribus\ui\contentpalette.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\scribus\ui\contentpalette_page.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\scribus\ui\contentpalette_default.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
@@ -2872,6 +2884,12 @@
<uic Include="..\..\..\scribus\ui\actionsearchdialog.ui">
<Filter>Form Files</Filter>
</uic>
+ <uic Include="..\..\..\scribus\ui\contentpalette_pagebase.ui">
+ <Filter>Form Files</Filter>
+ </uic>
+ <uic Include="..\..\..\scribus\ui\contentpalette_defaultbase.ui">
+ <Filter>Form Files</Filter>
+ </uic>
</ItemGroup>
<ItemGroup>
<lrelease Include="..\..\..\resources\translations\scribus.af.ts">
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
