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

22
src/rust/image_model.rs
View file

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