Differential D5441 Diff 21534 src/wrtembed/KReportDesigner.cpp

Changeset View

Standalone View

View Options

src/wrtembed/KReportDesigner.cpp

Show First 20 Lines • Show All 106 Lines • ▼ Show 20 Line(s)76public:
107 QList<KReportDesignerItemBase*> copy_list; 107​ QList<KReportDesignerItemBase*> copy_list;
108 QList<KReportDesignerItemBase*> cut_list; 108​ QList<KReportDesignerItemBase*> cut_list;
109}; 109​};
110 110​
111//! @internal 111​//! @internal
112class Q_DECL_HIDDEN KReportDesigner::Private 112​class Q_DECL_HIDDEN KReportDesigner::Private
113{ 113​{
114public: 114​public:
115 Private(){} 115​ Private() : currentUnit(DEFAULT_UNIT_TYPE) {}
116 116​
117 ~Private() 117​ ~Private()
118 { 118​ {
119 delete dataSource; 119​ delete dataSource;
120 } 120​ }
121 121​
122​ void updateCurrentUnit() {
123​ QString u = unit->value().toString();
124​ KReportUnit newUnit = KReportUnit(KReportUnit::symbolToType(u));
125​ if (newUnit.isValid()) {
126​ currentUnit = newUnit;
127​ } else {
128​ currentUnit = DEFAULT_UNIT;
129​ }
130​
131​ if (u == QLatin1String("dm")) {
132​ gridDivisions->setOption("max", 100);
133​ } else {
134​ gridDivisions->setOption("max", 10);
135​ if (gridDivisions->value().toInt() > 10) {
136​ gridDivisions->setValue(10, KProperty::DefaultValueOptions & KProperty::ValueOptions(KProperty::ValueOption::RememberOld));
staniekUnsubmitted
Done

setValue(10, KProperty::DefaultValueOptions & KProperty::ValueOptions(KProperty::ValueOption::RememberOld)

staniek: `setValue(10, KProperty::DefaultValueOptions & KProperty::ValueOptions(KProperty::ValueOption…
staniekUnsubmitted
Not Done

I've rebased master changes into this code: if you have unpublished fixes please do the same. Since kproperty 3.0.91 we're no longer using this complex math but instead: setValue(..., KProperty::ValueOption::IgnoreOld).

staniek: I've rebased master changes into this code: if you have unpublished fixes please do the same.
137​ }
138​ }
139​ }
140​
122 QGridLayout *grid; 141​ QGridLayout *grid;
123 KReportRuler *hruler; 142​ KReportRuler *hruler;
124 KReportZoomHandler zoomHandler; 143​ KReportZoomHandler zoomHandler;
125 QVBoxLayout *vboxlayout; 144​ QVBoxLayout *vboxlayout;
126 KReportPropertiesButton *pageButton; 145​ KReportPropertiesButton *pageButton;
127 146​
128 QGraphicsScene *activeScene = nullptr; 147​ QGraphicsScene *activeScene = nullptr;
129 148​
Show All 29 Lines
159 KProperty *showGrid; 178​ KProperty *showGrid;
160 KProperty *gridDivisions; 179​ KProperty *gridDivisions;
161 KProperty *gridSnap; 180​ KProperty *gridSnap;
162 KProperty *labelType; 181​ KProperty *labelType;
163#ifdef KREPORT_SCRIPTING 182​#ifdef KREPORT_SCRIPTING
164 KProperty *script; 183​ KProperty *script;
165#endif 184​#endif
166 185​
186​ KReportUnit currentUnit;
187​
167 //Actions 188​ //Actions
168 QAction *editCutAction; 189​ QAction *editCutAction;
169 QAction *editCopyAction; 190​ QAction *editCopyAction;
170 QAction *editPasteAction; 191​ QAction *editPasteAction;
171 QAction *editDeleteAction; 192​ QAction *editDeleteAction;
172 QAction *sectionEdit; 193​ QAction *sectionEdit;
173 QAction *parameterEdit; 194​ QAction *parameterEdit;
174 QAction *itemRaiseAction; 195​ QAction *itemRaiseAction;
Show All 35 Lines216{
210 d->vboxlayout->setMargin(0); 231​ d->vboxlayout->setMargin(0);
211 d->vboxlayout->setSizeConstraint(QLayout::SetFixedSize); 232​ d->vboxlayout->setSizeConstraint(QLayout::SetFixedSize);
212 233​
213 //Create nice rulers 234​ //Create nice rulers
214 d->hruler = new KReportRuler(this, Qt::Horizontal, d->zoomHandler); 235​ d->hruler = new KReportRuler(this, Qt::Horizontal, d->zoomHandler);
215 236​
216 d->pageButton = new KReportPropertiesButton(this); 237​ d->pageButton = new KReportPropertiesButton(this);
217 238​
239​ d->hruler->setUnit(DEFAULT_UNIT);
240​
218 d->grid->addWidget(d->pageButton, 0, 0); 241​ d->grid->addWidget(d->pageButton, 0, 0);
219 d->grid->addWidget(d->hruler, 0, 1); 242​ d->grid->addWidget(d->hruler, 0, 1);
220 d->grid->addLayout(d->vboxlayout, 1, 0, 1, 2); 243​ d->grid->addLayout(d->vboxlayout, 1, 0, 1, 2);
221 244​
222 d->pageButton->setMaximumSize(QSize(19, 22)); 245​ d->pageButton->setMaximumSize(QSize(19, 22));
223 d->pageButton->setMinimumSize(QSize(19, 22)); 246​ d->pageButton->setMinimumSize(QSize(19, 22));
224 247​
225 d->detail = new KReportDesignerSectionDetail(this); 248​ d->detail = new KReportDesignerSectionDetail(this);
▲ Show 20 Lines • Show All 53 Lines • ▼ Show 20 Line(s)298 QString msg = tr("This report contains scripts of type \"%1\". "
279 ).arg(d->originalInterpreter); 302​ ).arg(d->originalInterpreter);
280 QMessageBox::warning(this, tr("Unsupported Script Type"), msg); 303​ QMessageBox::warning(this, tr("Unsupported Script Type"), msg);
281 } 304​ }
282#endif 305​#endif
283 } else if (n == QLatin1String("report:grid")) { 306​ } else if (n == QLatin1String("report:grid")) {
284 d->showGrid->setValue(it.toElement().attribute(QLatin1String("report:grid-visible"), QString::number(1)).toInt() != 0); 307​ d->showGrid->setValue(it.toElement().attribute(QLatin1String("report:grid-visible"), QString::number(1)).toInt() != 0);
285 d->gridSnap->setValue(it.toElement().attribute(QLatin1String("report:grid-snap"), QString::number(1)).toInt() != 0); 308​ d->gridSnap->setValue(it.toElement().attribute(QLatin1String("report:grid-snap"), QString::number(1)).toInt() != 0);
286 d->gridDivisions->setValue(it.toElement().attribute(QLatin1String("report:grid-divisions"), QString::number(4)).toInt()); 309​ d->gridDivisions->setValue(it.toElement().attribute(QLatin1String("report:grid-divisions"), QString::number(4)).toInt());
287 d->unit->setValue(it.toElement().attribute(QLatin1String("report:page-unit"), QLatin1String("cm"))); 310​ d->unit->setValue(it.toElement().attribute(
311​ QLatin1String("report:page-unit"), DEFAULT_UNIT_STRING));
312​ d->updateCurrentUnit();
288 } 313​ }
289 314​
290 //! @todo Load page options 315​ //! @todo Load page options
291 else if (n == QLatin1String("report:page-style")) { 316​ else if (n == QLatin1String("report:page-style")) {
292 QString pagetype = it.firstChild().nodeValue(); 317​ QString pagetype = it.firstChild().nodeValue();
293 318​
294 if (pagetype == QLatin1String("predefined")) { 319​ if (pagetype == QLatin1String("predefined")) {
295 d->pageSize->setValue(it.toElement().attribute(QLatin1String("report:page-size"), QLatin1String("A4"))); 320​ d->pageSize->setValue(it.toElement().attribute(QLatin1String("report:page-size"), QLatin1String("A4")));
296 } else if (pagetype == QLatin1String("custom")) { 321​ } else if (pagetype == QLatin1String("custom")) {
297 d->pageSize->setValue(QLatin1String("Custom")); 322​ d->pageSize->setValue(QLatin1String("Custom"));
298 d->customPageSize->setValue(QSizeF(KReportUnit::parseValue(it.toElement().attribute(QLatin1String("report:custom-page-width"), QLatin1String(""))), 323​ d->customPageSize->setValue(QSizeF(KReportUnit::parseValue(it.toElement().attribute(QLatin1String("report:custom-page-width"), QLatin1String(""))),
299 KReportUnit::parseValue(it.toElement().attribute(QLatin1String("report:custom-page-height"), QLatin1String(""))))); 324​ KReportUnit::parseValue(it.toElement().attribute(QLatin1String("report:custom-page-height"), QLatin1String("")))));
300 } else if (pagetype == QLatin1String("label")) { 325​ } else if (pagetype == QLatin1String("label")) {
301 //! @todo 326​ //! @todo
302 } 327​ }
303 328​
304 d->rightMargin->setValue(KReportUnit::parseValue(it.toElement().attribute(QLatin1String("fo:margin-right"), QLatin1String("1.0cm")))); 329​ d->rightMargin->setValue(pageUnit().convertFromPoint(
305 d->leftMargin->setValue(KReportUnit::parseValue(it.toElement().attribute(QLatin1String("fo:margin-left"), QLatin1String("1.0cm")))); 330​ KReportUnit::parseValue(it.toElement().attribute(
306 d->topMargin->setValue(KReportUnit::parseValue(it.toElement().attribute(QLatin1String("fo:margin-top"), QLatin1String("1.0cm")))); 331​ QLatin1String("fo:margin-right"), DEFAULT_PAGE_MARGIN_STRING))));
307 d->bottomMargin->setValue(KReportUnit::parseValue(it.toElement().attribute(QLatin1String("fo:margin-bottom"), QLatin1String("1.0cm")))); 332​ d->leftMargin->setValue(pageUnit().convertFromPoint(
308 333​ KReportUnit::parseValue(it.toElement().attribute(
309 d->orientation->setValue(it.toElement().attribute(QLatin1String("report:print-orientation"), QLatin1String("portrait"))); 334​ QLatin1String("fo:margin-left"), DEFAULT_PAGE_MARGIN_STRING))));
310 335​ d->topMargin->setValue(pageUnit().convertFromPoint(
336​ KReportUnit::parseValue(it.toElement().attribute(
337​ QLatin1String("fo:margin-top"), DEFAULT_PAGE_MARGIN_STRING))));
338​ d->bottomMargin->setValue(pageUnit().convertFromPoint(
339​ KReportUnit::parseValue(it.toElement().attribute(
340​ QLatin1String("fo:margin-bottom"), DEFAULT_PAGE_MARGIN_STRING))));
341​ d->orientation->setValue(
342​ it.toElement().attribute(QLatin1String("report:print-orientation"),
343​ QLatin1String("portrait")));
311 } else if (n == QLatin1String("report:body")) { 344​ } else if (n == QLatin1String("report:body")) {
312 QDomNodeList sectionlist = it.childNodes(); 345​ QDomNodeList sectionlist = it.childNodes();
313 QDomNode sec; 346​ QDomNode sec;
314 347​
315 for (int s = 0; s < sectionlist.count(); ++s) { 348​ for (int s = 0; s < sectionlist.count(); ++s) {
316 sec = sectionlist.item(s); 349​ sec = sectionlist.item(s);
317 if (sec.isElement()) { 350​ if (sec.isElement()) {
318 QString sn = sec.nodeName().toLower(); 351​ QString sn = sec.nodeName().toLower();
319 //kreportDebug() << sn; 352​ //kreportDebug() << sn;
320 if (sn == QLatin1String("report:section")) { 353​ if (sn == QLatin1String("report:section")) {
321 QString sectiontype = sec.toElement().attribute(QLatin1String("report:section-type")); 354​ const QString sectiontype = KReportUtils::readSectionTypeNameAttribute(sec.toElement());
322 if (section(KReportSectionData::sectionTypeFromString(sectiontype)) == nullptr) { 355​ if (section(KReportSectionData::sectionTypeFromString(sectiontype)) == nullptr) {
323 insertSection(KReportSectionData::sectionTypeFromString(sectiontype)); 356​ insertSection(KReportSectionData::sectionTypeFromString(sectiontype));
324 section(KReportSectionData::sectionTypeFromString(sectiontype))->initFromXML(sec); 357​ section(KReportSectionData::sectionTypeFromString(sectiontype))->initFromXML(sec);
325 } 358​ }
326 } else if (sn == QLatin1String("report:detail")) { 359​ } else if (sn == QLatin1String("report:detail")) {
327 KReportDesignerSectionDetail * rsd = new KReportDesignerSectionDetail(this); 360​ KReportDesignerSectionDetail * rsd = new KReportDesignerSectionDetail(this);
328 rsd->initFromXML(&sec); 361​ rsd->initFromXML(&sec);
329 setDetail(rsd); 362​ setDetail(rsd);
▲ Show 20 Lines • Show All 55 Lines • ▼ Show 20 Line(s)411#endif
385 content.appendChild(grd); 418​ content.appendChild(grd);
386 419​
387 // pageOptions 420​ // pageOptions
388 // -- size 421​ // -- size
389 QDomElement pagestyle = doc.createElement(QLatin1String("report:page-style")); 422​ QDomElement pagestyle = doc.createElement(QLatin1String("report:page-style"));
390 423​
391 if (d->pageSize->value().toString() == QLatin1String("Custom")) { 424​ if (d->pageSize->value().toString() == QLatin1String("Custom")) {
392 pagestyle.appendChild(doc.createTextNode(QLatin1String("custom"))); 425​ pagestyle.appendChild(doc.createTextNode(QLatin1String("custom")));
393 KReportUtils::setAttribute(&pagestyle, QLatin1String("report:custom-page-width"), d->customPageSize->value().toSizeF().width()); ​
394 KReportUtils::setAttribute(&pagestyle, QLatin1String("report:custom-page-height"), d->customPageSize->value().toSizeF().height()); ​
395 426​
427​ KReportUtils::setAttribute(
428​ &pagestyle, QLatin1String("report:custom-page-width"),
429​ d->currentUnit.convertToPoint(d->customPageSize->value().toSizeF().width()));
430​ KReportUtils::setAttribute(
431​ &pagestyle, QLatin1String("report:custom-page-height"),
432​ d->currentUnit.convertToPoint(d->customPageSize->value().toSizeF().height()));
396 } else if (d->pageSize->value().toString() == QLatin1String("Label")) { 433​ } else if (d->pageSize->value().toString() == QLatin1String("Label")) {
397 pagestyle.appendChild(doc.createTextNode(QLatin1String("label"))); 434​ pagestyle.appendChild(doc.createTextNode(QLatin1String("label")));
398 pagestyle.setAttribute(QLatin1String("report:page-label-type"), d->labelType->value().toString()); 435​ pagestyle.setAttribute(QLatin1String("report:page-label-type"), d->labelType->value().toString());
399 } else { 436​ } else {
400 pagestyle.appendChild(doc.createTextNode(QLatin1String("predefined"))); 437​ pagestyle.appendChild(doc.createTextNode(QLatin1String("predefined")));
401 KReportUtils::addPropertyAsAttribute(&pagestyle, d->pageSize); 438​ KReportUtils::addPropertyAsAttribute(&pagestyle, d->pageSize);
402 //pagestyle.setAttribute("report:page-size", d->pageSize->value().toString()); 439​ //pagestyle.setAttribute("report:page-size", d->pageSize->value().toString());
403 } 440​ }
404 441​
405 // -- orientation 442​ // -- orientation
406 KReportUtils::addPropertyAsAttribute(&pagestyle, d->orientation); 443​ KReportUtils::addPropertyAsAttribute(&pagestyle, d->orientation);
407 444​
408 // -- margins: save as points, and not localized 445​ // -- margins: save as points, and not localized
409 KReportUtils::setAttribute(&pagestyle, QLatin1String("fo:margin-top"), d->topMargin->value().toDouble()); 446​ KReportUtils::setAttribute(
410 KReportUtils::setAttribute(&pagestyle, QLatin1String("fo:margin-bottom"), d->bottomMargin->value().toDouble()); 447​ &pagestyle, QLatin1String("fo:margin-top"),
411 KReportUtils::setAttribute(&pagestyle, QLatin1String("fo:margin-right"), d->rightMargin->value().toDouble()); 448​ d->currentUnit.convertToPoint(d->topMargin->value().toDouble()));
412 KReportUtils::setAttribute(&pagestyle, QLatin1String("fo:margin-left"), d->leftMargin->value().toDouble()); 449​ KReportUtils::setAttribute(
450​ &pagestyle, QLatin1String("fo:margin-bottom"),
451​ d->currentUnit.convertToPoint(d->bottomMargin->value().toDouble()));
452​ KReportUtils::setAttribute(
453​ &pagestyle, QLatin1String("fo:margin-right"),
454​ d->currentUnit.convertToPoint(d->rightMargin->value().toDouble()));
455​ KReportUtils::setAttribute(
456​ &pagestyle, QLatin1String("fo:margin-left"),
457​ d->currentUnit.convertToPoint(d->leftMargin->value().toDouble()));
413 458​
414 content.appendChild(pagestyle); 459​ content.appendChild(pagestyle);
415 460​
416 QDomElement body = doc.createElement(QLatin1String("report:body")); 461​ QDomElement body = doc.createElement(QLatin1String("report:body"));
417 QDomElement domsection; 462​ QDomElement domsection;
418 463​
419 for (int i = static_cast<int>(KReportSectionData::Type::PageHeaderFirst); 464​ for (int i = static_cast<int>(KReportSectionData::Type::PageHeaderFirst);
420 i <= static_cast<int>(KReportSectionData::Type::PageFooterAny); ++i) 465​ i <= static_cast<int>(KReportSectionData::Type::PageFooterAny); ++i)
▲ Show 20 Lines • Show All 304 Lines • ▼ Show 20 Line(s)764{
725 770​
726 d->title = new KProperty("title", QLatin1String("Report"), tr("Title"), tr("Report Title")); 771​ d->title = new KProperty("title", QLatin1String("Report"), tr("Title"), tr("Report Title"));
727 772​
728 KPropertyListData *listData = new KPropertyListData(KReportPageSize::pageFormatKeys(), 773​ KPropertyListData *listData = new KPropertyListData(KReportPageSize::pageFormatKeys(),
729 KReportPageSize::pageFormatNames()); 774​ KReportPageSize::pageFormatNames());
730 QVariant defaultKey = KReportPageSize::pageSizeKey(KReportPageSize::defaultSize()); 775​ QVariant defaultKey = KReportPageSize::pageSizeKey(KReportPageSize::defaultSize());
731 d->pageSize = new KProperty("page-size", listData, defaultKey, tr("Page Size")); 776​ d->pageSize = new KProperty("page-size", listData, defaultKey, tr("Page Size"));
732 777​
733 d->customPageSize = new KProperty("custom-page-size", QSizeF(KReportUnit(KReportUnit::Type::Centimeter).fromUserValue(10), KReportUnit(KReportUnit::Type::Centimeter).fromUserValue(10)), 778​ d->customPageSize = new KProperty("custom-page-size", DEFAULT_CUSTOM_PAGE_SIZE,
734 tr("Custom Page Size"), tr("Custom Page Size"), KProperty::SizeF); 779​ tr("Custom Page Size"), tr("Custom Page Size"), KProperty::SizeF);
780​ d->customPageSize->setOption("suffix", d->currentUnit.symbol());
781​
735 782​
736 listData = new KPropertyListData({ QLatin1String("portrait"), QLatin1String("landscape") }, 783​ listData = new KPropertyListData({ QLatin1String("portrait"), QLatin1String("landscape") },
737 QVariantList{ tr("Portrait"), tr("Landscape") }); 784​ QVariantList{ tr("Portrait"), tr("Landscape") });
738 d->orientation = new KProperty("print-orientation", listData, QLatin1String("portrait"), 785​ d->orientation = new KProperty("print-orientation", listData, QLatin1String("portrait"),
739 tr("Page Orientation")); 786​ tr("Page Orientation"));
740 787​
741 QList<KReportUnit::Type> types(KReportUnit::allTypes()); 788​ QList<KReportUnit::Type> types(KReportUnit::allTypes());
742 types.removeOne(KReportUnit::Type::Pixel); 789​ types.removeOne(KReportUnit::Type::Pixel);
743 listData = new KPropertyListData(KReportUnit::symbols(types), KReportUnit::descriptions(types)); 790​ listData = new KPropertyListData(KReportUnit::symbols(types), KReportUnit::descriptions(types));
744 d->unit = new KProperty("page-unit", listData, QLatin1String("cm"), tr("Page Unit")); 791​ d->unit = new KProperty("page-unit", listData, DEFAULT_UNIT_STRING, tr("Page Unit"));
745 ​
746 d->showGrid = new KProperty("grid-visible", true, tr("Show Grid")); 792​ d->showGrid = new KProperty("grid-visible", true, tr("Show Grid"));
747 d->gridSnap = new KProperty("grid-snap", true, tr("Snap to Grid")); 793​ d->gridSnap = new KProperty("grid-snap", true, tr("Snap to Grid"));
748 d->gridDivisions = new KProperty("grid-divisions", 4, tr("Grid Divisions")); 794​ d->gridDivisions = new KProperty("grid-divisions", 4, tr("Grid Divisions"));
795​ d->gridDivisions->setOption("min", 1);
796​ d->gridDivisions->setOption("max", 10);
797​
749 798​
750 d->leftMargin = new KProperty("margin-left", KReportUnit(KReportUnit::Type::Centimeter).fromUserValue(1.0), 799​ d->leftMargin = new KProperty("margin-left", pageUnit().convertFromPoint(KReportUnit::parseValue(DEFAULT_PAGE_MARGIN_STRING)),
751 tr("Left Margin"), tr("Left Margin"), KProperty::Double); 800​ tr("Left Margin"), tr("Left Margin"), KProperty::Double);
752 d->rightMargin = new KProperty("margin-right", KReportUnit(KReportUnit::Type::Centimeter).fromUserValue(1.0), 801​ d->rightMargin = new KProperty("margin-right", pageUnit().convertFromPoint(KReportUnit::parseValue(DEFAULT_PAGE_MARGIN_STRING)),
753 tr("Right Margin"), tr("Right Margin"), KProperty::Double); 802​ tr("Right Margin"), tr("Right Margin"), KProperty::Double);
754 d->topMargin = new KProperty("margin-top", KReportUnit(KReportUnit::Type::Centimeter).fromUserValue(1.0), 803​ d->topMargin = new KProperty("margin-top", pageUnit().convertFromPoint(KReportUnit::parseValue(DEFAULT_PAGE_MARGIN_STRING)),
755 tr("Top Margin"), tr("Top Margin"), KProperty::Double); 804​ tr("Top Margin"), tr("Top Margin"), KProperty::Double);
756 d->bottomMargin = new KProperty("margin-bottom", KReportUnit(KReportUnit::Type::Centimeter).fromUserValue(1.0), 805​ d->bottomMargin = new KProperty("margin-bottom", pageUnit().convertFromPoint(KReportUnit::parseValue(DEFAULT_PAGE_MARGIN_STRING)),
757 tr("Bottom Margin"), tr("Bottom Margin"), KProperty::Double); 806​ tr("Bottom Margin"), tr("Bottom Margin"), KProperty::Double);
758 d->leftMargin->setOption("unit", QLatin1String("cm")); 807​ d->leftMargin->setOption("suffix", d->currentUnit.symbol());
759 d->rightMargin->setOption("unit", QLatin1String("cm")); 808​ d->rightMargin->setOption("suffix", d->currentUnit.symbol());
760 d->topMargin->setOption("unit", QLatin1String("cm")); 809​ d->topMargin->setOption("suffix", d->currentUnit.symbol());
761 d->bottomMargin->setOption("unit", QLatin1String("cm")); 810​ d->bottomMargin->setOption("suffix", d->currentUnit.symbol());
762 811​
763 d->set.addProperty(d->title); 812​ d->set.addProperty(d->title);
764 d->set.addProperty(d->pageSize); 813​ d->set.addProperty(d->pageSize);
765 d->set.addProperty(d->customPageSize); 814​ d->set.addProperty(d->customPageSize);
766 d->set.addProperty(d->orientation); 815​ d->set.addProperty(d->orientation);
767 d->set.addProperty(d->unit); 816​ d->set.addProperty(d->unit);
768 d->set.addProperty(d->gridSnap); 817​ d->set.addProperty(d->gridSnap);
769 d->set.addProperty(d->showGrid); 818​ d->set.addProperty(d->showGrid);
770 d->set.addProperty(d->gridDivisions); 819​ d->set.addProperty(d->gridDivisions);
771 d->set.addProperty(d->leftMargin); 820​ d->set.addProperty(d->leftMargin);
772 d->set.addProperty(d->rightMargin); 821​ d->set.addProperty(d->rightMargin);
773 d->set.addProperty(d->topMargin); 822​ d->set.addProperty(d->topMargin);
774 d->set.addProperty(d->bottomMargin); 823​ d->set.addProperty(d->bottomMargin);
775 824​
825​ recalculateMaxMargins();
826​
776#ifdef KREPORT_SCRIPTING 827​#ifdef KREPORT_SCRIPTING
777 d->script = new KProperty("script", new KPropertyListData, QVariant(), tr("Object Script")); 828​ d->script = new KProperty("script", new KPropertyListData, QVariant(), tr("Object Script"));
778 d->set.addProperty(d->script); 829​ d->set.addProperty(d->script);
779#endif 830​#endif
780 831​
781} 832​}
782 833​
783/** 834​/**
784@brief Handle property changes 835​@brief Handle property changes
785*/ 836​*/
786void KReportDesigner::slotPropertyChanged(KPropertySet &s, KProperty &p) 837​void KReportDesigner::slotPropertyChanged(KPropertySet &s, KProperty &p)
787{ 838​{
839​ const QSignalBlocker blocker(s);
788 setModified(true); 840​ setModified(true);
789 emit pagePropertyChanged(s); 841​ QByteArray propertyName = p.name();
790 842​
791 if (p.name() == "page-unit") { 843​ if (propertyName == "page-unit") {
844​ const KReportUnit oldUnit = d->currentUnit;
845​ d->updateCurrentUnit();
792 d->hruler->setUnit(pageUnit()); 846​ d->hruler->setUnit(pageUnit());
793 QString newstr = d->set.property("page-unit").value().toString(); ​
794 847​
795 d->set.property("margin-left").setOption("unit", newstr); 848​ // convert values
796 d->set.property("margin-right").setOption("unit", newstr); 849​ d->leftMargin->setValue(
797 d->set.property("margin-top").setOption("unit", newstr); 850​ KReportUnit::convertFromUnitToUnit(d->leftMargin->value().toDouble(), oldUnit, d->currentUnit),
798 d->set.property("margin-bottom").setOption("unit", newstr); 851​ KProperty::DefaultValueOptions & ~KProperty::ValueOptions(KProperty::ValueOption::RememberOld));
799 d->set.property("custom-page-size").setOption("unit", newstr); 852​
853​ d->rightMargin->setValue(
854​ KReportUnit::convertFromUnitToUnit(d->rightMargin->value().toDouble(), oldUnit, d->currentUnit),
855​ KProperty::DefaultValueOptions & ~KProperty::ValueOptions(KProperty::ValueOption::RememberOld));
856​
857​ d->topMargin->setValue(
858​ KReportUnit::convertFromUnitToUnit(d->topMargin->value().toDouble(), oldUnit, d->currentUnit),
859​ KProperty::DefaultValueOptions & ~KProperty::ValueOptions(KProperty::ValueOption::RememberOld));
860​
861​ d->bottomMargin->setValue(
862​ KReportUnit::convertFromUnitToUnit(d->bottomMargin->value().toDouble(), oldUnit, d->currentUnit),
863​ KProperty::DefaultValueOptions & ~KProperty::ValueOptions(KProperty::ValueOption::RememberOld));
864​
865​ d->customPageSize->setValue(
866​ KReportUnit::convertFromUnitToUnit(d->customPageSize->value().toSizeF(), oldUnit, d->currentUnit),
867​ KProperty::DefaultValueOptions & ~KProperty::ValueOptions(KProperty::ValueOption::RememberOld));
868​
869​ d->leftMargin->setOption("suffix", d->currentUnit.symbol());
870​ d->rightMargin->setOption("suffix", d->currentUnit.symbol());
871​ d->topMargin->setOption("suffix", d->currentUnit.symbol());
872​ d->bottomMargin->setOption("suffix", d->currentUnit.symbol());
873​ d->customPageSize->setOption("suffix", d->currentUnit.symbol());
874​ } else if (propertyName.startsWith("margin-") || propertyName == "page-size" || propertyName == "custom-page-size") {
staniekUnsubmitted
Not Done

propertyName.startsWith("margin-") is not future-proof. What if we ever have properties like margin-background for example? ;)

staniek: `propertyName.startsWith("margin-")` is not future-proof. What if we ever have properties like…
875​ recalculateMaxMargins();
800 } 876​ }
877​ emit pagePropertyChanged(s);
878​
801} 879​}
802 880​
803void KReportDesigner::slotPageButton_Pressed() 881​void KReportDesigner::slotPageButton_Pressed()
804{ 882​{
805#ifdef KREPORT_SCRIPTING 883​#ifdef KREPORT_SCRIPTING
806 if (d->scriptSource) { 884​ if (d->scriptSource) {
807 QStringList sl = d->scriptSource->scriptList(); 885​ QStringList sl = d->scriptSource->scriptList();
808 sl.prepend(QString()); 886​ sl.prepend(QString());
▲ Show 20 Lines • Show All 47 Lines • ▼ Show 20 Line(s)
856int KReportDesigner::pageWidthPx() const 934​int KReportDesigner::pageWidthPx() const
857{ 935​{
858 QSize pageSizePx; 936​ QSize pageSizePx;
859 int pageWidth; 937​ int pageWidth;
860 938​
861 if (d->set.property("page-size").value().toString() == QLatin1String("Custom")) { 939​ if (d->set.property("page-size").value().toString() == QLatin1String("Custom")) {
862 KReportUnit unit = pageUnit(); 940​ KReportUnit unit = pageUnit();
863 941​
864 QSizeF customSize = d->set.property("custom-page-size").value().toSizeF(); 942​ QSizeF customSize = d->currentUnit.convertToPoint(d->set.property("custom-page-size").value().toSizeF());
865 QPageLayout layout(QPageSize(customSize, QPageSize::Point, QString(), QPageSize::ExactMatch), d->set.property("print-orientation").value().toString() 943​ QPageLayout layout(QPageSize(customSize, QPageSize::Point, QString(), QPageSize::ExactMatch), d->set.property("print-orientation").value().toString()
866 == QLatin1String("portrait") ? QPageLayout::Portrait : QPageLayout::Landscape, QMarginsF(0,0,0,0)); 944​ == QLatin1String("portrait") ? QPageLayout::Portrait : QPageLayout::Landscape, QMarginsF(0,0,0,0));
867 945​
868 pageSizePx = layout.fullRectPixels(KReportPrivate::dpiX()).size(); 946​ pageSizePx = layout.fullRectPixels(KReportPrivate::dpiX()).size();
869 } else { 947​ } else {
870 QPageLayout layout = QPageLayout( 948​ QPageLayout layout = QPageLayout(
871 QPageSize(KReportPageSize::pageSize(d->set.property("page-size").value().toString())), 949​ QPageSize(KReportPageSize::pageSize(d->set.property("page-size").value().toString())),
872 d->set.property("print-orientation").value().toString() 950​ d->set.property("print-orientation").value().toString()
873 == QLatin1String("portrait") ? QPageLayout::Portrait : QPageLayout::Landscape, QMarginsF(0,0,0,0)); 951​ == QLatin1String("portrait") ? QPageLayout::Portrait : QPageLayout::Landscape, QMarginsF(0,0,0,0));
874 pageSizePx = layout.fullRectPixels(KReportPrivate::dpiX()).size(); 952​ pageSizePx = layout.fullRectPixels(KReportPrivate::dpiX()).size();
875 } 953​ }
876 954​
877 pageWidth = pageSizePx.width(); 955​ pageWidth = pageSizePx.width();
878 956​
879 pageWidth = pageWidth - POINT_TO_INCH(d->set.property("margin-left").value().toDouble()) * KReportPrivate::dpiX(); 957​ pageWidth = pageWidth - KReportUnit::convertFromUnitToUnit(d->set.property("margin-left").value().toDouble(), pageUnit(), KReportUnit(KReportUnit::Type::Inch)) * KReportPrivate::dpiX();
880 pageWidth = pageWidth - POINT_TO_INCH(d->set.property("margin-right").value().toDouble()) * KReportPrivate::dpiX(); 958​ pageWidth = pageWidth - KReportUnit::convertFromUnitToUnit(d->set.property("margin-right").value().toDouble(), pageUnit(), KReportUnit(KReportUnit::Type::Inch)) * KReportPrivate::dpiX();
881 959​
882 return pageWidth; 960​ return pageWidth;
883} 961​}
884 962​
963​QSize KReportDesigner::pageSizePt() const
964​{
965​ QSize pageSizePt;
966​
967​ if (d->set.property("page-size").value().toString() == QLatin1String("Custom")) {
968​ KReportUnit unit = pageUnit();
969​
970​ QSizeF customSize = d->currentUnit.convertToPoint(d->set.property("custom-page-size").value().toSizeF());
971​ QPageLayout layout(QPageSize(customSize, QPageSize::Point, QString(), QPageSize::ExactMatch), d->set.property("print-orientation").value().toString()
972​ == QLatin1String("portrait") ? QPageLayout::Portrait : QPageLayout::Landscape, QMarginsF(0,0,0,0));
973​
974​ pageSizePt = layout.fullRectPoints().size();
975​ } else {
976​ QPageLayout layout = QPageLayout(
977​ QPageSize(KReportPageSize::pageSize(d->set.property("page-size").value().toString())),
978​ d->set.property("print-orientation").value().toString()
979​ == QLatin1String("portrait") ? QPageLayout::Portrait : QPageLayout::Landscape, QMarginsF(0,0,0,0));
980​ pageSizePt = layout.fullRectPoints().size();
981​ }
982​
983​ return pageSizePt;
984​}
985​
885void KReportDesigner::resizeEvent(QResizeEvent * event) 986​void KReportDesigner::resizeEvent(QResizeEvent * event)
886{ 987​{
887 Q_UNUSED(event); 988​ Q_UNUSED(event);
888 d->hruler->setRulerLength(pageWidthPx()); 989​ d->hruler->setRulerLength(pageWidthPx());
889} 990​}
890 991​
891void KReportDesigner::setDetail(KReportDesignerSectionDetail *rsd) 992​void KReportDesigner::setDetail(KReportDesignerSectionDetail *rsd)
892{ 993​{
Show All 12 Lines
905void KReportDesigner::deleteDetail() 1006​void KReportDesigner::deleteDetail()
906{ 1007​{
907 delete d->detail; 1008​ delete d->detail;
908 d->detail = nullptr; 1009​ d->detail = nullptr;
909} 1010​}
910 1011​
911KReportUnit KReportDesigner::pageUnit() const 1012​KReportUnit KReportDesigner::pageUnit() const
912{ 1013​{
913 const QString symbol = d->unit->value().toString(); 1014​ return d->currentUnit;
914 KReportUnit unit(KReportUnit::symbolToType(symbol)); ​
915 return unit.isValid() ? unit : DEFAULT_UNIT; ​
916} 1015​}
917 1016​
918void KReportDesigner::setGridOptions(bool vis, int div) 1017​void KReportDesigner::setGridOptions(bool vis, int div)
919{ 1018​{
920 d->showGrid->setValue(QVariant(vis)); 1019​ d->showGrid->setValue(QVariant(vis));
921 d->gridDivisions->setValue(div); 1020​ d->gridDivisions->setValue(div);
922} 1021​}
923 1022​
▲ Show 20 Lines • Show All 89 Lines • ▼ Show 20 Line(s)1111 else {
1013 kreportWarning() << "attempted to insert an unknown item"; 1112​ kreportWarning() << "attempted to insert an unknown item";
1014 } 1113​ }
1015 } 1114​ }
1016 if (item) { 1115​ if (item) {
1017 item->setVisible(true); 1116​ item->setVisible(true);
1018 item->setSelected(true); 1117​ item->setSelected(true);
1019 KReportItemBase* baseReportItem = dynamic_cast<KReportItemBase*>(item); 1118​ KReportItemBase* baseReportItem = dynamic_cast<KReportItemBase*>(item);
1020 if (baseReportItem) { 1119​ if (baseReportItem) {
1021 baseReportItem->setUnit(pageUnit()); ​
1022 KPropertySet *set = baseReportItem->propertySet(); 1120​ KPropertySet *set = baseReportItem->propertySet();
1023 KReportDesigner::addMetaProperties(set, classString, iconName); 1121​ KReportDesigner::addMetaProperties(set, classString, iconName);
1024 changeSet(set); 1122​ changeSet(set);
1025 if (v && v->designer()) { 1123​ if (v && v->designer()) {
1026 v->designer()->setModified(true); 1124​ v->designer()->setModified(true);
1027 } 1125​ }
1028 emit itemInserted(d->sectionData.itemToInsert); 1126​ emit itemInserted(d->sectionData.itemToInsert);
1029 } 1127​ }
▲ Show 20 Lines • Show All 516 Lines • ▼ Show 20 Line(s)
1546{ 1644​{
1547 Q_ASSERT(set); 1645​ Q_ASSERT(set);
1548 KProperty *prop; 1646​ KProperty *prop;
1549 set->addProperty(prop = new KProperty("this:classString", classString)); 1647​ set->addProperty(prop = new KProperty("this:classString", classString));
1550 prop->setVisible(false); 1648​ prop->setVisible(false);
1551 set->addProperty(prop = new KProperty("this:iconName", iconName)); 1649​ set->addProperty(prop = new KProperty("this:iconName", iconName));
1552 prop->setVisible(false); 1650​ prop->setVisible(false);
1553} 1651​}
1652​
1653​void KReportDesigner::recalculateMaxMargins()
1654​{
1655​ QSize pageSize = pageSizePt();
1656​ d->leftMargin->setOption("max", d->currentUnit.convertFromPoint(pageSize.width() - d->currentUnit.convertToPoint(d->rightMargin->value().toReal()) - MM_TO_POINT(SMALLEST_PAGE_SIZE_MM)));
staniekUnsubmitted
Not Done

This is effectively a fix but usability of this a bit low: user needs to locate the longer margin first and reduce it, then increase the desired margin (left-right, top-bottom). It is a bit frustrating when "keyboard does not work" because of the the max limits.

How about setting max for left/right margins to page.width-smallest_page_size and max of top/bottom margins to page.height-smallest_page_size (e.g. for portrait A4: 205 and 205)? Then proceed with fixups from 5.3.[1-4].

For this solution we will need a KProperty parameter in this method so we know what property was changed and what property should be fixed. Please look that we never fix up value of property that is currently changed by the user, rather the other property.

staniek: This is effectively a fix but usability of this a bit low: user needs to locate the longer…
1657​ d->rightMargin->setOption("max", d->currentUnit.convertFromPoint(pageSize.width() - d->currentUnit.convertToPoint(d->leftMargin->value().toReal())- MM_TO_POINT(SMALLEST_PAGE_SIZE_MM)));
1658​ d->topMargin->setOption("max", d->currentUnit.convertFromPoint(pageSize.height() - d->currentUnit.convertToPoint(d->bottomMargin->value().toReal())- MM_TO_POINT(SMALLEST_PAGE_SIZE_MM)));
1659​ d->bottomMargin->setOption("max", d->currentUnit.convertFromPoint(pageSize.height() - d->currentUnit.convertToPoint(d->topMargin->value().toReal())- MM_TO_POINT(SMALLEST_PAGE_SIZE_MM)));
1660​}