tza/openauto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes / Apply alpha to old style menu

Browse Source
This commit is contained in:
hawkeyexp 2019-01-06 11:09:32 +01:00
parent 0307adafe8
commit e653923eb6
4 changed files with 680 additions and 572 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/autoapp/UI/MainWindow.cpp
View File

@ -475,6 +475,9 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi
ui_->pushButtonBrightness->hide();
ui_->pushButtonBrightness2->hide();
ui_->BrightnessSliderControl->hide();
// also hide volume button cause not needed if brightness not visible
ui_->pushButtonVolume->hide();
ui_->pushButtonVolume2->hide();
}
// init alpha values
@ -488,6 +491,9 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi
ui_->pushButtonNight2->hide();
ui_->pushButtonBrightness->hide();
ui_->pushButtonBrightness2->hide();
// hide also volume cause not needed without brightness
ui_->pushButtonVolume->hide();
ui_->pushButtonVolume2->hide();
}
// Hide recordings button
@ -780,6 +786,25 @@ void f1x::openauto::autoapp::ui::MainWindow::updateAlpha()
ui_->pushButtonAndroidAuto->setStyleSheet( "background-color: rgba(48, 140, 198, " + alp + " ); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); color: rgb(255,255,255);");
ui_->pushButtonNoDevice->setStyleSheet( "background-color: rgba(48, 140, 198, " + alp + " ); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); color: rgb(255,255,255);");
ui_->pushButtonNoWiFiDevice->setStyleSheet( "background-color: rgba(252, 175, 62, " + alp + " ); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); color: rgb(255,255,255);");
// old style
ui_->pushButtonSettings2->setStyleSheet( "background-color: rgba(136, 138, 133, " + alp + " ); color: rgb(255, 255, 255); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); outline: none;");
ui_->pushButtonLock2->setStyleSheet( "background-color: rgba(136, 138, 133, " + alp + " ); color: rgb(255, 255, 255); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); outline: none;");
ui_->pushButtonMusic2->setStyleSheet( "background-color: rgba(136, 138, 133, " + alp + " ); color: rgb(255, 255, 255); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); outline: none;");
ui_->pushButtonBrightness2->setStyleSheet( "background-color: rgba(136, 138, 133, " + alp + " ); color: rgb(255, 255, 255); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); outline: none;");
ui_->pushButtonToggleGUI2->setStyleSheet( "background-color: rgba(136, 138, 133, " + alp + " ); color: rgb(255, 255, 255); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); outline: none;");
ui_->pushButtonExit2->setStyleSheet( "background-color: rgba(136, 138, 133, " + alp + " ); color: rgb(255, 255, 255); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); outline: none;");
ui_->pushButtonShutdown2->setStyleSheet( "background-color: rgba(136, 138, 133, " + alp + " ); color: rgb(255, 255, 255); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); outline: none;");
ui_->pushButtonReboot2->setStyleSheet( "background-color: rgba(136, 138, 133, " + alp + " ); color: rgb(255, 255, 255); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); outline: none;");
ui_->pushButtonCancel2->setStyleSheet( "background-color: rgba(136, 138, 133, " + alp + " ); color: rgb(255, 255, 255); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); outline: none;");
ui_->pushButtonAndroidAuto2->setStyleSheet( "background-color: rgba(136, 138, 133, " + alp + " ); color: rgb(255, 255, 255); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); outline: none;");
ui_->pushButtonNoDevice2->setStyleSheet( "background-color: rgba(136, 138, 133, " + alp + " ); color: rgb(255, 255, 255); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); outline: none;");
ui_->pushButtonWifi2->setStyleSheet( "background-color: rgba(136, 138, 133, " + alp + " ); color: rgb(255, 255, 255); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); outline: none;");
ui_->pushButtonNoWiFiDevice2->setStyleSheet( "background-color: rgba(136, 138, 133, " + alp + " ); color: rgb(255, 255, 255); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); outline: none;");
ui_->pushButtonDay2->setStyleSheet( "background-color: rgba(136, 138, 133, " + alp + " ); color: rgb(255, 255, 255); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); outline: none;");
ui_->pushButtonNight2->setStyleSheet( "background-color: rgba(136, 138, 133, " + alp + " ); color: rgb(255, 255, 255); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); outline: none;");
ui_->pushButtonCameraShow2->setStyleSheet( "background-color: rgba(136, 138, 133, " + alp + " ); color: rgb(255, 255, 255); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); outline: none;");
ui_->pushButtonVolume2->setStyleSheet( "background-color: rgba(136, 138, 133, " + alp + " ); color: rgb(255, 255, 255); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); outline: none;");
ui_->pushButtonDebug2->setStyleSheet( "background-color: rgba(136, 138, 133, " + alp + " ); color: rgb(255, 255, 255); border-radius: 4px; border: 2px solid rgba(255,255,255,0.5); outline: none;");
}
}
@ -791,6 +816,7 @@ void f1x::openauto::autoapp::ui::MainWindow::switchGuiToNight()
ui_->pushButtonDay2->show();
ui_->pushButtonNight->hide();
ui_->pushButtonNight2->hide();
ui_->BrightnessSliderControl->hide();
if (ui_->mediaWidget->isVisible() == true) {
ui_->VolumeSliderControl->hide();
}
@ -804,6 +830,7 @@ void f1x::openauto::autoapp::ui::MainWindow::switchGuiToDay()
ui_->pushButtonNight2->show();
ui_->pushButtonDay->hide();
ui_->pushButtonDay2->hide();
ui_->BrightnessSliderControl->hide();
if (ui_->mediaWidget->isVisible() == true) {
ui_->VolumeSliderControl->hide();
}
@ -1677,7 +1704,7 @@ void f1x::openauto::autoapp::ui::MainWindow::tmpChanged()
}
// Hide auto day/night if needed
if (this->lightsensor) {
if (this->lightsensor || std::ifstream("/tmp/daynight_gpio")) {
ui_->pushButtonDay->hide();
ui_->pushButtonNight->hide();
ui_->pushButtonDay2->hide();
@ -1739,6 +1766,9 @@ void f1x::openauto::autoapp::ui::MainWindow::tmpChanged()
ui_->pushButtonBrightness->hide();
ui_->pushButtonBrightness2->hide();
ui_->BrightnessSliderControl->hide();
// also hide volume button if brightness hidden
ui_->pushButtonVolume->hide();
ui_->pushButtonVolume2->hide();
if (ui_->mediaWidget->isVisible() == false) {
ui_->VolumeSliderControl->show();
}
@ -1748,6 +1778,10 @@ void f1x::openauto::autoapp::ui::MainWindow::tmpChanged()
if ((ui_->pushButtonBrightness->isVisible() == false) || (ui_->pushButtonBrightness->isVisible() == false)) {
ui_->pushButtonBrightness->show();
ui_->pushButtonBrightness2->show();
// also show volume button if brightness visible
ui_->pushButtonVolume->show();
ui_->pushButtonVolume2->show();
ui_->BrightnessSliderControl->hide();
}
}
}

11
src/autoapp/UI/SettingsWindow.cpp
View File

@ -116,6 +116,7 @@ SettingsWindow::SettingsWindow(configuration::IConfiguration::Pointer configurat
ui_->spinBoxHour->setValue((time_text_hour).toInt());
ui_->spinBoxMinute->setValue((time_text_minute).toInt());
ui_->label_modeswitchprogress->setText("Ok");
ui_->label_notavailable->hide();
if (std::ifstream("/tmp/hotspot_active")) {
ui_->radioButtonClient->setChecked(0);
@ -124,6 +125,8 @@ SettingsWindow::SettingsWindow(configuration::IConfiguration::Pointer configurat
ui_->lineEditPassword->show();
ui_->label_password->show();
ui_->lineEditPassword->setText("1234567890");
ui_->clientNetworkSelect->hide();
ui_->label_notavailable->show();
} else {
ui_->radioButtonClient->setChecked(1);
ui_->radioButtonHotspot->setChecked(0);
@ -131,6 +134,8 @@ SettingsWindow::SettingsWindow(configuration::IConfiguration::Pointer configurat
ui_->lineEditPassword->hide();
ui_->label_password->hide();
ui_->lineEditPassword->setText("");
ui_->clientNetworkSelect->hide();
ui_->label_notavailable->show();
}
}
@ -1002,6 +1007,8 @@ void SettingsWindow::onShowBindings()
void SettingsWindow::onStartHotspot()
{
ui_->label_modeswitchprogress->setText("Wait ...");
ui_->clientNetworkSelect->hide();
ui_->label_notavailable->show();
ui_->radioButtonClient->setEnabled(0);
ui_->radioButtonHotspot->setEnabled(0);
ui_->lineEdit_wlan0->setText("");
@ -1016,6 +1023,8 @@ void SettingsWindow::onStartHotspot()
void SettingsWindow::onStopHotspot()
{
ui_->label_modeswitchprogress->setText("Wait ...");
ui_->clientNetworkSelect->hide();
ui_->label_notavailable->show();
ui_->radioButtonClient->setEnabled(0);
ui_->radioButtonHotspot->setEnabled(0);
ui_->lineEdit_wlan0->setText("");
@ -1216,6 +1225,8 @@ void f1x::openauto::autoapp::ui::SettingsWindow::updateNetworkInfo()
ui_->lineEditPassword->hide();
ui_->label_password->hide();
ui_->lineEditPassword->setText("");
ui_->clientNetworkSelect->show();
ui_->label_notavailable->hide();
}
}

1045
src/autoapp/UI/mainwindow.ui
View File

File diff suppressed because it is too large Load Diff

160
src/autoapp/UI/settingswindow.ui
View File

@ -445,7 +445,7 @@ outline: none;
</sizepolicy>
</property>
<property name="title">
<string>Transparency Tile GUI</string>
<string>Transparency GUI</string>
</property>
<layout class="QFormLayout" name="formLayout_15">
<property name="topMargin">
@ -3406,114 +3406,142 @@ outline: none;</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_19">
<property name="leftMargin">
<number>9</number>
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>9</number>
<number>0</number>
</property>
<property name="bottomMargin">
<number>2</number>
</property>
<item>
<widget class="QPushButton" name="pushButtonNetwork0">
<widget class="QLabel" name="label_notavailable">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>120</width>
<height>0</height>
<width>0</width>
<height>24</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>120</width>
<height>16777215</height>
<width>16777215</width>
<height>24</height>
</size>
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="styleSheet">
<string notr="true">background-color: rgb(117, 80, 123);
outline: none;</string>
</property>
<property name="text">
<string>Config 1</string>
<string>not available</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonNetwork1">
<widget class="QWidget" name="clientNetworkSelect" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>120</width>
<height>0</height>
<width>0</width>
<height>24</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>120</width>
<height>16777215</height>
<width>16777215</width>
<height>24</height>
</size>
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="styleSheet">
<string notr="true">background-color: rgb(117, 80, 123);
<layout class="QHBoxLayout" name="horizontalLayout_22">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QPushButton" name="pushButtonNetwork0">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="styleSheet">
<string notr="true">background-color: rgb(117, 80, 123);
outline: none;</string>
</property>
<property name="text">
<string>Config 2</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonNetworkAuto">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>120</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>120</width>
<height>16777215</height>
</size>
</property>
<property name="styleSheet">
<string notr="true">background-color: rgb(78, 154, 6);
</property>
<property name="text">
<string>Default</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonNetwork1">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="styleSheet">
<string notr="true">background-color: rgb(117, 80, 123);
outline: none;</string>
</property>
<property name="text">
<string>Auto</string>
</property>
</property>
<property name="text">
<string>Phone Hotspot</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonNetworkAuto">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="styleSheet">
<string notr="true">background-color: rgb(78, 154, 6);
outline: none;</string>
</property>
<property name="text">
<string>Auto</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>