mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-06-26 10:54:14 +02:00
Compare commits
2 Commits
adbbeca905
...
d1ce42a148
| Author | SHA1 | Date | |
|---|---|---|---|
| d1ce42a148 | |||
| 6b9837b244 |
@@ -69,6 +69,7 @@ void ProjectPrintWindow::launchDialog(QETProject *project, QPrinter::OutputForma
|
|||||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove
|
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove
|
||||||
print_dialog.setEnabledOptions(QAbstractPrintDialog::PrintShowPageSize);
|
print_dialog.setEnabledOptions(QAbstractPrintDialog::PrintShowPageSize);
|
||||||
#else
|
#else
|
||||||
|
print_dialog.setOptions(QAbstractPrintDialog::PrintShowPageSize);
|
||||||
#if TODO_LIST
|
#if TODO_LIST
|
||||||
#pragma message("@TODO remove code for QT 6 or later")
|
#pragma message("@TODO remove code for QT 6 or later")
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ QETDiagramEditor::QETDiagramEditor(const QStringList &files, QWidget *parent) :
|
|||||||
m_workspace.setTabsClosable(true);
|
m_workspace.setTabsClosable(true);
|
||||||
|
|
||||||
//Set the signal mapper
|
//Set the signal mapper
|
||||||
connect(&windowMapper, SIGNAL(mapped(QWidget *)), this, SLOT(activateWidget(QWidget *)));
|
connect(&windowMapper, SIGNAL(mapped(QWidget*)), this, SLOT(activateWidget(QWidget*)));
|
||||||
|
|
||||||
setWindowTitle(tr("QElectroTech", "window title"));
|
setWindowTitle(tr("QElectroTech", "window title"));
|
||||||
setWindowIcon(QET::Icons::QETLogo);
|
setWindowIcon(QET::Icons::QETLogo);
|
||||||
|
|||||||
@@ -1001,11 +1001,16 @@ void QetGraphicsTableItem::adjustColumnsWidth()
|
|||||||
m_header_item->minimumSectionWidth().at(at_b))+b);
|
m_header_item->minimumSectionWidth().at(at_b))+b);
|
||||||
sum_+= m_header_item->sectionSize(i);
|
sum_+= m_header_item->sectionSize(i);
|
||||||
#else
|
#else
|
||||||
#if TODO_LIST
|
auto at_a = std::min(m_minimum_column_width.size()-1, (qsizetype) i); //In case of the I is higher than m_minimum_column_width or
|
||||||
#pragma message("@TODO remove code for QT 6 or later")
|
auto at_b = std::min(m_header_item->minimumSectionWidth().size()-1,(qsizetype) i); //m_header_item->minimumSectionWidth().size()
|
||||||
#endif
|
m_header_item->resizeSection(
|
||||||
qDebug()<<"Help code for QT 6 or later";
|
i,
|
||||||
|
std::max(
|
||||||
|
m_minimum_column_width.at(at_a),
|
||||||
|
m_header_item->minimumSectionWidth().at(at_b))+b);
|
||||||
|
sum_+= m_header_item->sectionSize(i);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user