From 4eedf60d76a047f63b0991eee0b623e9be854c76 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Thu, 13 Dec 2018 12:49:28 +0100 Subject: MainWindow: rework menu bar Split off menu bar into its own class out of MainWindow Menu bar now has a 'Find in menus' function --- src/meson.build | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/meson.build') diff --git a/src/meson.build b/src/meson.build index 0ad0166..7dfba88 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,11 +1,11 @@ # poi poi_moc = qt5.preprocess( moc_headers: ['browser.h', - 'mainwindow/mainwindow.h', 'mainwindow/widgets/dockwidget.h', 'mainwindow/widgets/navigationbar.h', 'mainwindow/widgets/searchform.h', + 'mainwindow/mainwindow.h', 'mainwindow/menubar.h', 'mainwindow/widgets/dockwidget.h', 'mainwindow/widgets/menusearch.h', 'mainwindow/widgets/navigationbar.h', 'mainwindow/widgets/searchform.h', 'session/sessiondialog.h', 'session/sessionform.h', 'subwindow/subwindow.h', 'subwindow/tabwidget.h', 'webengine/filter.h', 'webengine/urlinterceptor.h', 'webengine/webpage.h', 'webengine/webview.h'], - ui_files: ['mainwindow/mainwindow.ui', 'mainwindow/widgets/searchform.ui', 'session/sessiondialog.ui', 'session/sessionform.ui'], + ui_files: ['mainwindow/widgets/searchform.ui', 'session/sessiondialog.ui', 'session/sessionform.ui'], qresources: '../data/resources.qrc', rcc_extra_arguments: ['--format-version=1'], dependencies: dep_qt5 @@ -30,7 +30,9 @@ poi = executable(get_option('poiName'), install: true, 'util.cpp', 'util.h', 'mainwindow/mainwindow.cpp', + 'mainwindow/menubar.cpp', 'mainwindow/widgets/dockwidget.cpp', + 'mainwindow/widgets/menusearch.cpp', 'mainwindow/widgets/navigationbar.cpp', 'mainwindow/widgets/searchform.cpp', -- cgit v1.2.1