← Back to branch summary

~gilir/+junk/ubiquity-lxdm-autologin

« back to all changes in this revision

Viewing changes to ubiquity/frontend/kde_components/Timezone.py

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson, Evan Dandrea, Colin Watson
  • Date: 2009-03-10 10:19:54 UTC
  • Revision ID: james.westby@ubuntu.com-20090310101954-5pf2ihckkcikl1zk
Tags: 1.11.16
https://launchpad.net/bugs/337181
https://launchpad.net/bugs/337998
https://launchpad.net/bugs/298318
[ Evan Dandrea ]
* Incorporate the final time zone map artwork.  Support some
  additional time zones on the map.

[ Colin Watson ]
* KDE frontend:
  - grub_device_entry is now a combobox, so we need to use currentText()
    rather than text() (LP: #337181).
* GTK frontend:
  - Fix suggested keymap handling so that selecting that option after
    selecting a custom keymap applies the suggested keymap (LP: #337998).
* Add a fudge of 20% to the size of each tree on the live filesystem
  (other than / and /boot, which already have their own fudge factors) for
  the purposes of the partition-too-small check (LP: #298318).
* Automatic update of included source packages: choose-mirror 2.27ubuntu4,
  clock-setup 0.97ubuntu3, partman-partitioning 64ubuntu5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubiquity/frontend/kde_components/Timezone.py
32
32
        self.setObjectName("timezone_map")
33
33
        
34
34
        #load background pixmap
35
 
        self.imagePath = "/usr/share/ubiquity/pixmaps"
36
 
        self.pixmap = QPixmap("%s/time_zones_background.png" % self.imagePath)
 
35
        self.imagePath = "/usr/share/ubiquity/pixmaps/timezone"
 
36
        self.pixmap = QPixmap("%s/bg.png" % self.imagePath)
37
37
        
38
38
        #redraw timer for selected city time
39
39
        self.timer = QTimer(self)
44
44
        # zonenum + 11 = index (because I can't negative index, but the files go negative)
45
45
        self.zonePixmaps = []
46
46
        for zone in range (-11, 13):
47
 
            self.zonePixmaps.append(QPixmap('%s/time_zones_highlight_%d.png' % (self.imagePath, zone)))
 
47
            self.zonePixmaps.append(QPixmap('%s/timezone_%.1f.png' % (self.imagePath, float(zone))))
48
48
            
49
49
        #load the timezones from database
50
50
        tzdb = ubiquity.tz.Database()
213
213
        if self.selected_city == None:
214
214
            return None
215
215
        
216
 
        return self.selected_city.raw_zone
 
 
b'\\ No newline at end of file'
 
216
        return self.selected_city.raw_zone
 
217