Commit Graph

1170 Commits

Author SHA1 Message Date
Olli Suutari
9794d26e95 - Changed the order of blank to modes in Shortcuts list from:
Black, theme, desktop to desktop, theme, black.
- Pep8 fix (Ident)
2016-08-11 16:28:30 +03:00
Tim Bentley
098697a2cc more endpoint moves 2016-08-10 21:52:27 +01:00
Olli Suutari
50131ba202 - Merged trunk and resolved conflict that was created by ui-messages-part-1 branch. 2016-08-10 21:50:40 +03:00
Tim Bentley
80f927f5d6 Tidy up code more 2016-08-08 22:01:09 +01:00
suutari-olli
1298b629f1 - Merged trunk on 31.7.16 2016-07-31 14:58:54 +03:00
suutari-olli
aa1cd8fa91 - Merged trunk on 24.7.16
- Added superflys startup traceback fix to my code
- Resolved conflicts
2016-07-24 23:20:25 +03:00
Tim Bentley
ca2ceba972 Head 2016-07-23 05:59:26 +01:00
suutari-olli
f5bc8056f7 - removed one unrequired if statement. 2016-07-17 19:11:51 +03:00
suutari-olli
08bcb2c5d4 - Moved them to another init since something broke 2016-07-17 18:53:27 +03:00
suutari-olli
437039efed - Moved the 2nd new registry flag from one init to an another init which also has the 1st 2016-07-17 18:49:15 +03:00
suutari-olli
496c57cdfc - Fixed the issue where items sent to Preview from Service may cause tracebacks. 2016-07-17 18:41:55 +03:00
Tim Bentley
16a1b1a0af next prev 2 2016-07-17 08:28:25 +01:00
suutari-olli
4874f6a218 - Reduced comments
- Removed unrequired reg_value from test.
2016-07-16 19:51:08 +03:00
suutari-olli
02b4d27b96 pep8 fixes, test still broken. 2016-07-14 21:13:58 +03:00
Tomas Groth
8aa917c89c A bunch of fixes suggested by pylint. 2016-07-01 23:17:20 +02:00
Tim Bentley
7aa1acc176 More fixes 2016-06-27 21:55:36 +01:00
suutari-olli
6078e28171 Comment cleanup / Improvements 2016-06-27 02:20:57 +03:00
suutari-olli
68b4d62502 - Turned the two new hidden settings into registry flags 2016-06-27 02:14:24 +03:00
Tim Bentley
ac841a934c Add plugin endpoints 2016-06-22 20:47:11 +01:00
suutari-olli
c249eb1f20 merged trunk on 14.6.16 2016-06-14 01:02:56 +03:00
Tim Bentley
2b0e61d5fd Too many changes 2016-06-05 22:26:06 +01:00
Tim Bentley
32fad35f79 move remote to api and add waitress 2016-06-05 22:16:13 +01:00
7f5096d0f9 core_lib files string conversions 2016-05-20 09:22:06 -07:00
suutari-olli
165d8cd4ba - Merged trunk on 18.5.2016 20:57 2016-05-18 20:56:50 +03:00
suutari-olli
46e7ad4983 - Changes based on comments by TRB143 2016-05-10 14:06:00 +03:00
Ian Knight
bc6253a627 Housekeeping, added check for thumbnails to avoid icon scaling issues 2016-05-05 13:27:04 +09:30
Ian Knight
a2bc59b3d9 Merge from trunk 2016-05-04 21:50:37 +09:30
Ian Knight
f0d7cf7f36 Corrected aspect ratio on slide previews 2016-05-04 21:40:42 +09:30
suutari-olli
31ede5556d Added this to program startup code, should replace_service_manager_item ever crash the program.
Settings().setValue('core/is live item edited and replaced', False)
2016-04-27 23:38:46 +03:00
Tim Bentley
0d755e3354 more files 2016-04-22 19:32:45 +01:00
Tomas Groth
cb3ef2f7c8 Make it possible for presentations to wrap or go to next item, like native openlp-items. Fixes bug 1165855.
Fixes: https://launchpad.net/bugs/1165855
2016-04-21 22:09:42 +02:00
suutari-olli
55061b8fc1 - Added two tests for checking if doubleclicking preview should add item to service or send it to live. 2016-04-20 18:56:10 +03:00
Tim Bentley
bdeff60a97 updates 2016-04-17 20:32:15 +01:00
suutari-olli
518dde5d2d - Removed _ from end of one setting name.
- Fixed ident on replace_service_manager
2016-04-17 15:40:34 +03:00
suutari-olli
c046ba95d9 Made a better fix for fixing bug where display is unblanked on editing current live item.
This now sets a hidden setting to true while processing Live item and then changes it back to false.
Display is thus not unblanked at all during the process. (Old fix showed the edited slide for a small time)

Downside: All the new tests were based on the old method and thus they were removed.
2016-04-17 06:50:54 +03:00
suutari-olli
0563c6372f Made a better fix for fixing bug where display is unblanked on editing current live item.
This now sets a hidden setting to true while processing Live item and then changes it back to false.
Display is thus not unblanked at all during the process. (Old fix showed the edited slide for a small time)

Downside: All the new tests were based on the old method and thus they were removed.
2016-04-17 06:43:25 +03:00
suutari-olli
bf3cad050c Turned the new setting into question. 2016-04-17 04:52:45 +03:00
suutari-olli
5dbb69430f Fixed bug 1462420 (Double click on the preview duplicated the element in the service manger)
- Added a hidden setting for controlling this behaviour. 
 It is reset if any item is sent to preview from library.
 Sending the same item to service multiple times is still possible by using the "Add icon"
2016-04-17 04:36:53 +03:00
suutari-olli
69af91edef - Fixed bug 1462420 - Double clicking Preview adds item to Service countless times
(Added hidden setting for controlling this, it is set to True once double clicking
  has added item to Service and gets reset to False once new item is sent to preview.
2016-04-17 04:13:39 +03:00
Tim Bentley
a41d86cb7c Head 2016-04-06 06:08:44 +01:00
suutari-olli
12b63f8e71 Merged to trunk (1.4.2016) 2016-04-01 16:10:23 +03:00
Tim Bentley
ba6d66497c actions 2016-03-31 17:34:22 +01:00
suutari-olli
4a6b5b7cc4 In this merge:
- Moved setting for controlling unblanking behaviour to General options tab.
- Removed it from  advanced tab
- Changed default setting to "no"
- Looped playback (once or to end) is now linked to this setting
- Unblanking slides on click -.- no longer unblanks display when sending new items live if
  "Unblank display when sending new item to live" is not enabled. -.-
- Doubleclicking preview -.- ^^
- Improved some comments

To do:
Test(s)?
2016-03-15 20:37:55 +02:00
suutari-olli
ddae0b4247 Removed duplicate: self.on_hide_display(True)
(Was trying to create/test a test but failed and forgot to take it away)
2016-03-15 16:11:24 +02:00
suutari-olli
0c23135304 - Removed Whites space before (self, item) on row 789, how did it get there in the first place? 2016-03-15 11:39:54 +02:00
suutari-olli
546ed56823 - If display is blanked when song in Live is edited, now re-blanks display after updating the song. (Improved fix)
- Improved un-blanking when starting Loop, pressing "Stop loop" no longer unblanks display.
- Improved comment(s)

To do:
- Write test(s)
2016-03-14 04:11:13 +02:00
suutari-olli
43df6739b0 Now including fix for bug:
https://bugs.launchpad.net/openlp/+bug/1531691
2016-03-03 04:49:04 +02:00
suutari-olli
87b9ae3600 Added "Unblank display when changing slide in Live" to advanced tab.
Added automatic unblanking when starting loopped playback.

Now, only the tests remain!
2016-03-03 02:07:52 +02:00
suutari-olli
770843e0c6 This branch adds the functionality of un-blanking display from:
blank to desktop, black and theme by clicking slides in "Live" panel.

This also adds this functionality for:
- Starting loops
- Go to verse x
- Next/Previous verse
2016-03-03 00:49:49 +02:00
suutari.olli@gmail.com
b490772f8b This branch fixes the issue where Blank to desktop,
black and theme won't work if Live screen has stolen focus.

Examples of this happening: Clicking anything in the live window or certain single screen mode scenarios.

This was achieved by adding 3 lines of code, one for each method under the definition of methods available in this screen mode.

I also explained this in a comment I inserted to the code.

Since the only way to screw this seems to be by removing these additions,
a test for the...

bzr-revno: 2623
2016-02-28 20:33:19 +00:00
suutari-olli
e3c4f53dc4 Seems like I added one empty row at some point...
Removing it...
2016-02-27 00:03:32 +02:00
suutari-olli
6ef2cc8b59 Added test, fixed comment. 2016-02-26 23:28:01 +02:00
Tim Bentley
cdbf6ac9ea Fix timers 2016-02-16 21:14:38 +00:00
Tomas Groth
17d6f13ac0 More workarounds for bug 1531319.
Fixes: https://launchpad.net/bugs/1531319
2016-02-06 20:43:54 +01:00
suutari-olli
dee737e3fb Added proper comment 2016-01-23 17:28:16 +02:00
Tomas Groth
4594fcefbd pep fixes 2016-01-22 22:33:20 +01:00
Tomas Groth
4bef5f72f2 trunk 2016-01-22 22:30:26 +01:00
suutari-olli
5f513a9a1f This simple fix should make blank to desktop, black and theme available during single screen mode 2016-01-22 19:06:35 +02:00
Tomas Groth
85c329fb26 Workaround for windows display not updating, webkit player does not work yet. Partial fix for bug 1531319.
Fixes: https://launchpad.net/bugs/1531319
2016-01-20 23:25:40 +01:00
Tomas Groth
6b23a2224f Fix playback of linked audio. Fixes bug 1533280.
Fixes: https://launchpad.net/bugs/1533280
2016-01-15 21:22:08 +01:00
Tomas Groth
e91520fa60 pep8 fixes 2016-01-13 22:00:46 +01:00
Tomas Groth
e3d7e436f1 In _process_item, postpone check for _reset_blank, since the service_item can change type while being execute (Pdf->Image). For the same reason always use the serviceitem that might have been converted. 2016-01-12 21:17:15 +01:00
Tomas Groth
c8fd1b8338 Fix taking screenshots while using powerpoint or impress.
Fixes: https://launchpad.net/bugs/1532938
2016-01-11 22:13:57 +01:00
Tim Bentley
3a8b068af8 Year older 2015-12-31 22:46:06 +00:00
Jonathan Springer
05a653e670 Make sure all generated pixmaps are show at the proper pixel ratio 2015-11-29 17:48:10 -05:00
Jonathan Springer
7af1ca1d49 Migrate to PyQt5 2015-11-06 19:49:40 -05:00
Tomas Groth
fec061782b Make sure presentations is closed correctly. Fixes bug 1490996.
Fixes: https://launchpad.net/bugs/1490996
2015-09-03 20:21:43 +01:00
Tim Bentley
b7d0fc8ffc Fix focus and test 2015-05-31 07:40:37 +01:00
Tomas Groth
623a0974a5 For worshipassistant add a default verse-id for lyrics to use if none is given. Fixes bug 1458056.
Don't import setting keys that does not exists. Fixes bug 1458672.
When going from a theme-blanked item to item which doesn't support theme-blanking, switch to black-blank.
Only use transitions if we are changing slide. Fixes bug 1449064.
Make translation of 'Advanced' specific to the bible plugin.
Many PowerPoint fixes/improvements:
 * Make screenshots for main webview, even on single screen setup. Fixes bug 1449041.
 * Implement workaround for unblanking bug in PowerPoint 2010.
 * Open PowerPoint hidden so the main application window isn't visible.
 * Added support for odp for PowerPoint 2007 and newer.
 * Added support for Powerpoint events, which is used to update the slidecontroller if OpenLP is not in focus.
 * Minimized the flashing of the PowerPoint presentation window in the taskbar.

bzr-revno: 2539
2015-05-29 17:22:22 +01:00
Tim Bentley
54dbafed8e Fix issue with android where tagging is wrong is the render takes too long 2015-05-25 20:31:12 +01:00
Tomas Groth
c9a8f07a37 Only use transitions if we are changing slide. Fixes bug 1449064.
Fixes: https://launchpad.net/bugs/1449064
2015-05-01 22:17:59 +01:00
Tomas Groth
73ae9a2643 Make screenshots for main webview, even on single screen setup. Fixes bug 1449041.
Fixes: https://launchpad.net/bugs/1449041
2015-05-01 16:21:59 +02:00
Tomas Groth
d044821483 pep8 fixes 2015-04-30 14:48:45 +02:00
Tomas Groth
54fbaf3a4f When going from a theme-blanked item to item which doesn't support theme-blanking, switch to black-blank. 2015-04-30 14:37:13 +02:00
Tomas Groth
7e406e7005 Insert timeout on acquiring lock in slidecontroller to avoid hang. Fixes bug 1413324.
Fixes: https://launchpad.net/bugs/1413324
2015-03-18 22:02:51 +00:00
Tomas Groth
39c79aaed9 PEP8 fixes 2015-03-09 20:57:39 +00:00
Tomas Groth
06355032a2 Use the doubleclick-go-live setting in the preview controller. Fixes bug 1422197.
Fixes: https://launchpad.net/bugs/1422197
2015-02-16 21:59:55 +00:00
Tomas Groth
12a0b8b750 Add default shortcut bindings for preview next/prev, and make the appear in the shortcut edit dialog. Fixes bug 1412570.
Fixes: https://launchpad.net/bugs/1412570
2015-02-09 20:49:24 +00:00
Phill Ridout
59088887fc PEP Fixes 2015-01-29 21:21:03 +00:00
Phill Ridout
b33fe701df Make Phonon optional
Fixes: https://launchpad.net/bugs/1224404
2015-01-29 20:57:02 +00:00
Tomas Groth
f53187e26a Fix layout in player-settings. Fixes bug 1410772
Make sure we use dnd position if available. Fixes bug 1410843.
Set the default delay-spinbox value from the appropriate setting. Fixes bug 1411765.
Improve OpenLyrics import handling of authortypes. Fixes bug 1405172 and 1405175.

bzr-revno: 2482
2015-01-21 20:35:36 +00:00
de213b0f66 Copyright cleanup time,
bzr-revno: 2479
2015-01-19 08:34:29 +00:00
Tomas Groth
ff87971270 Set the default delay-spinbox value from the appropiate setting. Fixes bug 1411765.
Fixes: https://launchpad.net/bugs/1411765
2015-01-18 20:52:49 +00:00
ffcea13021 Updated the copyright. 2015-01-18 15:39:21 +02:00
Tomas Groth
1efc145cdf PEP8 fixes 2015-01-14 12:32:27 +01:00
Phill Ridout
c27c875f33 Readded deleted line. One more comment typo 2015-01-02 11:58:44 +00:00
Phill Ridout
b9f09142ed HEAD 2015-01-02 11:40:51 +00:00
Phill Ridout
20d927b270 Rework to use a subclassed QLabel to allow dynamic resizing 2015-01-02 11:40:07 +00:00
Tim Bentley
f3c09af379 Years go by 2014-12-31 10:58:13 +00:00
Phill Ridout
52c7d89706 removal of util function 2014-12-30 11:23:01 +00:00
Phill Ridout
19cb16d65b Moved 'eliding' code to a sublass of qlabel to enable the text to be rendrawn when resized 2014-12-30 11:21:06 +00:00
Phill Ridout
5d1eac9ded Add function to provide elided text
Fixes: https://launchpad.net/bugs/1405260
2014-12-30 08:48:46 +00:00
Phill Ridout
36417083ce head 2014-12-29 17:25:36 +00:00
Tomas Groth
321709d7a7 [bug 954613] Introduce locking when updating slide display to avoid slidecontroller and display getting out of sync.
Fixes: https://launchpad.net/bugs/954613
2014-12-19 23:07:32 +00:00
Phill Ridout
ae852466ec Fix selecting items in media manager using the keyboard when preview media items when clicked is set 2014-12-14 16:54:25 +00:00
Tomas Groth
4ed9e9a722 Added a refresh call to the hide-toolbar so that it gets updated if needed. Makes the blank-to-theme button visible in the toolbar.
Fix for loading songs with linked audio + test. Fixes bug 1398403
Remove dummy initialization of preview_display to solve issue of mediaplayer preview being hidden.
When cloning a song copy the mediafiles as well. Fixes bug 1309998.
Use shutil.which instead of calling which with check_output, when detecting mudraw/gs.
Moved test service files into appropriate folder.
Set the default song search to search as type.

bzr-revno: 2454
2014-12-07 08:21:37 +00:00
Tomas Groth
56f4b8aa5e Another fix for blank menu. 2014-12-06 20:40:40 +00:00
Tomas Groth
fd57f81376 Remove dummy initialization of preview_display to solve issue of mediaplayer preview being hidden 2014-12-04 22:14:56 +00:00
Tomas Groth
e94579e7f1 Only update blank menu if needed 2014-12-03 21:19:43 +00:00
Tomas Groth
767e3d91f2 Added a refresh call to the hide-toolbar so that it gets updated if needed. Makes the blank-to-theme button visible in the toolbar. 2014-12-02 11:07:03 +00:00
Tomas Groth
31018fb5ae When escaping live display stop looping to prevent display to reappear. Fixes bug 1266271
Fixes: https://launchpad.net/bugs/1266271
2014-11-25 22:22:28 +00:00
Tomas Groth
ed13dcbd75 Only show slide-dropdown on live-slidecontroller when it is populated. Fixes bug 1390238.
Fixes: https://launchpad.net/bugs/1390238
2014-11-13 12:21:54 +01:00
Tomas Groth
28599c8f24 Make sure that the slidecontroller toolbar layout is correctly adjusted to fit its size. Fixes bug 1387304
Fixes: https://launchpad.net/bugs/1387304
2014-11-13 11:26:44 +01:00
Tim Bentley
837013763a fix focus 2014-11-01 07:47:26 +00:00
Tim Bentley
afde4a25ad Fix missing dummy values for debug 2014-10-27 20:22:57 +00:00
Tomas Groth
5ecbfa61fd Fix tests so they can run individually.
Fix for importing custom tags from openlyricsxml.
Fixed console popping up on windows when running mudraw.exe.
Added oxps as supported presentation filetype (by mudraw).

bzr-revno: 2425
2014-10-21 22:06:02 +01:00
Tomas Groth
71324fc932 Forward ported fix for bug1265368
Fixes: https://launchpad.net/bugs/1265368
2014-09-25 11:07:31 +02:00
Tomas Groth
a0b7c72e09 Changed Image dimension-key into width and height + a bunch of small changes 2014-07-15 20:52:59 +02:00
Tomas Groth
022ac9bfac trunk 2014-07-14 09:08:41 +02:00
f2d3bbee47 Added the name of the current item to the service controller, and added some more tests 2014-07-13 01:47:53 +02:00
Tomas Groth
542fe4e887 small changes 2014-07-11 23:45:01 +02:00
Tomas Groth
bc29a01eb5 head 2014-04-23 21:30:12 +02:00
Samuel Mehrbrodt
4640b1b2d9 Trunk 2014-04-15 10:33:21 +02:00
Samuel Mehrbrodt
a82a13d2ed Fixes for PDF DPI Detection 2014-04-09 12:48:12 +02:00
Jonathan Springer
6ca37531a0 Remove unnecessary platform specific code, remove orphaned and unused registry execute, and fix two functions to register to the registry instead of executing. 2014-04-01 13:07:25 -04:00
Samuel Mehrbrodt
a4829c62ba Add missing arguments for debug mode
Fixes: https://launchpad.net/bugs/1296574
2014-03-26 12:26:16 +01:00
Tim Bentley
5d9533947d Final set of PEP8 cleanups 2014-03-20 19:10:31 +00:00
Tomas Groth
258f1db411 Merged with head. 2014-03-18 20:40:09 +01:00
Tim Bentley
5e6f97d74e fix order and comment 2014-03-13 20:08:47 +00:00
Tim Bentley
31ee1b43a6 first view 2014-03-12 17:41:52 +00:00
Tomas Groth
52a73f3475 merged with head 2014-02-25 21:11:48 +01:00
Tomas Groth
e90f277bd6 merged with trunk 2014-02-21 22:48:25 +01:00
Tim Bentley
7fe95731f9 Fix up Main display 2014-01-11 17:52:01 +00:00
Felipe Polo-Wood
d2782e099f Merged with Tim's refactoring changes 2014-01-09 14:52:20 -05:00
Tim Bentley
5eba575618 Add tests for new function 2014-01-04 11:50:27 +00:00
Tomas Groth
f5ace2c238 merged with trunk 2013-12-31 12:20:11 +00:00
Felipe Polo-Wood
b495c47a5a More styling issues 2013-12-30 13:19:50 -05:00
Felipe Polo-Wood
1a83a0a557 Merge head 2013-12-30 03:53:51 -05:00
Tomas Groth
84334a039e Merged with trunk. 2013-12-29 19:47:54 +00:00
Tim Bentley
e6bcf7d852 Head and fix confilcts 2013-12-28 21:33:38 +00:00
Tomas Groth
685258b744 Made presenting PDF from the servicemanager work 2013-12-27 17:44:12 +00:00
Tim Bentley
6d8b5cadb4 Lib cleanup and 2014 2013-12-24 08:56:50 +00:00
Tim Bentley
b2bee17211 Few minnor fixes 2013-12-24 06:15:41 +00:00
Tim Bentley
a5ca17246f Fix on_slide_select bugs 2013-12-21 08:46:30 +00:00
Tim Bentley
d4ce5489ad updates and fix up slidecontroller 2013-12-19 20:17:06 +00:00
Tim Bentley
e9a7850bc8 Add registry mixin and code cleanups 2013-12-15 16:50:09 +00:00
Tim Bentley
cd9f9e4c8d move registry to common 2013-12-13 17:44:05 +00:00
Felipe Polo-Wood
04abbd97d0 implemented caching thru the ImageManager
Styling issues
Merge with fix-router changes
2013-11-22 13:21:07 -05:00
Felipe Polo-Wood
fecd56106d Removed extra line
Made PowerpontController class compatible with Linux
2013-10-31 22:53:52 -04:00
Felipe Polo-Wood
e958e17889 - Added settings dialog at the client (with choice for thumbnail)
- Fixed problem Presentations at remote getting out of sync
2013-10-31 16:54:38 -04:00
Felipe Polo-Wood
6d464dec4b Added resizing capabilities to the thumbnails
Fixed a problem with setting the presentation slides from the remote
2013-10-29 11:38:28 -04:00
Tim Bentley
b9e2a2cdc1 Missed imports 2013-10-13 22:07:28 +01:00
Tim Bentley
63685cb29e Move Settings and translate 2013-10-13 21:36:42 +01:00
Andreas Preikschat
3e1a863bae 2to3 and resources.py 2013-08-31 20:17:38 +02:00
Andreas Preikschat
025e031d76 updated constructor 2013-07-18 16:34:33 +02:00
Andreas Preikschat
5fb36b5ef7 updated constructor 2013-07-18 16:32:23 +02:00
Andreas Preikschat
829d68cdd8 fixed attribute error 2013-07-05 20:39:31 +02:00
Andreas Preikschat
15c1c6d907 head + conflicts 2013-07-03 22:20:12 +02:00
Andreas Preikschat
62c5908d85 python3 division in slidecontroller 2013-06-18 11:09:54 +02:00
Andreas Preikschat
39d691d2eb fix 2013-06-16 18:46:44 +02:00
Andreas Preikschat
5cce4c9443 head 2013-06-16 18:40:47 +02:00
Tim Bentley
e8d5ad7736 Clean up slidecontroller 2013-06-16 08:54:16 +01:00
Tim Bentley
d253ef5852 Fix bug and add new test or bibles 2013-06-15 21:51:11 +01:00
Patrick Zimmermann
4106ecd71e Remove superfluous comment. 2013-06-15 12:56:09 +02:00
Patrick Zimmermann
d5cd4aaa91 Merge master. 2013-06-14 22:38:37 +02:00
Tim Bentley
6e5588b7cf Update settings and minor cleanups 2013-06-03 19:47:25 +01:00
Tim Bentley
9160832e0a fix error 2013-06-03 19:03:45 +01:00
Andreas Preikschat
1f80f6c830 renames 2013-06-01 20:35:00 +02:00
Tim Bentley
1113044955 Add basic Live display to remote 2013-05-19 20:56:48 +01:00
Patrick Zimmermann
154c82f5ea Rename a method and remove a non needed registry var. 2013-04-27 12:00:27 +02:00
Andreas Preikschat
8f994b2895 - fixed short lines
- renamed attributes and methods

bzr-revno: 2239
2013-04-23 23:46:07 +02:00
Patrick Zimmermann
145a1aedcb Add some docstrings and rename some methods for clarity. 2013-04-23 19:12:08 +02:00
Patrick Zimmermann
1c2a5b5156 Merge trunk. 2013-04-22 23:02:12 +02:00
Patrick Zimmermann
823e7b1ec0 Change a line back to trunk state. 2013-04-22 22:51:33 +02:00
Tim Bentley
2965271ada and more 2013-04-21 08:26:45 +01:00
Tim Bentley
02b1f7b78b and more 2013-04-21 08:21:29 +01:00
Andreas Preikschat
4063de2700 head 2013-04-20 22:34:46 +02:00
Patrick Zimmermann
1c31940650 Merge trunk. 2013-04-18 23:17:14 +02:00
Patrick Zimmermann
2b9a13ff97 Clean up PreviewWidget interface a little more. 2013-04-18 22:50:02 +02:00
Patrick Zimmermann
25db18d34c Use inheritance instead of composition. Some interface cleanup. 2013-04-18 22:15:44 +02:00
Andreas Preikschat
2ad78e4cb9 renaming 2013-04-18 11:32:48 +02:00
Patrick Zimmermann
d687288336 Correct a preview_list_widget -> preview_widget call and fix update of preview when switching the service item. 2013-04-16 23:42:23 +02:00
Patrick Zimmermann
fd22d17d37 Fix an import problem and use signals correctly. Worksbzr diff 2013-04-15 20:01:59 +02:00
Patrick Zimmermann
0dbda9ee21 Accidentially removed image load logic. Readded. 2013-04-15 19:26:18 +02:00
Patrick Zimmermann
3609d2e0e1 Switch over to PreviewListWidget class. Untested. 2013-04-15 19:12:47 +02:00
Tim Bentley
2345d59e6f Head 2013-04-08 17:53:26 +01:00
Andreas Preikschat
07d6fa63c5 introduced constant 2013-04-05 15:41:42 +02:00
Andreas Preikschat
42f52cc300 Separate blank buttons don't hide on resizing (bug #1164925)
Fixes: https://launchpad.net/bugs/1164925
2013-04-05 12:50:10 +02:00
Tim Bentley
4641a4d447 Head 2013-03-26 08:56:33 +00:00
Tim Bentley
401f5ac2be More updates 2013-03-26 08:55:05 +00:00
Tim Bentley
b9a5ee28a9 Fix missing string converstion 2013-03-26 07:34:42 +00:00
Tim Bentley
a73570d4fc Minor fixes for missed 2013-03-23 06:46:41 +00:00
Tim Bentley
bed1ca2d57 Head and more fixes 2013-03-22 21:05:42 +00:00
Tim Bentley
fb6d292be0 Plugins 2 - setttingsSection gone 2013-03-19 19:43:22 +00:00
Tim Bentley
8e03c2e4b7 Head and conflicts 2013-03-17 21:29:00 +00:00
Tim Bentley
0f6216d653 More changes 2013-03-17 21:20:40 +00:00
Tim Bentley
df2da440f0 Fixes 2013-03-17 20:00:39 +00:00
Tim Bentley
e641c0e8b3 main window and theme manager 2013-03-16 11:05:52 +00:00
Tim Bentley
1c76353cba head 2013-03-15 08:40:16 +00:00
Tim Bentley
9ae8db3396 Minor fixes 2013-03-14 20:21:04 +00:00
Tim Bentley
5c79832bcc More updates to authentication 2013-03-11 21:00:00 +00:00
Tim Bentley
c62dab074e Basic Authentication now working 2013-03-08 19:15:49 +00:00
Tim Bentley
6bf07f9dce Head 2013-03-08 16:35:10 +00:00
Tim Bentley
2464bef944 Head + conflicts 2013-03-07 18:22:38 +00:00
Andreas Preikschat
7adb4bbdb5 do not override build-ins, clean ups 2013-03-07 13:59:35 +01:00
Andreas Preikschat
d2df81141f last old signals 2013-03-07 12:10:16 +01:00
Andreas Preikschat
6066c80194 changed most of the signals to our new style 2013-03-07 12:01:06 +01:00
Andreas Preikschat
33ebf40630 toolbar: code standards 2013-03-07 07:48:09 +01:00
Andreas Preikschat
c403e78684 renamed mediaObject, fixed songVerseMenu 2013-03-06 23:42:52 +01:00
Tim Bentley
f1aadde13c Initial Cherrypy implementation 2013-03-06 21:53:29 +00:00