Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wayland fixes #6018

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion pyanaconda/ui/gui/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@
gi.require_version("AnacondaWidgets", "3.4")
gi.require_version("GdkPixbuf", "2.0")
gi.require_version("GObject", "2.0")
gi.require_version("GLib", "2.0")

from gi.repository import Gdk, Gtk, AnacondaWidgets, GdkPixbuf, GObject
from gi.repository import Gdk, Gtk, AnacondaWidgets, GdkPixbuf, GObject, GLib

from pyanaconda.flags import flags
from pyanaconda.core.i18n import _, C_
Expand Down Expand Up @@ -289,6 +290,7 @@ def __init__(self, fullscreen=False, decorated=False):
# Remove the title bar, resize controls and other stuff if the window manager
# allows it and decorated is set to False. Otherwise, it has no effect.
self.set_decorated(decorated)
self.set_titlebar(Gtk.DrawingArea())

# Hide the titlebar when maximized if the window manager allows it.
# This makes anaconda look full-screenish but without covering parts
Expand Down Expand Up @@ -519,6 +521,8 @@ def __init__(self, storage, payload,

self.data = None

if conf.system.provides_liveuser:
GLib.set_prgname("liveinst") # matches liveinst.desktop filename
self.mainWindow = MainWindow(fullscreen=fullscreen, decorated=False)

self._distributionText = distributionText
Expand Down
6 changes: 6 additions & 0 deletions pyanaconda/ui/gui/main.glade
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
<property name="modal">True</property>
<property name="type_hint">dialog</property>
<property name="decorated">False</property>
<child type="titlebar">
<object class="GtkDrawingArea"/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox2">
<property name="can_focus">False</property>
Expand Down Expand Up @@ -80,6 +83,9 @@
<property name="can_focus">False</property>
<property name="type_hint">dialog</property>
<property name="decorated">False</property>
<child type="titlebar">
<object class="GtkDrawingArea"/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="quitDialog-vbox1">
<property name="can_focus">False</property>
Expand Down
3 changes: 3 additions & 0 deletions pyanaconda/ui/gui/spokes/advanced_user.glade
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
<property name="border_width">6</property>
<property name="type_hint">dialog</property>
<property name="decorated">False</property>
<child type="titlebar">
<object class="GtkDrawingArea"/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
Expand Down
3 changes: 3 additions & 0 deletions pyanaconda/ui/gui/spokes/advstorage/dasd.glade
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
<property name="modal">True</property>
<property name="type_hint">dialog</property>
<property name="decorated">False</property>
<child type="titlebar">
<object class="GtkDrawingArea"/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
Expand Down
3 changes: 3 additions & 0 deletions pyanaconda/ui/gui/spokes/advstorage/fcoe.glade
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
<property name="modal">True</property>
<property name="type_hint">dialog</property>
<property name="decorated">False</property>
<child type="titlebar">
<object class="GtkDrawingArea"/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
Expand Down
3 changes: 3 additions & 0 deletions pyanaconda/ui/gui/spokes/advstorage/iscsi.glade
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
<property name="default_width">600</property>
<property name="type_hint">dialog</property>
<property name="decorated">False</property>
<child type="titlebar">
<object class="GtkDrawingArea"/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
Expand Down
3 changes: 3 additions & 0 deletions pyanaconda/ui/gui/spokes/advstorage/zfcp.glade
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
<property name="modal">True</property>
<property name="type_hint">dialog</property>
<property name="decorated">False</property>
<child type="titlebar">
<object class="GtkDrawingArea"/>
</child>
<property name="default-width">600</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
Expand Down
6 changes: 6 additions & 0 deletions pyanaconda/ui/gui/spokes/keyboard.glade
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,9 @@
<property name="default_height">450</property>
<property name="type_hint">dialog</property>
<property name="decorated">False</property>
<child type="titlebar">
<object class="GtkDrawingArea"/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
Expand Down Expand Up @@ -593,6 +596,9 @@
<property name="default_height">450</property>
<property name="type_hint">dialog</property>
<property name="decorated">False</property>
<child type="titlebar">
<object class="GtkDrawingArea"/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox2">
<property name="can_focus">False</property>
Expand Down
3 changes: 3 additions & 0 deletions pyanaconda/ui/gui/spokes/lib/beta_warning_dialog.glade
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
<property name="default-width">550</property>
<property name="type-hint">dialog</property>
<property name="decorated">False</property>
<child type="titlebar">
<object class="GtkDrawingArea"/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can-focus">False</property>
Expand Down
3 changes: 3 additions & 0 deletions pyanaconda/ui/gui/spokes/lib/cart.glade
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
<property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
<property name="decorated">False</property>
<child type="titlebar">
<object class="GtkDrawingArea"/>
</child>
<child>
<placeholder/>
</child>
Expand Down
12 changes: 12 additions & 0 deletions pyanaconda/ui/gui/spokes/lib/custom_storage_helpers.glade
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
<property name="border-width">6</property>
<property name="type-hint">dialog</property>
<property name="decorated">False</property>
<child type="titlebar">
<object class="GtkDrawingArea"/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox2">
<property name="can-focus">False</property>
Expand Down Expand Up @@ -115,6 +118,9 @@
<property name="border-width">6</property>
<property name="type-hint">dialog</property>
<property name="decorated">False</property>
<child type="titlebar">
<object class="GtkDrawingArea"/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox4">
<property name="can-focus">False</property>
Expand Down Expand Up @@ -310,6 +316,9 @@
<property name="border-width">6</property>
<property name="type-hint">dialog</property>
<property name="decorated">False</property>
<child type="titlebar">
<object class="GtkDrawingArea"/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can-focus">False</property>
Expand Down Expand Up @@ -593,6 +602,9 @@ use. Try something else?</property>
<property name="border-width">6</property>
<property name="type-hint">dialog</property>
<property name="decorated">False</property>
<child type="titlebar">
<object class="GtkDrawingArea"/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox5">
<property name="can-focus">False</property>
Expand Down
3 changes: 3 additions & 0 deletions pyanaconda/ui/gui/spokes/lib/dasdfmt.glade
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
<property name="modal">True</property>
<property name="type_hint">dialog</property>
<property name="decorated">False</property>
<child type="titlebar">
<object class="GtkDrawingArea"/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
Expand Down
3 changes: 3 additions & 0 deletions pyanaconda/ui/gui/spokes/lib/detailederror.glade
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
<property name="window_position">center</property>
<property name="type_hint">dialog</property>
<property name="decorated">False</property>
<child type="titlebar">
<object class="GtkDrawingArea"/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox2">
<property name="can_focus">False</property>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
<property name="border-width">6</property>
<property name="type-hint">dialog</property>
<property name="decorated">False</property>
<child type="titlebar">
<object class="GtkDrawingArea"/>
</child>
<property name="create-folders">False</property>
<property name="filter">isoFilter</property>
<child internal-child="vbox">
Expand Down Expand Up @@ -79,6 +82,9 @@
<property name="window-position">center-on-parent</property>
<property name="type-hint">dialog</property>
<property name="decorated">False</property>
<child type="titlebar">
<object class="GtkDrawingArea"/>
</child>
<signal name="close" handler="on_close" swapped="no"/>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
Expand Down Expand Up @@ -232,6 +238,9 @@
<property name="window-position">center-on-parent</property>
<property name="type-hint">dialog</property>
<property name="decorated">False</property>
<child type="titlebar">
<object class="GtkDrawingArea"/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox4">
<property name="can-focus">False</property>
Expand Down
3 changes: 3 additions & 0 deletions pyanaconda/ui/gui/spokes/lib/network_secret_agent.glade
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
<property name="title" translatable="yes">Authentication</property>
<property name="type_hint">dialog</property>
<property name="decorated">False</property>
<child type="titlebar">
<object class="GtkDrawingArea"/>
</child>
<child>
<placeholder/>
</child>
Expand Down
3 changes: 3 additions & 0 deletions pyanaconda/ui/gui/spokes/lib/ntp_dialog.glade
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
<property name="border_width">6</property>
<property name="type_hint">dialog</property>
<property name="decorated">False</property>
<child type="titlebar">
<object class="GtkDrawingArea"/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
Expand Down
3 changes: 3 additions & 0 deletions pyanaconda/ui/gui/spokes/lib/passphrase.glade
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
<property name="default_width">600</property>
<property name="type_hint">dialog</property>
<property name="decorated">False</property>
<child type="titlebar">
<object class="GtkDrawingArea"/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox3">
<property name="can_focus">False</property>
Expand Down
3 changes: 3 additions & 0 deletions pyanaconda/ui/gui/spokes/lib/refresh.glade
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
<property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
<property name="decorated">False</property>
<child type="titlebar">
<object class="GtkDrawingArea"/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
Expand Down
3 changes: 3 additions & 0 deletions pyanaconda/ui/gui/spokes/lib/resize.glade
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@
<property name="modal">True</property>
<property name="type-hint">dialog</property>
<property name="decorated">False</property>
<child type="titlebar">
<object class="GtkDrawingArea"/>
</child>
<signal name="key-release-event" handler="on_key_pressed" swapped="no"/>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
Expand Down
6 changes: 6 additions & 0 deletions pyanaconda/ui/gui/spokes/lib/storage_dialogs.glade
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
<property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
<property name="decorated">False</property>
<child type="titlebar">
<object class="GtkDrawingArea"/>
</child>
<child>
<placeholder/>
</child>
Expand Down Expand Up @@ -230,6 +233,9 @@
<property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
<property name="decorated">False</property>
<child type="titlebar">
<object class="GtkDrawingArea"/>
</child>
<child>
<placeholder/>
</child>
Expand Down
Loading