← Back to branch summary

~gnome15-team/gnome15/trunk

« back to all changes in this revision

Viewing changes to gnome15/src/main/python/gnome15/g15config.py

  • Committer: tanktarta
  • Date: 2012-12-03 23:09:39 UTC
  • Revision ID: tanktarta-20121203230939-sizbi1uxjtmbmc0t
Some problems creating the default profile when Gnome15 is first installed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gnome15/src/main/python/gnome15/g15config.py
1381
1381
        dialog.hide()
1382
1382
        if response == 1:
1383
1383
            active_profile = g15profile.get_active_profile(self.selected_device)
1384
 
            if self.selected_profile.id == active_profile.id:
 
1384
            if active_profile is not None and self.selected_profile.id == active_profile.id:
1385
1385
                if g15profile.is_locked(self.selected_device):
1386
1386
                    g15profile.set_locked(self.selected_device, False)
1387
1387
                self._make_active(g15profile.get_profile(self.selected_device, 0))
1563
1563
            if active != None:
1564
1564
                active_id = active.id
1565
1565
            self.selected_profile = None
 
1566
            default_profile = g15profile.get_default_profile(self.selected_device)
1566
1567
            self.profiles = g15profile.get_profiles(self.selected_device)
1567
1568
            locked = g15profile.is_locked(self.selected_device)
1568
1569
            for profile in self.profiles: 
1571
1572
                if selected:
1572
1573
                    weight = 700
1573
1574
                lock_icon = gtk.gdk.pixbuf_new_from_file(os.path.join(g15globals.image_dir, "locked.png")) if locked and selected else None 
1574
 
                self.profiles_model.append([profile.name, weight, profile.id, profile.name != "Default", not profile.read_only, lock_icon ])
 
1575
                self.profiles_model.append([profile.name, weight, profile.id, profile == default_profile, not profile.read_only, lock_icon ])
1575
1576
                if current_selection != None and profile.id == current_selection.id:
1576
1577
                    tree_selection.select_path(self.profiles_model.get_path(self.profiles_model.get_iter(len(self.profiles_model) - 1)))
1577
1578
                    self.selected_profile = profile         
1578
 
            if len(self.profiles) == 0:
1579
 
                default_profile = g15profile.G15Profile(self.selected_device, "Default")
1580
 
                g15profile.create_profile(default_profile)
1581
 
                self._load_profile_list()
1582
1579
            if self.selected_profile == None:                
1583
1580
                tree_selection.select_path(self.profiles_model.get_path(self.profiles_model.get_iter(0)))
1584
1581
                self.selected_profile = self.profiles[0]