Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BornAgain
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mlz
BornAgain
Commits
a851eea0
Commit
a851eea0
authored
1 year ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
Sample summary: title of group; fixed height of description
parent
bdbcb26a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!2069
GUI repairs and standardization
Pipeline
#117845
passed
1 year ago
Stage: build
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
GUI/View/Instrument/InstrumentView.cpp
+1
-1
1 addition, 1 deletion
GUI/View/Instrument/InstrumentView.cpp
GUI/View/SampleDesigner/SampleForm.cpp
+3
-2
3 additions, 2 deletions
GUI/View/SampleDesigner/SampleForm.cpp
with
4 additions
and
3 deletions
GUI/View/Instrument/InstrumentView.cpp
+
1
−
1
View file @
a851eea0
...
@@ -97,7 +97,7 @@ void InstrumentView::createWidgetsForCurrentInstrument()
...
@@ -97,7 +97,7 @@ void InstrumentView::createWidgetsForCurrentInstrument()
//... Groupbox with instrument name and description (same layout for all instrument types)
//... Groupbox with instrument name and description (same layout for all instrument types)
auto
title
=
QString
(
"
Information
(%1 instrument)"
).
arg
(
currentInstrument
->
instrumentType
());
auto
title
=
QString
(
"
Summary
(%1 instrument)"
).
arg
(
currentInstrument
->
instrumentType
());
auto
*
g
=
new
CollapsibleGroupBox
(
title
,
m_scrollArea
,
currentInstrument
->
expandInfo
);
auto
*
g
=
new
CollapsibleGroupBox
(
title
,
m_scrollArea
,
currentInstrument
->
expandInfo
);
g
->
setSizePolicy
(
QSizePolicy
::
Expanding
,
QSizePolicy
::
Fixed
);
g
->
setSizePolicy
(
QSizePolicy
::
Expanding
,
QSizePolicy
::
Fixed
);
auto
*
formLayout
=
new
QFormLayout
;
auto
*
formLayout
=
new
QFormLayout
;
...
...
This diff is collapsed.
Click to expand it.
GUI/View/SampleDesigner/SampleForm.cpp
+
3
−
2
View file @
a851eea0
...
@@ -58,7 +58,8 @@ public:
...
@@ -58,7 +58,8 @@ public:
SampleForm
::
SampleForm
(
QWidget
*
parent
,
SampleItem
*
sampleItem
,
SampleEditorController
*
ec
)
SampleForm
::
SampleForm
(
QWidget
*
parent
,
SampleItem
*
sampleItem
,
SampleEditorController
*
ec
)
:
CollapsibleGroupBox
(
"Sample"
,
parent
,
sampleItem
->
expandInfo
)
:
CollapsibleGroupBox
(
"Summary and layer-independent parameters"
,
parent
,
sampleItem
->
expandInfo
)
,
m_sampleItem
(
sampleItem
)
,
m_sampleItem
(
sampleItem
)
,
m_ec
(
ec
)
,
m_ec
(
ec
)
{
{
...
@@ -77,7 +78,7 @@ SampleForm::SampleForm(QWidget* parent, SampleItem* sampleItem, SampleEditorCont
...
@@ -77,7 +78,7 @@ SampleForm::SampleForm(QWidget* parent, SampleItem* sampleItem, SampleEditorCont
auto
*
descriptionEdit
=
new
QTextEdit
;
auto
*
descriptionEdit
=
new
QTextEdit
;
m_layout
->
addRow
(
"Description:"
,
descriptionEdit
);
m_layout
->
addRow
(
"Description:"
,
descriptionEdit
);
descriptionEdit
->
setFixedWidth
(
585
);
descriptionEdit
->
setFixedWidth
(
585
);
descriptionEdit
->
set
Maximum
Height
(
10
0
);
descriptionEdit
->
set
Fixed
Height
(
6
0
);
descriptionEdit
->
setAcceptRichText
(
false
);
descriptionEdit
->
setAcceptRichText
(
false
);
descriptionEdit
->
setTabChangesFocus
(
true
);
descriptionEdit
->
setTabChangesFocus
(
true
);
descriptionEdit
->
setPlainText
(
sampleItem
->
description
());
descriptionEdit
->
setPlainText
(
sampleItem
->
description
());
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment