Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
dtk-widgets
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
19
Issues
19
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dtk
dtk-widgets
Commits
62a2b689
Commit
62a2b689
authored
Sep 26, 2019
by
WINTZ Julien
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enhancing menu framework API.
parent
b457bf70
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
2 deletions
+25
-2
src/dtkWidgets/dtkWidgetsParameterMenuBarGenerator.cpp
src/dtkWidgets/dtkWidgetsParameterMenuBarGenerator.cpp
+22
-1
src/dtkWidgets/dtkWidgetsParameterMenuBarGenerator.h
src/dtkWidgets/dtkWidgetsParameterMenuBarGenerator.h
+3
-1
No files found.
src/dtkWidgets/dtkWidgetsParameterMenuBarGenerator.cpp
View file @
62a2b689
...
...
@@ -18,6 +18,7 @@
#include "dtkWidgetsParameter.h"
#include "dtkWidgetsMenu.h"
#include "dtkWidgetsMenuBar.h"
#include "dtkWidgetsMenuBar_p.h"
#include <dtkCore/dtkCoreParameter>
...
...
@@ -96,7 +97,6 @@ dtkWidgetsParameterMenuBarGenerator::dtkWidgetsParameterMenuBarGenerator(const Q
return
;
}
if
(
menu_file
.
open
(
QFile
::
ReadOnly
))
{
QJsonParseError
menu_error
;
QJsonDocument
menu_document
=
QJsonDocument
::
fromJson
(
menu_file
.
readAll
(),
&
menu_error
);
...
...
@@ -144,6 +144,27 @@ void dtkWidgetsParameterMenuBarGenerator::populate(dtkWidgetsMenuBar *menubar)
}
}
void
dtkWidgetsParameterMenuBarGenerator
::
populate
(
dtkWidgetsMenuBarContainer
*
container
)
{
dtkWidgetsMenuBar
*
dummy
=
new
dtkWidgetsMenuBar
;
for
(
auto
it
=
d
->
menu
.
begin
();
it
!=
d
->
menu
.
end
();
++
it
)
{
if
(
it
->
isObject
())
{
QJsonObject
content_object
=
it
->
toObject
();
if
(
content_object
.
contains
(
"group"
))
{
QJsonObject
group_object
=
content_object
[
"group"
].
toObject
();
d
->
parseGroup
(
dummy
,
group_object
);
}
else
{
qWarning
()
<<
Q_FUNC_INFO
<<
"'contents' sections are expected to contain objects only. Non object entry is ignored."
;
}
}
else
{
qWarning
()
<<
Q_FUNC_INFO
<<
"'contents' sections are expected to contain objects only. Non object entry is ignored."
;
}
}
container
->
build
(
dummy
->
menus
());
}
dtkCoreParameters
dtkWidgetsParameterMenuBarGenerator
::
parameters
(
void
)
const
{
return
d
->
parameters
;
...
...
src/dtkWidgets/dtkWidgetsParameterMenuBarGenerator.h
View file @
62a2b689
...
...
@@ -21,6 +21,7 @@
#include <QtCore>
class
dtkWidgetsMenuBar
;
class
dtkWidgetsMenuBarContainer
;
class
dtkCoreParameter
;
// ///////////////////////////////////////////////////////////////////
...
...
@@ -34,7 +35,8 @@ public:
~
dtkWidgetsParameterMenuBarGenerator
(
void
);
public:
void
populate
(
dtkWidgetsMenuBar
*
menubar
);
void
populate
(
dtkWidgetsMenuBar
*
);
void
populate
(
dtkWidgetsMenuBarContainer
*
);
public:
dtkCoreParameters
parameters
(
void
)
const
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment