diff --git a/src/autoapp/UI/ConnectDialog.cpp b/src/autoapp/UI/ConnectDialog.cpp index bb503d7..88587cc 100644 --- a/src/autoapp/UI/ConnectDialog.cpp +++ b/src/autoapp/UI/ConnectDialog.cpp @@ -131,7 +131,7 @@ void ConnectDialog::loadClientList() if (std::ifstream("/tmp/hotspot_active")) { ui_->listWidgetClients->show(); - ui_->pushButtonUpdate->show(); + //ui_->pushButtonUpdate->show(); if (std::ifstream("/tmp/temp_recent_list")) { QFile versionFile(QString("/tmp/temp_recent_list")); versionFile.open(QIODevice::ReadOnly); diff --git a/src/autoapp/UI/MainWindow.cpp b/src/autoapp/UI/MainWindow.cpp index f9ab78d..a28dec7 100644 --- a/src/autoapp/UI/MainWindow.cpp +++ b/src/autoapp/UI/MainWindow.cpp @@ -2142,7 +2142,7 @@ void f1x::openauto::autoapp::ui::MainWindow::tmpChanged() this->openautoupdate = check_file_exist("/tmp/openauto_update_available"); this->systemupdate = check_file_exist("/tmp/system_update_available"); - if (this->csmtupdate || this->udevupdate || this->openautoupdate || this->systemupdate) { + /*if (this->csmtupdate || this->udevupdate || this->openautoupdate || this->systemupdate) { if (ui_->pushButtonUpdate->isVisible() == false) { ui_->pushButtonUpdate->show(); ui_->label_left->show(); @@ -2153,7 +2153,7 @@ void f1x::openauto::autoapp::ui::MainWindow::tmpChanged() ui_->label_dummy_right->show(); } } - } else { + } else {*/ if (ui_->pushButtonUpdate->isVisible() == true) { ui_->pushButtonUpdate->hide(); ui_->label_left->hide(); diff --git a/src/autoapp/UI/UpdateDialog.cpp b/src/autoapp/UI/UpdateDialog.cpp index 635ea13..4a311ef 100644 --- a/src/autoapp/UI/UpdateDialog.cpp +++ b/src/autoapp/UI/UpdateDialog.cpp @@ -36,7 +36,8 @@ UpdateDialog::UpdateDialog(QWidget *parent) ui_->labelSystemReadyInstall->hide(); ui_->labelUpdateChecking->hide(); ui_->pushButtonUpdateCancel->hide(); - updateCheck(); + // TODO: Restore once switched + //updateCheck(); watcher_tmp = new QFileSystemWatcher(this); watcher_tmp->addPath("/tmp"); diff --git a/src/autoapp/UI/mainwindow.ui b/src/autoapp/UI/mainwindow.ui index 503c8e0..dd911e5 100644 --- a/src/autoapp/UI/mainwindow.ui +++ b/src/autoapp/UI/mainwindow.ui @@ -305,7 +305,7 @@ color: rgb(211, 215, 207); background-color: rgba(255, 255, 255, 0); - <html><head/><body><p><span style=" font-style:normal; color:#ffffff;">crank</span><span style=" font-style:normal; color:#5ce739;">shaft </span><span style=" font-style:normal; color:#40bfbf;">NG </span><span style=" font-style:normal; color:#888a85;">- OpenCarOS</span></p></body></html> + <html><head/><body><p><span style=" font-style:normal; color:#7700C8;">Journey</span><span style=" font-style:normal; color:#ffffff;">OS </span></p></body></html> Qt::AlignCenter diff --git a/src/autoapp/UI/settingswindow.ui b/src/autoapp/UI/settingswindow.ui index 717018a..f0cbcd8 100644 --- a/src/autoapp/UI/settingswindow.ui +++ b/src/autoapp/UI/settingswindow.ui @@ -331,7 +331,7 @@ outline: none; Handedness of traffic - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop @@ -540,7 +540,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} 50 - Qt::Horizontal + Qt::Orientation::Horizontal @@ -673,7 +673,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} 50 - Qt::Horizontal + Qt::Orientation::Horizontal @@ -757,7 +757,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} 50 - Qt::Horizontal + Qt::Orientation::Horizontal @@ -908,7 +908,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} - Qt::Vertical + Qt::Orientation::Vertical @@ -1094,7 +1094,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} <html><head/><body><p><img src=":/ico_warning.png"/></p></body></html> - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -1188,16 +1188,16 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} - QFrame::NoFrame + QFrame::Shape::NoFrame - QFrame::Plain + QFrame::Shadow::Plain Layer index - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter @@ -1275,7 +1275,7 @@ subcontrol-position: center left; Margin height - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter @@ -1327,7 +1327,7 @@ subcontrol-position: center left; - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop 0 @@ -1359,7 +1359,7 @@ subcontrol-position: center left; Margin width - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter @@ -1439,7 +1439,7 @@ subcontrol-position: center left; false - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -1536,7 +1536,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} 100 - Qt::Horizontal + Qt::Orientation::Horizontal @@ -1702,7 +1702,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} <html><head/><body><p><img src=":/ico_info.png"/></p></body></html> - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -2010,7 +2010,6 @@ QComboBox::item:selected { - 75 true @@ -2045,7 +2044,6 @@ color: rgb(255, 255, 255); - 75 true @@ -2057,7 +2055,7 @@ color: rgb(255, 255, 255); Test in progress ... - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -2132,7 +2130,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} 100 - Qt::Horizontal + Qt::Orientation::Horizontal @@ -2198,7 +2196,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} 100 - Qt::Horizontal + Qt::Orientation::Horizontal @@ -2208,7 +2206,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} - Qt::Vertical + Qt::Orientation::Vertical @@ -2228,10 +2226,10 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop 1 @@ -2720,7 +2718,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} - Qt::Vertical + Qt::Orientation::Vertical @@ -2821,7 +2819,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} - Qt::Horizontal + Qt::Orientation::Horizontal @@ -2853,7 +2851,6 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} - 75 true @@ -2926,7 +2923,7 @@ outline: none; Wifi Setup - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter @@ -3523,7 +3520,7 @@ outline: none; Wifi Mode - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop false @@ -3612,7 +3609,6 @@ outline: none; - 75 true @@ -3623,7 +3619,7 @@ outline: none; Wait... - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -3746,7 +3742,6 @@ outline: none; - 75 true @@ -3781,7 +3776,6 @@ outline: none; - 75 true @@ -3821,7 +3815,7 @@ outline: none; not available - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -4145,7 +4139,6 @@ outline: none; - 75 true @@ -4162,7 +4155,7 @@ outline: none; - Qt::Vertical + Qt::Orientation::Vertical @@ -4667,7 +4660,7 @@ outline: none; Boot Screen - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter @@ -4888,7 +4881,7 @@ outline: none; Screen Off Timeout: - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter @@ -4916,7 +4909,7 @@ outline: none; - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter @@ -4979,7 +4972,7 @@ subcontrol-position: center left; Seconds - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter @@ -5070,7 +5063,7 @@ subcontrol-position: center left; Shutdown Timeout: - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter @@ -5098,7 +5091,7 @@ subcontrol-position: center left; - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter @@ -5158,7 +5151,7 @@ subcontrol-position: center left; Minutes - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter @@ -5208,7 +5201,7 @@ subcontrol-position: center left; - Qt::Vertical + Qt::Orientation::Vertical @@ -5421,7 +5414,7 @@ subcontrol-position: center left; - - - - QComboBox::AdjustToContentsOnFirstShow + QComboBox::SizeAdjustPolicy::AdjustToContentsOnFirstShow 0 @@ -7117,7 +7110,7 @@ outline: none; Start Day - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter @@ -7172,7 +7165,7 @@ subcontrol-position: center left; - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter 0 @@ -7210,7 +7203,7 @@ subcontrol-position: center left; Start Night - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter @@ -7333,7 +7326,7 @@ subcontrol-position: center left; - Qt::Vertical + Qt::Orientation::Vertical @@ -7550,7 +7543,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} 5 - Qt::Horizontal + Qt::Orientation::Horizontal @@ -7625,7 +7618,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} 20 - Qt::Horizontal + Qt::Orientation::Horizontal @@ -7648,7 +7641,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} 100 - Qt::Horizontal + Qt::Orientation::Horizontal @@ -7671,7 +7664,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} 200 - Qt::Horizontal + Qt::Orientation::Horizontal @@ -7694,7 +7687,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} 500 - Qt::Horizontal + Qt::Orientation::Horizontal @@ -7781,7 +7774,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} 30 - Qt::Horizontal + Qt::Orientation::Horizontal @@ -7817,7 +7810,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} 90 - Qt::Horizontal + Qt::Orientation::Horizontal @@ -7853,7 +7846,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} 150 - Qt::Horizontal + Qt::Orientation::Horizontal @@ -7889,7 +7882,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} 210 - Qt::Horizontal + Qt::Orientation::Horizontal @@ -7925,7 +7918,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} 255 - Qt::Horizontal + Qt::Orientation::Horizontal @@ -7950,7 +7943,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} Options - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop @@ -7993,7 +7986,7 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;} - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop 0 @@ -8194,7 +8187,7 @@ or lower - Qt::Vertical + Qt::Orientation::Vertical @@ -8464,7 +8457,6 @@ subcontrol-position: center left; - 75 true @@ -8480,7 +8472,7 @@ outline: none; - Qt::Horizontal + Qt::Orientation::Horizontal @@ -8512,7 +8504,6 @@ outline: none; - 75 true @@ -8600,7 +8591,6 @@ outline: none; 12 - 75 true @@ -8624,7 +8614,7 @@ QComboBox::item:selected { } - QComboBox::AdjustToContents + QComboBox::SizeAdjustPolicy::AdjustToContents @@ -8788,7 +8778,6 @@ QComboBox::item:selected { 12 - 75 true @@ -8860,7 +8849,6 @@ QComboBox::item:selected { 12 - 75 true @@ -8995,7 +8983,6 @@ QComboBox::item:selected { 12 - 75 true @@ -9121,7 +9108,7 @@ QComboBox::item:selected { Timezone - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter @@ -9148,7 +9135,6 @@ QComboBox::item:selected { 12 - 75 true @@ -9251,7 +9237,6 @@ QComboBox::item:selected { 12 - 75 true @@ -9310,7 +9295,7 @@ QComboBox::item:selected { FPS - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter @@ -9619,10 +9604,10 @@ border-color: rgb(85, 87, 83); - Qt::Horizontal + Qt::Orientation::Horizontal - QSizePolicy::Fixed + QSizePolicy::Policy::Fixed @@ -9685,7 +9670,7 @@ border-color: rgb(85, 87, 83); AWB - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter @@ -9711,7 +9696,6 @@ border-color: rgb(85, 87, 83); - 50 false @@ -9987,7 +9971,6 @@ QComboBox::item:selected { - 75 true @@ -10191,7 +10174,7 @@ QComboBox::item:selected { - Qt::Horizontal + Qt::Orientation::Horizontal @@ -10339,10 +10322,10 @@ border-color: rgb(85, 87, 83); - Qt::Horizontal + Qt::Orientation::Horizontal - QSizePolicy::Fixed + QSizePolicy::Policy::Fixed @@ -10494,7 +10477,6 @@ QComboBox::item:selected { 12 - 75 true @@ -10575,7 +10557,7 @@ QComboBox::item:selected { - Qt::Vertical + Qt::Orientation::Vertical @@ -10612,7 +10594,6 @@ QComboBox::item:selected { - 75 true @@ -10646,7 +10627,6 @@ QComboBox::item:selected { - 75 true @@ -10680,7 +10660,6 @@ QComboBox::item:selected { - 75 true