Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
2740e3fb
Commit
2740e3fb
authored
Feb 26, 2011
by
lm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Working on usuability improvements in the parameter interface
parent
841cfa64
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
69 additions
and
4 deletions
+69
-4
QGCActionButton.ui
src/ui/designer/QGCActionButton.ui
+12
-0
QGCCommandButton.cc
src/ui/designer/QGCCommandButton.cc
+9
-1
QGCCommandButton.ui
src/ui/designer/QGCCommandButton.ui
+14
-2
QGCParamSlider.cc
src/ui/designer/QGCParamSlider.cc
+9
-0
QGCParamSlider.ui
src/ui/designer/QGCParamSlider.ui
+13
-1
QGCToolWidget.ui
src/ui/designer/QGCToolWidget.ui
+12
-0
No files found.
src/ui/designer/QGCActionButton.ui
View file @
2740e3fb
...
...
@@ -14,6 +14,18 @@
<string>
Form
</string>
</property>
<layout
class=
"QGridLayout"
name=
"gridLayout"
columnstretch=
"100,100,50"
>
<property
name=
"leftMargin"
>
<number>
6
</number>
</property>
<property
name=
"topMargin"
>
<number>
3
</number>
</property>
<property
name=
"rightMargin"
>
<number>
6
</number>
</property>
<property
name=
"bottomMargin"
>
<number>
3
</number>
</property>
<item
row=
"1"
column=
"0"
colspan=
"2"
>
<widget
class=
"QLabel"
name=
"nameLabel"
>
<property
name=
"minimumSize"
>
...
...
src/ui/designer/QGCCommandButton.cc
View file @
2740e3fb
...
...
@@ -68,6 +68,10 @@ void QGCCommandButton::setCommandButtonName(QString text)
void
QGCCommandButton
::
startEditMode
()
{
// Hide elements
ui
->
commandButton
->
hide
();
ui
->
nameLabel
->
hide
();
ui
->
editCommandComboBox
->
show
();
ui
->
editFinishButton
->
show
();
ui
->
editNameLabel
->
show
();
...
...
@@ -79,6 +83,7 @@ void QGCCommandButton::startEditMode()
ui
->
editParam2SpinBox
->
show
();
ui
->
editParam3SpinBox
->
show
();
ui
->
editParam4SpinBox
->
show
();
//setStyleSheet("QGroupBox { border: 1px solid #66666B; border-radius: 3px; padding: 10px 0px 0px 0px; background: #111122; }");
isInEditMode
=
true
;
}
...
...
@@ -99,9 +104,12 @@ void QGCCommandButton::endEditMode()
ui
->
editParam4SpinBox
->
hide
();
}
ui
->
commandButton
->
show
();
ui
->
nameLabel
->
show
();
// Write to settings
emit
editingFinished
();
//setStyleSheet("");
isInEditMode
=
false
;
}
...
...
src/ui/designer/QGCCommandButton.ui
View file @
2740e3fb
...
...
@@ -14,6 +14,18 @@
<string>
Form
</string>
</property>
<layout
class=
"QGridLayout"
name=
"gridLayout"
columnstretch=
"100,0,0,0"
>
<property
name=
"leftMargin"
>
<number>
6
</number>
</property>
<property
name=
"topMargin"
>
<number>
3
</number>
</property>
<property
name=
"rightMargin"
>
<number>
6
</number>
</property>
<property
name=
"bottomMargin"
>
<number>
3
</number>
</property>
<item
row=
"5"
column=
"0"
colspan=
"3"
>
<widget
class=
"QComboBox"
name=
"editCommandComboBox"
/>
</item>
...
...
@@ -27,14 +39,14 @@
<item
row=
"0"
column=
"3"
>
<widget
class=
"QLineEdit"
name=
"editButtonName"
>
<property
name=
"text"
>
<string>
Unnamed
</string>
<string>
<
Button Label
>
</string>
</property>
</widget>
</item>
<item
row=
"0"
column=
"0"
colspan=
"3"
>
<widget
class=
"QLineEdit"
name=
"editNameLabel"
>
<property
name=
"text"
>
<string>
Description
</string>
<string>
<
Button Description Label (in front of button)
>
</string>
</property>
</widget>
</item>
...
...
src/ui/designer/QGCParamSlider.cc
View file @
2740e3fb
...
...
@@ -112,6 +112,12 @@ void QGCParamSlider::selectParameter(int paramIndex)
void
QGCParamSlider
::
startEditMode
()
{
ui
->
valueSlider
->
hide
();
ui
->
valueSpinBox
->
hide
();
ui
->
nameLabel
->
hide
();
ui
->
writeButton
->
hide
();
ui
->
readButton
->
hide
();
ui
->
editDoneButton
->
show
();
ui
->
editMaxLabel
->
show
();
ui
->
editMinLabel
->
show
();
...
...
@@ -153,6 +159,9 @@ void QGCParamSlider::endEditMode()
ui
->
editMaxSpinBox
->
hide
();
ui
->
writeButton
->
show
();
ui
->
readButton
->
show
();
ui
->
valueSlider
->
show
();
ui
->
valueSpinBox
->
show
();
ui
->
nameLabel
->
show
();
isInEditMode
=
false
;
emit
editingFinished
();
}
...
...
src/ui/designer/QGCParamSlider.ui
View file @
2740e3fb
...
...
@@ -14,6 +14,18 @@
<string>
Form
</string>
</property>
<layout
class=
"QGridLayout"
name=
"gridLayout"
columnstretch=
"100,0,0,0,0,0,0,0,0"
>
<property
name=
"leftMargin"
>
<number>
6
</number>
</property>
<property
name=
"topMargin"
>
<number>
3
</number>
</property>
<property
name=
"rightMargin"
>
<number>
6
</number>
</property>
<property
name=
"bottomMargin"
>
<number>
3
</number>
</property>
<property
name=
"horizontalSpacing"
>
<number>
6
</number>
</property>
...
...
@@ -23,7 +35,7 @@
<item
row=
"1"
column=
"1"
colspan=
"3"
>
<widget
class=
"QLineEdit"
name=
"editNameLabel"
>
<property
name=
"text"
>
<string>
Informal Name..
</string>
<string>
<
Parameter Name / Label
>
</string>
</property>
</widget>
</item>
...
...
src/ui/designer/QGCToolWidget.ui
View file @
2740e3fb
...
...
@@ -15,8 +15,20 @@
</property>
<layout
class=
"QVBoxLayout"
name=
"toolLayout"
>
<property
name=
"spacing"
>
<number>
0
</number>
</property>
<property
name=
"leftMargin"
>
<number>
6
</number>
</property>
<property
name=
"topMargin"
>
<number>
0
</number>
</property>
<property
name=
"rightMargin"
>
<number>
6
</number>
</property>
<property
name=
"bottomMargin"
>
<number>
0
</number>
</property>
<item>
<widget
class=
"QLabel"
name=
"hintLabel"
>
<property
name=
"text"
>
...
...
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