| Line 77... |
Line 77... |
| 77 |
int port{0}; //!< The port number
|
77 |
int port{0}; //!< The port number
|
| 78 |
int ID{0}; //!< the panel ID (a number starting by 10000)
|
78 |
int ID{0}; //!< the panel ID (a number starting by 10000)
|
| 79 |
string ptype; //!< The type of the panel (android, ipad, iphone, ...)
|
79 |
string ptype; //!< The type of the panel (android, ipad, iphone, ...)
|
| 80 |
string version; //!< The "firmware" version
|
80 |
string version; //!< The "firmware" version
|
| 81 |
string logFile; //!< Optional path and name of a logfile
|
81 |
string logFile; //!< Optional path and name of a logfile
|
| - |
|
82 |
#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
|
| - |
|
83 |
#ifdef QT_DEBUG
|
| - |
|
84 |
string logLevel{"INFO|WARNING|ERROR|DEBUG"}; //!< The log level(s).
|
| - |
|
85 |
uint logLevelBits{HLOG_INFO|HLOG_WARNING|HLOG_ERROR|HLOG_DEBUG};//!< The numeric bit field of the loglevel
|
| - |
|
86 |
#else
|
| 82 |
string logLevel; //!< The log level(s).
|
87 |
string logLevel{"NONE"}; //!< The log level(s).
|
| 83 |
uint logLevelBits; //!< The numeric bit field of the loglevel
|
88 |
uint logLevelBits{HLOG_NONE};//!< The numeric bit field of the loglevel
|
| - |
|
89 |
#endif
|
| - |
|
90 |
#else
|
| - |
|
91 |
string logLevel{"PROTOCOL"};//!< The log level(s).
|
| - |
|
92 |
uint logLevelBits{HLOG_PROTOCOL};//!< The numeric bit field of the loglevel
|
| - |
|
93 |
#endif
|
| 84 |
bool longformat{false}; //!< TRUE = long format
|
94 |
bool longformat{false}; //!< TRUE = long format
|
| 85 |
bool noBanner{false}; //!< Startup without showing a banner on the command line.
|
95 |
bool noBanner{false}; //!< Startup without showing a banner on the command line.
|
| 86 |
bool certCheck{false}; //!< TRUE = Check certificate for SSL connection
|
96 |
bool certCheck{false}; //!< TRUE = Check certificate for SSL connection
|
| 87 |
bool scale{false}; //!< TRUE = Images are scaled to fit the whole screen
|
97 |
bool scale{false}; //!< TRUE = Images are scaled to fit the whole screen
|
| 88 |
bool tbsuppress{false}; //!< TRUE = Don't show toolbar even if enough space
|
98 |
bool tbsuppress{false}; //!< TRUE = Don't show toolbar even if enough space
|
| Line 491... |
Line 501... |
| 491 |
}
|
501 |
}
|
| 492 |
else
|
502 |
else
|
| 493 |
{
|
503 |
{
|
| 494 |
localSettings.logLevelBits = level;
|
504 |
localSettings.logLevelBits = level;
|
| 495 |
localSettings.logLevel = logLevelBitsToString(level);
|
505 |
localSettings.logLevel = logLevelBitsToString(level);
|
| - |
|
506 |
TStreamError::setLogLevel(level);
|
| 496 |
MSG_INFO("New log level from bits: " << localSettings.logLevel);
|
507 |
MSG_INFO("New log level from bits: " << localSettings.logLevel);
|
| 497 |
}
|
508 |
}
|
| 498 |
|
509 |
|
| 499 |
mTemporary = false;
|
510 |
mTemporary = false;
|
| 500 |
return true;
|
511 |
return true;
|
| Line 2122... |
Line 2133... |
| 2122 |
}
|
2133 |
}
|
| 2123 |
|
2134 |
|
| 2124 |
fs.close();
|
2135 |
fs.close();
|
| 2125 |
mInitialized = true;
|
2136 |
mInitialized = true;
|
| 2126 |
TStreamError::setLogLevel(localSettings.logLevel);
|
2137 |
TStreamError::setLogLevel(localSettings.logLevel);
|
| 2127 |
// TStreamError::setLogLevel("INFO|WARNING|ERROR|DEBUG");
|
- |
|
| 2128 |
// TStreamError::setLogLevel("ALL");
|
- |
|
| 2129 |
TStreamError::setLogFile(localSettings.logFile);
|
2138 |
TStreamError::setLogFile(localSettings.logFile);
|
| 2130 |
|
2139 |
|
| 2131 |
if (localSettings.uuid.empty())
|
2140 |
if (localSettings.uuid.empty())
|
| 2132 |
{
|
2141 |
{
|
| 2133 |
#ifdef __ANDROID__
|
2142 |
#ifdef __ANDROID__
|