From 278e8fb310f8b28a22f0e0ab57958354d009d015 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Fri, 17 Oct 2008 23:07:43 +0000 Subject: [PATCH] Finished the settings form, updated the main form. bzr-revno: 20 --- openlp/resources/forms/mainwindow.ui | 178 +++-- openlp/resources/forms/settings.ui | 843 ++++++++++++++++++++++- openlp/resources/images/media_custom.png | Bin 0 -> 514 bytes openlp/resources/images/openlp-2.qrc | 1 + 4 files changed, 946 insertions(+), 76 deletions(-) create mode 100644 openlp/resources/images/media_custom.png diff --git a/openlp/resources/forms/mainwindow.ui b/openlp/resources/forms/mainwindow.ui index 2f4859709..36bbd9c67 100644 --- a/openlp/resources/forms/mainwindow.ui +++ b/openlp/resources/forms/mainwindow.ui @@ -59,8 +59,8 @@ 0 0 - 268 - 542 + 275 + 536 @@ -99,8 +99,8 @@ 0 0 - 268 - 542 + 275 + 536 @@ -127,7 +127,7 @@ 0 0 1087 - 22 + 27 @@ -255,24 +255,33 @@ - + + 0 + + + 2 + + + 0 + + 0 - 4 + 0 0 - + 0 0 - 237 - 652 + 236 + 609 @@ -290,8 +299,8 @@ 0 - - + + 0 @@ -299,7 +308,7 @@ 0 - + New Song @@ -319,7 +328,7 @@ - + Edit Song @@ -339,7 +348,7 @@ - + Delete Song @@ -359,7 +368,7 @@ - + 0 @@ -381,7 +390,7 @@ - + Send to Preview @@ -401,7 +410,7 @@ - + Send to Live @@ -421,7 +430,7 @@ - + Add to Service @@ -441,7 +450,7 @@ - + Qt::Horizontal @@ -457,17 +466,17 @@ - + - + 0 0 - 237 - 652 + 236 + 609 @@ -570,17 +579,26 @@ - + - + + + Custom Slides + + + + :/media/media_custom.png:/media/media_custom.png + + + 0 0 - 237 - 652 + 236 + 609 @@ -598,8 +616,8 @@ 0 - - + + 0 @@ -607,13 +625,19 @@ 0 - + + + Load Video + + + Load a video + - Send to Preview + Load Video - :/system/system_preview.png:/system/system_preview.png + :/videos/video_load.png:/videos/video_load.png @@ -626,6 +650,36 @@ + + + + Remove Video + + + RI + + + + :/videos/video_delete.png:/videos/video_delete.png + + + + 22 + 22 + + + + true + + + + + + + Qt::Vertical + + + @@ -683,17 +737,17 @@ - + - + 0 0 - 237 - 652 + 236 + 609 @@ -711,8 +765,8 @@ 0 - - + + 0 @@ -720,7 +774,7 @@ 0 - + Load Video @@ -740,10 +794,13 @@ 22 + + true + - + Remove Video @@ -766,14 +823,14 @@ - + Qt::Vertical - + Go Live! @@ -796,7 +853,7 @@ - + Add to Order of Service @@ -819,7 +876,7 @@ - + Qt::Horizontal @@ -835,17 +892,17 @@ - + - + 0 0 - 237 - 652 + 236 + 609 @@ -863,8 +920,8 @@ 0 - - + + 0 @@ -872,7 +929,7 @@ 0 - + Load Video @@ -892,10 +949,13 @@ 22 + + true + - + Remove Video @@ -918,14 +978,14 @@ - + Qt::Vertical - + Go Live! @@ -948,7 +1008,7 @@ - + Add to Order of Service @@ -971,7 +1031,7 @@ - + Qt::Horizontal @@ -987,7 +1047,7 @@ - + @@ -1221,7 +1281,7 @@ - + Qt::Horizontal diff --git a/openlp/resources/forms/settings.ui b/openlp/resources/forms/settings.ui index 89a18150a..4d40a94b1 100644 --- a/openlp/resources/forms/settings.ui +++ b/openlp/resources/forms/settings.ui @@ -5,8 +5,8 @@ 0 0 - 607 - 344 + 721 + 441 @@ -36,11 +36,11 @@ 8 - + - Default theme + Global theme - + 8 @@ -94,44 +94,56 @@ 8 - + - RadioButton + Song level - + - TextLabel + Use the theme from each song in the database. If a song doesn't have a theme associated with it, then use the service's theme. If the service doesn't have a theme, then use the global theme. + + + true - + - RadioButton + Service level - + - TextLabel + Use the theme from the service , overriding any of the individual songs' themes. If the service doesn't have a theme, then use the global theme. + + + true - + - RadioButton + Global level + + + true - + - TextLabel + Use the global theme, overriding any themes associated wither either the service or the songs. + + + true @@ -144,11 +156,808 @@ Display + + + 8 + + + 8 + + + + + + 8 + + + 0 + + + + + Monitors + + + + 8 + + + 8 + + + + + Select monitor for output display: + + + + + + + + Monitor 1 on X11 Windowing System + + + + + Monitor 2 on X11 Windowing System + + + + + + + + + + + Font Size + + + + 8 + + + 8 + + + + + Automatically resize font to fit text to slide + + + true + + + + + + + Wrap long lines to keep desired font + + + + + + + + + + Song Display + + + + 8 + + + 8 + + + + + Enable displaying of song credits + + + true + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + 8 + + + 0 + + + + + Verse Display + + + + 8 + + + 8 + + + + + + 8 + + + 0 + + + + + Verse style + + + + + + + Paragraph style + + + true + + + + + + + + + + Only show new chapter numbers + + + + + + + + 8 + + + 0 + + + + + Display Style: + + + + + + + + No brackets + + + + + ( and ) + + + + + { and } + + + + + [ and ] + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Changes don't affect verses already in the service</span></p></body></html> + + + + + + + + + + Blank Screen + + + + 8 + + + 8 + + + + + Show warning on startup + + + + + + + + + + Video Mode + + + + 8 + + + 8 + + + + + Use Video Mode Rendering + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">No video preview available with VMR enabled</span></p></body></html> + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + Slide + + + + 8 + + + 8 + + + + + + 8 + + + 0 + + + + + Alerts + + + + 8 + + + 8 + + + + + Font Name: + + + + + + + + + + + 8 + + + 0 + + + + + Font Color: + + + + + + + + 24 + 24 + + + + + 24 + 24 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Background Color: + + + + + + + + 24 + 24 + + + + + 24 + 24 + + + + + + + + + + + + 16777215 + 64 + + + + + + + + + 8 + + + 0 + + + + + Display length: + + + + + + + s + + + 180 + + + 5 + + + + + + + Qt::Horizontal + + + + 147 + 20 + + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 94 + + + + + + + + + + + + 8 + + + 0 + + + + + Song Wizard + + + + 8 + + + 8 + + + + + Use the Song Wizard to add songs + + + true + + + + + + + + + + Slide Wrap Around + + + + 8 + + + 8 + + + + + Enable slide wrap around + + + + + + + + + + Timed Cycling + + + + 8 + + + 8 + + + + + + 8 + + + 0 + + + + + Update interval: + + + + + + + s + + + 600 + + + 30 + + + + + + + Qt::Horizontal + + + + 139 + 20 + + + + + + + + + + + Enable timed cycling + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + General + + + 8 + + + 8 + + + + + + 8 + + + 0 + + + + + CCLI Details + + + + 8 + + + 8 + + + + + CCLI Number: + + + + + + + + + + SongSelect Username: + + + + + + + + + + SongSelect Password: + + + + + + + QLineEdit::Password + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + 8 + + + 0 + + + + + Auto Open Last Service + + + + + + Automatically open the last service at startup + + + + + + + + + + Search + + + + + + Enabled search-as-you-type + + + true + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + GeneralLeftWidget + GeneralRightWidget + verticalSpacer diff --git a/openlp/resources/images/media_custom.png b/openlp/resources/images/media_custom.png new file mode 100644 index 0000000000000000000000000000000000000000..a3c39f84b01b613711d513c364c7bda60bf40b5d GIT binary patch literal 514 zcmV+d0{#7oP)fOQdZcB@P3sI60o!O*FJByFDWg*&cyMexBl@9zEhyq7=(0GyD{;C~h);>T{F z!_D7W79j$7o&+fb2q{6ZXK@vINwLFjH>BGh08~wDS(d?Kxnz)v3x4SPDc$>E?27vWj3|OsJH*`ilaWov>wg92lmTGmbkUUW5j3n&5RgjTFcQuo-~zju>ifXqg5GmMS9SNv7EVbl&nEeUN5?Ue{@M z0cHa$sW)&NU5Ej=rh$Jz5D}`Xg0iY`{yt9_fRsTh7K-jpvYL}50pCA>yYcvC`Y@ev z{+M)5x?uH#;JzpdEXxvU5^gpd+-|qnG!3rTYfRG=2UpjxRC~lgrdkTaaG(KoU0Z;k zJZ~system_settings.png + media_custom.png media_presentation.png media_image.png media_song.png