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
734fbaf7
Commit
734fbaf7
authored
Sep 02, 2013
by
Lorenz Meier
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #366 from tstellanova/update_version_info
clean org references and update version number
parents
81524eeb
08ed1b26
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
9 deletions
+10
-9
QGCCore.cc
src/QGCCore.cc
+2
-2
SerialLink.cc
src/comm/SerialLink.cc
+2
-2
configuration.h
src/configuration.h
+4
-3
terminalconsole.cpp
src/ui/configuration/terminalconsole.cpp
+2
-2
No files found.
src/QGCCore.cc
View file @
734fbaf7
...
...
@@ -77,8 +77,8 @@ QGCCore::QGCCore(bool firstStart, int &argc, char* argv[]) : QApplication(argc,
// Set application name
this
->
setApplicationName
(
QGC_APPLICATION_NAME
);
this
->
setApplicationVersion
(
QGC_APPLICATION_VERSION
);
this
->
setOrganizationName
(
Q
Latin1String
(
"diydrones"
)
);
this
->
setOrganizationDomain
(
"com.diydrones"
);
this
->
setOrganizationName
(
Q
GC
::
ORG_NAME
);
this
->
setOrganizationDomain
(
QGC
::
ORG_DOMAIN
);
// Set settings format
QSettings
::
setDefaultFormat
(
QSettings
::
IniFormat
);
...
...
src/comm/SerialLink.cc
View file @
734fbaf7
...
...
@@ -106,7 +106,7 @@ QList<QString> SerialLink::getCurrentPorts()
void
SerialLink
::
loadSettings
()
{
// Load defaults from settings
QSettings
settings
(
QGC
::
COMPANY
NAME
,
QGC
::
APPNAME
);
QSettings
settings
(
QGC
::
ORG_
NAME
,
QGC
::
APPNAME
);
settings
.
sync
();
if
(
settings
.
contains
(
"SERIALLINK_COMM_PORT"
))
{
...
...
@@ -122,7 +122,7 @@ void SerialLink::loadSettings()
void
SerialLink
::
writeSettings
()
{
// Store settings
QSettings
settings
(
QGC
::
COMPANY
NAME
,
QGC
::
APPNAME
);
QSettings
settings
(
QGC
::
ORG_
NAME
,
QGC
::
APPNAME
);
settings
.
setValue
(
"SERIALLINK_COMM_PORT"
,
getPortName
());
settings
.
setValue
(
"SERIALLINK_COMM_BAUD"
,
getBaudRateType
());
settings
.
setValue
(
"SERIALLINK_COMM_PARITY"
,
getParityType
());
...
...
src/configuration.h
View file @
734fbaf7
...
...
@@ -11,14 +11,15 @@
#define WITH_TEXT_TO_SPEECH 1
#define QGC_APPLICATION_NAME "QGroundControl"
#define QGC_APPLICATION_VERSION "v.
1.1.2
(beta)"
#define QGC_APPLICATION_VERSION "v.
2.0.0
(beta)"
namespace
QGC
{
const
QString
APPNAME
=
"QGROUNDCONTROL"
;
const
QString
COMPANYNAME
=
"QGROUNDCONTROL"
;
const
int
APPLICATIONVERSION
=
110
;
// 1.1.0
const
QString
ORG_NAME
=
"QGROUNDCONTROL.ORG"
;
//can be customized by forks to e.g. mycompany.com to maintain separate Settings for customized apps
const
QString
ORG_DOMAIN
=
"org.qgroundcontrol"
;
//can be customized by forks
const
int
APPLICATIONVERSION
=
200
;
// 2.0.0
}
#endif // QGC_CONFIGURATION_H
src/ui/configuration/terminalconsole.cpp
View file @
734fbaf7
...
...
@@ -265,7 +265,7 @@ void TerminalConsole::setLink(int index)
void
TerminalConsole
::
loadSettings
()
{
// Load defaults from settings
QSettings
settings
(
QGC
::
COMPANY
NAME
,
QGC
::
APPNAME
);
QSettings
settings
(
QGC
::
ORG_
NAME
,
QGC
::
APPNAME
);
settings
.
sync
();
if
(
settings
.
contains
(
"TERMINALCONSOLE_COMM_PORT"
))
{
...
...
@@ -287,7 +287,7 @@ void TerminalConsole::loadSettings()
void
TerminalConsole
::
writeSettings
()
{
// Store settings
QSettings
settings
(
QGC
::
COMPANY
NAME
,
QGC
::
APPNAME
);
QSettings
settings
(
QGC
::
ORG_
NAME
,
QGC
::
APPNAME
);
settings
.
setValue
(
"TERMINALCONSOLE_COMM_PORT"
,
m_settings
.
name
);
settings
.
setValue
(
"TERMINALCONSOLE_COMM_BAUD"
,
m_settings
.
baudRate
);
settings
.
setValue
(
"TERMINALCONSOLE_COMM_PARITY"
,
m_settings
.
parity
);
...
...
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