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

InkBox settings: More design fixes

Browse source
This commit is contained in:
Nicolas Mailloux 2023-12-29 17:24:52 -05:00
parent d95c2a370e
commit 20c4bc3b4a
3 changed files with 76 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/reader/reader.cpp
View file

@ -119,14 +119,6 @@ reader::reader(QWidget *parent) :
ui->viewHighlightsBtn->setText(""); ui->viewHighlightsBtn->setText("");
ui->viewHighlightsBtn->setIcon(QIcon(":/resources/view-highlights.png")); ui->viewHighlightsBtn->setIcon(QIcon(":/resources/view-highlights.png"));
// On the Mini with QT_FONT_DPI set to 187 (default for this device), quitBtn makes the UI go beyond the limits of the screen when the menu bar is shown
if(global::deviceID == "n705\n") {
ui->quitBtn->hide();
ui->quitBtn->deleteLater();
ui->line_19->hide();
ui->line_19->deleteLater();
}
// Style misc. // Style misc.
ui->bookInfoLabel->setStyleSheet("font-style: italic"); ui->bookInfoLabel->setStyleSheet("font-style: italic");

12
src/settings/settings.cpp
View file

@ -81,9 +81,7 @@ settings::settings(QWidget *parent) :
homeIconHeight = sW / 20; homeIconHeight = sW / 20;
} }
ui->headerBtn->hide(); ui->headerStackedWidget->hide();
ui->headerLabel->hide();
ui->line_12->hide();
ui->headerBtn->setIcon(QIcon(":/resources/chevron-left.png")); ui->headerBtn->setIcon(QIcon(":/resources/chevron-left.png"));
ui->headerBtn->setProperty("type", "borderless"); ui->headerBtn->setProperty("type", "borderless");
@ -1109,14 +1107,10 @@ void settings::on_settingsStackedWidget_currentChanged(int arg1)
{ {
if(ui->settingsStackedWidget->currentIndex() != 0) { if(ui->settingsStackedWidget->currentIndex() != 0) {
ui->headerLabel->setText(ui->settingsStackedWidget->currentWidget()->objectName()); ui->headerLabel->setText(ui->settingsStackedWidget->currentWidget()->objectName());
ui->headerBtn->show(); ui->headerStackedWidget->show();
ui->headerLabel->show();
ui->line_12->show();
} }
else { else {
ui->headerBtn->hide(); ui->headerStackedWidget->hide();
ui->headerLabel->hide();
ui->line_12->hide();
} }
} }

113
src/settings/settings.ui
View file

@ -87,50 +87,83 @@
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <widget class="QStackedWidget" name="headerStackedWidget">
<property name="bottomMargin"> <property name="sizePolicy">
<number>0</number> <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<item> <widget class="QWidget" name="page">
<widget class="QPushButton" name="headerBtn"> <layout class="QVBoxLayout" name="verticalLayout_4">
<property name="text"> <property name="sizeConstraint">
<string> Back</string> <enum>QLayout::SetDefaultConstraint</enum>
</property> </property>
</widget> <property name="leftMargin">
</item> <number>0</number>
<item>
<spacer name="horizontalSpacer_19">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="topMargin">
<size> <number>0</number>
<width>40</width>
<height>20</height>
</size>
</property> </property>
</spacer> <property name="rightMargin">
</item> <number>0</number>
<item>
<widget class="QLabel" name="headerLabel">
<property name="text">
<string>headerLabel</string>
</property> </property>
</widget> <property name="bottomMargin">
</item> <number>0</number>
</layout> </property>
</item> <item>
<item> <layout class="QHBoxLayout" name="horizontalLayout">
<widget class="Line" name="line_12"> <property name="sizeConstraint">
<property name="frameShadow"> <enum>QLayout::SetDefaultConstraint</enum>
<enum>QFrame::Plain</enum> </property>
</property> <property name="bottomMargin">
<property name="lineWidth"> <number>0</number>
<number>2</number> </property>
</property> <item>
<property name="orientation"> <widget class="QPushButton" name="headerBtn">
<enum>Qt::Horizontal</enum> <property name="text">
</property> <string> Back</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_19">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="headerLabel">
<property name="text">
<string>headerLabel</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="Line" name="line_12">
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="lineWidth">
<number>2</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_2"/>
</widget> </widget>
</item> </item>
<item> <item>
@ -375,7 +408,7 @@ Save &amp;&amp; Quit
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>419</width> <width>419</width>
<height>726</height> <height>387</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_3">