diff options
Diffstat (limited to 'mvc')
| -rw-r--r-- | mvc/basicconverters.py | 2 | ||||
| -rw-r--r-- | mvc/resources/converters/apple.py | 2 | ||||
| -rwxr-xr-x | mvc/resources/windows/gtkrc | 12 | ||||
| -rw-r--r-- | mvc/signals.py | 10 |
4 files changed, 12 insertions, 14 deletions
diff --git a/mvc/basicconverters.py b/mvc/basicconverters.py index 76bc2b6..4cb4c0d 100644 --- a/mvc/basicconverters.py +++ b/mvc/basicconverters.py @@ -135,7 +135,7 @@ avc_intra_1080 = PRORES_1080('AVC Intra 1080p') avc_intra_720 = PRORES_720('AVC Intra 720p') ingest_formats = ('Ingest Formats', [dnxhd_1080, dnxhd_720, prores_1080, - prores_720, avc_intra_1080, avc_intra_720]) + prores_720, avc_intra_1080, avc_intra_720]) null_converter = NullConverter('Same Format') converters = [video_formats, audio_formats, ingest_formats, null_converter] diff --git a/mvc/resources/converters/apple.py b/mvc/resources/converters/apple.py index 41fdd7a..20cb76e 100644 --- a/mvc/resources/converters/apple.py +++ b/mvc/resources/converters/apple.py @@ -25,4 +25,4 @@ apple_tv = AppleConversion('Apple TV', 1280, 720) universal = AppleConversion('Apple Universal', 1280, 720) converters = [ipod, ipod_touch, ipod_retina, iphone, iphone_retina, iphone_5, - ipad, ipad_retina, apple_tv, universal] + ipad, ipad_retina, apple_tv, universal] diff --git a/mvc/resources/windows/gtkrc b/mvc/resources/windows/gtkrc index 7add72c..45a6969 100755 --- a/mvc/resources/windows/gtkrc +++ b/mvc/resources/windows/gtkrc @@ -26,7 +26,7 @@ style "clearlooks-default" xthickness = 1 ythickness = 1 - fg[NORMAL] = "#505050" + fg[NORMAL] = "#505050" fg[ACTIVE] = "#505050" fg[SELECTED] = "#ffffff" fg[INSENSITIVE] = "#9B9B9B" @@ -99,8 +99,8 @@ style "clearlooks-menubar" = "clearlooks-default" { xthickness = 2 ythickness = 2 - base[PRELIGHT] = "#63E62E" - base[SELECTED] = "#4DB224" + base[PRELIGHT] = "#63E62E" + base[SELECTED] = "#4DB224" } style "clearlooks-menu-item" = "clearlooks-default" @@ -158,9 +158,9 @@ class "GtkMenuItem" style "clearlooks-menu-item" class "GtkStatusbar" style "clearlooks-wide" class "GtkNotebook" style "clearlooks-notebook" class "GtkProgressBar" style "clearlooks-progressbar" -class "*MenuBar*" style "clearlooks-menubar" -class "GtkMenuBar*" style "clearlooks-menubar" -class "MetaFrames" style "metacity-frame" +class "*MenuBar*" style "clearlooks-menubar" +class "GtkMenuBar*" style "clearlooks-menubar" +class "MetaFrames" style "metacity-frame" widget_class "*MenuItem*" style "clearlooks-menu-item" diff --git a/mvc/signals.py b/mvc/signals.py index 6b09406..2f64dc9 100644 --- a/mvc/signals.py +++ b/mvc/signals.py @@ -262,10 +262,10 @@ class SystemSignals(SignalEmitter): """ def __init__(self): SignalEmitter.__init__(self, 'error', 'startup-success', - 'startup-failure', 'shutdown', - 'update-available', 'new-dialog', - 'theme-first-run', 'videos-added', - 'download-complete') + 'startup-failure', 'shutdown', + 'update-available', 'new-dialog', + 'theme-first-run', 'videos-added', + 'download-complete') def shutdown(self): self.emit('shutdown') @@ -296,6 +296,4 @@ class SystemSignals(SignalEmitter): exc_info = None logging.error('%s: %s' % (when, details), exc_info=exc_info) - - system = SystemSignals() |