[pitivi] Keep the welcome dialog shown when clicking "Missing dependencies..."
- From: Jean-François Fortin Tam <jfft src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] Keep the welcome dialog shown when clicking "Missing dependencies..."
- Date: Sun, 3 Nov 2013 20:03:03 +0000 (UTC)
commit b9f62d73083ff6de572fa98e714def138a431ce6
Author: Jean-François Fortin Tam <nekohayo gmail com>
Date: Sun Nov 3 21:01:19 2013 +0100
Keep the welcome dialog shown when clicking "Missing dependencies..."
Also prevent GTK3 from messing up the size of the missing dependencies dialog,
and remove an unused import in timeline/timeline.py
Fixes bug #711357
pitivi/dialogs/depsmanager.py | 10 ++++++++--
pitivi/dialogs/startupwizard.py | 3 +--
pitivi/timeline/timeline.py | 1 -
3 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/pitivi/dialogs/depsmanager.py b/pitivi/dialogs/depsmanager.py
index 58137f2..5799ddd 100644
--- a/pitivi/dialogs/depsmanager.py
+++ b/pitivi/dialogs/depsmanager.py
@@ -32,14 +32,20 @@ class DepsManager(object):
The sane way to query and install is by using PackageKit's InstallResource()
"""
- def __init__(self, app):
+ def __init__(self, app, parent_window=None):
self.app = app
self.builder = Gtk.Builder()
self.builder.add_from_file(os.path.join(get_ui_dir(), "depsmanager.ui"))
self.builder.connect_signals(self)
self.window = self.builder.get_object("window1")
- self.window.set_transient_for(self.app.gui)
self.window.set_modal(True)
+ if parent_window:
+ self.window.set_transient_for(parent_window)
+ else:
+ self.window.set_transient_for(self.app.gui)
+ # Same hack as in the rendering progress dialog,
+ # to prevent GTK3 from eating a crazy amount of vertical space:
+ self.window.set_resizable(False)
# FIXME: autodetect if we can actually use PackageKit's "InstallResource" dbus
# method, and if yes, show this button.
diff --git a/pitivi/dialogs/startupwizard.py b/pitivi/dialogs/startupwizard.py
index 9328cd7..b754e99 100644
--- a/pitivi/dialogs/startupwizard.py
+++ b/pitivi/dialogs/startupwizard.py
@@ -102,8 +102,7 @@ class StartUpWizard(object):
self.app.gui.openProject()
def _onMissingDepsButtonClickedCb(self, unused_button):
- self.hide()
- DepsManager(self.app)
+ DepsManager(self.app, parent_window=self.window)
def _userManualCb(self, unused_button):
"""Handle a click on the Help button."""
diff --git a/pitivi/timeline/timeline.py b/pitivi/timeline/timeline.py
index 3cfceba..571ddc9 100644
--- a/pitivi/timeline/timeline.py
+++ b/pitivi/timeline/timeline.py
@@ -33,7 +33,6 @@ from pitivi.autoaligner import AlignmentProgressDialog, AutoAligner
from pitivi.check import missing_soft_deps
from pitivi.utils.timeline import Zoomable, Selection, SELECT, UNSELECT
from pitivi.settings import GlobalSettings
-from pitivi.dialogs.depsmanager import DepsManager
from pitivi.dialogs.prefs import PreferencesDialog
from pitivi.utils.loggable import Loggable
from pitivi.utils.ui import EXPANDED_SIZE, SPACING, PLAYHEAD_WIDTH, CONTROL_WIDTH, TYPE_PITIVI_EFFECT
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]