Skip to content
This repository has been archived by the owner on May 28, 2022. It is now read-only.

Commit

Permalink
Fix #153 Log and Error Notification System
Browse files Browse the repository at this point in the history
Added a log window accessible through the help
menu. Added a widget to the Record status bar
that displays the latest high priority message
with a status icon to indicate the type of message.
  • Loading branch information
farazs committed Nov 9, 2014
1 parent d93c4b0 commit 8f8c8fa
Show file tree
Hide file tree
Showing 9 changed files with 1,122 additions and 5 deletions.
13 changes: 12 additions & 1 deletion src/freeseer/frontend/qtcommon/FreeseerApp.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# freeseer - vga/presentation capture software
#
# Copyright (C) 2013 Free and Open Source Software Learning Centre
# Copyright (C) 2013, 2014 Free and Open Source Software Learning Centre
# http://fosslc.org
#
# This program is free software: you can redistribute it and/or modify
Expand Down Expand Up @@ -42,6 +42,7 @@
from PyQt4.QtGui import QPixmap

from freeseer.frontend.qtcommon.AboutDialog import AboutDialog
from freeseer.frontend.qtcommon.log import LogDialog
from freeseer.frontend.qtcommon import resource # noqa

try:
Expand All @@ -63,6 +64,8 @@ def __init__(self):
self.aboutDialog = AboutDialog()
self.aboutDialog.setModal(True)

self.logDialog = LogDialog()

#
# Translator
#
Expand Down Expand Up @@ -106,9 +109,14 @@ def __init__(self):
self.actionAbout.setObjectName(_fromUtf8("actionAbout"))
self.actionAbout.setIcon(self.icon)

self.actionLog = QAction(self)
self.actionLog.setObjectName(_fromUtf8("actionLog"))
self.actionLog.setShortcut("Ctrl+L")

# Actions
self.menuFile.addAction(self.actionExit)
self.menuHelp.addAction(self.actionAbout)
self.menuHelp.addAction(self.actionLog)
self.menuHelp.addAction(self.actionOnlineHelp)
self.menubar.addAction(self.menuFile.menuAction())
self.menubar.addAction(self.menuLanguage.menuAction())
Expand All @@ -119,6 +127,7 @@ def __init__(self):

self.connect(self.actionExit, SIGNAL('triggered()'), self.close)
self.connect(self.actionAbout, SIGNAL('triggered()'), self.aboutDialog.show)
self.connect(self.actionLog, SIGNAL('triggered()'), self.logDialog.show)
self.connect(self.actionOnlineHelp, SIGNAL('triggered()'), self.openOnlineHelp)

self.retranslateFreeseerApp()
Expand All @@ -144,6 +153,7 @@ def translate(self, action):
self.retranslateFreeseerApp()
self.aboutDialog.aboutWidget.retranslate(self.current_language)
self.retranslate()
self.logDialog.retranslate()

def retranslate(self):
"""
Expand All @@ -161,6 +171,7 @@ def retranslateFreeseerApp(self):

self.actionExit.setText(self.app.translate("FreeseerApp", "&Quit"))
self.actionAbout.setText(self.app.translate("FreeseerApp", "&About"))
self.actionLog.setText(self.app.translate("FreeseerApp", "View &Log"))
self.actionOnlineHelp.setText(self.app.translate("FreeseerApp", "Online Documentation"))
# --- Menubar

Expand Down
Binary file added src/freeseer/frontend/qtcommon/images/green.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/freeseer/frontend/qtcommon/images/red.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/freeseer/frontend/qtcommon/images/yellow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 8f8c8fa

Please sign in to comment.