chris/lumina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

smaller font picker so it fits better on SongEditor.qml

Browse source
This commit is contained in:
Chris Cochrun 2023-11-21 06:34:32 -06:00
parent adc8bc8c04
commit 39ef6ed492
2 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/qml/presenter/SongEditor.qml
View file

@ -29,7 +29,7 @@ Item {
Controls.ComboBox { Controls.ComboBox {
id: fontBox id: fontBox
model: Qt.fontFamilies() model: Qt.fontFamilies()
implicitWidth: 300 implicitWidth: root.width / 5 > 300 ? 300 : root.width / 5
editable: true editable: true
hoverEnabled: true hoverEnabled: true
/* flat: true */ /* flat: true */
@ -164,12 +164,6 @@ Item {
Controls.ToolSeparator {} Controls.ToolSeparator {}
Item { Layout.fillWidth: true } Item { Layout.fillWidth: true }
Controls.ToolSeparator {} Controls.ToolSeparator {}
Controls.ToolButton {
text: "Effects"
icon.name: "image-auto-adjust"
hoverEnabled: true
onClicked: {}
}
Controls.ToolButton { Controls.ToolButton {
id: backgroundButton id: backgroundButton
text: "Background" text: "Background"
@ -177,6 +171,12 @@ Item {
hoverEnabled: true hoverEnabled: true
onClicked: backgroundTypePopup.open() onClicked: backgroundTypePopup.open()
} }
Controls.ToolButton {
text: "Effects"
icon.name: "image-auto-adjust"
hoverEnabled: true
onClicked: {}
}
Controls.Popup { Controls.Popup {
id: backgroundTypePopup id: backgroundTypePopup

22
src/rust/image_model.rs
View file

@ -62,17 +62,17 @@ mod image_model {
TitleRole, TitleRole,
} }
impl FromStr for Role { // impl FromStr for Role {
type Err = (); // type Err = ();
fn from_str(input: &str) -> Result<Role, Self::Err> { // fn from_str(input: &str) -> Result<Role, Self::Err> {
match input { // match input {
"id" => Ok(Role::IdRole), // "id" => Ok(Role::IdRole),
"title" => Ok(Role::TitleRole), // "title" => Ok(Role::TitleRole),
"path" => Ok(Role::PathRole), // "path" => Ok(Role::PathRole),
_ => Err(()), // _ => Err(()),
} // }
} // }
} // }
// use crate::entities::{images, prelude::Images}; // use crate::entities::{images, prelude::Images};
// use sea_orm::{ConnectionTrait, Database, DbBackend, DbErr, Statement, ActiveValue}; // use sea_orm::{ConnectionTrait, Database, DbBackend, DbErr, Statement, ActiveValue};