michael/quill
1
0
Fork 0
mirror of https://github.com/Quill-OS/quill.git synced 2024-12-26 23:57:22 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improved USBMS prompt

Browse source 
Still half-working but better
This commit is contained in:
Nicolas Mailloux 2021-05-09 14:07:05 -04:00
parent 49e6a7167f
commit ef34273f37
11 changed files with 281 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
functions.h
View file

@ -37,7 +37,11 @@ namespace global {
} }
inline bool updateDialog; inline bool updateDialog;
inline bool lowBatteryDialog; inline bool lowBatteryDialog;
}
namespace usbms {
inline bool usbmsDialog; inline bool usbmsDialog;
inline bool showUsbmsDialog;
inline bool launchUsbms;
} }
namespace settings { namespace settings {
inline bool settingsRebootDialog; inline bool settingsRebootDialog;

22
generaldialog.cpp
View file

@ -86,6 +86,14 @@ generalDialog::generalDialog(QWidget *parent) :
this->adjustSize(); this->adjustSize();
string_writeconfig("/inkbox/lowBatteryDialog", "false"); string_writeconfig("/inkbox/lowBatteryDialog", "false");
} }
else if(global::usbms::usbmsDialog == true) {
usbmsDialog = true;
ui->okBtn->setText("Connect");
ui->cancelBtn->setText("Cancel");
ui->bodyLabel->setText("Do you want to connect your device to a computer to manage books?");
ui->headerLabel->setText("USB cable connected");
this->adjustSize();
}
else { else {
// We shouldn't be there ;) // We shouldn't be there ;)
; ;
@ -112,6 +120,9 @@ void generalDialog::on_cancelBtn_clicked()
string_writeconfig("/tmp/cancelUpdateDialog", "true"); string_writeconfig("/tmp/cancelUpdateDialog", "true");
generalDialog::close(); generalDialog::close();
} }
if(usbmsDialog == true) {
generalDialog::close();
}
} }
void generalDialog::on_okBtn_clicked() void generalDialog::on_okBtn_clicked()
@ -129,7 +140,7 @@ void generalDialog::on_okBtn_clicked()
proc->waitForFinished(); proc->waitForFinished();
} }
else { else {
// Restore default settings, we're not running on InkBox OS // Restore default settings, we're not on InkBox OS
QString prog ("sh"); QString prog ("sh");
QStringList args; QStringList args;
args << "reset-config.sh"; args << "reset-config.sh";
@ -153,6 +164,15 @@ void generalDialog::on_okBtn_clicked()
proc->start(prog, args); proc->start(prog, args);
proc->waitForFinished(); proc->waitForFinished();
} }
if(usbmsDialog == true) {
global::usbms::usbmsDialog = false;
global::usbms::launchUsbms = true;
usbmsWindow = new usbms_splash();
usbmsWindow->setAttribute(Qt::WA_DeleteOnClose);
usbmsWindow->setGeometry(QRect(QPoint(0,0), screen()->geometry ().size()));
usbmsWindow->show();
}
} }
void generalDialog::on_acceptBtn_clicked() void generalDialog::on_acceptBtn_clicked()
{ {

6
generaldialog.h
View file

@ -3,6 +3,8 @@
#include <QDialog> #include <QDialog>
#include "usbms_splash.h"
using namespace std; using namespace std;
namespace Ui { namespace Ui {
@ -21,16 +23,16 @@ public:
bool settingsRebootDialog = false; bool settingsRebootDialog = false;
bool koboxSettingsRebootDialog = false; bool koboxSettingsRebootDialog = false;
bool lowBatteryDialog = false; bool lowBatteryDialog = false;
bool usbmsDialog = false;
private slots: private slots:
void on_cancelBtn_clicked(); void on_cancelBtn_clicked();
void on_okBtn_clicked(); void on_okBtn_clicked();
void on_acceptBtn_clicked(); void on_acceptBtn_clicked();
private: private:
Ui::generalDialog *ui; Ui::generalDialog *ui;
usbms_splash *usbmsWindow;
}; };
#endif // GENERALDIALOG_H #endif // GENERALDIALOG_H

8
koboxappsdialog.cpp
View file

@ -49,6 +49,9 @@ koboxAppsDialog::koboxAppsDialog(QWidget *parent) :
QStringListModel* model = new QStringListModel(this); QStringListModel* model = new QStringListModel(this);
QStringList list = apps.split("\n", QString::SkipEmptyParts); QStringList list = apps.split("\n", QString::SkipEmptyParts);
// Apps that aren't extensions
list.prepend("Geany");
if(checkconfig("/external_root/opt/root/rooted") == true) { if(checkconfig("/external_root/opt/root/rooted") == true) {
list.prepend("KTerm"); list.prepend("KTerm");
} }
@ -87,7 +90,7 @@ void koboxAppsDialog::on_launchBtn_clicked()
// DPI setting // DPI setting
string_checkconfig(".config/00-kobox/dpiSetting"); string_checkconfig(".config/00-kobox/dpiSetting");
if(checkconfig_str_val == "") { if(checkconfig_str_val == "") {
dpiSetting = "150"; dpiSetting = "125";
} }
else { else {
dpiSetting = checkconfig_str_val.toStdString(); dpiSetting = checkconfig_str_val.toStdString();
@ -106,6 +109,9 @@ void koboxAppsDialog::on_launchBtn_clicked()
dpModeSetting = "fullscreen"; dpModeSetting = "fullscreen";
dpiSetting = "175"; dpiSetting = "175";
} }
else if(itemText == "Geany") {
string_writeconfig("/external_root/tmp/X_program", "geany");
}
else { else {
QString itemTextLower = itemText.toLower(); QString itemTextLower = itemText.toLower();
std::string app = itemTextLower.toStdString(); std::string app = itemTextLower.toStdString();

17
koboxsettings.cpp
View file

@ -27,6 +27,16 @@ koboxSettings::koboxSettings(QWidget *parent) :
else { else {
ui->koboxStatusLabel->setText("KoBox is <b>disabled</b>"); ui->koboxStatusLabel->setText("KoBox is <b>disabled</b>");
} }
// DPI setting
string_checkconfig(".config/00-kobox/dpiSetting");
if(checkconfig_str_val == "") {
;
}
else {
int dpi_setting = checkconfig_str_val.toInt();
ui->spinBox->setValue(dpi_setting);
}
} }
koboxSettings::~koboxSettings() koboxSettings::~koboxSettings()
@ -63,3 +73,10 @@ void koboxSettings::openSettingsRebootDialog() {
generalDialogWindow->setAttribute(Qt::WA_DeleteOnClose); generalDialogWindow->setAttribute(Qt::WA_DeleteOnClose);
generalDialogWindow->show(); generalDialogWindow->show();
} }
void koboxSettings::on_spinBox_valueChanged(int arg1)
{
QString number = QString::number(arg1);
string number_str = number.toStdString();
string_writeconfig(".config/00-kobox/dpiSetting", number_str);
}

2
koboxsettings.h
View file

@ -24,6 +24,8 @@ private slots:
void on_okBtn_clicked(); void on_okBtn_clicked();
void on_checkBox_toggled(bool checked); void on_checkBox_toggled(bool checked);
void on_spinBox_valueChanged(int arg1);
private: private:
Ui::koboxSettings *ui; Ui::koboxSettings *ui;
generalDialog *generalDialogWindow; generalDialog *generalDialogWindow;

189
koboxsettings.ui
View file

@ -16,6 +16,52 @@
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="6" column="0">
<widget class="QPushButton" name="okBtn">
<property name="font">
<font>
<family>Inter</family>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>
OK
</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="Line" name="line">
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="lineWidth">
<number>5</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="font">
<font>
<family>Inter</family>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>KoBox settings</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QStackedWidget" name="stackedWidget"> <widget class="QStackedWidget" name="stackedWidget">
<widget class="QWidget" name="page"> <widget class="QWidget" name="page">
@ -34,6 +80,19 @@
</property> </property>
<item> <item>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="6" column="0">
<widget class="QLabel" name="label_3">
<property name="font">
<font>
<family>Chivo</family>
<italic>true</italic>
</font>
</property>
<property name="text">
<string>Settings</string>
</property>
</widget>
</item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QLabel" name="koboxStatusLabel"> <widget class="QLabel" name="koboxStatusLabel">
<property name="text"> <property name="text">
@ -44,6 +103,19 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="Line" name="line_3"> <widget class="Line" name="line_3">
<property name="frameShadow"> <property name="frameShadow">
@ -54,6 +126,19 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="font">
<font>
<family>Chivo</family>
<italic>true</italic>
</font>
</property>
<property name="text">
<string>KoBox status</string>
</property>
</widget>
</item>
<item row="5" column="0"> <item row="5" column="0">
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="1"> <item row="0" column="1">
@ -91,32 +176,56 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="1" column="0"> <item row="7" column="0">
<widget class="QLabel" name="label_2"> <widget class="Line" name="line_4">
<property name="font"> <property name="frameShadow">
<font> <enum>QFrame::Plain</enum>
<family>Chivo</family>
<italic>true</italic>
</font>
</property> </property>
<property name="text"> <property name="orientation">
<string>KoBox status</string> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0"> <item row="8" column="0">
<spacer name="verticalSpacer"> <layout class="QGridLayout" name="gridLayout_4">
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Applications scale (DPI)</string>
</property>
</widget>
</item>
<item row="0" column="1">
<spacer name="horizontalSpacer_3">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>40</width>
<height>40</height> <height>20</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="0" column="2">
<widget class="QSpinBox" name="spinBox">
<property name="minimum">
<number>25</number>
</property>
<property name="maximum">
<number>250</number>
</property>
<property name="singleStep">
<number>25</number>
</property>
</widget>
</item>
</layout>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>
@ -124,59 +233,7 @@
<widget class="QWidget" name="page_2"/> <widget class="QWidget" name="page_2"/>
</widget> </widget>
</item> </item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="font">
<font>
<family>Inter</family>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>KoBox settings</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="5" column="0"> <item row="5" column="0">
<widget class="QStackedWidget" name="settingsWidget">
<widget class="QWidget" name="page_5"/>
<widget class="QWidget" name="page_6"/>
</widget>
</item>
<item row="1" column="0">
<widget class="Line" name="line">
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="lineWidth">
<number>5</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QPushButton" name="okBtn">
<property name="font">
<font>
<family>Inter</family>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>
OK
</string>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="Line" name="line_2"> <widget class="Line" name="line_2">
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Plain</enum> <enum>QFrame::Plain</enum>

23
mainwindow.cpp
View file

@ -55,6 +55,8 @@ MainWindow::MainWindow(QWidget *parent)
// Variables // Variables
global::battery::showLowBatteryDialog = true; global::battery::showLowBatteryDialog = true;
global::battery::showCriticalBatteryAlert = true; global::battery::showCriticalBatteryAlert = true;
global::usbms::showUsbmsDialog = true;
global::usbms::launchUsbms = false;
global::mainwindow::tabSwitcher::repaint = true; global::mainwindow::tabSwitcher::repaint = true;
// Getting the screen's size // Getting the screen's size
@ -354,7 +356,8 @@ MainWindow::MainWindow(QWidget *parent)
QTimer *usbmsPrompt = new QTimer(this); QTimer *usbmsPrompt = new QTimer(this);
usbmsPrompt->setInterval(2000); usbmsPrompt->setInterval(2000);
connect(usbmsPrompt, &QTimer::timeout, [&]() { connect(usbmsPrompt, &QTimer::timeout, [&]() {
if(global::mainwindow::usbmsDialog != true) { if(checkconfig("/opt/inkbox_genuine") == true) {
if(global::usbms::showUsbmsDialog != true) {
; ;
} }
else { else {
@ -365,10 +368,16 @@ MainWindow::MainWindow(QWidget *parent)
} }
else { else {
// An USB cable is connected! // An USB cable is connected!
openUsbmsDialog();
} }
} }
}
else {
// Do nothing, we're running along with Nickel & friends...
;
}
} ); } );
usbmsPrompt->start();
// We set the brightness level saved in the config file // We set the brightness level saved in the config file
int brightness_value = brightness_checkconfig(".config/03-brightness/config"); int brightness_value = brightness_checkconfig(".config/03-brightness/config");
@ -551,6 +560,16 @@ void MainWindow::openLowBatteryDialog() {
QApplication::processEvents(); QApplication::processEvents();
} }
void MainWindow::openUsbmsDialog() {
global::usbms::showUsbmsDialog = false;
global::usbms::usbmsDialog = true;
generalDialogWindow = new generalDialog(this);
generalDialogWindow->setAttribute(Qt::WA_DeleteOnClose);
generalDialogWindow->show();
QApplication::processEvents();
}
void MainWindow::openCriticalBatteryAlertWindow() { void MainWindow::openCriticalBatteryAlertWindow() {
global::battery::showCriticalBatteryAlert = true; global::battery::showCriticalBatteryAlert = true;
global::battery::showLowBatteryDialog = false; global::battery::showLowBatteryDialog = false;

1
mainwindow.h
View file

@ -44,6 +44,7 @@ public:
void openLowBatteryDialog(); void openLowBatteryDialog();
void openCriticalBatteryAlertWindow(); void openCriticalBatteryAlertWindow();
void openUsbmsDialog();
void resetWindow(bool resetStackedWidget); void resetWindow(bool resetStackedWidget);
void resetIcons(); void resetIcons();

66
usbms_splash.cpp
View file

@ -3,6 +3,7 @@
#include <QPixmap> #include <QPixmap>
#include <QScreen> #include <QScreen>
#include <QTimer>
#include "functions.h" #include "functions.h"
@ -48,6 +49,71 @@ usbms_splash::usbms_splash(QWidget *parent) :
QPixmap scaledPixmap = pixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio); QPixmap scaledPixmap = pixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio);
ui->label_2->setPixmap(scaledPixmap); ui->label_2->setPixmap(scaledPixmap);
} }
if(global::usbms::launchUsbms == true) {
global::usbms::launchUsbms = false;
usbms_launch();
}
}
void usbms_splash::usbms_launch()
{
QString umount_prog ("umount");
QStringList umount_args;
umount_args << "/dev/loop0";
QProcess *umount_proc = new QProcess();
umount_proc->start(umount_prog, umount_args);
umount_proc->waitForFinished();
QString rmmod ("rmmod");
QStringList rmmod_args;
rmmod_args << "g_ether.ko";
QProcess *rmmod_proc = new QProcess();
rmmod_proc->start(rmmod, rmmod_args);
rmmod_proc->waitForFinished();
QString prog ("insmod");
QStringList args;
args << "/external_root/modules/arcotg_udc.ko";
QProcess *proc = new QProcess();
proc->start(prog, args);
proc->waitForFinished();
QString prog_1 ("insmod");
QStringList args_1;
args_1 << "/external_root/modules/g_mass_storage.ko" << "file=/external_root/opt/storage/onboard" << "removable=y" << "stall=0";
QProcess *proc_1 = new QProcess();
proc_1->start(prog_1, args_1);
proc_1->waitForFinished();
QTimer *usbms_t = new QTimer(this);
usbms_t->setInterval(1000);
connect(usbms_t, &QTimer::timeout, [&]() {
QString prog ("mass_storage.sh");
QStringList args;
QProcess *proc = new QProcess();
proc->start(prog, args);
proc->waitForFinished();
QFile modules("/tmp/usbevent");
modules.open(QIODevice::ReadWrite);
QTextStream in (&modules);
const QString content = in.readAll();
std::string contentstr = content.toStdString();
modules.close();
if(contentstr.find("1") != std::string::npos) {
QString reboot_prog ("busybox");
QStringList reboot_args;
reboot_args << "reboot";
QProcess *reboot_proc = new QProcess();
reboot_proc->start(reboot_prog, reboot_args);
reboot_proc->waitForFinished();
}
else {
;
}
} );
usbms_t->start();
} }
usbms_splash::~usbms_splash() usbms_splash::~usbms_splash()

2
usbms_splash.h
View file

@ -15,6 +15,8 @@ public:
explicit usbms_splash(QWidget *parent = nullptr); explicit usbms_splash(QWidget *parent = nullptr);
~usbms_splash(); ~usbms_splash();
void usbms_launch();
private: private:
Ui::usbms_splash *ui; Ui::usbms_splash *ui;
}; };