← Back to branch summary

~ubuntu-branches/ubuntu/raring/ubiquity-slideshow-ubuntu/raring

« back to all changes in this revision

Viewing changes to kubuntu-slideshow.py

  • Committer: Bazaar Package Importer
  • Author(s): Evan Dandrea, Dylan McCall, Evan Dandrea
  • Date: 2010-02-26 14:26:00 UTC
  • Revision ID: james.westby@ubuntu.com-20100226142600-5bulva07ptvdnzx3
Tags: 15
https://launchpad.net/bugs/526483
https://launchpad.net/bugs/528465
[ Dylan McCall ]
* Rearranged source package to closely mirror build output.
* Renamed ./slides to ./slideshows, reflecting new arrangement.
* Each slideshow now has a unique slideshow.conf file.
* Split link-core and link-default for slideshows. link-default
  is NOT symlinked to a central place, encouraging customization.
* Generated icons now go straight to the build directory.
* Merging new Xubuntu slideshow.
* Merging new visuals for Kubuntu slideshow.

[ Evan Dandrea ]
* Fix typo in Kubuntu chat slide.
* Move from po2html, which is no longer included in Debian, to po4a.
* Make each slideshow package Replace and Conflict the ubiquity-
  slideshow virtual package, to ensure that only one slideshow can be
  installed at a time and so we can put all of the files in a single
  location (LP: #526483).  The upgrade slideshows do the same with the
  ubiquity-slideshow-upgrade virtual package.
* Update update-launchpad-translations.sh to reflect recent directory
  layout changes.
* Update translations from Launchpad.
* Remove possibly inappropriate URL from br translation (LP: #528465).

Show diffs side-by-side

added added

removed removed

Lines of Context:
kubuntu-slideshow.py
10
10
from PyQt4 import uic
11
11
 
12
12
base_directory = os.path.dirname (sys.argv[0])
13
 
slideshow_path = os.path.abspath(base_directory)
 
13
slideshow_path = os.path.abspath(base_directory + "/slideshows")
14
14
 
15
15
slideshow_config = ConfigParser.ConfigParser()
16
 
slideshow_config.read(os.path.join(slideshow_path,'slideshow.conf'))
 
16
slideshow_config.read(os.path.join(slideshow_path,'kubuntu/slideshow.conf'))
17
17
 
18
18
config_width = int(slideshow_config.get('Slideshow','width'))
19
19
config_height = int(slideshow_config.get('Slideshow','height'))
50
50
    ui.webView.page().mainFrame().setScrollBarPolicy(Qt.Horizontal, Qt.ScrollBarAlwaysOff)
51
51
    ui.webView.page().mainFrame().setScrollBarPolicy(Qt.Vertical, Qt.ScrollBarAlwaysOff)
52
52
    
53
 
    ui.webView.load(QUrl(os.path.join(slideshow_path, "slides", "kubuntu", "index.html")))
 
53
    ui.webView.load(QUrl(os.path.join(slideshow_path, "kubuntu", "slides", "index.html")))
54
54
    
55
55
    ui.setWindowTitle("Ubiquity Slideshow with Webkit")
56
56
    ui.show()