← Back to branch summary

~ubuntu-branches/ubuntu/vivid/blueman/vivid-proposed

« back to all changes in this revision

Viewing changes to blueman/gui/manager/ManagerMenu.py

  • Committer: Package Import Robot
  • Author(s): Artur Rona
  • Date: 2014-12-24 18:33:36 UTC
  • mfrom: (2.3.8 sid)
  • Revision ID: package-import@ubuntu.com-20141224183336-cyb82ot0y8tz8flq
Tags: 1.99~alpha1-1ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - debian/patches/01_dont_autostart_lxde.patch:
    + Don't autostart the applet in LXDE.
  - debian/patches/03_filemanager_fix.patch:
    + Add support for more filemanagers.
* debian/patches/02_dont_crash_on_non-bluetooth_card.patch:
  - Dropped, no longer applicable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
blueman/gui/manager/ManagerMenu.py
1
 
import gtk
 
1
from gi.repository import Gtk
2
2
import blueman.bluez as Bluez
3
3
from blueman.Functions import *
4
4
from blueman.gui.manager.ManagerDeviceMenu import ManagerDeviceMenu
16
16
        self.adapter_items = []
17
17
        self.Search = None
18
18
 
19
 
        self.item_adapter = gtk.MenuItem(_("_Adapter"))
20
 
        self.item_device = gtk.MenuItem(_("_Device"))
 
19
        self.item_adapter = Gtk.MenuItem.new_with_mnemonic(_("_Adapter"))
 
20
        self.item_device = Gtk.MenuItem.new_with_mnemonic(_("_Device"))
21
21
 
22
 
        self.item_view = gtk.MenuItem(_("_View"))
23
 
        self.item_help = gtk.MenuItem(_("_Help"))
 
22
        self.item_view = Gtk.MenuItem.new_with_mnemonic(_("_View"))
 
23
        self.item_help = Gtk.MenuItem.new_with_mnemonic(_("_Help"))
24
24
 
25
25
        self.Menubar.append(self.item_adapter)
26
26
        self.Menubar.append(self.item_device)
27
27
        self.Menubar.append(self.item_view)
28
28
        self.Menubar.append(self.item_help)
29
29
 
30
 
        help_menu = gtk.Menu()
 
30
        help_menu = Gtk.Menu()
31
31
 
32
32
        self.item_help.set_submenu(help_menu)
33
33
        help_menu.show()
37
37
        help_menu.append(item)
38
38
        item.show()
39
39
 
40
 
        item = gtk.SeparatorMenuItem()
 
40
        item = Gtk.SeparatorMenuItem()
41
41
        help_menu.append(item)
42
42
        item.show()
43
43
 
44
 
        item = gtk.ImageMenuItem("gtk-about")
 
44
        item = Gtk.ImageMenuItem.new_from_stock("gtk-about", None)
45
45
        item.connect("activate", lambda x: show_about_dialog('Blueman ' + _('Device Manager')))
46
46
        help_menu.append(item)
47
47
        item.show()
48
48
 
49
 
        view_menu = gtk.Menu()
 
49
        view_menu = Gtk.Menu()
50
50
        self.item_view.set_submenu(view_menu)
51
51
        view_menu.show()
52
52
 
53
 
        item = gtk.CheckMenuItem(_("Show Toolbar"))
 
53
        item = Gtk.CheckMenuItem.new_with_mnemonic(_("Show Toolbar"))
54
54
        if self.blueman.Config.props.show_toolbar == None:
55
55
            item.props.active = True
56
56
        else:
62
62
        view_menu.append(item)
63
63
        item.show()
64
64
 
65
 
        item = gtk.CheckMenuItem(_("Show Statusbar"))
 
65
        item = Gtk.CheckMenuItem.new_with_mnemonic(_("Show Statusbar"))
66
66
        if self.blueman.Config.props.show_statusbar == None:
67
67
            item.props.active = True
68
68
        else:
74
74
        view_menu.append(item)
75
75
        item.show()
76
76
 
77
 
        item = gtk.SeparatorMenuItem()
 
77
        item = Gtk.SeparatorMenuItem()
78
78
        view_menu.append(item)
79
79
        item.show()
80
80
 
81
 
        itemf = gtk.RadioMenuItem(None, _("Latest Device First"))
 
81
        group = []
 
82
 
 
83
        itemf = Gtk.RadioMenuItem.new_with_label(group, _("Latest Device First"))
 
84
        group = itemf.get_group()
82
85
        view_menu.append(itemf)
83
86
        itemf.show()
84
87
 
85
 
        iteml = gtk.RadioMenuItem(itemf, _("Latest Device Last"))
 
88
        iteml = Gtk.RadioMenuItem.new_with_label(group, _("Latest Device Last"))
 
89
        group = iteml.get_group()
86
90
        view_menu.append(iteml)
87
91
        iteml.show()
88
92
 
105
109
        blueman.List.connect("device-selected", self.on_device_selected)
106
110
        blueman.List.connect("adapter-changed", self.on_adapter_changed)
107
111
 
108
 
        self.adapters = blueman.List.Manager.ListAdapters()
 
112
        self.adapters = blueman.List.manager.list_adapters()
109
113
 
110
114
        self.on_adapter_changed(blueman.List, blueman.List.GetAdapterPath())
111
115
 
119
123
                self.device_menu = ManagerDeviceMenu(self.blueman)
120
124
                self.item_device.set_submenu(self.device_menu)
121
125
            else:
122
 
                gobject.idle_add(self.device_menu.Generate, priority=gobject.PRIORITY_LOW)
 
126
                GObject.idle_add(self.device_menu.Generate, priority=GObject.PRIORITY_LOW)
123
127
 
124
128
        else:
125
129
            self.item_device.props.sensitive = False
137
141
                    self.Search.props.sensitive = True
138
142
 
139
143
    def generate_adapter_menu(self):
140
 
        menu = gtk.Menu()
 
144
        menu = Gtk.Menu()
141
145
 
142
 
        sep = gtk.SeparatorMenuItem()
 
146
        sep = Gtk.SeparatorMenuItem()
143
147
        sep.show()
144
148
        menu.append(sep)
145
149
 
146
 
        settings = gtk.ImageMenuItem("gtk-preferences")
 
150
        settings = Gtk.ImageMenuItem.new_from_stock("gtk-preferences", None)
147
151
        settings.connect("activate", lambda x: self.blueman.adapter_properties())
148
152
        settings.show()
149
153
        menu.append(settings)
150
154
 
151
 
        group = None
 
155
        group = []
152
156
        for adapter in self.adapters:
153
 
            props = adapter.GetProperties()
154
 
            item = gtk.RadioMenuItem(group, props["Name"])
155
 
            if group == None:
156
 
                group = item
 
157
            props = adapter.get_properties()
 
158
            item = Gtk.RadioMenuItem.new_with_label(group, props["Name"])
 
159
            group = item.get_group()
157
160
 
158
 
            item.connect("activate", self.on_adapter_selected, adapter.GetObjectPath())
159
 
            if adapter.GetObjectPath() == self.blueman.List.Adapter.GetObjectPath():
 
161
            item.connect("activate", self.on_adapter_selected, adapter.get_object_path())
 
162
            if adapter.get_object_path() == self.blueman.List.Adapter.get_object_path():
160
163
                item.props.active = True
161
164
 
162
165
            item.show()
163
166
            menu.prepend(item)
164
167
 
165
 
        sep = gtk.SeparatorMenuItem()
 
168
        sep = Gtk.SeparatorMenuItem()
166
169
        sep.show()
167
170
        menu.prepend(sep)
168
171
 
177
180
            m.deactivate()
178
181
        self.item_adapter.set_submenu(menu)
179
182
 
180
 
        sep = gtk.SeparatorMenuItem()
 
183
        sep = Gtk.SeparatorMenuItem()
181
184
        sep.show()
182
185
        menu.append(sep)
183
186
 
184
 
        item = gtk.ImageMenuItem("gtk-quit")
185
 
        item.connect("activate", lambda x: gtk.main_quit())
 
187
        item = Gtk.ImageMenuItem.new_from_stock("gtk-quit", None)
 
188
        item.connect("activate", lambda x: Gtk.main_quit())
186
189
        item.show()
187
190
        menu.append(item)
188
191
 
189
192
    def on_adapter_selected(self, menuitem, adapter_path):
190
193
        if menuitem.props.active:
191
 
            if adapter_path != self.blueman.List.Adapter.GetObjectPath():
 
194
            if adapter_path != self.blueman.List.Adapter.get_object_path():
192
195
                dprint("selected", adapter_path)
193
196
                self.blueman.Config.props.last_adapter = adapter_path_to_name(adapter_path)
194
197
                self.blueman.List.SetAdapter(adapter_path)
200
203
 
201
204
    def on_adapter_removed(self, device_list, adapter_path):
202
205
        for adapter in self.adapters:
203
 
            if adapter.GetObjectPath() == adapter_path:
 
206
            if adapter.get_object_path() == adapter_path:
204
207
                self.adapters.remove(adapter)
205
208
        self.generate_adapter_menu()
206
209