Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Layout fixes #297

Merged
merged 10 commits into from
Nov 8, 2024
Merged

Layout fixes #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d5f3cef
ui::mainwindow: increase info box to 11pt to avoid height change; lints
daringer Oct 21, 2024
4c7f9d4
ui: unify tab left content margins; hide settings tree headline
daringer Oct 21, 2024
8d57748
Unify font sizes everywhere - except welcome screen
daringer Oct 21, 2024
baa5518
nk3-button: increase font size on hidden device
daringer Oct 21, 2024
ace41c9
welcome: redesign for consistent look&feel
daringer Oct 21, 2024
fa2247c
more font-size consistency
daringer Oct 21, 2024
d9b4763
ui: improve centered alignment of navigation logo
daringer Oct 22, 2024
2969176
ui::overview: use specific font-size for 'Init Status' content
daringer Oct 22, 2024
9b7c46a
fix some more font sizes
daringer Oct 28, 2024
c26bf55
settings/secrets: enforce same width
daringer Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions nitrokeyapp/gui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,10 +227,9 @@ def show_navigation(self) -> None:
self.ui.vertical_navigation.setMaximumWidth(80)
self.ui.btn_dial_help.hide()

self.ui.main_logo.setMaximumWidth(48)
self.ui.main_logo.setMaximumHeight(48)
self.ui.main_logo.setMinimumWidth(48)
self.ui.main_logo.setMinimumHeight(48)
self.ui.main_logo.setFixedWidth(64)
self.ui.main_logo.setFixedHeight(64)
self.ui.main_logo.setContentsMargins(0, 0, 0, 0)

def hide_navigation(self) -> None:
for btn in self.device_buttons:
Expand All @@ -240,10 +239,9 @@ def hide_navigation(self) -> None:
self.ui.vertical_navigation.setMaximumWidth(200)
self.ui.btn_dial_help.show()

self.ui.main_logo.setMaximumWidth(120)
self.ui.main_logo.setMaximumHeight(120)
self.ui.main_logo.setMinimumWidth(64)
self.ui.main_logo.setMinimumHeight(64)
self.ui.main_logo.setFixedWidth(190)
self.ui.main_logo.setFixedHeight(200)
self.ui.main_logo.setContentsMargins(30, 40, 40, 40)

def show_device(self, data: DeviceData) -> None:
self.selected_device = data
Expand Down Expand Up @@ -271,6 +269,9 @@ def show_device(self, data: DeviceData) -> None:
view = self.views[self.tabs.currentIndex()]
view.refresh(data, force=True)

for btn in self.device_buttons:
btn.set_stylesheet_small()

def hide_device(self) -> None:
self.selected_device = None

Expand All @@ -279,6 +280,9 @@ def hide_device(self) -> None:
self.hide_navigation()
self.welcome_widget.show()

for btn in self.device_buttons:
btn.set_stylesheet_big()

@Slot(int)
def tab_changed(self, idx: int) -> None:
view = self.views[self.tabs.currentIndex()]
Expand Down
42 changes: 30 additions & 12 deletions nitrokeyapp/nk3_button.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,8 @@ def __init__(
self.setCheckable(True)
self.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)

self.setStyleSheet(
"""
QToolButton { background-color: none; border: none; margin: 0;
margin-top: 8px; padding: 0.25em; border-radius: 6px;
font: bold; font-size: 10px; border: 1px solid palette(button);
}
QToolButton:checked { background-color: palette(button);
border: 1px outset palette(shadow);
font: bold; font-size: 10px;
}
"""
)
self.set_stylesheet_small()

self.effect = QtWidgets.QGraphicsColorizeEffect(self)
self.effect.setColor(QtGui.QColor(115, 215, 125))
self.effect.setStrength(0)
Expand Down Expand Up @@ -63,6 +53,34 @@ def __init__(

self.animation = anims

def set_stylesheet_big(self) -> None:
self.setStyleSheet(
"""
QToolButton { background-color: none; border: none; margin: 0;
margin-top: 8px; padding: 0.25em; border-radius: 6px;
font: bold; font-size: 12px; border: 1px solid palette(button);
}
QToolButton:checked { background-color: palette(button);
border: 1px outset palette(shadow);
font: bold; font-size: 10px;
}
"""
)

def set_stylesheet_small(self) -> None:
self.setStyleSheet(
"""
QToolButton { background-color: none; border: none; margin: 0;
margin-top: 8px; padding: 0.25em; border-radius: 6px;
font: bold; font-size: 10px; border: 1px solid palette(button);
}
QToolButton:checked { background-color: palette(button);
border: 1px outset palette(shadow);
font: bold; font-size: 10px;
}
"""
)

def start_touch(self) -> None:
self.animation.start()
self.setToolTip("touch your Nitrokey 3")
Expand Down
2 changes: 1 addition & 1 deletion nitrokeyapp/secrets_tab/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ def check_credential(self) -> None:
if self.ui.select_algorithm.isEnabled():
if algo == "None":
self.ui.otp.setReadOnly(True)
self.ui.otp.setPlaceholderText("<Select Algorithm>")
self.ui.otp.setPlaceholderText("<select algorithm>")
else:
self.ui.otp.setReadOnly(False)
self.ui.otp.setPlaceholderText("<empty>")
Expand Down
2 changes: 1 addition & 1 deletion nitrokeyapp/settings_tab/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ def update_status_form(self, data: Optional[List[Tuple[str, str]]] = None) -> No
d_obj = getattr(self.ui, f"value_{idx}")

if data is not None and len(data) > idx:
l_obj.setText(f"**{data[idx][0]}:**")
l_obj.setText(f"{data[idx][0]}: ")
d_obj.setText(data[idx][1])
l_obj.show()
d_obj.show()
Expand Down
77 changes: 41 additions & 36 deletions nitrokeyapp/ui/mainwindow.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</size>
</property>
<property name="contextMenuPolicy">
<enum>Qt::DefaultContextMenu</enum>
<enum>Qt::ContextMenuPolicy::DefaultContextMenu</enum>
</property>
<property name="windowTitle">
<string>Nitrokey App</string>
Expand All @@ -35,10 +35,10 @@
<string notr="true"/>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonIconOnly</enum>
<enum>Qt::ToolButtonStyle::ToolButtonIconOnly</enum>
</property>
<property name="tabShape">
<enum>QTabWidget::Rounded</enum>
<enum>QTabWidget::TabShape::Rounded</enum>
</property>
<property name="dockNestingEnabled">
<bool>false</bool>
Expand All @@ -63,17 +63,17 @@
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
<enum>QFrame::Shape::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
<enum>QFrame::Shadow::Plain</enum>
</property>
<property name="lineWidth">
<number>0</number>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_9">
<property name="sizeConstraint">
<enum>QLayout::SetMaximumSize</enum>
<enum>QLayout::SizeConstraint::SetMaximumSize</enum>
</property>
<property name="leftMargin">
<number>9</number>
Expand Down Expand Up @@ -124,7 +124,7 @@
</property>
<property name="font">
<font>
<pointsize>8</pointsize>
<pointsize>11</pointsize>
</font>
</property>
<property name="text">
Expand All @@ -135,10 +135,10 @@
<item>
<spacer name="__spacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
<enum>QSizePolicy::Policy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
Expand All @@ -152,7 +152,7 @@
<widget class="QLabel" name="device_info">
<property name="font">
<font>
<pointsize>8</pointsize>
<pointsize>11</pointsize>
<bold>true</bold>
</font>
</property>
Expand All @@ -169,6 +169,11 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>8</pointsize>
</font>
</property>
<property name="text">
<string/>
</property>
Expand All @@ -179,7 +184,7 @@
</layout>
</widget>
</item>
<item row="0" column="0" rowspan="3" alignment="Qt::AlignHCenter">
<item row="0" column="0" rowspan="3">
<widget class="QFrame" name="vertical_navigation">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
Expand All @@ -197,10 +202,10 @@
<string notr="true"/>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
<enum>QFrame::Shape::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
<enum>QFrame::Shadow::Raised</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="leftMargin">
Expand All @@ -209,20 +214,14 @@
<property name="rightMargin">
<number>9</number>
</property>
<item alignment="Qt::AlignHCenter">
<item>
<widget class="QLabel" name="main_logo">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="lineWidth">
<number>1</number>
</property>
<property name="text">
<string/>
</property>
Expand All @@ -233,14 +232,14 @@
<bool>true</bool>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<set>Qt::AlignmentFlag::AlignCenter</set>
</property>
</widget>
</item>
<item alignment="Qt::AlignHCenter">
<item>
<widget class="QLabel" name="label_insert_Nitrokey">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
Expand All @@ -260,7 +259,7 @@
your Nitrokey</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<set>Qt::AlignmentFlag::AlignCenter</set>
</property>
</widget>
</item>
Expand Down Expand Up @@ -291,7 +290,7 @@
<item>
<spacer name="vertical_spacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
Expand Down Expand Up @@ -339,7 +338,7 @@
</font>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
<enum>Qt::FocusPolicy::NoFocus</enum>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;home&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
Expand Down Expand Up @@ -367,7 +366,7 @@
</property>
</widget>
</item>
<item alignment="Qt::AlignHCenter">
<item>
<widget class="QPushButton" name="btn_dial_help">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
Expand All @@ -394,13 +393,13 @@
<bool>false</bool>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
<enum>Qt::FocusPolicy::NoFocus</enum>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;help&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="layoutDirection">
<enum>Qt::RightToLeft</enum>
<enum>Qt::LayoutDirection::RightToLeft</enum>
</property>
<property name="styleSheet">
<string notr="true">QPushButton {
Expand Down Expand Up @@ -480,11 +479,12 @@
</property>
<property name="font">
<font>
<pointsize>14</pointsize>
<pointsize>11</pointsize>
<bold>false</bold>
</font>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
<enum>Qt::LayoutDirection::LeftToRight</enum>
</property>
<property name="autoFillBackground">
<bool>false</bool>
Expand All @@ -493,19 +493,19 @@
<string notr="true"/>
</property>
<property name="inputMethodHints">
<set>Qt::ImhNone</set>
<set>Qt::InputMethodHint::ImhNone</set>
</property>
<property name="tabPosition">
<enum>QTabWidget::North</enum>
<enum>QTabWidget::TabPosition::North</enum>
</property>
<property name="tabShape">
<enum>QTabWidget::Rounded</enum>
<enum>QTabWidget::TabShape::Rounded</enum>
</property>
<property name="currentIndex">
<number>-1</number>
</property>
<property name="elideMode">
<enum>Qt::ElideNone</enum>
<enum>Qt::TextElideMode::ElideNone</enum>
</property>
<property name="usesScrollButtons">
<bool>true</bool>
Expand All @@ -529,6 +529,11 @@
</item>
<item row="1" column="1">
<widget class="QProgressBar" name="progress_bar">
<property name="font">
<font>
<pointsize>11</pointsize>
</font>
</property>
<property name="value">
<number>0</number>
</property>
Expand Down
Loading