diff --git a/resources/iconsets/1_7_0/16/table-cell-style.svg b/resources/iconsets/1_7_0/16/table-cell-style.svg new file mode 100644 index 000000000..82eadfa7d --- /dev/null +++ b/resources/iconsets/1_7_0/16/table-cell-style.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/iconsets/1_7_0/16/table-style.svg b/resources/iconsets/1_7_0/16/table-style.svg new file mode 100644 index 000000000..cf4852ae8 --- /dev/null +++ b/resources/iconsets/1_7_0/16/table-style.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/resources/iconsets/1_7_0/1_7_0.xml b/resources/iconsets/1_7_0/1_7_0.xml index d17386b89..310a06f17 100644 --- a/resources/iconsets/1_7_0/1_7_0.xml +++ b/resources/iconsets/1_7_0/1_7_0.xml @@ -478,6 +478,8 @@ On Dark: #e580ff; rgb(229, 128, 255); hsl(288, 100, 75) + + diff --git a/scribus/ui/propertiespalette_table.cpp b/scribus/ui/propertiespalette_table.cpp index 7d4246466..cf7c65f20 100644 --- a/scribus/ui/propertiespalette_table.cpp +++ b/scribus/ui/propertiespalette_table.cpp @@ -40,8 +40,6 @@ PropertiesPalette_Table::PropertiesPalette_Table(QWidget* parent) : QWidget(pare setSizePolicy( QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum)); iconSetChange(); - labelTable->setBuddy(tableStyleCombo); - labelCells->setBuddy(cellStyleCombo); MarginStruct distances; @@ -49,6 +47,7 @@ PropertiesPalette_Table::PropertiesPalette_Table(QWidget* parent) : QWidget(pare cellPaddingWidget->toggleLabelVisibility(false); connect(ScQApp, SIGNAL(iconSetChanged()), this, SLOT(iconSetChange())); + connect(ScQApp, SIGNAL(labelVisibilityChanged(bool)), this, SLOT(toggleLabelVisibility(bool))); connect(tableStyleCombo, SIGNAL(newStyle(QString)), this, SLOT(setTableStyle(QString))); connect(cellStyleCombo, SIGNAL(newStyle(QString)), this, SLOT(setCellStyle(QString))); @@ -62,6 +61,8 @@ void PropertiesPalette_Table::iconSetChange() removeBorderLineButton->setIcon(iconManager.loadIcon("stroke-remove")); buttonClearTableStyle->setIcon(iconManager.loadIcon("reset")); buttonClearCellStyle->setIcon(iconManager.loadIcon("reset")); + labelTable->setPixmap(iconManager.loadPixmap("table-style")); + labelCells->setPixmap(iconManager.loadPixmap("table-cell-style")); } void PropertiesPalette_Table::handleUpdateRequest(int updateFlags) @@ -250,6 +251,16 @@ void PropertiesPalette_Table::updatePaddingControls() cellPaddingWidget->setNewValues(padding); } +void PropertiesPalette_Table::toggleLabelVisibility(bool v) +{ + borderLineColorLabel->setLabelVisibility(v); + borderLineShadeLabel->setLabelVisibility(v); + borderLineStyleLabel->setLabelVisibility(v); + borderLineWidthLabel->setLabelVisibility(v); + fillColorLabel->setLabelVisibility(v); + fillShadeLabel->setLabelVisibility(v); +} + void PropertiesPalette_Table::setTableStyle(const QString &name) { if (!m_item || !m_item->isTable()) @@ -882,6 +893,19 @@ void PropertiesPalette_Table::updateBorders() void PropertiesPalette_Table::languageChange() { retranslateUi(this); + + scTableStyles->setText(tr("Styles")); + scTableFills->setText(tr("Fill")); + scTableBorders->setText(tr("Borders")); + scTableCellPadding->setText(tr("Cell Padding")); + + borderLineColorLabel->setText(tr("C&olor")); + borderLineShadeLabel->setText(tr("S&hade")); + borderLineStyleLabel->setText(tr("&Type")); + borderLineWidthLabel->setText(tr("&Width")); + fillColorLabel->setText(tr("&Color")); + fillShadeLabel->setText(tr("&Shade")); + } void PropertiesPalette_Table::unitChange() diff --git a/scribus/ui/propertiespalette_table.h b/scribus/ui/propertiespalette_table.h index 868d904ca..97c0f3db7 100644 --- a/scribus/ui/propertiespalette_table.h +++ b/scribus/ui/propertiespalette_table.h @@ -68,6 +68,7 @@ public slots: void updateFillControls(); void updateStyleControls(); void updatePaddingControls(); + void toggleLabelVisibility(bool v); private slots: void setTableStyle(const QString& name); diff --git a/scribus/ui/propertiespalette_tablebase.ui b/scribus/ui/propertiespalette_tablebase.ui index 8946f6ac0..94c1443cf 100644 --- a/scribus/ui/propertiespalette_tablebase.ui +++ b/scribus/ui/propertiespalette_tablebase.ui @@ -6,543 +6,740 @@ 0 0 - 354 - 463 + 386 + 490 + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + - - + + Styles - - - 6 - - - 6 - - - 6 - - - 6 - - - 3 - - - - - Table: - - - - - - - - 0 - 0 - - - - Table style of currently selected table - - - - - - - Remove Direct Table Formatting - - - - 16 - 16 - - - - - - - - Cells: - - - - - - - - 0 - 0 - - - - Cell style of currently selected cell - - - - - - - Remove Direct Cell Formatting - - - - 16 - 16 - - - - - - - - - - - Fill - - - - 3 - - - 6 - - - 6 - - - 6 - - - 6 - - - - - 3 - - - - - 3 + + + + 8 + + + 8 + + + 8 + + + 8 + + + 8 + + + + + + 0 + 0 + + + + false + + + + 0 - - 3 + + 0 - - - - false - - - Color: - - - - - - - false - + + 0 + + + 0 + + + - + 0 0 - - - 100 - 0 - + + Table style of currently selected table - - - - - - 3 - - - 3 - - - - - false + + + + Remove Direct Table Formatting - - Shade: + + + 16 + 16 + - - - - false - - - - 0 - 0 - + + + + Qt::Orientation::Horizontal - + - 100 + 0 0 - - % - - - 0 - - - 100.000000000000000 - - - 100.000000000000000 - - + - - - - - - - - - - Borders - - - - 3 - - - 6 - - - 6 - - - 6 - - - 6 - - - - - 3 - - - - - 3 + + + + + + + 0 + 0 + + + + false + + + + 0 + + + 0 + + + 0 + + + 0 - - - true - + - + 0 0 + + Cell style of currently selected cell + - - - true + + + Remove Direct Cell Formatting - - - 0 - 0 - + + + 16 + 16 + - + - Qt::Orientation::Vertical - - - QSizePolicy::Policy::Minimum + Qt::Orientation::Horizontal - 20 - 40 + 0 + 0 - - - - - true - - - - 0 - 0 - - - - - 0 - 50 - - - - - - - - - 0 - 0 - - - - - 80 - 80 - - - - QFrame::Shape::StyledPanel - - - QFrame::Shadow::Sunken - - - - - - - - - 3 - - - - - QFormLayout::FieldGrowthPolicy::ExpandingFieldsGrow - - - 3 - - - 3 - - - - - false - - - Width: - - - borderLineWidth - - - - - - - false - - - Color: + + + + + + + + + + Fill + + + + + 4 + + + 8 + + + 8 + + + 8 + + + 8 + + + + + 4 + + + + + + 0 + 0 + + + + Color + + + + 0 - - borderLineColor + + 0 - - - - - - false + + 0 - - - 0 - 0 - + + 0 - - - 100 - 0 - + + + + false + + + + 0 + 0 + + + + + 100 + 0 + + + + + + + + + + + + 0 + 0 + + + + Shade + + + + 0 - - - - - - false + + 0 - - - 0 - 0 - + + 0 - - - 100 - 0 - + + 0 - - - - - - - - 3 - - - 3 - - - - - false + + + + false + + + + 0 + 0 + + + + + 100 + 0 + + + + % + + + 0 + + + 100.000000000000000 + + + 100.000000000000000 + + + + + + + + + + Qt::Orientation::Horizontal + + + + 0 + 0 + + + + + + + + + + + + + + Borders + + + + + 4 + + + 8 + + + 8 + + + 8 + + + 8 + + + + + 3 + + + + + 3 + + + + + true + + + + 0 + 0 + + + + + + + + true + + + + 0 + 0 + + + + + + + + Qt::Orientation::Vertical + + + QSizePolicy::Policy::Minimum + + + + 20 + 40 + + + + + + + + + + true + + + + 0 + 0 + + + + + 0 + 50 + + + + + + + + + 0 + 0 + + + + + 80 + 80 + + + + QFrame::Shape::StyledPanel + + + QFrame::Shadow::Sunken + + + + + + + + + 4 + + + + + + 0 + 0 + + + + Width + + + + 0 - - Type: + + 0 - - borderLineStyle + + 0 - - - - - - false + + 0 - - - 0 - 0 - + + + + false + + + + 0 + 0 + + + + + 100 + 0 + + + + + + + + + + + + 0 + 0 + + + + Type + + + + 0 - - - 100 - 0 - + + 0 - - - - - - false + + 0 - - Shade: + + 0 - - borderLineShade + + + + false + + + + 0 + 0 + + + + + 100 + 0 + + + + + + + + + + + Qt::Orientation::Horizontal + + + + 0 + 0 + + + + + + + + + + 4 + + + + + + 0 + 0 + + + + Color + + + + 0 - - - - - - false + + 0 - - - 0 - 0 - + + 0 - - - 100 - 0 - + + 0 - - % + + + + false + + + + 0 + 0 + + + + + 100 + 0 + + + + + + + + + + + + 0 + 0 + + + + Shade + + + + 0 - + 0 - - 100.000000000000000 + + 0 - - 100.000000000000000 + + 0 - - - - - - - + + + + false + + + + 0 + 0 + + + + + 100 + 0 + + + + % + + + 0 + + + 100.000000000000000 + + + 100.000000000000000 + + + + + + + + + + Qt::Orientation::Horizontal + + + + 0 + 0 + + + + + + + + - - + + Cell Padding - - - - - 4 - - - - - - - - Qt::Orientation::Horizontal - - - - 0 - 0 - - - - - - - + + + + 4 + + + 8 + + + 8 + + + 8 + + + 8 + + + + + 4 + + + + + + + + Qt::Orientation::Horizontal + + + + 0 + 0 + + + + + + + + @@ -561,11 +758,30 @@ + + FormWidget + QWidget +
ui/widgets/form_widget.h
+ 1 + + + SectionContainer + QWidget +
ui/widgets/section_container.h
+ setWidget + 1 + ScrSpinBox QDoubleSpinBox
ui/scrspinbox.h
 + + NewMarginWidget + QWidget +
ui/newmarginwidget.h
+ 1 + LineCombo QComboBox @@ -592,12 +808,6 @@ QComboBox
ui/stylecombos.h
 - - NewMarginWidget - QWidget -
ui/newmarginwidget.h
- 1 -