diff --git a/limereport/databrowser/lrdatabrowser.cpp b/limereport/databrowser/lrdatabrowser.cpp index 0ac9efb..5eeafc7 100644 --- a/limereport/databrowser/lrdatabrowser.cpp +++ b/limereport/databrowser/lrdatabrowser.cpp @@ -53,7 +53,14 @@ DataBrowser::DataBrowser(QWidget *parent) : QWidget(parent), ui(new Ui::DataBrowser), m_report(0), m_closingWindows(false), m_settings(0), m_ownedSettings(false) { + auto f = qApp->font(); + f.setPointSize(f.pointSize()*0.7); ui->setupUi(this); + setFont(f); + ui->tabWidget->setFont(f); + ui->tabWidget->setCurrentWidget(ui->tab_2); + ui->variablesTree->setFont(f); + ui->dataTree->setFont(f); connect(ui->addConnection,SIGNAL(clicked()),this,SLOT(slotAddConnection())); connect(ui->deleteConection,SIGNAL(clicked()),this,SLOT(slotDeleteConnection())); connect(ui->addDataSource,SIGNAL(clicked()),this,SLOT(slotAddDataSource())); diff --git a/limereport/databrowser/lrdatabrowser.ui b/limereport/databrowser/lrdatabrowser.ui index 5d48986..bdccdbb 100644 --- a/limereport/databrowser/lrdatabrowser.ui +++ b/limereport/databrowser/lrdatabrowser.ui @@ -35,7 +35,7 @@ QTabWidget::South - 1 + 0 diff --git a/limereport/lrreportdesignwindow.cpp b/limereport/lrreportdesignwindow.cpp index 6c45a6a..9d9148e 100644 --- a/limereport/lrreportdesignwindow.cpp +++ b/limereport/lrreportdesignwindow.cpp @@ -105,9 +105,7 @@ ReportDesignWindow::ReportDesignWindow(ReportEnginePrivateInterface* report, QWi ReportDesignWindowInterface(parent), m_textAttibutesIsChanging(false), m_settings(settings), m_ownedSettings(false), m_progressDialog(0), m_showProgressDialog(true), m_editorTabType(ReportDesignWidget::Page), m_reportItemIsLocked(false) { - auto f = qApp->font(); - f.setPointSize(f.pointSize()*0.7); - setFont(f); + setAttribute(Qt::WA_WindowPropagation); initReportEditor(report); createActions(); // createMainMenu(); diff --git a/limereport/objectinspector/lrobjectinspectorwidget.cpp b/limereport/objectinspector/lrobjectinspectorwidget.cpp index f2cfdb0..87a2b6b 100644 --- a/limereport/objectinspector/lrobjectinspectorwidget.cpp +++ b/limereport/objectinspector/lrobjectinspectorwidget.cpp @@ -182,6 +182,7 @@ ObjectInspectorWidget::ObjectInspectorWidget(QWidget *parent) f.setPointSize(f.pointSize()*0.7); setFont(f); m_objectInspectorView = new ObjectInspectorTreeView(this); + m_objectInspectorView->setFont(f); m_propertyModel = new BaseDesignPropertyModel(this); m_filterModel = new PropertyFilterModel(this); m_filterModel->setSourceModel(m_propertyModel); @@ -193,6 +194,7 @@ ObjectInspectorWidget::ObjectInspectorWidget(QWidget *parent) m_objectInspectorView->setModel(m_filterModel); QVBoxLayout* l = new QVBoxLayout(); QLineEdit* le = new QLineEdit(this); + le->setFont(f); QToolButton * pbClear = new QToolButton(this); pbClear->setToolTip(tr("Clear")); pbClear->setIcon(QIcon(":/items/clear.png"));