mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Start the FilterDive state

Browse source 
Register the new FilterDive widget on the mainwindow
so we can trigger a shortcut to display it.
The shortcut currently doesn't exists.

Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
This commit is contained in:
Tomaz Canabrava 2018-10-13 12:47:10 +02:00 • committed by Dirk Hohndel
parent 19f6e8810c
commit 8378695d7f
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
desktop-widgets/mainwindow.cpp
View file

@ -53,6 +53,7 @@
#include "desktop-widgets/tab-widgets/maintab.h" #include "desktop-widgets/tab-widgets/maintab.h"
#include "desktop-widgets/updatemanager.h" #include "desktop-widgets/updatemanager.h"
#include "desktop-widgets/usersurvey.h" #include "desktop-widgets/usersurvey.h"
#include "desktop-widgets/filterwidget2.h"
#include "profile-widget/profilewidget2.h" #include "profile-widget/profilewidget2.h"
@ -141,10 +142,10 @@ MainWindow::MainWindow() : QMainWindow(),
diveList = new DiveListView(this); diveList = new DiveListView(this);
graphics = new ProfileWidget2(this); graphics = new ProfileWidget2(this);
MapWidget *mapWidget = MapWidget::instance(); MapWidget *mapWidget = MapWidget::instance();
divePlannerSettingsWidget = new PlannerSettingsWidget(this); divePlannerSettingsWidget = new PlannerSettingsWidget(this);
divePlannerWidget = new DivePlannerWidget(this); divePlannerWidget = new DivePlannerWidget(this);
plannerDetails = new PlannerDetails(this); plannerDetails = new PlannerDetails(this);
auto *filterWidget2 = new FilterWidget2();
// what is a sane order for those icons? we should have the ones the user is // what is a sane order for those icons? we should have the ones the user is
// most likely to want towards the top so they are always visible // most likely to want towards the top so they are always visible
@ -193,6 +194,7 @@ MainWindow::MainWindow() : QMainWindow(),
registerApplicationState("PlanDive", divePlannerWidget, profileContainer, divePlannerSettingsWidget, plannerDetails ); registerApplicationState("PlanDive", divePlannerWidget, profileContainer, divePlannerSettingsWidget, plannerDetails );
registerApplicationState("EditPlannedDive", divePlannerWidget, profileContainer, diveList, mapWidget ); registerApplicationState("EditPlannedDive", divePlannerWidget, profileContainer, diveList, mapWidget );
registerApplicationState("EditDiveSite", diveSiteEdit, profileContainer, diveList, mapWidget); registerApplicationState("EditDiveSite", diveSiteEdit, profileContainer, diveList, mapWidget);
registerApplicationState("FilterDive", mainTab, profileContainer, diveList, filterWidget2);
setStateProperties("Default", enabledList, enabledList, enabledList,enabledList); setStateProperties("Default", enabledList, enabledList, enabledList,enabledList);
setStateProperties("AddDive", enabledList, enabledList, enabledList,enabledList); setStateProperties("AddDive", enabledList, enabledList, enabledList,enabledList);
@ -200,7 +202,7 @@ MainWindow::MainWindow() : QMainWindow(),
setStateProperties("PlanDive", enabledList, enabledList, enabledList,enabledList); setStateProperties("PlanDive", enabledList, enabledList, enabledList,enabledList);
setStateProperties("EditPlannedDive", enabledList, enabledList, enabledList,enabledList); setStateProperties("EditPlannedDive", enabledList, enabledList, enabledList,enabledList);
setStateProperties("EditDiveSite", enabledList, disabledList, disabledList, enabledList); setStateProperties("EditDiveSite", enabledList, disabledList, disabledList, enabledList);
setStateProperties("FilterDive", enabledList, enabledList, enabledList, enabledList);
setApplicationState("Default"); setApplicationState("Default");
ui.multiFilter->hide(); ui.multiFilter->hide();

1
desktop-widgets/mainwindow.h
View file

@ -35,6 +35,7 @@ class ProfileWidget2;
class PlannerDetails; class PlannerDetails;
class PlannerSettingsWidget; class PlannerSettingsWidget;
class LocationInformationWidget; class LocationInformationWidget;
class FilterWidget2;
typedef std::pair<QByteArray, QVariant> WidgetProperty; typedef std::pair<QByteArray, QVariant> WidgetProperty;
typedef QVector<WidgetProperty> PropertyList; typedef QVector<WidgetProperty> PropertyList;