Edit mode toollbar has been removed for read only preview mode

This commit is contained in:
Arin Alexander 2019-07-09 12:28:58 +03:00
parent 74db10189f
commit e211838595
2 changed files with 9 additions and 4 deletions

View File

@ -189,6 +189,10 @@ void PreviewReportWindow::setMenuVisible(bool value)
void PreviewReportWindow::setHideResultEditButton(bool value) void PreviewReportWindow::setHideResultEditButton(bool value)
{ {
ui->actionEdit_Mode->setVisible(value); ui->actionEdit_Mode->setVisible(value);
if (!value && ui->editModeTools) {
delete ui->editModeTools;
ui->editModeTools = 0;
}
} }
void PreviewReportWindow::setHidePrintButton(bool value) void PreviewReportWindow::setHidePrintButton(bool value)
@ -292,7 +296,8 @@ void PreviewReportWindow::moveEvent(QMoveEvent* e)
void PreviewReportWindow::showEvent(QShowEvent *) void PreviewReportWindow::showEvent(QShowEvent *)
{ {
m_fontEditor->setVisible(ui->actionEdit_Mode->isChecked()); m_fontEditor->setVisible(ui->actionEdit_Mode->isChecked());
ui->editModeTools->setVisible(false); if (ui->editModeTools)
ui->editModeTools->setVisible(false);
m_textAlignmentEditor->setVisible(ui->actionEdit_Mode->isChecked()); m_textAlignmentEditor->setVisible(ui->actionEdit_Mode->isChecked());
switch (m_previewScaleType) { switch (m_previewScaleType) {
case FitWidth: case FitWidth:
@ -500,7 +505,7 @@ void PreviewReportWindow::on_actionShow_Toolbar_triggered()
writeSetting(); writeSetting();
} }
void PreviewReportWindow::slotCurrentPageChanged(int page) void PreviewReportWindow::slotCurrentPageChanged(int /*page*/)
{ {
slotActivateItemSelectionMode(); slotActivateItemSelectionMode();
} }

View File

@ -60,7 +60,7 @@
<widget class="QStatusBar" name="statusbar"/> <widget class="QStatusBar" name="statusbar"/>
<widget class="QToolBar" name="toolBar"> <widget class="QToolBar" name="toolBar">
<property name="windowTitle"> <property name="windowTitle">
<string>toolBar</string> <string>MainToolBar</string>
</property> </property>
<property name="iconSize"> <property name="iconSize">
<size> <size>
@ -98,7 +98,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>toolBar_2</string> <string>EditModeTools</string>
</property> </property>
<attribute name="toolBarArea"> <attribute name="toolBarArea">
<enum>LeftToolBarArea</enum> <enum>LeftToolBarArea</enum>