Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
dtk-widgets
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
13
Issues
13
List
Boards
Labels
Milestones
Merge Requests
2
Merge Requests
2
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
dtk
dtk-widgets
Commits
3c76ec10
Commit
3c76ec10
authored
May 21, 2019
by
NICLAUSSE Nicolas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use dtkCoreParameters alias + update test (wip)
parent
233086de
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
1321 additions
and
6 deletions
+1321
-6
src/dtkWidgets/dtkWidgetsParameterMenuBarGenerator.cpp
src/dtkWidgets/dtkWidgetsParameterMenuBarGenerator.cpp
+2
-2
src/dtkWidgets/dtkWidgetsParameterMenuBarGenerator.h
src/dtkWidgets/dtkWidgetsParameterMenuBarGenerator.h
+3
-2
tst/dtkWidgets/dtkWidgetsParameterMenuBarGeneratorTest.cpp
tst/dtkWidgets/dtkWidgetsParameterMenuBarGeneratorTest.cpp
+5
-2
tst/resources/new_definition.json
tst/resources/new_definition.json
+689
-0
tst/resources/new_menu.json
tst/resources/new_menu.json
+622
-0
No files found.
src/dtkWidgets/dtkWidgetsParameterMenuBarGenerator.cpp
View file @
3c76ec10
...
...
@@ -38,7 +38,7 @@ public:
QJsonArray
menu
;
public:
QHash
<
QString
,
dtkCoreParameter
*>
parameters
;
dtkCoreParameters
parameters
;
};
// ///////////////////////////////////////////////////////////////////
...
...
@@ -146,7 +146,7 @@ void dtkWidgetsParameterMenuBarGenerator::populate(dtkWidgetsMenuBar *menubar)
}
}
QHash
<
QString
,
dtkCoreParameter
*>
dtkWidgetsParameterMenuBarGenerator
::
parameters
(
void
)
const
dtkCoreParameters
dtkWidgetsParameterMenuBarGenerator
::
parameters
(
void
)
const
{
return
d
->
parameters
;
}
...
...
src/dtkWidgets/dtkWidgetsParameterMenuBarGenerator.h
View file @
3c76ec10
...
...
@@ -16,11 +16,12 @@
#include <dtkWidgetsExport>
#include <dtkCore/dtkCoreParameters>
#include <QtCore>
class
dtkWidgetsMenuBar
;
class
dtkCoreParameter
;
class
dtkWidgetsParameter
;
// ///////////////////////////////////////////////////////////////////
// dtkWidgetsParameterMenuBarGenerator declaration
...
...
@@ -36,7 +37,7 @@ public:
void
populate
(
dtkWidgetsMenuBar
*
menubar
);
public:
QHash
<
QString
,
dtkCoreParameter
*>
parameters
(
void
)
const
;
dtkCoreParameters
parameters
(
void
)
const
;
protected:
class
dtkWidgetsParameterMenuBarGeneratorPrivate
*
d
;
...
...
tst/dtkWidgets/dtkWidgetsParameterMenuBarGeneratorTest.cpp
View file @
3c76ec10
...
...
@@ -69,11 +69,14 @@ void dtkWidgetsParameterMenuBarGeneratorTestCase::init(void)
void
dtkWidgetsParameterMenuBarGeneratorTestCase
::
testBasic
(
void
)
{
QString
nature_file_path
=
QFINDTESTDATA
(
"../resources/
parameters_nature
.json"
);
QString
definition_file_path
=
QFINDTESTDATA
(
"../resources/
parameters
_definition.json"
);
QString
nature_file_path
=
QFINDTESTDATA
(
"../resources/
new_menu
.json"
);
QString
definition_file_path
=
QFINDTESTDATA
(
"../resources/
new
_definition.json"
);
dtkWidgetsParameterMenuBarGenerator
menu_bar_generator
(
nature_file_path
,
definition_file_path
);
dtkCoreParameters
params
=
menu_bar_generator
.
parameters
();
QCOMPARE
(
params
.
count
()
,
79
);
}
void
dtkWidgetsParameterMenuBarGeneratorTestCase
::
cleanup
(
void
)
...
...
tst/resources/new_definition.json
0 → 100644
View file @
3c76ec10
This diff is collapsed.
Click to expand it.
tst/resources/new_menu.json
0 → 100644
View file @
3c76ec10
This diff is collapsed.
Click to expand it.
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