raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
16,466 Commits 5 Branches 0 Tags 296 MiB
Commit Graph

263 Commits

Author SHA1 Message Date
Tim Bentley e61bb30d75 missed one 2013-02-02 20:21:14 +00:00
Tim Bentley 4f2b21ddfa Fix review comments 2013-02-02 19:49:56 +00:00
Raoul Snyman b0d96aa932 HEAD 2013-02-02 20:43:34 +02:00
Tim Bentley 345b0fcd12 Fix up merge request issues 2013-02-02 07:08:28 +00:00
Tim Bentley 8c0144d1fc Merge errors 2013-02-01 22:14:30 +00:00
Tim Bentley 3b6f897f6e Cleanup Advance Tab 2013-02-01 20:09:47 +00:00
Raoul Snyman 18034a2f6a Linting cleanups. 2013-02-01 21:58:18 +02:00
Patrick Zimmermann cd89c4de9a Enable -> Use and British spelling. 2013-01-27 23:10:03 +01:00
Patrick Zimmermann 6e1f9cd3c1 Adapt code for new Settings() infrastructure. 2013-01-27 23:07:30 +01:00
Patrick Zimmermann 85810cc7f5 Merge master. 2013-01-27 22:55:24 +01:00
Patrick Zimmermann 768b27101e Reverse option logic. Now it's "enable alternating row colors". 2013-01-18 22:41:11 +01:00
Andreas Preikschat e55b6ce78e removed set_last_dir and get_last_dir methods 2013-01-17 23:14:06 +01:00
Patrick Zimmermann 5f04c934b1 Merge master. 2013-01-12 21:52:23 +01:00
Patrick Zimmermann 4af3798cd3 Fix a comment indentation. 2013-01-12 21:51:14 +01:00
Andreas Preikschat 91fbf037a2 splitted ui.py into two files; changed imports 2013-01-11 01:19:11 +01:00
Andreas Preikschat 2616f63007 removed value parameter (still needs work) 2013-01-11 00:07:48 +01:00
Andreas Preikschat eb6bc6adbc started work to store setting in a (half) central place 2013-01-10 20:33:48 +01:00
Patrick Zimmermann 33bad25104 Rename "workarounds" -> "display workarounds". 2013-01-01 21:03:12 +01:00
Patrick Zimmermann cf9f55d5d2 Change blockSignals() to use True & False. Correct line length. 2013-01-01 14:38:36 +01:00
Patrick Zimmermann b5fe0139ea Merge master (including Settings() refactor). 2012-12-30 13:01:27 +01:00
Tim Bentley 4a0b3f90aa 2013 is comming 2012-12-29 20:56:56 +00:00
Tim Bentley 9f28874eb5 Code fixes 2012-12-29 18:13:08 +00:00
Tim Bentley 2b6b6d5756 Start of ui 2012-12-29 09:35:24 +00:00
Andreas Preikschat f1bdcec79d r2131 + conflicts 2012-12-27 17:33:38 +01:00
Arjan Schrijver e574466ebb use unicode strings 2012-12-20 09:05:25 +01:00
Patrick Zimmermann f156c37e90 Fix indentation. 2012-12-19 23:25:52 +01:00
Patrick Zimmermann cf36197993 Rename stylesheetFix -> alternateRows. 2012-12-19 23:22:11 +01:00
Arjan Schrijver e7787ddd2d fixed bug #1092121 'Interface unusable when run on XFce' 
Fixes: https://launchpad.net/bugs/1092121
 2012-12-19 17:26:53 +01:00
Patrick Zimmermann c9624ab378 Default stylesheet logic to true on Windows even without existing configuration. 2012-12-17 20:50:09 +01:00
Patrick Zimmermann f239b2345d Move changes to new branch. 2012-12-11 00:35:53 +01:00
Andreas Preikschat 7fa97b2cac fixed import order 2012-12-06 12:09:10 +01:00
Andreas Preikschat cd69d2f930 head + conflicts 2012-12-05 22:10:20 +01:00
Andreas Preikschat 9b1709963e Change defaults for display screen mouse hiding 
bzr-revno: 2122
 2012-12-05 06:13:34 +00:00
Andreas Preikschat 80604f7729 - removed not needed 'QtCore.Qt.OtherFocusReason' from setFocus calls 
- fixed 'short' lines
- changed addItem to addItems when possible
- other clean ups
- refactored class
- removed not needed parameters

bzr-revno: 2121
 2012-12-05 06:12:07 +00:00
Andreas Preikschat fc38f62a17 trunk + conflicts 2012-12-04 22:50:14 +01:00
Andreas Preikschat ea4e271e21 r2118 2012-12-02 21:29:21 +01:00
Tim Bentley a7294a8e8b Copyright and Translation updates from 2.0 2012-12-01 07:57:54 +00:00
Tim Bentley 5646183803 Fixes 2012-11-11 21:16:14 +00:00
Tim Bentley 55f4bc3a73 Fix name and add spearator 2012-11-11 19:33:53 +00:00
Tim Bentley 47c9af348c Fix spelling - oops 2012-11-07 21:37:01 +00:00
Andreas Preikschat 3629c8a535 r2098 + conflict 2012-11-01 16:56:03 +01:00
Tim Bentley 716dc9ccf0 More updates 2012-10-21 15:07:57 +01:00
Tim Bentley cdbc1fd82e Copyrights 2012-10-21 14:16:22 +01:00
Andreas Preikschat cff3f252fd r2082 + conflicts + fix 2012-10-11 12:40:22 +02:00
Andreas Preikschat 5d3269e907 fixed bug 1014422 ('X11 Over ride being on by default causes gnome-shell to become unusable') 
Fixes: https://launchpad.net/bugs/1014422
 2012-10-08 16:14:38 +02:00
Andreas Preikschat 4a7a7e9050 fixes 2012-10-03 19:09:56 +02:00
Andreas Preikschat 159f3ea9a2 r2074 + conflicts 2012-10-03 18:38:06 +02:00
Andreas Preikschat f375d4b0b8 fixed bug 1050081 'display screen - hide mouse by default' 
Fixes: https://launchpad.net/bugs/1050081
 2012-10-03 13:27:28 +02:00
Andreas Preikschat 4ad88e18f9 r2068 2012-09-24 17:12:50 +02:00
ElderP 86465f349d Added code to fix (normalize) the custom data path 2012-09-17 18:20:38 -04:00
Tim Bentley 1d881e426a Fix service date formats 2012-09-16 16:33:05 +01:00
Martin Zibricky a33936f247 Fixed #1046587 - individual placeholders are passed to time.strftime(). 2012-09-15 01:55:55 +02:00
Martin Zibricky 9ecca162bd Additional translate() substitution fixes in openlp.core modules. 2012-09-06 15:49:47 +02:00
Martin Zibricky 9736707e5b Fixed bug #1046599: String substitution cannot be done for translate() funciton and for QString type. 2012-09-06 11:31:27 +02:00
ElderP cf1a0b27ea Added code to hide data location wizard if running portable 2012-07-15 07:59:55 -04:00
Andreas Preikschat 978cc3bc36 - removed not needed 'QtCore.Qt.OtherFocusReason' from setFocus calls 
- fixed 'short' lines
- changed addItem to addItems when possible
- other clean ups
 2012-07-12 18:48:28 +02:00
Samuel Findlay 4510fdbede Added three names in Copyright headers and About window (Samuel Findlay, Edwin Lunando, Dave Warnock). Fixed consistency issues. 2012-06-23 00:14:53 +10:00
Stevan Pettit 245c0acd89 Merge with trunk, resolve conflicts 2012-06-09 19:14:28 -04:00
Stevan Pettit 67093ed65f Added code to call superclass cancel 2012-06-09 08:03:47 -04:00
Stevan Pettit b8cd0dc7b3 Moved cancel button call to advancedtab 2012-06-08 15:27:08 -04:00
Stevan Pettit de15cf85a3 Changed some labels. Fixed GUI buttons 2012-06-01 14:36:53 -04:00
Stevan Pettit 0548bfb345 Modified code to use the directory choosen by user, don't append a sub-dir 2012-05-20 21:23:50 -04:00
Stevan Pettit f239cdcdad Various changes 2012-05-20 15:29:08 -04:00
Andreas Preikschat ed3b7660fa removed not neede unicode calls 2012-05-17 20:57:01 +02:00
Andreas Preikschat a379d9ec54 more clean ups 2012-05-17 18:53:54 +02:00
Andreas Preikschat 2d99f59c84 started to use QString v2 api 2012-05-17 17:13:09 +02:00
Stevan Pettit eb58ee10e8 Changed name of settings INI to conform to PortableApps Standards 
Disabled data path change when running portable
 2012-05-14 23:17:20 -04:00
Stevan Pettit f1586052a6 Added code to allow OpenLP to run portable 2012-05-11 08:22:34 -04:00
Stevan Pettit cf0e8c184e Fixed code per comments. Fixed misc syntax errors. 2012-05-10 19:23:45 -04:00
Stevan Pettit e86272f4d5 Fixed dialogues. Made changes to GUI. 2012-05-03 14:30:30 -04:00
Raoul Snyman c03403f103 HEAD 2012-05-01 20:42:34 +02:00
Raoul Snyman 070ed7fcb5 Merged HEAD from trunk and fixed a conflict. 
Some more refactoring.
 2012-04-22 21:37:11 +02:00
M2j 5ee446f694 Head 1933 2012-04-03 19:59:34 +02:00
M2j 9a68ce898a string fix: behaviour > behavior 2012-04-03 18:15:17 +02:00
M2j 45e4d2c77d string changes 2012-04-02 21:52:47 +02:00
M2j b97445eaab string changed 2012-04-02 20:44:07 +02:00
M2j 352ee8e041 Bug #960386: string fixes 
fix missalignment of theme level selection labels
change default theme level to song level
 2012-04-02 12:32:52 +02:00
M2j c747baa2ea Trigger push button actions with click signal instead of push signal 2012-04-02 02:19:16 +02:00
Raoul Snyman 7f6ed27040 Shortened some translation comments, as Qt says that the entire context of a translation may be no longer than 255 characters. 
Updated the translation files while I was at it.
 2012-03-17 23:30:53 +02:00
Jonathan Corwin e8a1d7591e Fix a few typos 2012-03-10 18:36:59 +00:00
Mattias Põldaru d4efbfe122 Moved two items over to right columns. 2012-02-13 13:10:27 +02:00
Mattias Põldaru d09cfa4a57 Merge trunk. 2012-02-08 00:07:24 +02:00
Mattias Põldaru 62e2616ace Code cleanup. 2012-02-07 12:54:13 +02:00
Jonathan Stafford e6f1ed20a9 Moved Setting to Advanced Tab 2012-02-06 21:28:16 +08:00
Mattias Põldaru 51ee117a48 More function name changes. 2012-02-04 09:46:10 +02:00
Mattias Põldaru 6f219e175f Name changes to camelCase where appropriate. 2012-02-02 14:42:52 +02:00
Mattias Põldaru 6da181834c Meinert's suggestions taken into account about syntax and removed unnecessary variables. 2012-01-30 01:16:12 +02:00
Mattias Põldaru 90332e60d3 Prevent several updates to service name example when launching OpenLP. 2012-01-29 23:14:27 +02:00
Mattias Põldaru 01d42e0f11 Use note text as tooltip. 2012-01-29 18:47:15 +02:00
Mattias Põldaru b03295584b Addresses Meinert's concern about a hidden exception. 2012-01-28 01:13:35 +02:00
Mattias Põldaru 83155d45ea Text changes, thanks to Raoul. 2012-01-28 00:10:12 +02:00
Mattias Põldaru 8c483a58b3 Added checkbox for to disable default service name, just as suggested. 2012-01-25 11:32:20 +02:00
Stevan Pettit ce230df91d Added code to allow user to change the location of the OpenLP data directory 2012-01-19 15:25:53 -05:00
Mattias Põldaru 62a5578528 Make % acceptable character for filenames again. 2012-01-18 21:18:18 +02:00
Mattias Põldaru 62d4db0c82 Added a comment for translators. 2012-01-18 21:16:50 +02:00
Mattias Põldaru 8601a47dce Remove obsolete import. Fix saving wrong syntax and % bugs. 2012-01-18 13:20:15 +02:00
Mattias Põldaru e4f983e6ca Label back with new text. Also element Labels to the right place as Meinert suggested. 2012-01-17 10:50:29 +02:00
Mattias Põldaru df60a89121 Change default name and remove now obsolete string. 2012-01-16 15:59:23 +02:00
Mattias Põldaru 982bfbbd55 Fix labels according to Meinert's comment. 2012-01-16 15:50:17 +02:00
Mattias Põldaru e6f2fd67c3 Disable QTimeEdit box, when it is not used. 2012-01-15 11:58:02 +02:00
Mattias Põldaru ba0ab63149 Merge trunk. 2012-01-15 03:34:08 +02:00
Mattias Põldaru b70f95c825 Added possibility to choose one day time in next week or now as the datetime. Also took Meinert's comment about too restricted filename characters into account. 2012-01-15 03:21:35 +02:00
Jonathan Corwin 3ebe38f7e1 Setting for X11 bypass flag. Don't open Impress unnecessarily if not enabled 2012-01-07 11:22:53 +00:00
Mattias Põldaru 6263a0c999 Merge trunk. 2012-01-03 02:12:09 +02:00
Mattias Põldaru 1cf246940d A few fixes, useful when default service name is wrong. 2012-01-03 02:08:08 +02:00
Tim Bentley 2a5e8935bb New year merge 2011-12-27 10:33:55 +00:00
Mattias Põldaru cd565fe4a9 First almost working example. I suppose someone suggest to make specific class now. You may be right :) 2011-12-15 20:13:45 +02:00
Tim Bentley 608910a098 Fix name 2011-06-12 17:02:52 +01:00
Tim Bentley c812770153 Copyright fixes 2011-06-12 16:41:01 +01:00
Tim Bentley acdbefd922 Fixes 2011-05-26 18:11:22 +01:00
Tim Bentley 8f6ed366a1 Copyright updates 2011-05-26 17:25:54 +01:00
Raoul Snyman 7669643774 Updated the copyright notice, adding Jeffrey Smith back in after he accidentally got removed somewhere somehow. 2011-05-24 22:47:05 +02:00
Raoul Snyman 35cb2b2fa6 Fix up the multicolouredness. 2011-04-27 12:30:29 +02:00
Raoul Snyman 86a05a38b5 Fixed bug #752212. Added a revert button to revert the image to the default OpenLP image. Also moved things slightly to for the dialog to look a little better on other platforms/DEs. 2011-04-27 11:00:37 +02:00
Raoul Snyman 8090adf1bc Made UiStrings a Singleton, and updated all usage of it. 2011-04-15 23:43:59 +02:00
Tim Bentley 269c4fa044 Fixups 2011-04-15 18:17:51 +01:00
Tim Bentley 6454b88a83 Fix Tab parentage 2011-04-13 20:12:47 +01:00
Tim Bentley 20fbe4d28d Settings Cleanup part2 2011-04-12 20:32:17 +01:00
Tim Bentley e00eaba884 Settings Cleanup part1 2011-04-12 18:45:32 +01:00
Jonathan Corwin db68c0419f Fix bug when hit service live button, but nothing to go live. Add option to preview immediately in media manager. Add keyboard shortcuts to media manager 2011-04-02 10:52:32 +01:00
Raoul Snyman efbcfd0772 Updated copyright information. 2011-03-24 21:04:02 +02:00
Raoul Snyman 780a87e840 Updated copyright information. Removed .eric4project directory from version control. 2011-02-24 07:47:38 +02:00
Raoul Snyman c74b2fc964 Updated the settings tab. 2011-02-23 22:55:55 +02:00
Raoul Snyman 99635299ea Updated with browse button. 2011-02-23 15:55:36 +02:00
Raoul Snyman a5b278b871 Added a setting in the advanced tab to give the users the option of changing the default display screen. 2011-02-23 08:42:33 +02:00
Jon Tibble a8f16262fc More string refactoring 2011-02-12 04:09:03 +00:00
Jon Tibble 0b83c7180f UiStrings updates 2011-02-10 04:06:16 +00:00
Andreas Preikschat 642011b379 2011-02-04 19:00:59 +01:00
Andreas Preikschat 0047b8d1c1 2011-02-04 13:57:48 +01:00
Jon Tibble dd1f418f46 Long line 2011-02-01 19:16:51 +00:00
Andreas Preikschat fbbeddd65d fixed a bug with items like 'test.test.avi' not loading; added error message when aborting 2011-02-01 11:06:56 +01:00
Andreas Preikschat 7b3f61e93b added setting 2011-01-31 20:35:35 +01:00
Jon Tibble cc0bfabaa2 Head r1223 2011-01-18 00:04:12 +00:00
Garrett 55e23bcfbc fixed spelling mistakes 2011-01-17 08:38:39 -08:00
Garrett d3bc39a262 fixed my sad spelling mistakes 2011-01-17 08:36:48 -08:00
Garrett 6a7edfc7c0 changed GeneralTab to AdvancedTab when translating since I moved the code 2011-01-17 08:32:58 -08:00
Garrett 0cab45bcf8 moved function code into buildHtml, made setting name more descriptive 2011-01-17 08:24:23 -08:00
Garrett 1defafbe86 moved the option to the advanced tab, removed extra line returns 2011-01-16 16:08:16 -08:00
M2j 6de12718f6 Head 1186 2011-01-04 10:19:53 +01:00
M2j b0c9b3f077 integrated 'split layout' in the SettingsTab class 
remove the documentMode from the TabWidget in the SettingsDialog
replace comment for HideMode class
 2011-01-03 12:25:30 +01:00
Tim Bentley c11454b02d Fix review comments 2011-01-03 08:56:17 +00:00
M2j 2e6613edf4 simplified all setupUi() in openlp.core.ui and the setting tabs of the plugins 2011-01-02 23:24:14 +01:00
Tim Bentley 48a96769d7 Add YAS for closure 2011-01-02 16:42:30 +00:00
M2j 49e852b7e3 worked on setupUI for MainDisplay, MainWindow and PluginForm 2011-01-01 14:22:12 +01:00
M2j e6a24cf08c rewritten setupUI for AboutDialog, AdvancedTab, ExceptionDialog, FilerenameDialog and GeneralTab 2010-12-31 19:10:45 +01:00
Tim Bentley e77ce3ffdb Bump values by 1 version or year 2010-12-26 11:04:47 +00:00
Jon Tibble 533a0c5b5b Head r1131 2010-12-06 23:28:01 +00:00
Tim Bentley 2752279d43 Remove need to restart for double click event changes 2010-11-26 09:49:06 +00:00
Jon Tibble 1c11cab27b Whitespace & unused imports 2010-11-24 01:51:08 +00:00
Tim Bentley 948cb57d59 Remove blank check box line 
Fix situation when trying to work with no themes

Fixes: https://launchpad.net/bugs/677710
 2010-11-20 16:36:54 +00:00