← Back to branch summary

~vcs-imports/kupfer/master-new

« back to all changes in this revision

Viewing changes to kupfer/ui/browser.py

  • Committer: Ulrik Sverdrup
  • Date: 2010-03-31 01:22:40 UTC
  • Revision ID: git-v1:fdcdd78f4921a2e74a9a12cbd59fa5bfeeecd8cd
Add an accelerator for Show Preferences, default to Ctrl+;

Show diffs side-by-side

added added

removed removed

Lines of Context:
kupfer/ui/browser.py
12
12
import gio
13
13
import gobject
14
14
 
 
15
from kupfer import kupferui
 
16
from kupfer import version
 
17
 
15
18
from kupfer import scheduler
16
19
from kupfer.ui  import listen
17
20
from kupfer.ui import keybindings
1211
1214
                self.data_controller.find_object("qpfer:quit")
1212
1215
 
1213
1216
        def show_help(self):
1214
 
                from kupfer import kupferui
1215
1217
                kupferui.show_help()
 
1218
                self.emit("launched-action")
 
1219
 
 
1220
        def show_preferences(self):
 
1221
                kupferui.show_preferences()
 
1222
                self.emit("launched-action")
1216
1223
 
1217
1224
        def compose_action(self):
1218
1225
                self.data_controller.compose_selection()
1388
1395
gobject.type_register(Interface)
1389
1396
gobject.signal_new("cancelled", Interface, gobject.SIGNAL_RUN_LAST,
1390
1397
                gobject.TYPE_BOOLEAN, ())
 
1398
# Send only when the interface itself launched an action directly
 
1399
gobject.signal_new("launched-action", Interface, gobject.SIGNAL_RUN_LAST,
 
1400
                gobject.TYPE_BOOLEAN, ())
1391
1401
 
1392
1402
class WindowController (pretty.OutputMixin):
1393
1403
        """
1403
1413
                data_controller.connect("command-result", self.result_callback)
1404
1414
 
1405
1415
                self.interface = Interface(data_controller, self.window)
 
1416
                self.interface.connect("launched-action", self.launch_callback)
1406
1417
                self.interface.connect("cancelled", self._cancelled)
1407
1418
                self._setup_window()
1408
1419
                self._statusicon = None
1421
1432
                        else: self.hide_statusicon()
1422
1433
 
1423
1434
        def _setup_status_icon(self):
1424
 
                from kupfer import kupferui
1425
 
                from kupfer import version
1426
 
 
1427
1435
                status = gtk.status_icon_new_from_icon_name(version.ICON_NAME)
1428
1436
                status.set_tooltip(version.PROGRAM_NAME)
1429
1437
                menu = gtk.Menu()
1452
1460
                """
1453
1461
                Returns window
1454
1462
                """
1455
 
                from kupfer import version
1456
1463
 
1457
1464
                self.window.connect("delete-event", self._close_window)
1458
1465
                widget = self.interface.get_widget()