From e154d76094c20fb374b116e6a8e1965544466eea Mon Sep 17 00:00:00 2001 From: Chris Lumens Date: Wed, 25 Jul 2012 10:53:57 -0400 Subject: Move all .ui files to a .glade extension. xgettext is dumb and only looks at file extensions. It has no way to let you tell it what extension maps to what language on the command line. Thus, out glade files must be .glade if they are to get translated. --- pyanaconda/ui/gui/Makefile.am | 2 +- pyanaconda/ui/gui/__init__.py | 2 +- pyanaconda/ui/gui/hubs/Makefile.am | 2 +- pyanaconda/ui/gui/hubs/progress.glade | 210 ++ pyanaconda/ui/gui/hubs/progress.py | 2 +- pyanaconda/ui/gui/hubs/progress.ui | 210 -- pyanaconda/ui/gui/hubs/summary.glade | 116 ++ pyanaconda/ui/gui/hubs/summary.py | 2 +- pyanaconda/ui/gui/hubs/summary.ui | 116 -- pyanaconda/ui/gui/main.glade | 103 + pyanaconda/ui/gui/main.ui | 103 - pyanaconda/ui/gui/spokes/Makefile.am | 2 +- pyanaconda/ui/gui/spokes/custom.glade | 1630 ++++++++++++++++ pyanaconda/ui/gui/spokes/custom.py | 6 +- pyanaconda/ui/gui/spokes/custom.ui | 1630 ---------------- pyanaconda/ui/gui/spokes/datetime_spoke.glade | 898 +++++++++ pyanaconda/ui/gui/spokes/datetime_spoke.py | 4 +- pyanaconda/ui/gui/spokes/datetime_spoke.ui | 898 --------- pyanaconda/ui/gui/spokes/keyboard.glade | 495 +++++ pyanaconda/ui/gui/spokes/keyboard.py | 4 +- pyanaconda/ui/gui/spokes/keyboard.ui | 495 ----- pyanaconda/ui/gui/spokes/lib/Makefile.am | 2 +- pyanaconda/ui/gui/spokes/lib/cart.glade | 211 ++ pyanaconda/ui/gui/spokes/lib/cart.py | 2 +- pyanaconda/ui/gui/spokes/lib/cart.ui | 211 -- pyanaconda/ui/gui/spokes/lib/detailederror.glade | 145 ++ pyanaconda/ui/gui/spokes/lib/detailederror.py | 2 +- pyanaconda/ui/gui/spokes/lib/detailederror.ui | 145 -- pyanaconda/ui/gui/spokes/network.glade | 2219 ++++++++++++++++++++++ pyanaconda/ui/gui/spokes/network.py | 6 +- pyanaconda/ui/gui/spokes/network.ui | 2219 ---------------------- pyanaconda/ui/gui/spokes/software.glade | 272 +++ pyanaconda/ui/gui/spokes/software.py | 2 +- pyanaconda/ui/gui/spokes/software.ui | 272 --- pyanaconda/ui/gui/spokes/source.glade | 1262 ++++++++++++ pyanaconda/ui/gui/spokes/source.py | 10 +- pyanaconda/ui/gui/spokes/source.ui | 1262 ------------ pyanaconda/ui/gui/spokes/storage.glade | 802 ++++++++ pyanaconda/ui/gui/spokes/storage.py | 4 +- pyanaconda/ui/gui/spokes/storage.ui | 802 -------- pyanaconda/ui/gui/spokes/welcome.glade | 380 ++++ pyanaconda/ui/gui/spokes/welcome.py | 4 +- pyanaconda/ui/gui/spokes/welcome.ui | 380 ---- 43 files changed, 8772 insertions(+), 8772 deletions(-) create mode 100644 pyanaconda/ui/gui/hubs/progress.glade delete mode 100644 pyanaconda/ui/gui/hubs/progress.ui create mode 100644 pyanaconda/ui/gui/hubs/summary.glade delete mode 100644 pyanaconda/ui/gui/hubs/summary.ui create mode 100644 pyanaconda/ui/gui/main.glade delete mode 100644 pyanaconda/ui/gui/main.ui create mode 100644 pyanaconda/ui/gui/spokes/custom.glade delete mode 100644 pyanaconda/ui/gui/spokes/custom.ui create mode 100644 pyanaconda/ui/gui/spokes/datetime_spoke.glade delete mode 100644 pyanaconda/ui/gui/spokes/datetime_spoke.ui create mode 100644 pyanaconda/ui/gui/spokes/keyboard.glade delete mode 100644 pyanaconda/ui/gui/spokes/keyboard.ui create mode 100644 pyanaconda/ui/gui/spokes/lib/cart.glade delete mode 100644 pyanaconda/ui/gui/spokes/lib/cart.ui create mode 100644 pyanaconda/ui/gui/spokes/lib/detailederror.glade delete mode 100644 pyanaconda/ui/gui/spokes/lib/detailederror.ui create mode 100644 pyanaconda/ui/gui/spokes/network.glade delete mode 100644 pyanaconda/ui/gui/spokes/network.ui create mode 100644 pyanaconda/ui/gui/spokes/software.glade delete mode 100644 pyanaconda/ui/gui/spokes/software.ui create mode 100644 pyanaconda/ui/gui/spokes/source.glade delete mode 100644 pyanaconda/ui/gui/spokes/source.ui create mode 100644 pyanaconda/ui/gui/spokes/storage.glade delete mode 100644 pyanaconda/ui/gui/spokes/storage.ui create mode 100644 pyanaconda/ui/gui/spokes/welcome.glade delete mode 100644 pyanaconda/ui/gui/spokes/welcome.ui diff --git a/pyanaconda/ui/gui/Makefile.am b/pyanaconda/ui/gui/Makefile.am index 7a3958cc3..51d43a8da 100644 --- a/pyanaconda/ui/gui/Makefile.am +++ b/pyanaconda/ui/gui/Makefile.am @@ -24,4 +24,4 @@ guidir = $(pkgpyexecdir)/ui/gui gui_PYTHON = *.py uidir = $(datadir)/$(PACKAGE_NAME)/ui/ -dist_ui_DATA = *.ui +dist_ui_DATA = *.glade diff --git a/pyanaconda/ui/gui/__init__.py b/pyanaconda/ui/gui/__init__.py index 6e4a7fb5d..1a7ecc89a 100644 --- a/pyanaconda/ui/gui/__init__.py +++ b/pyanaconda/ui/gui/__init__.py @@ -391,7 +391,7 @@ class UIObject(object): class QuitDialog(UIObject): builderObjects = ["quitDialog"] mainWidgetName = "quitDialog" - uiFile = "main.ui" + uiFile = "main.glade" def run(self): rc = self.window.run() diff --git a/pyanaconda/ui/gui/hubs/Makefile.am b/pyanaconda/ui/gui/hubs/Makefile.am index d1dad0a50..ae520a6e3 100644 --- a/pyanaconda/ui/gui/hubs/Makefile.am +++ b/pyanaconda/ui/gui/hubs/Makefile.am @@ -22,4 +22,4 @@ hubsdir = $(pkgpyexecdir)/ui/gui/hubs hubs_PYTHON = *.py uidir = $(datadir)/$(PACKAGE_NAME)/ui/hubs -dist_ui_DATA = *.ui +dist_ui_DATA = *.glade diff --git a/pyanaconda/ui/gui/hubs/progress.glade b/pyanaconda/ui/gui/hubs/progress.glade new file mode 100644 index 000000000..1eb32c97e --- /dev/null +++ b/pyanaconda/ui/gui/hubs/progress.glade @@ -0,0 +1,210 @@ + + + + + + filler + False + filler + PERSONALIZATION + + + False + vertical + + + False + + + + + + False + False + 0 + + + + + False + 0 + 0.5 + + + False + vertical + 6 + + + True + never + + + + + + True + True + 1 + + + + + True + False + vertical + 6 + + + True + False + 6 + + + True + False + True + + + False + True + 0 + + + + + True + False + start + Preparing to install + + + True + True + 1 + + + + + False + True + 0 + + + + + True + False + + + False + True + 1 + + + + + 750 + 120 + True + True + False + False + + + True + False + gtk-missing-image + + + + + + + + True + False + True + 6 + + + True + False + end + %s is now successfully installed on your system and ready +for you to use! Go ahead and reboot to start using it! + + + 1 + 0 + 1 + 1 + + + + + _REBOOT + False + True + True + True + end + end + True + False + True + + + 1 + 1 + 1 + 1 + + + + + + + + + + + 1 + + + + + + + + + + + + + + False + True + 2 + + + + + False + True + 2 + + + + + + + True + True + 1 + + + + + + diff --git a/pyanaconda/ui/gui/hubs/progress.py b/pyanaconda/ui/gui/hubs/progress.py index 2eb1b75de..f9c20234c 100644 --- a/pyanaconda/ui/gui/hubs/progress.py +++ b/pyanaconda/ui/gui/hubs/progress.py @@ -40,7 +40,7 @@ __all__ = ["ProgressHub"] class ProgressHub(Hub): builderObjects = ["progressWindow"] mainWidgetName = "progressWindow" - uiFile = "hubs/progress.ui" + uiFile = "hubs/progress.glade" def __init__(self, data, storage, payload, instclass): Hub.__init__(self, data, storage, payload, instclass) diff --git a/pyanaconda/ui/gui/hubs/progress.ui b/pyanaconda/ui/gui/hubs/progress.ui deleted file mode 100644 index 1eb32c97e..000000000 --- a/pyanaconda/ui/gui/hubs/progress.ui +++ /dev/null @@ -1,210 +0,0 @@ - - - - - - filler - False - filler - PERSONALIZATION - - - False - vertical - - - False - - - - - - False - False - 0 - - - - - False - 0 - 0.5 - - - False - vertical - 6 - - - True - never - - - - - - True - True - 1 - - - - - True - False - vertical - 6 - - - True - False - 6 - - - True - False - True - - - False - True - 0 - - - - - True - False - start - Preparing to install - - - True - True - 1 - - - - - False - True - 0 - - - - - True - False - - - False - True - 1 - - - - - 750 - 120 - True - True - False - False - - - True - False - gtk-missing-image - - - - - - - - True - False - True - 6 - - - True - False - end - %s is now successfully installed on your system and ready -for you to use! Go ahead and reboot to start using it! - - - 1 - 0 - 1 - 1 - - - - - _REBOOT - False - True - True - True - end - end - True - False - True - - - 1 - 1 - 1 - 1 - - - - - - - - - - - 1 - - - - - - - - - - - - - - False - True - 2 - - - - - False - True - 2 - - - - - - - True - True - 1 - - - - - - diff --git a/pyanaconda/ui/gui/hubs/summary.glade b/pyanaconda/ui/gui/hubs/summary.glade new file mode 100644 index 000000000..25aa16564 --- /dev/null +++ b/pyanaconda/ui/gui/hubs/summary.glade @@ -0,0 +1,116 @@ + + + + + + filler + False + filler + False + False + INSTALLATION SUMMARY + + + False + vertical + + + False + + + + + + False + False + 0 + + + + + False + 0 + 0.5 + 1.0 + + + False + vertical + 6 + + + True + True + never + + + + + + True + True + 1 + + + + + + + True + True + 1 + + + + + True + False + 6 + 6 + 6 + + + _QUIT + False + True + True + True + start + True + False + True + + + False + True + 0 + + + + + _CONTINUE + False + True + True + True + end + False + True + + + False + True + 1 + + + + + False + True + 2 + + + + + + diff --git a/pyanaconda/ui/gui/hubs/summary.py b/pyanaconda/ui/gui/hubs/summary.py index 4973ebe87..c867e496a 100644 --- a/pyanaconda/ui/gui/hubs/summary.py +++ b/pyanaconda/ui/gui/hubs/summary.py @@ -26,7 +26,7 @@ __all__ = ["SummaryHub"] class SummaryHub(Hub): builderObjects = ["summaryWindow"] mainWidgetName = "summaryWindow" - uiFile = "hubs/summary.ui" + uiFile = "hubs/summary.glade" # FIXME: I really hate this. diff --git a/pyanaconda/ui/gui/hubs/summary.ui b/pyanaconda/ui/gui/hubs/summary.ui deleted file mode 100644 index 25aa16564..000000000 --- a/pyanaconda/ui/gui/hubs/summary.ui +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - filler - False - filler - False - False - INSTALLATION SUMMARY - - - False - vertical - - - False - - - - - - False - False - 0 - - - - - False - 0 - 0.5 - 1.0 - - - False - vertical - 6 - - - True - True - never - - - - - - True - True - 1 - - - - - - - True - True - 1 - - - - - True - False - 6 - 6 - 6 - - - _QUIT - False - True - True - True - start - True - False - True - - - False - True - 0 - - - - - _CONTINUE - False - True - True - True - end - False - True - - - False - True - 1 - - - - - False - True - 2 - - - - - - diff --git a/pyanaconda/ui/gui/main.glade b/pyanaconda/ui/gui/main.glade new file mode 100644 index 000000000..2f773a48f --- /dev/null +++ b/pyanaconda/ui/gui/main.glade @@ -0,0 +1,103 @@ + + + + + False + 5 + dialog + False + + + False + vertical + 2 + + + False + end + + + _Cancel + False + True + True + True + False + True + + + False + True + 0 + + + + + _Quit + False + True + True + True + False + True + + + False + True + 1 + + + + + False + True + end + 0 + + + + + True + False + 5 + + + True + False + gtk-quit + 6 + + + False + True + 0 + + + + + True + False + Are you sure you wish to quit the +installation process? + + + False + True + 1 + + + + + False + True + 1 + + + + + + cancelButton + quitButton + + + diff --git a/pyanaconda/ui/gui/main.ui b/pyanaconda/ui/gui/main.ui deleted file mode 100644 index 2f773a48f..000000000 --- a/pyanaconda/ui/gui/main.ui +++ /dev/null @@ -1,103 +0,0 @@ - - - - - False - 5 - dialog - False - - - False - vertical - 2 - - - False - end - - - _Cancel - False - True - True - True - False - True - - - False - True - 0 - - - - - _Quit - False - True - True - True - False - True - - - False - True - 1 - - - - - False - True - end - 0 - - - - - True - False - 5 - - - True - False - gtk-quit - 6 - - - False - True - 0 - - - - - True - False - Are you sure you wish to quit the -installation process? - - - False - True - 1 - - - - - False - True - 1 - - - - - - cancelButton - quitButton - - - diff --git a/pyanaconda/ui/gui/spokes/Makefile.am b/pyanaconda/ui/gui/spokes/Makefile.am index 4968a897d..352f4e4fb 100644 --- a/pyanaconda/ui/gui/spokes/Makefile.am +++ b/pyanaconda/ui/gui/spokes/Makefile.am @@ -24,4 +24,4 @@ spokesdir = $(pkgpyexecdir)/ui/gui/spokes spokes_PYTHON = *.py uidir = $(datadir)/$(PACKAGE_NAME)/ui/spokes -dist_ui_DATA = *.ui +dist_ui_DATA = *.glade diff --git a/pyanaconda/ui/gui/spokes/custom.glade b/pyanaconda/ui/gui/spokes/custom.glade new file mode 100644 index 000000000..5f97efad1 --- /dev/null +++ b/pyanaconda/ui/gui/spokes/custom.glade @@ -0,0 +1,1630 @@ + + + + + + False + 5 + dialog + False + + + False + vertical + 2 + + + False + 24 + end + + + _Cancel + False + True + True + True + end + False + True + + + + False + True + 0 + + + + + _Add mount point + False + True + True + True + end + False + True + + + + False + True + 1 + + + + + False + True + end + 0 + + + + + True + False + 6 + + + True + False + 6 + 1 + <b>Desired Capacity:</b> + True + + + 0 + 4 + 1 + 1 + + + + + True + False + 1 + <b>Mount Point:</b> + True + + + 0 + 2 + 1 + 1 + + + + + True + False + 12 + ADD A NEW MOUNT POINT + + + + + + + 0 + 0 + 2 + 1 + + + + + True + False + 12 + More customization options are available +after creating the mount point below. + + + 0 + 1 + 2 + 1 + + + + + True + True + ● + + + 1 + 2 + 1 + 1 + + + + + False + True + start + 6 + + + True + False + gtk-dialog-warning + 2 + + + False + True + 0 + + + + + True + False + That mount point is already in +use. Try something else? + + + + + + + False + True + 1 + + + + + 1 + 3 + 1 + 1 + + + + + True + True + eg: "20 GB", "500mb" (minus the quotation marks) + ● + + + 1 + 4 + 1 + 1 + + + + + False + True + 1 + + + + + + addCancelButton + addConfirmButton + + + + True + False + list-add-symbolic + + + False + 5 + dialog + False + + + False + vertical + 2 + + + False + end + + + _Cancel + False + True + True + True + False + True + + + + False + True + 0 + + + + + _Delete It + False + True + True + True + False + True + + + + False + True + 1 + + + + + False + True + end + 0 + + + + + True + False + Are you sure you want to delete +all of the data on %s? + True + + + False + True + 1 + + + + + + deleteCancelButton + deleteConfirmButton + + + + filler + False + filler + MANUAL PARTITIONING + + + + False + vertical + 6 + + + False + 6 + 6 + 6 + + + False + False + 0 + + + + + False + 0 + 0.89999997615814209 + 0.5 + + + False + vertical + 6 + + + True + False + 12 + + + True + False + start + start + + + False + True + True + True + False + addImage + + + + False + True + 0 + + + + + False + True + True + True + False + removeImage + + + + False + True + 1 + + + + + False + True + True + True + False + settingsImage + + + + False + True + 2 + + + + + 0 + 1 + 1 + 1 + + + + + True + True + True + in + + + True + False + + + + + + + + 0 + 0 + 1 + 1 + + + + + True + True + False + + + True + False + When you create mount points for your %s %s install, +you'll be able to view their details here. + + + + + + + + True + False + True + vertical + 6 + + + True + False + + + True + False + 0 + Selected Device + + + + + + + False + True + 0 + + + + + True + False + end + 0 + Device description + + + + + + True + True + 1 + + + + + False + True + 0 + + + + + True + False + + + False + True + 6 + 1 + + + + + True + False + 6 + + + True + False + <b>Label:</b> + True + + + False + True + 0 + + + + + True + True + True + ● + True + + + False + True + 1 + + + + + True + False + end + <b>Desired Capacity (MB):</b> + True + + + False + True + 2 + + + + + True + True + end + ● + 7 + True + sizeAdjustment + True + + + False + False + 3 + + + + + False + True + 2 + + + + + True + True + + + True + False + 12 + 6 + 6 + + + True + False + 0 + <b>Device Type:</b> + True + + + 0 + 0 + 1 + 1 + + + + + True + False + 0 + <b>File System:</b> + True + + + 0 + 1 + 1 + 1 + + + + + True + False + True + + BTRFS + LVM + RAID + Standard Partition + + + + + 1 + 0 + 1 + 1 + + + + + True + False + True + + + 1 + 1 + 1 + 1 + + + + + Encrypt + False + True + True + False + start + False + 0 + True + + + 2 + 0 + 1 + 1 + + + + + True + True + True + False + + + True + False + 12 + + + True + False + + + Redundancy (mirror) + False + True + True + False + False + 0 + True + + + False + True + 0 + + + + + True + False + 2 + (-0Gb) + + + + + + False + True + 1 + + + + + 0 + 0 + 1 + 1 + + + + + True + False + + + Optimized performance (stripe) + False + True + True + False + False + 0 + True + + + False + True + 0 + + + + + True + False + (-0Gb) + + + + + + False + True + 1 + + + + + 0 + 1 + 1 + 1 + + + + + True + False + + + Error detection (parity) + False + True + True + False + False + 0 + True + + + False + True + 0 + + + + + True + False + (-0Gb) + + + + + + False + True + 1 + + + + + 0 + 2 + 1 + 1 + + + + + True + False + 12 + + + Distributed + False + True + True + False + False + 0 + True + + + False + True + 0 + + + + + True + False + (-0Gb) + + + + + + False + True + 1 + + + + + Redundant + False + True + True + False + 6 + False + 0 + True + + + False + True + 2 + + + + + True + False + (-0Gb) + + + + + + False + True + 3 + + + + + 0 + 3 + 1 + 1 + + + + + True + False + + + Compression + False + True + True + False + False + 0 + True + + + False + True + 0 + + + + + True + False + (-0Gb) + + + + + + False + True + 1 + + + + + 0 + 4 + 1 + 1 + + + + + True + False + 0 + <b>Technology:</b> + True + + + 1 + 0 + 1 + 1 + + + + + True + False + 0 + 0 + 1 + + BTRFS + LVM + RAID + + + + 1 + 1 + 1 + 1 + + + + + + + + + + True + False + 12 + + + True + False + + + Redundancy (mirror) + False + True + True + False + False + 0 + True + + + False + True + 0 + + + + + True + False + 2 + (-0Gb) + + + + + + False + True + 1 + + + + + 0 + 0 + 1 + 1 + + + + + True + False + + + Optimized performance (stripe) + False + True + True + False + False + 0 + True + + + False + True + 0 + + + + + True + False + (-0Gb) + + + + + + False + True + 1 + + + + + 0 + 1 + 1 + 1 + + + + + True + False + 0 + <b>Technology:</b> + True + + + 1 + 0 + 1 + 1 + + + + + True + False + 1 + 0 + 1 + + BTRFS + LVM + RAID + + + + 1 + 1 + 1 + 1 + + + + + 1 + + + + + + + + True + False + 12 + + + True + False + + + Redundancy (mirror) + False + True + True + False + False + 0 + True + + + False + True + 0 + + + + + True + False + 2 + (-0Gb) + + + + + + False + True + 1 + + + + + 0 + 0 + 1 + 1 + + + + + True + False + + + Optimized performance (stripe) + False + True + True + False + False + 0 + True + + + False + True + 0 + + + + + True + False + (-0Gb) + + + + + + False + True + 1 + + + + + 0 + 1 + 1 + 1 + + + + + True + False + + + Error detection (parity) + False + True + True + False + False + 0 + True + + + False + True + 0 + + + + + True + False + (-0Gb) + + + + + + False + True + 1 + + + + + 0 + 2 + 1 + 1 + + + + + True + False + 12 + + + Distributed + False + True + True + False + False + 0 + True + + + False + True + 0 + + + + + True + False + (-0Gb) + + + + + + False + True + 1 + + + + + Redundant + False + True + True + False + 6 + False + 0 + True + + + False + True + 2 + + + + + True + False + (-0Gb) + + + + + + False + True + 3 + + + + + 0 + 3 + 1 + 1 + + + + + True + False + 0 + <b>Technology:</b> + True + + + 1 + 0 + 1 + 1 + + + + + True + False + 0 + + + 1 + 2 + 1 + 1 + + + + + True + False + 2 + 0 + 1 + + BTRFS + LVM + RAID + + + + 1 + 1 + 1 + 1 + + + + + 2 + + + + + + + + 0 + 2 + 3 + 1 + + + + + + + + + + True + False + Customize... + + + + + False + True + 3 + + + + + 1 + + + + + + + + + + + + + + 1 + 0 + 1 + 2 + + + + + False + True + 0 + + + + + + + True + True + 1 + + + + + True + False + 6 + 6 + 6 + 6 + 12 + + + True + False + + + True + False + start + 6 + vertical + + + True + False + 0 + <span size="small" foreground="white">AVAILABLE SPACE</span> + True + + + False + True + 0 + + + + + True + False + 0 + + + + + + + + False + True + 1 + + + + + + + 0 + 0 + 1 + 1 + + + + + True + False + + + True + False + start + 6 + vertical + + + True + False + 0 + <span size="small" foreground="white">TOTAL SPACE</span> + True + + + False + True + 0 + + + + + True + False + 0 + 0.47999998927116394 + + + + + + + + False + True + 1 + + + + + + + 1 + 0 + 1 + 1 + + + + + _FINISH PARTITIONING + False + True + True + True + end + start + True + False + True + + + + 2 + 1 + 1 + 1 + + + + + summary + False + True + True + True + start + False + none + True + False + 0 + + + + 0 + 1 + 2 + 1 + + + + + False + True + 2 + + + + + + + True + False + list-remove-symbolic + + + True + False + system-run-symbolic + + + 100 + 1 + 10 + + diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py index 59326590b..27939576b 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -58,7 +58,7 @@ new_install_name = _("New %s %s Installation") % (productName, productVersion) class AddDialog(UIObject): builderObjects = ["addDialog"] mainWidgetName = "addDialog" - uiFile = "spokes/custom.ui" + uiFile = "spokes/custom.glade" def __init__(self, *args, **kwargs): UIObject.__init__(self, *args, **kwargs) @@ -88,7 +88,7 @@ class AddDialog(UIObject): class ConfirmDeleteDialog(UIObject): builderObjects = ["confirmDeleteDialog"] mainWidgetName = "confirmDeleteDialog" - uiFile = "spokes/custom.ui" + uiFile = "spokes/custom.glade" def on_delete_cancel_clicked(self, button, *args): self.window.destroy() @@ -115,7 +115,7 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): "partitionStore", "addImage", "removeImage", "settingsImage"] mainWidgetName = "customStorageWindow" - uiFile = "spokes/custom.ui" + uiFile = "spokes/custom.glade" category = StorageCategory title = N_("MANUAL PARTITIONING") diff --git a/pyanaconda/ui/gui/spokes/custom.ui b/pyanaconda/ui/gui/spokes/custom.ui deleted file mode 100644 index 5f97efad1..000000000 --- a/pyanaconda/ui/gui/spokes/custom.ui +++ /dev/null @@ -1,1630 +0,0 @@ - - - - - - False - 5 - dialog - False - - - False - vertical - 2 - - - False - 24 - end - - - _Cancel - False - True - True - True - end - False - True - - - - False - True - 0 - - - - - _Add mount point - False - True - True - True - end - False - True - - - - False - True - 1 - - - - - False - True - end - 0 - - - - - True - False - 6 - - - True - False - 6 - 1 - <b>Desired Capacity:</b> - True - - - 0 - 4 - 1 - 1 - - - - - True - False - 1 - <b>Mount Point:</b> - True - - - 0 - 2 - 1 - 1 - - - - - True - False - 12 - ADD A NEW MOUNT POINT - - - - - - - 0 - 0 - 2 - 1 - - - - - True - False - 12 - More customization options are available -after creating the mount point below. - - - 0 - 1 - 2 - 1 - - - - - True - True - ● - - - 1 - 2 - 1 - 1 - - - - - False - True - start - 6 - - - True - False - gtk-dialog-warning - 2 - - - False - True - 0 - - - - - True - False - That mount point is already in -use. Try something else? - - - - - - - False - True - 1 - - - - - 1 - 3 - 1 - 1 - - - - - True - True - eg: "20 GB", "500mb" (minus the quotation marks) - ● - - - 1 - 4 - 1 - 1 - - - - - False - True - 1 - - - - - - addCancelButton - addConfirmButton - - - - True - False - list-add-symbolic - - - False - 5 - dialog - False - - - False - vertical - 2 - - - False - end - - - _Cancel - False - True - True - True - False - True - - - - False - True - 0 - - - - - _Delete It - False - True - True - True - False - True - - - - False - True - 1 - - - - - False - True - end - 0 - - - - - True - False - Are you sure you want to delete -all of the data on %s? - True - - - False - True - 1 - - - - - - deleteCancelButton - deleteConfirmButton - - - - filler - False - filler - MANUAL PARTITIONING - - - - False - vertical - 6 - - - False - 6 - 6 - 6 - - - False - False - 0 - - - - - False - 0 - 0.89999997615814209 - 0.5 - - - False - vertical - 6 - - - True - False - 12 - - - True - False - start - start - - - False - True - True - True - False - addImage - - - - False - True - 0 - - - - - False - True - True - True - False - removeImage - - - - False - True - 1 - - - - - False - True - True - True - False - settingsImage - - - - False - True - 2 - - - - - 0 - 1 - 1 - 1 - - - - - True - True - True - in - - - True - False - - - - - - - - 0 - 0 - 1 - 1 - - - - - True - True - False - - - True - False - When you create mount points for your %s %s install, -you'll be able to view their details here. - - - - - - - - True - False - True - vertical - 6 - - - True - False - - - True - False - 0 - Selected Device - - - - - - - False - True - 0 - - - - - True - False - end - 0 - Device description - - - - - - True - True - 1 - - - - - False - True - 0 - - - - - True - False - - - False - True - 6 - 1 - - - - - True - False - 6 - - - True - False - <b>Label:</b> - True - - - False - True - 0 - - - - - True - True - True - ● - True - - - False - True - 1 - - - - - True - False - end - <b>Desired Capacity (MB):</b> - True - - - False - True - 2 - - - - - True - True - end - ● - 7 - True - sizeAdjustment - True - - - False - False - 3 - - - - - False - True - 2 - - - - - True - True - - - True - False - 12 - 6 - 6 - - - True - False - 0 - <b>Device Type:</b> - True - - - 0 - 0 - 1 - 1 - - - - - True - False - 0 - <b>File System:</b> - True - - - 0 - 1 - 1 - 1 - - - - - True - False - True - - BTRFS - LVM - RAID - Standard Partition - - - - - 1 - 0 - 1 - 1 - - - - - True - False - True - - - 1 - 1 - 1 - 1 - - - - - Encrypt - False - True - True - False - start - False - 0 - True - - - 2 - 0 - 1 - 1 - - - - - True - True - True - False - - - True - False - 12 - - - True - False - - - Redundancy (mirror) - False - True - True - False - False - 0 - True - - - False - True - 0 - - - - - True - False - 2 - (-0Gb) - - - - - - False - True - 1 - - - - - 0 - 0 - 1 - 1 - - - - - True - False - - - Optimized performance (stripe) - False - True - True - False - False - 0 - True - - - False - True - 0 - - - - - True - False - (-0Gb) - - - - - - False - True - 1 - - - - - 0 - 1 - 1 - 1 - - - - - True - False - - - Error detection (parity) - False - True - True - False - False - 0 - True - - - False - True - 0 - - - - - True - False - (-0Gb) - - - - - - False - True - 1 - - - - - 0 - 2 - 1 - 1 - - - - - True - False - 12 - - - Distributed - False - True - True - False - False - 0 - True - - - False - True - 0 - - - - - True - False - (-0Gb) - - - - - - False - True - 1 - - - - - Redundant - False - True - True - False - 6 - False - 0 - True - - - False - True - 2 - - - - - True - False - (-0Gb) - - - - - - False - True - 3 - - - - - 0 - 3 - 1 - 1 - - - - - True - False - - - Compression - False - True - True - False - False - 0 - True - - - False - True - 0 - - - - - True - False - (-0Gb) - - - - - - False - True - 1 - - - - - 0 - 4 - 1 - 1 - - - - - True - False - 0 - <b>Technology:</b> - True - - - 1 - 0 - 1 - 1 - - - - - True - False - 0 - 0 - 1 - - BTRFS - LVM - RAID - - - - 1 - 1 - 1 - 1 - - - - - - - - - - True - False - 12 - - - True - False - - - Redundancy (mirror) - False - True - True - False - False - 0 - True - - - False - True - 0 - - - - - True - False - 2 - (-0Gb) - - - - - - False - True - 1 - - - - - 0 - 0 - 1 - 1 - - - - - True - False - - - Optimized performance (stripe) - False - True - True - False - False - 0 - True - - - False - True - 0 - - - - - True - False - (-0Gb) - - - - - - False - True - 1 - - - - - 0 - 1 - 1 - 1 - - - - - True - False - 0 - <b>Technology:</b> - True - - - 1 - 0 - 1 - 1 - - - - - True - False - 1 - 0 - 1 - - BTRFS - LVM - RAID - - - - 1 - 1 - 1 - 1 - - - - - 1 - - - - - - - - True - False - 12 - - - True - False - - - Redundancy (mirror) - False - True - True - False - False - 0 - True - - - False - True - 0 - - - - - True - False - 2 - (-0Gb) - - - - - - False - True - 1 - - - - - 0 - 0 - 1 - 1 - - - - - True - False - - - Optimized performance (stripe) - False - True - True - False - False - 0 - True - - - False - True - 0 - - - - - True - False - (-0Gb) - - - - - - False - True - 1 - - - - - 0 - 1 - 1 - 1 - - - - - True - False - - - Error detection (parity) - False - True - True - False - False - 0 - True - - - False - True - 0 - - - - - True - False - (-0Gb) - - - - - - False - True - 1 - - - - - 0 - 2 - 1 - 1 - - - - - True - False - 12 - - - Distributed - False - True - True - False - False - 0 - True - - - False - True - 0 - - - - - True - False - (-0Gb) - - - - - - False - True - 1 - - - - - Redundant - False - True - True - False - 6 - False - 0 - True - - - False - True - 2 - - - - - True - False - (-0Gb) - - - - - - False - True - 3 - - - - - 0 - 3 - 1 - 1 - - - - - True - False - 0 - <b>Technology:</b> - True - - - 1 - 0 - 1 - 1 - - - - - True - False - 0 - - - 1 - 2 - 1 - 1 - - - - - True - False - 2 - 0 - 1 - - BTRFS - LVM - RAID - - - - 1 - 1 - 1 - 1 - - - - - 2 - - - - - - - - 0 - 2 - 3 - 1 - - - - - - - - - - True - False - Customize... - - - - - False - True - 3 - - - - - 1 - - - - - - - - - - - - - - 1 - 0 - 1 - 2 - - - - - False - True - 0 - - - - - - - True - True - 1 - - - - - True - False - 6 - 6 - 6 - 6 - 12 - - - True - False - - - True - False - start - 6 - vertical - - - True - False - 0 - <span size="small" foreground="white">AVAILABLE SPACE</span> - True - - - False - True - 0 - - - - - True - False - 0 - - - - - - - - False - True - 1 - - - - - - - 0 - 0 - 1 - 1 - - - - - True - False - - - True - False - start - 6 - vertical - - - True - False - 0 - <span size="small" foreground="white">TOTAL SPACE</span> - True - - - False - True - 0 - - - - - True - False - 0 - 0.47999998927116394 - - - - - - - - False - True - 1 - - - - - - - 1 - 0 - 1 - 1 - - - - - _FINISH PARTITIONING - False - True - True - True - end - start - True - False - True - - - - 2 - 1 - 1 - 1 - - - - - summary - False - True - True - True - start - False - none - True - False - 0 - - - - 0 - 1 - 2 - 1 - - - - - False - True - 2 - - - - - - - True - False - list-remove-symbolic - - - True - False - system-run-symbolic - - - 100 - 1 - 10 - - diff --git a/pyanaconda/ui/gui/spokes/datetime_spoke.glade b/pyanaconda/ui/gui/spokes/datetime_spoke.glade new file mode 100644 index 000000000..cdf1cf5b5 --- /dev/null +++ b/pyanaconda/ui/gui/spokes/datetime_spoke.glade @@ -0,0 +1,898 @@ + + + + + + + + + + + + cities + + + citiesFilter + + + True + False + system-run-symbolic + + + True + False + list-add-symbolic + + + filler + False + filler + DATE & TIME + + + + False + vertical + 6 + + + False + 6 + 6 + 6 + 2 + 2 + + + False + False + 0 + + + + + False + 0 + 1 + 1 + + + False + vertical + 6 + + + True + False + vertical + + + True + False + 1 + 0.94999998807907104 + + + True + False + + + True + False + Region: + + + False + True + 3 + 0 + + + + + True + False + regions + + + + + 0 + + + + + False + True + 2 + 1 + + + + + True + False + City: + + + False + True + 5 + 2 + + + + + True + False + citiesSort + + + + + 0 + + + + + False + True + 3 + + + + + True + False + 1 + 0.20000000298023224 + + + True + False + + + True + False + Network Time + + + False + True + 3 + 0 + + + + + True + True + end + start + False + + + + False + True + 1 + 1 + + + + + True + True + True + False + configImage + + + + False + True + 1 + 2 + + + + + + + True + True + 4 + + + + + + + False + True + 0 + + + + + True + False + + + + True + True + 6 + 1 + + + + + True + False + 1 + 0.94999998807907104 + + + True + False + + + True + False + 5 + + + True + False + 00 + + + + + + 0 + 1 + 1 + 1 + + + + + True + False + : + + + + + + 1 + 1 + 1 + 1 + + + + + True + False + 00 + + + + + + 2 + 1 + 1 + 1 + + + + + True + True + True + False + upImage + + + + 0 + 0 + 1 + 1 + + + + + True + True + True + False + downImage + + + + 0 + 2 + 1 + 1 + + + + + True + True + True + False + upImage1 + + + + 4 + 0 + 1 + 1 + + + + + True + True + True + False + upImage2 + + + + 2 + 0 + 1 + 1 + + + + + True + True + True + False + downImage1 + + + + 4 + 2 + 1 + 1 + + + + + True + True + True + False + downImage2 + + + + 2 + 2 + 1 + 1 + + + + + True + False + + + + + + + 3 + 1 + 1 + 1 + + + + + True + False + PM + + + + + + 4 + 1 + 1 + 1 + + + + + + + + + + + + + + + + + False + True + 0 + + + + + True + False + 1 + 0.5 + + + True + False + vertical + + + 24-hour + True + True + False + False + 0 + True + True + + + + False + True + 0 + + + + + AM/PM + True + True + False + False + 0 + True + timeFormatRB + + + False + True + 1 + + + + + + + False + True + 8 + 1 + + + + + True + False + 1 + 0.30000001192092896 + 0.20000000298023224 + + + True + False + + + True + False + months + + + + + 0 + + + + + False + True + 0 + + + + + True + False + daysFilter + + + + + 0 + + + + + False + True + 1 + + + + + True + False + years + + + + + 0 + + + + + False + True + 2 + + + + + + + True + True + 2 + + + + + + + False + True + 2 + + + + + True + True + 0 + + + + + + + True + True + 1 + + + + + + + + + + + + + + + + days + + + False + 5 + dialog + + + False + vertical + + + True + False + 0.80000001192092896 + + + True + False + vertical + + + True + False + Add and mark for usage NTP servers + + + + + + False + True + 0 + + + + + True + False + 0.80000001192092896 + 0.80000001192092896 + + + True + False + vertical + + + True + False + + + True + True + ● + True + + + + True + True + 0 + + + + + True + True + True + False + addImage + + + + False + True + 4 + 1 + + + + + False + True + 1 + + + + + True + True + never + in + + + True + True + serversStore + False + 0 + + + + + + Hostname + True + + + True + + + + 0 + + + + + + + Working + + + + + + + + Use + + + + + + 2 + + + + + + + + + True + True + 1 + + + + + + + False + True + 1 + + + + + True + False + + + + + + False + True + 2 + + + + + + + False + True + 0 + + + + + False + end + + + gtk-cancel + True + True + True + False + True + + + False + True + 0 + + + + + gtk-ok + True + True + True + False + True + + + False + True + 1 + + + + + False + True + end + 3 + + + + + + cancelButton + okButton + + + + True + False + go-down-symbolic + + + True + False + go-down-symbolic + + + True + False + go-down-symbolic + + + + + + + + + + + + + + + + + + + + + + + + + True + False + go-up-symbolic + + + True + False + go-up-symbolic + + + True + False + go-up-symbolic + + + + + + + + diff --git a/pyanaconda/ui/gui/spokes/datetime_spoke.py b/pyanaconda/ui/gui/spokes/datetime_spoke.py index 42767bb99..314a886b7 100644 --- a/pyanaconda/ui/gui/spokes/datetime_spoke.py +++ b/pyanaconda/ui/gui/spokes/datetime_spoke.py @@ -46,7 +46,7 @@ POOL_SERVERS_NOTE = _("Note: pool servers may not be available all the time") class NTPconfigDialog(UIObject): builderObjects = ["ntpConfigDialog", "addImage", "serversStore"] mainWidgetName = "ntpConfigDialog" - uiFile = "spokes/datetime_spoke.ui" + uiFile = "spokes/datetime_spoke.glade" def __init__(self, *args): UIObject.__init__(self, *args) @@ -244,7 +244,7 @@ class DatetimeSpoke(NormalSpoke): ] mainWidgetName = "datetimeWindow" - uiFile = "spokes/datetime_spoke.ui" + uiFile = "spokes/datetime_spoke.glade" category = LocalizationCategory diff --git a/pyanaconda/ui/gui/spokes/datetime_spoke.ui b/pyanaconda/ui/gui/spokes/datetime_spoke.ui deleted file mode 100644 index cdf1cf5b5..000000000 --- a/pyanaconda/ui/gui/spokes/datetime_spoke.ui +++ /dev/null @@ -1,898 +0,0 @@ - - - - - - - - - - - - cities - - - citiesFilter - - - True - False - system-run-symbolic - - - True - False - list-add-symbolic - - - filler - False - filler - DATE & TIME - - - - False - vertical - 6 - - - False - 6 - 6 - 6 - 2 - 2 - - - False - False - 0 - - - - - False - 0 - 1 - 1 - - - False - vertical - 6 - - - True - False - vertical - - - True - False - 1 - 0.94999998807907104 - - - True - False - - - True - False - Region: - - - False - True - 3 - 0 - - - - - True - False - regions - - - - - 0 - - - - - False - True - 2 - 1 - - - - - True - False - City: - - - False - True - 5 - 2 - - - - - True - False - citiesSort - - - - - 0 - - - - - False - True - 3 - - - - - True - False - 1 - 0.20000000298023224 - - - True - False - - - True - False - Network Time - - - False - True - 3 - 0 - - - - - True - True - end - start - False - - - - False - True - 1 - 1 - - - - - True - True - True - False - configImage - - - - False - True - 1 - 2 - - - - - - - True - True - 4 - - - - - - - False - True - 0 - - - - - True - False - - - - True - True - 6 - 1 - - - - - True - False - 1 - 0.94999998807907104 - - - True - False - - - True - False - 5 - - - True - False - 00 - - - - - - 0 - 1 - 1 - 1 - - - - - True - False - : - - - - - - 1 - 1 - 1 - 1 - - - - - True - False - 00 - - - - - - 2 - 1 - 1 - 1 - - - - - True - True - True - False - upImage - - - - 0 - 0 - 1 - 1 - - - - - True - True - True - False - downImage - - - - 0 - 2 - 1 - 1 - - - - - True - True - True - False - upImage1 - - - - 4 - 0 - 1 - 1 - - - - - True - True - True - False - upImage2 - - - - 2 - 0 - 1 - 1 - - - - - True - True - True - False - downImage1 - - - - 4 - 2 - 1 - 1 - - - - - True - True - True - False - downImage2 - - - - 2 - 2 - 1 - 1 - - - - - True - False - - - - - - - 3 - 1 - 1 - 1 - - - - - True - False - PM - - - - - - 4 - 1 - 1 - 1 - - - - - - - - - - - - - - - - - False - True - 0 - - - - - True - False - 1 - 0.5 - - - True - False - vertical - - - 24-hour - True - True - False - False - 0 - True - True - - - - False - True - 0 - - - - - AM/PM - True - True - False - False - 0 - True - timeFormatRB - - - False - True - 1 - - - - - - - False - True - 8 - 1 - - - - - True - False - 1 - 0.30000001192092896 - 0.20000000298023224 - - - True - False - - - True - False - months - - - - - 0 - - - - - False - True - 0 - - - - - True - False - daysFilter - - - - - 0 - - - - - False - True - 1 - - - - - True - False - years - - - - - 0 - - - - - False - True - 2 - - - - - - - True - True - 2 - - - - - - - False - True - 2 - - - - - True - True - 0 - - - - - - - True - True - 1 - - - - - - - - - - - - - - - - days - - - False - 5 - dialog - - - False - vertical - - - True - False - 0.80000001192092896 - - - True - False - vertical - - - True - False - Add and mark for usage NTP servers - - - - - - False - True - 0 - - - - - True - False - 0.80000001192092896 - 0.80000001192092896 - - - True - False - vertical - - - True - False - - - True - True - ● - True - - - - True - True - 0 - - - - - True - True - True - False - addImage - - - - False - True - 4 - 1 - - - - - False - True - 1 - - - - - True - True - never - in - - - True - True - serversStore - False - 0 - - - - - - Hostname - True - - - True - - - - 0 - - - - - - - Working - - - - - - - - Use - - - - - - 2 - - - - - - - - - True - True - 1 - - - - - - - False - True - 1 - - - - - True - False - - - - - - False - True - 2 - - - - - - - False - True - 0 - - - - - False - end - - - gtk-cancel - True - True - True - False - True - - - False - True - 0 - - - - - gtk-ok - True - True - True - False - True - - - False - True - 1 - - - - - False - True - end - 3 - - - - - - cancelButton - okButton - - - - True - False - go-down-symbolic - - - True - False - go-down-symbolic - - - True - False - go-down-symbolic - - - - - - - - - - - - - - - - - - - - - - - - - True - False - go-up-symbolic - - - True - False - go-up-symbolic - - - True - False - go-up-symbolic - - - - - - - - diff --git a/pyanaconda/ui/gui/spokes/keyboard.glade b/pyanaconda/ui/gui/spokes/keyboard.glade new file mode 100644 index 000000000..1243e22fb --- /dev/null +++ b/pyanaconda/ui/gui/spokes/keyboard.glade @@ -0,0 +1,495 @@ + + + + + + True + False + list-add-symbolic + + + False + 5 + 450 + dialog + False + + + False + vertical + 2 + + + False + end + + + gtk-cancel + True + True + True + False + True + + + + False + True + 0 + + + + + gtk-add + True + True + True + False + True + + + + False + True + 1 + + + + + False + True + end + 0 + + + + + True + False + vertical + 6 + + + True + False + start + ADD A KEYBOARD LAYOUT + + + + + + False + True + 0 + + + + + True + False + You may add a keyboard layout by selecting it below: + + + False + True + 1 + + + + + True + True + True + never + in + + + True + True + newLayoutStoreSort + False + False + + + multiple + + + + + Name + True + 0 + + + + 0 + + + + + + + + + True + True + 2 + + + + + True + True + ● + edit-clear-symbolic + + + + + False + False + 3 + + + + + False + True + 1 + + + + + + cancelButton + confirmAddButton + + + + + + + + + + True + False + go-down-symbolic + + + filler + False + filler + False + False + KEYBOARD LAYOUT + + + + False + vertical + + + False + 2 + 2 + + + False + False + 0 + + + + + False + 0 + 0 + 0.5 + + + False + vertical + 6 + + + True + False + Which keyboard layouts would you like to use on this system? You may move +any layout to the top of the list to select it as the default. + True + + + + + + False + True + 0 + + + + + True + False + 12 + + + True + False + vertical + + + True + True + in + + + True + True + addedLayoutStore + False + 0 + + + + + + + + name + True + True + 0 + + + + 0 + + + + + + + + + True + True + 0 + + + + + True + False + True + start + + + True + True + True + False + addImage + + + + False + True + 0 + + + + + True + True + True + False + removeImage + + + + False + True + 1 + + + + + True + True + True + False + upImage + + + + False + True + 2 + + + + + True + True + True + False + downImage + + + + False + True + 3 + + + + + True + True + True + False + previewImage + + + + False + True + 4 + + + + + False + False + 1 + + + + + False + True + 0 + + + + + True + False + vertical + 6 + + + True + False + start + Test the selected layout below: + + + False + True + 0 + + + + + True + True + ● + True + + + False + True + 1 + + + + + True + False + end + Alt + Shift to switch layouts. + + + + + + False + True + 2 + + + + + _Options... + True + True + True + end + False + True + + + False + True + end + 3 + + + + + True + True + 1 + + + + + True + True + 1 + + + + + + + True + True + 1 + + + + + + + + + + + + + newLayoutStore + + + newLayoutStoreFilter + + + True + False + input-keyboard-symbolic + + + True + False + list-remove-symbolic + + + True + False + go-up-symbolic + + diff --git a/pyanaconda/ui/gui/spokes/keyboard.py b/pyanaconda/ui/gui/spokes/keyboard.py index 4f390d598..9ca60d64d 100644 --- a/pyanaconda/ui/gui/spokes/keyboard.py +++ b/pyanaconda/ui/gui/spokes/keyboard.py @@ -42,7 +42,7 @@ class AddLayoutDialog(UIObject): builderObjects = ["addLayoutDialog", "newLayoutStore", "newLayoutStoreFilter", "newLayoutStoreSort"] mainWidgetName = "addLayoutDialog" - uiFile = "spokes/keyboard.ui" + uiFile = "spokes/keyboard.glade" def __init__(self, *args): UIObject.__init__(self, *args) @@ -140,7 +140,7 @@ class KeyboardSpoke(NormalSpoke): builderObjects = ["addedLayoutStore", "keyboardWindow", "addImage", "removeImage", "upImage", "downImage", "previewImage"] mainWidgetName = "keyboardWindow" - uiFile = "spokes/keyboard.ui" + uiFile = "spokes/keyboard.glade" category = LocalizationCategory diff --git a/pyanaconda/ui/gui/spokes/keyboard.ui b/pyanaconda/ui/gui/spokes/keyboard.ui deleted file mode 100644 index 1243e22fb..000000000 --- a/pyanaconda/ui/gui/spokes/keyboard.ui +++ /dev/null @@ -1,495 +0,0 @@ - - - - - - True - False - list-add-symbolic - - - False - 5 - 450 - dialog - False - - - False - vertical - 2 - - - False - end - - - gtk-cancel - True - True - True - False - True - - - - False - True - 0 - - - - - gtk-add - True - True - True - False - True - - - - False - True - 1 - - - - - False - True - end - 0 - - - - - True - False - vertical - 6 - - - True - False - start - ADD A KEYBOARD LAYOUT - - - - - - False - True - 0 - - - - - True - False - You may add a keyboard layout by selecting it below: - - - False - True - 1 - - - - - True - True - True - never - in - - - True - True - newLayoutStoreSort - False - False - - - multiple - - - - - Name - True - 0 - - - - 0 - - - - - - - - - True - True - 2 - - - - - True - True - ● - edit-clear-symbolic - - - - - False - False - 3 - - - - - False - True - 1 - - - - - - cancelButton - confirmAddButton - - - - - - - - - - True - False - go-down-symbolic - - - filler - False - filler - False - False - KEYBOARD LAYOUT - - - - False - vertical - - - False - 2 - 2 - - - False - False - 0 - - - - - False - 0 - 0 - 0.5 - - - False - vertical - 6 - - - True - False - Which keyboard layouts would you like to use on this system? You may move -any layout to the top of the list to select it as the default. - True - - - - - - False - True - 0 - - - - - True - False - 12 - - - True - False - vertical - - - True - True - in - - - True - True - addedLayoutStore - False - 0 - - - - - - - - name - True - True - 0 - - - - 0 - - - - - - - - - True - True - 0 - - - - - True - False - True - start - - - True - True - True - False - addImage - - - - False - True - 0 - - - - - True - True - True - False - removeImage - - - - False - True - 1 - - - - - True - True - True - False - upImage - - - - False - True - 2 - - - - - True - True - True - False - downImage - - - - False - True - 3 - - - - - True - True - True - False - previewImage - - - - False - True - 4 - - - - - False - False - 1 - - - - - False - True - 0 - - - - - True - False - vertical - 6 - - - True - False - start - Test the selected layout below: - - - False - True - 0 - - - - - True - True - ● - True - - - False - True - 1 - - - - - True - False - end - Alt + Shift to switch layouts. - - - - - - False - True - 2 - - - - - _Options... - True - True - True - end - False - True - - - False - True - end - 3 - - - - - True - True - 1 - - - - - True - True - 1 - - - - - - - True - True - 1 - - - - - - - - - - - - - newLayoutStore - - - newLayoutStoreFilter - - - True - False - input-keyboard-symbolic - - - True - False - list-remove-symbolic - - - True - False - go-up-symbolic - - diff --git a/pyanaconda/ui/gui/spokes/lib/Makefile.am b/pyanaconda/ui/gui/spokes/lib/Makefile.am index edf1be594..ecd597cbc 100644 --- a/pyanaconda/ui/gui/spokes/lib/Makefile.am +++ b/pyanaconda/ui/gui/spokes/lib/Makefile.am @@ -22,4 +22,4 @@ spokesdir = $(pkgpyexecdir)/ui/gui/spokes/lib spokes_PYTHON = *.py uidir = $(datadir)/$(PACKAGE_NAME)/ui/spokes/lib -dist_ui_DATA = *.ui +dist_ui_DATA = *.glade diff --git a/pyanaconda/ui/gui/spokes/lib/cart.glade b/pyanaconda/ui/gui/spokes/lib/cart.glade new file mode 100644 index 000000000..92fdfe53a --- /dev/null +++ b/pyanaconda/ui/gui/spokes/lib/cart.glade @@ -0,0 +1,211 @@ + + + + + + + + + + + + + + + + + + 500 + 400 + False + 5 + SELECTED DISKS + True + center-on-parent + True + dialog + False + False + + + False + vertical + 6 + + + False + end + + + _Close + False + True + True + True + True + end + False + True + + + + False + True + 0 + + + + + False + True + end + 0 + + + + + True + False + vertical + 6 + + + True + False + 0 + SELECTED DISKS + + + + + + False + True + 0 + + + + + True + True + in + + + True + False + + + True + True + disk_store + + + + + + 6 + Description + True + + + + 0 + + + + + + + 6 + Capacity + True + + + + 1 + + + + + + + 6 + Free + + + + 2 + + + + + + + 6 + Id + + + + 3 + + + + + + + + + + + True + True + 1 + + + + + _Remove + False + True + True + True + start + False + True + + + + False + True + 2 + + + + + True + False + 0 + Disk summary goes here + True + + + False + True + end + 3 + + + + + True + True + 1 + + + + + + close_button + + + diff --git a/pyanaconda/ui/gui/spokes/lib/cart.py b/pyanaconda/ui/gui/spokes/lib/cart.py index 54f2acc7e..c40b7f58b 100644 --- a/pyanaconda/ui/gui/spokes/lib/cart.py +++ b/pyanaconda/ui/gui/spokes/lib/cart.py @@ -42,7 +42,7 @@ def size_str(mb): class SelectedDisksDialog(UIObject): builderObjects = ["selected_disks_dialog", "disk_store"] mainWidgetName = "selected_disks_dialog" - uiFile = "spokes/lib/cart.ui" + uiFile = "spokes/lib/cart.glade" def initialize(self, disks, free, showRemove=True): for disk in disks: diff --git a/pyanaconda/ui/gui/spokes/lib/cart.ui b/pyanaconda/ui/gui/spokes/lib/cart.ui deleted file mode 100644 index 92fdfe53a..000000000 --- a/pyanaconda/ui/gui/spokes/lib/cart.ui +++ /dev/null @@ -1,211 +0,0 @@ - - - - - - - - - - - - - - - - - - 500 - 400 - False - 5 - SELECTED DISKS - True - center-on-parent - True - dialog - False - False - - - False - vertical - 6 - - - False - end - - - _Close - False - True - True - True - True - end - False - True - - - - False - True - 0 - - - - - False - True - end - 0 - - - - - True - False - vertical - 6 - - - True - False - 0 - SELECTED DISKS - - - - - - False - True - 0 - - - - - True - True - in - - - True - False - - - True - True - disk_store - - - - - - 6 - Description - True - - - - 0 - - - - - - - 6 - Capacity - True - - - - 1 - - - - - - - 6 - Free - - - - 2 - - - - - - - 6 - Id - - - - 3 - - - - - - - - - - - True - True - 1 - - - - - _Remove - False - True - True - True - start - False - True - - - - False - True - 2 - - - - - True - False - 0 - Disk summary goes here - True - - - False - True - end - 3 - - - - - True - True - 1 - - - - - - close_button - - - diff --git a/pyanaconda/ui/gui/spokes/lib/detailederror.glade b/pyanaconda/ui/gui/spokes/lib/detailederror.glade new file mode 100644 index 000000000..72d98604c --- /dev/null +++ b/pyanaconda/ui/gui/spokes/lib/detailederror.glade @@ -0,0 +1,145 @@ + + + + + + False + 5 + True + center + dialog + False + + + False + vertical + 2 + + + True + False + 18 + 0 + The following software marked for installation has errors. This is likely caused by an error with +your installation source. You can attempt to remove these packages from your installation, +change your installation source, or quit the installer. + + + False + True + 0 + + + + + True + True + in + + + True + True + False + False + detailedTextBuffer + + + + + True + True + 1 + + + + + False + end + + + gtk-cancel + False + True + True + True + start + False + True + + + False + False + 0 + True + + + + + gtk-quit + False + True + True + True + end + False + True + + + False + True + 1 + + + + + _Remove Packages + False + True + True + True + end + False + True + + + False + True + 2 + + + + + _Modify Software Source + False + True + True + True + True + end + False + True + + + False + True + 3 + + + + + False + True + end + 2 + + + + + + detailedCancelButton + detailedQuitButton + detailedRemoveButton + detailedChangeButton + + + diff --git a/pyanaconda/ui/gui/spokes/lib/detailederror.py b/pyanaconda/ui/gui/spokes/lib/detailederror.py index 03df2f707..55dd43644 100644 --- a/pyanaconda/ui/gui/spokes/lib/detailederror.py +++ b/pyanaconda/ui/gui/spokes/lib/detailederror.py @@ -28,7 +28,7 @@ __all__ = ["DetailedErrorDialog"] class DetailedErrorDialog(UIObject): builderObjects = ["detailedErrorDialog", "detailedTextBuffer"] mainWidgetName = "detailedErrorDialog" - uiFile = "detailederror.ui" + uiFile = "detailederror.glade" def refresh(self, msg): buf = self.builder.get_object("detailedTextBuffer") diff --git a/pyanaconda/ui/gui/spokes/lib/detailederror.ui b/pyanaconda/ui/gui/spokes/lib/detailederror.ui deleted file mode 100644 index 72d98604c..000000000 --- a/pyanaconda/ui/gui/spokes/lib/detailederror.ui +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - False - 5 - True - center - dialog - False - - - False - vertical - 2 - - - True - False - 18 - 0 - The following software marked for installation has errors. This is likely caused by an error with -your installation source. You can attempt to remove these packages from your installation, -change your installation source, or quit the installer. - - - False - True - 0 - - - - - True - True - in - - - True - True - False - False - detailedTextBuffer - - - - - True - True - 1 - - - - - False - end - - - gtk-cancel - False - True - True - True - start - False - True - - - False - False - 0 - True - - - - - gtk-quit - False - True - True - True - end - False - True - - - False - True - 1 - - - - - _Remove Packages - False - True - True - True - end - False - True - - - False - True - 2 - - - - - _Modify Software Source - False - True - True - True - True - end - False - True - - - False - True - 3 - - - - - False - True - end - 2 - - - - - - detailedCancelButton - detailedQuitButton - detailedRemoveButton - detailedChangeButton - - - diff --git a/pyanaconda/ui/gui/spokes/network.glade b/pyanaconda/ui/gui/spokes/network.glade new file mode 100644 index 000000000..49c75c289 --- /dev/null +++ b/pyanaconda/ui/gui/spokes/network.glade @@ -0,0 +1,2219 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + filler + False + filler + NETWORK CONFIGURATION + + + + False + vertical + 6 + + + False + 6 + 6 + 6 + + + + + + False + False + 0 + + + + + False + 0 + 0 + 0.5 + + + False + vertical + 6 + + + True + False + We'll need network access to fetch information about your location and to make software +updates available for you. + + + + + + False + True + 0 + + + + + + + + + + True + True + 1 + + + + + + + filler + False + filler + NETWORK CONFIGURATION + + + + False + vertical + + + False + + + False + False + 0 + + + + + False + 0 + 0 + 0.5 + + + False + vertical + 6 + + + True + False + 10 + 12 + + + True + False + 3 + + + True + False + 6 + + + True + False + + + True + True + in + 300 + + + True + True + liststore_devices + False + 2 + False + + + + + + + + True + True + 0 + + + + + True + False + icons + False + 1 + + + True + False + False + True + list-add-symbolic + + + False + True + + + + + True + False + False + True + list-remove-symbolic + + + False + True + + + + + False + True + 1 + + + + + True + True + 0 + + + + + True + True + False + + + True + False + 12 + 6 + + + True + False + start + 10 + 6 + + + True + False + end + start + 1 + 48 + network-wired + 6 + + + 0 + 0 + 1 + 1 + + + + + True + False + start + True + 3 + + + True + False + 0 + Wired + end + + + + + + + False + False + 0 + + + + + True + False + 0 + Cable unplugged + + + False + False + 1 + + + + + 1 + 0 + 1 + 1 + + + + + True + False + 1 + Hardware Address + + + 0 + 1 + 1 + 1 + + + + + True + False + 1 + Speed + + + 0 + 2 + 1 + 1 + + + + + True + False + 1 + IPv4 Address + + + 0 + 3 + 1 + 1 + + + + + True + False + 1 + IPv6 Address + + + 0 + 4 + 1 + 1 + + + + + True + False + 1 + Subnet Mask + + + 0 + 5 + 1 + 1 + + + + + True + False + 1 + Default Route + + + 0 + 6 + 1 + 1 + + + + + True + False + 1 + 0 + DNS + + + 0 + 7 + 1 + 1 + + + + + True + False + 0 + AA:BB:CC:DD:55:66:77:88 + + + 1 + 1 + 2 + 1 + + + + + True + False + 0 + 1 Mb/s + + + 1 + 2 + 2 + 1 + + + + + True + False + 0 + 127.0.0.1 + + + 1 + 3 + 2 + 1 + + + + + True + False + 0 + ::1 + + + 1 + 4 + 2 + 1 + + + + + True + False + 0 + 127.0.0.1 + + + 1 + 5 + 2 + 1 + + + + + True + False + 0 + 127.0.0.1 + + + 1 + 6 + 2 + 1 + + + + + True + False + 0 + 0 + 127.0.0.1 + True + + + 1 + 7 + 2 + 1 + + + + + True + False + end + start + + + True + True + end + start + False + + + + + 2 + 0 + 1 + 1 + + + + + False + True + 0 + + + + + True + False + 12 + True + True + + + C_onfigure... + True + True + True + end + end + True + True + False + True + + + 1 + 0 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True + True + 1 + + + + + + + True + False + wired + + + False + + + + + True + False + 12 + 6 + + + True + False + start + 10 + 6 + + + True + False + end + start + 1 + 48 + network-wireless + 6 + + + 0 + 0 + 1 + 1 + + + + + True + False + start + True + 3 + + + True + False + 0 + Wireless + end + + + + + + + False + False + 0 + + + + + True + False + 0 + Not connected + + + False + False + 1 + + + + + 1 + 0 + 1 + 1 + + + + + True + False + 1 + Hardware Address + + + 0 + 1 + 1 + 1 + + + + + True + False + 1 + Speed + + + 0 + 2 + 1 + 1 + + + + + True + False + 1 + IPv4 Address + + + 0 + 5 + 1 + 1 + + + + + True + False + 1 + IPv6 Address + + + 0 + 6 + 1 + 1 + + + + + True + False + 1 + Default Route + + + 0 + 7 + 1 + 1 + + + + + True + False + 1 + 0 + DNS + + + 0 + 8 + 1 + 1 + + + + + True + False + 0 + AA:BB:CC:DD:55:66:77:88 + + + 1 + 1 + 2 + 1 + + + + + True + False + 0 + 1 Mb/s + + + 1 + 2 + 2 + 1 + + + + + True + False + 0 + 127.0.0.1 + + + 1 + 5 + 2 + 1 + + + + + True + False + 0 + ::1 + + + 1 + 6 + 2 + 1 + + + + + True + False + 0 + 127.0.0.1 + + + 1 + 7 + 2 + 1 + + + + + True + False + 0 + 0 + 127.0.0.1 + True + + + 1 + 8 + 2 + 1 + + + + + True + False + end + start + + + True + True + end + start + False + + + + + 2 + 0 + 1 + 1 + + + + + True + False + 1 + Security + + + 0 + 3 + 1 + 1 + + + + + True + False + 1 + _Network Name + True + combobox_wireless_network_name + + + 0 + 4 + 1 + 1 + + + + + True + False + 1 + Network Name + + + 0 + 9 + 1 + 1 + + + + + True + False + 1 + Security Key + + + 0 + 10 + 1 + 1 + + + + + True + False + 0 + WPA + + + 1 + 3 + 2 + 1 + + + + + True + False + liststore_wireless_network + True + 1 + + + False + ● + + + + + 1 + 4 + 2 + 1 + + + + + True + False + 0 + My Hot Spot + True + + + 1 + 9 + 2 + 1 + + + + + True + False + 0 + My Secret + True + + + 1 + 10 + 2 + 1 + + + + + False + True + 0 + + + + + True + False + 12 + True + True + + + _Use as Hotspot... + True + True + True + start + end + True + True + False + True + + + 0 + 0 + 1 + 1 + + + + + _Stop Hotspot... + True + True + True + start + end + True + True + False + True + + + 1 + 0 + 1 + 1 + + + + + _Configure... + True + True + True + end + end + True + True + False + True + + + 2 + 0 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + True + True + end + 1 + + + + + 1 + + + + + True + False + wireless + + + 1 + False + + + + + True + False + 12 + 6 + + + True + False + start + 10 + 6 + + + True + False + end + start + 1 + 48 + network-cellular-connected-symbolic + 6 + + + 0 + 0 + 1 + 1 + + + + + True + False + start + True + 3 + + + True + False + 0 + Mobile Broadband + end + + + + + + + False + False + 0 + + + + + True + False + 0 + Not connected + + + False + False + 1 + + + + + 1 + 0 + 1 + 1 + + + + + True + False + 1 + IMEI + + + 0 + 1 + 1 + 1 + + + + + True + False + 1 + Speed + + + 0 + 2 + 1 + 1 + + + + + True + False + 1 + Provider + + + 0 + 3 + 1 + 1 + + + + + True + False + 0 + 1234567890 + True + + + 1 + 1 + 2 + 1 + + + + + True + False + 0 + 1 Mb/s + True + + + 1 + 2 + 2 + 1 + + + + + True + False + 0 + SuperTel Supremo + True + + + 1 + 3 + 2 + 1 + + + + + True + False + 0 + 127.0.0.1 + True + + + 1 + 4 + 2 + 1 + + + + + True + False + 0 + True + + + 1 + 5 + 2 + 1 + + + + + True + False + 0 + True + + + 1 + 6 + 2 + 1 + + + + + True + False + 0 + 0 + True + + + 1 + 7 + 2 + 1 + + + + + True + False + end + start + + + 2 + 0 + 1 + 1 + + + + + True + False + 1 + IP Address + + + 0 + 4 + 1 + 1 + + + + + True + False + 1 + IPv6 Address + + + 0 + 5 + 1 + 1 + + + + + True + False + 1 + Default Route + + + 0 + 6 + 1 + 1 + + + + + True + False + 1 + 0 + DNS + + + 0 + 7 + 1 + 1 + + + + + False + True + 0 + + + + + True + False + 1 + 1 + 0 + 0 + 12 + + + _Configure... + True + True + True + False + True + + + + + True + True + end + 1 + + + + + 2 + + + + + True + False + mobilebb + + + 2 + False + + + + + True + False + 12 + 6 + + + True + False + start + 10 + 6 + + + True + False + end + start + 1 + 48 + network-vpn + 6 + + + 0 + 0 + 1 + 1 + + + + + True + False + start + True + 3 + + + True + False + 0 + VPN + end + + + + + + + False + False + 0 + + + + + True + False + 0 + Not connected + + + False + False + 1 + + + + + 1 + 0 + 1 + 1 + + + + + True + False + 1 + VPN Type + + + 0 + 1 + 1 + 1 + + + + + True + False + 1 + Gateway + + + 0 + 2 + 1 + 1 + + + + + True + False + 1 + Group Name + + + 0 + 3 + 1 + 1 + + + + + True + False + 1 + Group Password + + + 0 + 4 + 1 + 1 + + + + + True + False + 1 + Username + + + 0 + 5 + 1 + 1 + + + + + True + False + 0 + openvpn + True + + + 1 + 1 + 2 + 1 + + + + + True + False + 0 + AA:BB:CC:DD:55:66:77:88 + True + + + 1 + 2 + 2 + 1 + + + + + True + False + 0 + SEKRIT + True + + + 1 + 3 + 2 + 1 + + + + + True + False + 0 + ********** + True + + + 1 + 4 + 2 + 1 + + + + + True + False + 0 + smithy + True + + + 1 + 5 + 2 + 1 + + + + + True + False + end + start + + + 2 + 0 + 1 + 1 + + + + + False + True + 0 + + + + + True + False + 1 + 1 + 0 + 0 + 12 + + + _Configure... + True + True + True + False + True + + + + + True + True + end + 1 + + + + + 2 + + + + + True + False + vpn + + + 2 + False + + + + + True + False + 12 + 6 + + + True + False + start + 10 + 6 + + + True + False + end + start + 1 + 48 + preferences-system-network + 6 + + + 0 + 0 + 1 + 1 + + + + + True + False + start + True + 3 + + + True + False + 0 + Proxy + end + + + + + + + False + False + 0 + + + + + True + False + 0 + Not connected + + + False + False + 1 + + + + + 1 + 0 + 1 + 1 + + + + + True + False + end + start + + + 2 + 0 + 1 + 1 + + + + + True + False + 1 + _Method + True + combobox_proxy_mode + + + 0 + 1 + 1 + 1 + + + + + True + True + + + 1 + 1 + 2 + 1 + + + + + True + False + 1 + _Configuration URL + True + entry_proxy_url + + + 0 + 2 + 1 + 1 + + + + + True + True + ● + True + + + 1 + 2 + 2 + 1 + + + + + True + False + 1 + _HTTP Proxy + True + entry_proxy_http + + + 0 + 3 + 1 + 1 + + + + + True + False + 1 + H_TTPS Proxy + True + entry_proxy_https + + + 0 + 4 + 1 + 1 + + + + + True + False + 1 + _FTP Proxy + True + entry_proxy_ftp + + + 0 + 5 + 1 + 1 + + + + + True + False + 1 + _Socks Host + True + entry_proxy_socks + + + 0 + 6 + 1 + 1 + + + + + True + False + 0 + WPAD warning... + True + 50 + + + 0 + 7 + 3 + 1 + + + + + True + True + ● + True + + + 1 + 3 + 1 + 1 + + + + + True + True + ● + 1 + True + + + 2 + 3 + 1 + 1 + + + + + True + True + ● + True + + + 1 + 4 + 1 + 1 + + + + + True + True + ● + True + + + 1 + 5 + 1 + 1 + + + + + True + True + ● + True + + + 1 + 6 + 1 + 1 + + + + + True + True + ● + 1 + True + + + 2 + 4 + 1 + 1 + + + + + True + True + ● + 1 + True + + + 2 + 5 + 1 + 1 + + + + + True + True + ● + 1 + True + + + 2 + 6 + 1 + 1 + + + + + False + True + 0 + + + + + 2 + + + + + True + False + proxy + + + 2 + False + + + + + + + + True + False + other + + + 2 + False + + + + + True + True + 1 + + + + + True + True + 0 + + + + + True + True + 0 + + + + + True + False + + + Unlock + True + True + True + False + + + False + False + 0 + + + + + True + False + 3 + + + True + False + Air_plane Mode + True + + + False + False + end + 1 + + + + + True + True + 1 + + + + + False + True + 1 + + + + + False + True + 0 + + + + + + + True + True + 1 + + + + + + diff --git a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py index b11fb4c3a..e0f3792f1 100644 --- a/pyanaconda/ui/gui/spokes/network.py +++ b/pyanaconda/ui/gui/spokes/network.py @@ -902,7 +902,7 @@ class NetworkControlBox(): class NetworkSpoke(NormalSpoke): builderObjects = ["networkWindow", "liststore_wireless_network", "liststore_devices"] mainWidgetName = "networkWindow" - uiFile = "spokes/network.ui" + uiFile = "spokes/network.glade" title = N_("NETWORK CONFIGURATION") icon = "network-transmit-receive-symbolic" @@ -962,7 +962,7 @@ class NetworkSpoke(NormalSpoke): class NetworkStandaloneSpoke(StandaloneSpoke): builderObjects = ["networkStandaloneWindow", "networkControlBox_vbox", "liststore_wireless_network", "liststore_devices"] mainWidgetName = "networkStandaloneWindow" - uiFile = "spokes/network.ui" + uiFile = "spokes/network.glade" preForHub = SummaryHub priority = 10 @@ -1040,7 +1040,7 @@ if __name__ == "__main__": builder = Gtk.Builder() import os - ui_file_path = os.environ.get('UIPATH')+'spokes/network.ui' + ui_file_path = os.environ.get('UIPATH')+'spokes/network.glade' builder.add_from_file(ui_file_path) n = NetworkControlBox(builder) diff --git a/pyanaconda/ui/gui/spokes/network.ui b/pyanaconda/ui/gui/spokes/network.ui deleted file mode 100644 index 49c75c289..000000000 --- a/pyanaconda/ui/gui/spokes/network.ui +++ /dev/null @@ -1,2219 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - filler - False - filler - NETWORK CONFIGURATION - - - - False - vertical - 6 - - - False - 6 - 6 - 6 - - - - - - False - False - 0 - - - - - False - 0 - 0 - 0.5 - - - False - vertical - 6 - - - True - False - We'll need network access to fetch information about your location and to make software -updates available for you. - - - - - - False - True - 0 - - - - - - - - - - True - True - 1 - - - - - - - filler - False - filler - NETWORK CONFIGURATION - - - - False - vertical - - - False - - - False - False - 0 - - - - - False - 0 - 0 - 0.5 - - - False - vertical - 6 - - - True - False - 10 - 12 - - - True - False - 3 - - - True - False - 6 - - - True - False - - - True - True - in - 300 - - - True - True - liststore_devices - False - 2 - False - - - - - - - - True - True - 0 - - - - - True - False - icons - False - 1 - - - True - False - False - True - list-add-symbolic - - - False - True - - - - - True - False - False - True - list-remove-symbolic - - - False - True - - - - - False - True - 1 - - - - - True - True - 0 - - - - - True - True - False - - - True - False - 12 - 6 - - - True - False - start - 10 - 6 - - - True - False - end - start - 1 - 48 - network-wired - 6 - - - 0 - 0 - 1 - 1 - - - - - True - False - start - True - 3 - - - True - False - 0 - Wired - end - - - - - - - False - False - 0 - - - - - True - False - 0 - Cable unplugged - - - False - False - 1 - - - - - 1 - 0 - 1 - 1 - - - - - True - False - 1 - Hardware Address - - - 0 - 1 - 1 - 1 - - - - - True - False - 1 - Speed - - - 0 - 2 - 1 - 1 - - - - - True - False - 1 - IPv4 Address - - - 0 - 3 - 1 - 1 - - - - - True - False - 1 - IPv6 Address - - - 0 - 4 - 1 - 1 - - - - - True - False - 1 - Subnet Mask - - - 0 - 5 - 1 - 1 - - - - - True - False - 1 - Default Route - - - 0 - 6 - 1 - 1 - - - - - True - False - 1 - 0 - DNS - - - 0 - 7 - 1 - 1 - - - - - True - False - 0 - AA:BB:CC:DD:55:66:77:88 - - - 1 - 1 - 2 - 1 - - - - - True - False - 0 - 1 Mb/s - - - 1 - 2 - 2 - 1 - - - - - True - False - 0 - 127.0.0.1 - - - 1 - 3 - 2 - 1 - - - - - True - False - 0 - ::1 - - - 1 - 4 - 2 - 1 - - - - - True - False - 0 - 127.0.0.1 - - - 1 - 5 - 2 - 1 - - - - - True - False - 0 - 127.0.0.1 - - - 1 - 6 - 2 - 1 - - - - - True - False - 0 - 0 - 127.0.0.1 - True - - - 1 - 7 - 2 - 1 - - - - - True - False - end - start - - - True - True - end - start - False - - - - - 2 - 0 - 1 - 1 - - - - - False - True - 0 - - - - - True - False - 12 - True - True - - - C_onfigure... - True - True - True - end - end - True - True - False - True - - - 1 - 0 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True - True - 1 - - - - - - - True - False - wired - - - False - - - - - True - False - 12 - 6 - - - True - False - start - 10 - 6 - - - True - False - end - start - 1 - 48 - network-wireless - 6 - - - 0 - 0 - 1 - 1 - - - - - True - False - start - True - 3 - - - True - False - 0 - Wireless - end - - - - - - - False - False - 0 - - - - - True - False - 0 - Not connected - - - False - False - 1 - - - - - 1 - 0 - 1 - 1 - - - - - True - False - 1 - Hardware Address - - - 0 - 1 - 1 - 1 - - - - - True - False - 1 - Speed - - - 0 - 2 - 1 - 1 - - - - - True - False - 1 - IPv4 Address - - - 0 - 5 - 1 - 1 - - - - - True - False - 1 - IPv6 Address - - - 0 - 6 - 1 - 1 - - - - - True - False - 1 - Default Route - - - 0 - 7 - 1 - 1 - - - - - True - False - 1 - 0 - DNS - - - 0 - 8 - 1 - 1 - - - - - True - False - 0 - AA:BB:CC:DD:55:66:77:88 - - - 1 - 1 - 2 - 1 - - - - - True - False - 0 - 1 Mb/s - - - 1 - 2 - 2 - 1 - - - - - True - False - 0 - 127.0.0.1 - - - 1 - 5 - 2 - 1 - - - - - True - False - 0 - ::1 - - - 1 - 6 - 2 - 1 - - - - - True - False - 0 - 127.0.0.1 - - - 1 - 7 - 2 - 1 - - - - - True - False - 0 - 0 - 127.0.0.1 - True - - - 1 - 8 - 2 - 1 - - - - - True - False - end - start - - - True - True - end - start - False - - - - - 2 - 0 - 1 - 1 - - - - - True - False - 1 - Security - - - 0 - 3 - 1 - 1 - - - - - True - False - 1 - _Network Name - True - combobox_wireless_network_name - - - 0 - 4 - 1 - 1 - - - - - True - False - 1 - Network Name - - - 0 - 9 - 1 - 1 - - - - - True - False - 1 - Security Key - - - 0 - 10 - 1 - 1 - - - - - True - False - 0 - WPA - - - 1 - 3 - 2 - 1 - - - - - True - False - liststore_wireless_network - True - 1 - - - False - ● - - - - - 1 - 4 - 2 - 1 - - - - - True - False - 0 - My Hot Spot - True - - - 1 - 9 - 2 - 1 - - - - - True - False - 0 - My Secret - True - - - 1 - 10 - 2 - 1 - - - - - False - True - 0 - - - - - True - False - 12 - True - True - - - _Use as Hotspot... - True - True - True - start - end - True - True - False - True - - - 0 - 0 - 1 - 1 - - - - - _Stop Hotspot... - True - True - True - start - end - True - True - False - True - - - 1 - 0 - 1 - 1 - - - - - _Configure... - True - True - True - end - end - True - True - False - True - - - 2 - 0 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - True - True - end - 1 - - - - - 1 - - - - - True - False - wireless - - - 1 - False - - - - - True - False - 12 - 6 - - - True - False - start - 10 - 6 - - - True - False - end - start - 1 - 48 - network-cellular-connected-symbolic - 6 - - - 0 - 0 - 1 - 1 - - - - - True - False - start - True - 3 - - - True - False - 0 - Mobile Broadband - end - - - - - - - False - False - 0 - - - - - True - False - 0 - Not connected - - - False - False - 1 - - - - - 1 - 0 - 1 - 1 - - - - - True - False - 1 - IMEI - - - 0 - 1 - 1 - 1 - - - - - True - False - 1 - Speed - - - 0 - 2 - 1 - 1 - - - - - True - False - 1 - Provider - - - 0 - 3 - 1 - 1 - - - - - True - False - 0 - 1234567890 - True - - - 1 - 1 - 2 - 1 - - - - - True - False - 0 - 1 Mb/s - True - - - 1 - 2 - 2 - 1 - - - - - True - False - 0 - SuperTel Supremo - True - - - 1 - 3 - 2 - 1 - - - - - True - False - 0 - 127.0.0.1 - True - - - 1 - 4 - 2 - 1 - - - - - True - False - 0 - True - - - 1 - 5 - 2 - 1 - - - - - True - False - 0 - True - - - 1 - 6 - 2 - 1 - - - - - True - False - 0 - 0 - True - - - 1 - 7 - 2 - 1 - - - - - True - False - end - start - - - 2 - 0 - 1 - 1 - - - - - True - False - 1 - IP Address - - - 0 - 4 - 1 - 1 - - - - - True - False - 1 - IPv6 Address - - - 0 - 5 - 1 - 1 - - - - - True - False - 1 - Default Route - - - 0 - 6 - 1 - 1 - - - - - True - False - 1 - 0 - DNS - - - 0 - 7 - 1 - 1 - - - - - False - True - 0 - - - - - True - False - 1 - 1 - 0 - 0 - 12 - - - _Configure... - True - True - True - False - True - - - - - True - True - end - 1 - - - - - 2 - - - - - True - False - mobilebb - - - 2 - False - - - - - True - False - 12 - 6 - - - True - False - start - 10 - 6 - - - True - False - end - start - 1 - 48 - network-vpn - 6 - - - 0 - 0 - 1 - 1 - - - - - True - False - start - True - 3 - - - True - False - 0 - VPN - end - - - - - - - False - False - 0 - - - - - True - False - 0 - Not connected - - - False - False - 1 - - - - - 1 - 0 - 1 - 1 - - - - - True - False - 1 - VPN Type - - - 0 - 1 - 1 - 1 - - - - - True - False - 1 - Gateway - - - 0 - 2 - 1 - 1 - - - - - True - False - 1 - Group Name - - - 0 - 3 - 1 - 1 - - - - - True - False - 1 - Group Password - - - 0 - 4 - 1 - 1 - - - - - True - False - 1 - Username - - - 0 - 5 - 1 - 1 - - - - - True - False - 0 - openvpn - True - - - 1 - 1 - 2 - 1 - - - - - True - False - 0 - AA:BB:CC:DD:55:66:77:88 - True - - - 1 - 2 - 2 - 1 - - - - - True - False - 0 - SEKRIT - True - - - 1 - 3 - 2 - 1 - - - - - True - False - 0 - ********** - True - - - 1 - 4 - 2 - 1 - - - - - True - False - 0 - smithy - True - - - 1 - 5 - 2 - 1 - - - - - True - False - end - start - - - 2 - 0 - 1 - 1 - - - - - False - True - 0 - - - - - True - False - 1 - 1 - 0 - 0 - 12 - - - _Configure... - True - True - True - False - True - - - - - True - True - end - 1 - - - - - 2 - - - - - True - False - vpn - - - 2 - False - - - - - True - False - 12 - 6 - - - True - False - start - 10 - 6 - - - True - False - end - start - 1 - 48 - preferences-system-network - 6 - - - 0 - 0 - 1 - 1 - - - - - True - False - start - True - 3 - - - True - False - 0 - Proxy - end - - - - - - - False - False - 0 - - - - - True - False - 0 - Not connected - - - False - False - 1 - - - - - 1 - 0 - 1 - 1 - - - - - True - False - end - start - - - 2 - 0 - 1 - 1 - - - - - True - False - 1 - _Method - True - combobox_proxy_mode - - - 0 - 1 - 1 - 1 - - - - - True - True - - - 1 - 1 - 2 - 1 - - - - - True - False - 1 - _Configuration URL - True - entry_proxy_url - - - 0 - 2 - 1 - 1 - - - - - True - True - ● - True - - - 1 - 2 - 2 - 1 - - - - - True - False - 1 - _HTTP Proxy - True - entry_proxy_http - - - 0 - 3 - 1 - 1 - - - - - True - False - 1 - H_TTPS Proxy - True - entry_proxy_https - - - 0 - 4 - 1 - 1 - - - - - True - False - 1 - _FTP Proxy - True - entry_proxy_ftp - - - 0 - 5 - 1 - 1 - - - - - True - False - 1 - _Socks Host - True - entry_proxy_socks - - - 0 - 6 - 1 - 1 - - - - - True - False - 0 - WPAD warning... - True - 50 - - - 0 - 7 - 3 - 1 - - - - - True - True - ● - True - - - 1 - 3 - 1 - 1 - - - - - True - True - ● - 1 - True - - - 2 - 3 - 1 - 1 - - - - - True - True - ● - True - - - 1 - 4 - 1 - 1 - - - - - True - True - ● - True - - - 1 - 5 - 1 - 1 - - - - - True - True - ● - True - - - 1 - 6 - 1 - 1 - - - - - True - True - ● - 1 - True - - - 2 - 4 - 1 - 1 - - - - - True - True - ● - 1 - True - - - 2 - 5 - 1 - 1 - - - - - True - True - ● - 1 - True - - - 2 - 6 - 1 - 1 - - - - - False - True - 0 - - - - - 2 - - - - - True - False - proxy - - - 2 - False - - - - - - - - True - False - other - - - 2 - False - - - - - True - True - 1 - - - - - True - True - 0 - - - - - True - True - 0 - - - - - True - False - - - Unlock - True - True - True - False - - - False - False - 0 - - - - - True - False - 3 - - - True - False - Air_plane Mode - True - - - False - False - end - 1 - - - - - True - True - 1 - - - - - False - True - 1 - - - - - False - True - 0 - - - - - - - True - True - 1 - - - - - - diff --git a/pyanaconda/ui/gui/spokes/software.glade b/pyanaconda/ui/gui/spokes/software.glade new file mode 100644 index 000000000..d0d91325e --- /dev/null +++ b/pyanaconda/ui/gui/spokes/software.glade @@ -0,0 +1,272 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + filler + False + filler + SOFTWARE SELECTION + + + + + False + vertical + + + False + + + False + False + 0 + + + + + False + 0 + 0.5 + 0.5 + + + False + 6 + True + + + True + False + 24 + True + + + True + False + vertical + 6 + + + True + False + start + DESKTOP + + + + + + False + True + 0 + + + + + True + True + never + never + in + + + True + False + + + True + True + 6 + 6 + 6 + 6 + desktopStore + False + False + 0 + + + + + + column + + + 250 + 0 + word-char + 200 + + + 1 + + + + + + + + + + + False + True + 1 + + + + + False + True + 0 + + + + + True + False + vertical + 6 + + + True + False + start + ADD-ONS + + + + + + False + True + 0 + + + + + True + True + never + in + + + True + True + 6 + 6 + 6 + 6 + addonStore + False + False + 0 + + + + + + column + + + + 0 + + + + 0 + + + + + + + column + + + 250 + 0 + word-char + 200 + + + 1 + + + + + + + + + True + True + 1 + + + + + _Add custom add-on... + False + True + True + True + end + False + True + + + + False + True + 2 + + + + + False + True + 1 + + + + + False + True + 0 + + + + + + + True + True + 1 + + + + + + diff --git a/pyanaconda/ui/gui/spokes/software.py b/pyanaconda/ui/gui/spokes/software.py index 07c001d28..eccf4d387 100644 --- a/pyanaconda/ui/gui/spokes/software.py +++ b/pyanaconda/ui/gui/spokes/software.py @@ -39,7 +39,7 @@ __all__ = ["SoftwareSelectionSpoke"] class SoftwareSelectionSpoke(NormalSpoke): builderObjects = ["addonStore", "desktopStore", "softwareWindow"] mainWidgetName = "softwareWindow" - uiFile = "spokes/software.ui" + uiFile = "spokes/software.glade" category = SoftwareCategory diff --git a/pyanaconda/ui/gui/spokes/software.ui b/pyanaconda/ui/gui/spokes/software.ui deleted file mode 100644 index d0d91325e..000000000 --- a/pyanaconda/ui/gui/spokes/software.ui +++ /dev/null @@ -1,272 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - filler - False - filler - SOFTWARE SELECTION - - - - - False - vertical - - - False - - - False - False - 0 - - - - - False - 0 - 0.5 - 0.5 - - - False - 6 - True - - - True - False - 24 - True - - - True - False - vertical - 6 - - - True - False - start - DESKTOP - - - - - - False - True - 0 - - - - - True - True - never - never - in - - - True - False - - - True - True - 6 - 6 - 6 - 6 - desktopStore - False - False - 0 - - - - - - column - - - 250 - 0 - word-char - 200 - - - 1 - - - - - - - - - - - False - True - 1 - - - - - False - True - 0 - - - - - True - False - vertical - 6 - - - True - False - start - ADD-ONS - - - - - - False - True - 0 - - - - - True - True - never - in - - - True - True - 6 - 6 - 6 - 6 - addonStore - False - False - 0 - - - - - - column - - - - 0 - - - - 0 - - - - - - - column - - - 250 - 0 - word-char - 200 - - - 1 - - - - - - - - - True - True - 1 - - - - - _Add custom add-on... - False - True - True - True - end - False - True - - - - False - True - 2 - - - - - False - True - 1 - - - - - False - True - 0 - - - - - - - True - True - 1 - - - - - - diff --git a/pyanaconda/ui/gui/spokes/source.glade b/pyanaconda/ui/gui/spokes/source.glade new file mode 100644 index 000000000..5259431bc --- /dev/null +++ b/pyanaconda/ui/gui/spokes/source.glade @@ -0,0 +1,1262 @@ + + + + + + False + 5 + dialog + False + + + False + vertical + 2 + + + False + end + + + gtk-cancel + False + True + True + True + False + True + + + False + True + 0 + + + + + _Add + False + True + True + True + False + True + + + False + True + 1 + + + + + False + True + end + 0 + + + + + True + False + vertical + 8 + + + True + False + 0 + ADD A CUSTOM ADD-ON + + + + + + False + True + 0 + + + + + True + False + 0 + WHERE IS THE YUM REPOSITORY FOR YOUR ADD-ON? + + + + + + False + True + 1 + + + + + True + False + True + 2 + + + True + True + True + ● + True + gtk-delete + + + + + 1 + 2 + 1 + 1 + + + + + True + True + True + True + always + in + + + True + True + peopleRepositoriesFilter + False + False + 1 + + + + + + + + Repository + + + + 0 + 2 + + + + + + + + + 1 + 1 + 1 + 1 + + + + + False + True + True + False + False + 0 + True + True + + + + 0 + 0 + 1 + 1 + + + + + True + False + GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK + + + + True + False + True + 0 + Fedora People Repositories + + + + + 1 + 0 + 1 + 1 + + + + + + + + + + + True + True + 2 + + + + + True + False + 2 + + + True + True + True + ● + True + gtk-delete + + + + + 1 + 1 + 1 + 1 + + + + + False + True + True + False + False + 0 + True + addRepositorySelectList + + + 0 + 0 + 1 + 1 + + + + + True + False + 0 + enter URL of your desired repository + + + + + + 1 + 2 + 1 + 1 + + + + + True + False + + + 0 + 2 + 1 + 1 + + + + + True + False + gtk-apply + + + 0 + 1 + 1 + 1 + + + + + True + False + GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK + + + + True + False + True + 0 + Standard YUM repository: + + + + + 1 + 0 + 1 + 1 + + + + + False + True + 3 + + + + + True + True + 1 + + + + + + add_repo_cancel_button + add_repo_add_button + + + + + *.iso + + + + 441 + 320 + False + 5 + False + dialog + False + + + False + vertical + 2 + + + False + end + + + gtk-cancel + False + True + True + True + False + True + + + False + True + 0 + + + + + gtk-open + False + True + True + True + False + True + + + False + True + 1 + + + + + False + True + end + 0 + + + + + True + False + vertical + False + isoFilter + + + True + True + 1 + + + + + + cancelChooserButton + openChooserButton + + + + 320 + 320 + False + 5 + False + True + center-on-parent + dialog + False + False + + + False + vertical + 2 + + + False + end + + + _DONE + False + True + False + True + True + False + True + + + + False + True + 0 + + + + + False + True + end + 0 + + + + + True + False + True + vertical + + + True + False + start + MEDIA VERIFICATION + + + + + + False + True + 0 + + + + + True + False + 0.5 + 0.5 + + + True + False + vertical + 6 + + + True + False + Verifying media, please wait... + + + False + True + 0 + + + + + True + False + + + False + True + 1 + + + + + + + True + True + 48 + 1 + + + + + False + True + 1 + + + + + + doneButton + + + + + + + + + + + + + + + + + + + + <b>User repo</b> +my testing repository + http://url + + + <b>TeXLive</b> +TeXlive 2012 repository + http://jnovy.texlive + + + + + peopleRepositories + + + False + 5 + False + True + center-on-parent + dialog + False + False + + + False + vertical + 2 + + + False + end + + + _CANCEL + False + True + True + True + False + True + + + + False + True + 0 + + + + + _ADD + False + True + True + True + False + True + + + + False + True + 1 + + + + + False + True + end + 0 + + + + + True + False + vertical + + + _Enable HTTP Proxy + False + True + True + False + False + True + 0 + True + + + + False + True + 0 + + + + + True + False + 12 + vertical + 6 + + + True + False + 6 + 6 + + + True + False + 0 + <b>Proxy URL</b> + True + + + 0 + 0 + 1 + 1 + + + + + True + False + 0 + <span size="small"><b>Example:</b> squid.mysite.org:3128</span> + True + + + 1 + 1 + 1 + 1 + + + + + True + True + ● + 40 + + + 1 + 0 + 1 + 1 + + + + + + + + False + True + 0 + + + + + _Use Authentication + False + True + True + False + False + True + 0 + True + + + + False + True + 1 + + + + + True + False + 12 + 6 + 6 + + + True + False + 0 + <b>Username</b> + True + + + 0 + 0 + 1 + 1 + + + + + True + False + 0 + <b>Password</b> + True + + + 0 + 1 + 1 + 1 + + + + + True + True + ● + + + 1 + 0 + 1 + 1 + + + + + True + True + False + ● + + + 1 + 1 + 1 + 1 + + + + + False + True + 2 + + + + + True + True + 1 + + + + + True + True + 1 + + + + + + proxyCancelButton + proxyAddButton + + + + filler + False + filler + INSTALLATION SOURCE + + + + False + vertical + + + False + + + False + False + 0 + + + + + False + 0 + 0 + 0.5 + + + False + vertical + 6 + + + True + False + start + WHICH INSTALLATION SOURCE WOULD YOU LIKE TO USE? + + + + + + False + True + 0 + + + + + _Auto-detected install media: + False + True + False + True + 12 + False + True + 0 + True + isoRadioButton + + + False + True + 1 + + + + + False + True + 24 + 6 + False + + + True + True + never + out + + + True + False + out + + + True + False + vertical + + + + + + + + + + True + True + 0 + + + + + _Verify + False + True + True + True + center + False + True + + + + False + True + 1 + + + + + False + True + 2 + + + + + _ISO file: + False + True + False + True + 12 + False + True + 0 + True + True + + + False + True + 3 + + + + + False + True + 24 + 6 + False + + + True + False + Device: + + + False + True + 0 + + + + + True + False + partitionStore + + + + 1 + + + + + True + True + 1 + + + + + _Choose an ISO + False + True + True + True + False + True + + + + False + True + 2 + + + + + _Verify + False + True + False + True + True + False + True + + + + False + True + 3 + + + + + False + True + 4 + + + + + On the _network: + False + True + True + False + 12 + False + True + 0 + True + True + isoRadioButton + + + False + True + 5 + + + + + True + False + 24 + vertical + 6 + False + + + True + False + 6 + + + True + False + 0 + + Closest mirror + http:// + https:// + ftp:// + nfs + + + + + False + True + 0 + + + + + True + True + ● + True + + + True + True + 1 + + + + + _Proxy setup... + False + True + True + True + False + True + + + + False + True + 2 + + + + + False + True + 0 + + + + + False + True + 6 + + + True + False + NFS mount options: + + + False + True + 0 + + + + + True + True + True + This field is optional. + This field is optional. + ● + True + + + True + True + 1 + + + + + False + True + 1 + + + + + False + True + 6 + + + + + True + False + start + 12 + UPDATES + + + + + + False + True + 7 + + + + + _Don't install the latest available software updates. Install the default versions provided by the install source above. + False + True + True + False + 12 + False + True + 0 + True + + + False + True + 8 + + + + + + + True + True + 1 + + + + + + diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py index 68020c88e..447405270 100644 --- a/pyanaconda/ui/gui/spokes/source.py +++ b/pyanaconda/ui/gui/spokes/source.py @@ -48,7 +48,7 @@ METADATA_ERROR_MESSAGE = _("Error downloading package metadata...") class ProxyDialog(UIObject): builderObjects = ["proxyDialog"] mainWidgetName = "proxyDialog" - uiFile = "spokes/source.ui" + uiFile = "spokes/source.glade" def on_proxy_cancel_clicked(self, *args): self.window.destroy() @@ -129,7 +129,7 @@ class ProxyDialog(UIObject): class MediaCheckDialog(UIObject): builderObjects = ["mediaCheckDialog"] mainWidgetName = "mediaCheckDialog" - uiFile = "spokes/source.ui" + uiFile = "spokes/source.glade" def _checkisoEndsCB(self, pid, status): doneButton = self.builder.get_object("doneButton") @@ -196,7 +196,7 @@ class MediaCheckDialog(UIObject): class IsoChooser(UIObject): builderObjects = ["isoChooserDialog", "isoFilter"] mainWidgetName = "isoChooserDialog" - uiFile = "spokes/source.ui" + uiFile = "spokes/source.glade" def refresh(self, currentFile=""): UIObject.refresh(self) @@ -238,7 +238,7 @@ class IsoChooser(UIObject): class AdditionalReposDialog(UIObject): builderObjects = ["additionalReposDialog", "peopleRepositories", "peopleRepositoriesFilter"] mainWidgetName = "additionalReposDialog" - uiFile = "spokes/source.ui" + uiFile = "spokes/source.glade" typingTimeout = 1 @@ -409,7 +409,7 @@ class AdditionalReposDialog(UIObject): class SourceSpoke(NormalSpoke): builderObjects = ["isoChooser", "isoFilter", "partitionStore", "sourceWindow", "dirImage"] mainWidgetName = "sourceWindow" - uiFile = "spokes/source.ui" + uiFile = "spokes/source.glade" category = SoftwareCategory diff --git a/pyanaconda/ui/gui/spokes/source.ui b/pyanaconda/ui/gui/spokes/source.ui deleted file mode 100644 index 5259431bc..000000000 --- a/pyanaconda/ui/gui/spokes/source.ui +++ /dev/null @@ -1,1262 +0,0 @@ - - - - - - False - 5 - dialog - False - - - False - vertical - 2 - - - False - end - - - gtk-cancel - False - True - True - True - False - True - - - False - True - 0 - - - - - _Add - False - True - True - True - False - True - - - False - True - 1 - - - - - False - True - end - 0 - - - - - True - False - vertical - 8 - - - True - False - 0 - ADD A CUSTOM ADD-ON - - - - - - False - True - 0 - - - - - True - False - 0 - WHERE IS THE YUM REPOSITORY FOR YOUR ADD-ON? - - - - - - False - True - 1 - - - - - True - False - True - 2 - - - True - True - True - ● - True - gtk-delete - - - - - 1 - 2 - 1 - 1 - - - - - True - True - True - True - always - in - - - True - True - peopleRepositoriesFilter - False - False - 1 - - - - - - - - Repository - - - - 0 - 2 - - - - - - - - - 1 - 1 - 1 - 1 - - - - - False - True - True - False - False - 0 - True - True - - - - 0 - 0 - 1 - 1 - - - - - True - False - GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK - - - - True - False - True - 0 - Fedora People Repositories - - - - - 1 - 0 - 1 - 1 - - - - - - - - - - - True - True - 2 - - - - - True - False - 2 - - - True - True - True - ● - True - gtk-delete - - - - - 1 - 1 - 1 - 1 - - - - - False - True - True - False - False - 0 - True - addRepositorySelectList - - - 0 - 0 - 1 - 1 - - - - - True - False - 0 - enter URL of your desired repository - - - - - - 1 - 2 - 1 - 1 - - - - - True - False - - - 0 - 2 - 1 - 1 - - - - - True - False - gtk-apply - - - 0 - 1 - 1 - 1 - - - - - True - False - GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK - - - - True - False - True - 0 - Standard YUM repository: - - - - - 1 - 0 - 1 - 1 - - - - - False - True - 3 - - - - - True - True - 1 - - - - - - add_repo_cancel_button - add_repo_add_button - - - - - *.iso - - - - 441 - 320 - False - 5 - False - dialog - False - - - False - vertical - 2 - - - False - end - - - gtk-cancel - False - True - True - True - False - True - - - False - True - 0 - - - - - gtk-open - False - True - True - True - False - True - - - False - True - 1 - - - - - False - True - end - 0 - - - - - True - False - vertical - False - isoFilter - - - True - True - 1 - - - - - - cancelChooserButton - openChooserButton - - - - 320 - 320 - False - 5 - False - True - center-on-parent - dialog - False - False - - - False - vertical - 2 - - - False - end - - - _DONE - False - True - False - True - True - False - True - - - - False - True - 0 - - - - - False - True - end - 0 - - - - - True - False - True - vertical - - - True - False - start - MEDIA VERIFICATION - - - - - - False - True - 0 - - - - - True - False - 0.5 - 0.5 - - - True - False - vertical - 6 - - - True - False - Verifying media, please wait... - - - False - True - 0 - - - - - True - False - - - False - True - 1 - - - - - - - True - True - 48 - 1 - - - - - False - True - 1 - - - - - - doneButton - - - - - - - - - - - - - - - - - - - - <b>User repo</b> -my testing repository - http://url - - - <b>TeXLive</b> -TeXlive 2012 repository - http://jnovy.texlive - - - - - peopleRepositories - - - False - 5 - False - True - center-on-parent - dialog - False - False - - - False - vertical - 2 - - - False - end - - - _CANCEL - False - True - True - True - False - True - - - - False - True - 0 - - - - - _ADD - False - True - True - True - False - True - - - - False - True - 1 - - - - - False - True - end - 0 - - - - - True - False - vertical - - - _Enable HTTP Proxy - False - True - True - False - False - True - 0 - True - - - - False - True - 0 - - - - - True - False - 12 - vertical - 6 - - - True - False - 6 - 6 - - - True - False - 0 - <b>Proxy URL</b> - True - - - 0 - 0 - 1 - 1 - - - - - True - False - 0 - <span size="small"><b>Example:</b> squid.mysite.org:3128</span> - True - - - 1 - 1 - 1 - 1 - - - - - True - True - ● - 40 - - - 1 - 0 - 1 - 1 - - - - - - - - False - True - 0 - - - - - _Use Authentication - False - True - True - False - False - True - 0 - True - - - - False - True - 1 - - - - - True - False - 12 - 6 - 6 - - - True - False - 0 - <b>Username</b> - True - - - 0 - 0 - 1 - 1 - - - - - True - False - 0 - <b>Password</b> - True - - - 0 - 1 - 1 - 1 - - - - - True - True - ● - - - 1 - 0 - 1 - 1 - - - - - True - True - False - ● - - - 1 - 1 - 1 - 1 - - - - - False - True - 2 - - - - - True - True - 1 - - - - - True - True - 1 - - - - - - proxyCancelButton - proxyAddButton - - - - filler - False - filler - INSTALLATION SOURCE - - - - False - vertical - - - False - - - False - False - 0 - - - - - False - 0 - 0 - 0.5 - - - False - vertical - 6 - - - True - False - start - WHICH INSTALLATION SOURCE WOULD YOU LIKE TO USE? - - - - - - False - True - 0 - - - - - _Auto-detected install media: - False - True - False - True - 12 - False - True - 0 - True - isoRadioButton - - - False - True - 1 - - - - - False - True - 24 - 6 - False - - - True - True - never - out - - - True - False - out - - - True - False - vertical - - - - - - - - - - True - True - 0 - - - - - _Verify - False - True - True - True - center - False - True - - - - False - True - 1 - - - - - False - True - 2 - - - - - _ISO file: - False - True - False - True - 12 - False - True - 0 - True - True - - - False - True - 3 - - - - - False - True - 24 - 6 - False - - - True - False - Device: - - - False - True - 0 - - - - - True - False - partitionStore - - - - 1 - - - - - True - True - 1 - - - - - _Choose an ISO - False - True - True - True - False - True - - - - False - True - 2 - - - - - _Verify - False - True - False - True - True - False - True - - - - False - True - 3 - - - - - False - True - 4 - - - - - On the _network: - False - True - True - False - 12 - False - True - 0 - True - True - isoRadioButton - - - False - True - 5 - - - - - True - False - 24 - vertical - 6 - False - - - True - False - 6 - - - True - False - 0 - - Closest mirror - http:// - https:// - ftp:// - nfs - - - - - False - True - 0 - - - - - True - True - ● - True - - - True - True - 1 - - - - - _Proxy setup... - False - True - True - True - False - True - - - - False - True - 2 - - - - - False - True - 0 - - - - - False - True - 6 - - - True - False - NFS mount options: - - - False - True - 0 - - - - - True - True - True - This field is optional. - This field is optional. - ● - True - - - True - True - 1 - - - - - False - True - 1 - - - - - False - True - 6 - - - - - True - False - start - 12 - UPDATES - - - - - - False - True - 7 - - - - - _Don't install the latest available software updates. Install the default versions provided by the install source above. - False - True - True - False - 12 - False - True - 0 - True - - - False - True - 8 - - - - - - - True - True - 1 - - - - - - diff --git a/pyanaconda/ui/gui/spokes/storage.glade b/pyanaconda/ui/gui/spokes/storage.glade new file mode 100644 index 000000000..16fa40271 --- /dev/null +++ b/pyanaconda/ui/gui/spokes/storage.glade @@ -0,0 +1,802 @@ + + + + + + 500 + 200 + False + 5 + True + center-on-parent + True + dialog + False + False + + + False + vertical + 6 + + + False + + + Cancel & _add more disks + False + True + True + True + center + 6 + False + True + + + + False + True + 0 + + + + + _Continue + False + True + True + True + True + center + 6 + False + True + + + + False + True + end + 1 + + + + + False + True + end + 0 + + + + + True + False + vertical + 6 + + + True + False + 0 + INSTALLATION OPTIONS + + + + + + False + True + 0 + + + + + True + False + 0 + Here we'll describe what your options are. + True + + + False + True + 1 + + + + + Let me _review & customize the partitioning of the disks anyway. + False + True + True + False + False + True + 0 + True + + + + False + True + end + 2 + + + + + False + True + 1 + + + + + + options1_cancel_button + options_continue_button1 + + + + 600 + 400 + False + 5 + True + center-on-parent + True + dialog + False + False + + + False + vertical + 6 + + + False + + + Cancel & _add more disks + False + True + True + True + center + 6 + False + True + + + + False + True + 0 + + + + + _Modify software selection + False + True + True + True + center + 6 + False + True + + + + False + True + end + 1 + + + + + Reclaim _space + False + True + True + True + True + center + 6 + False + True + + + + False + True + 2 + + + + + False + True + end + 0 + + + + + True + False + vertical + 6 + + + True + False + 0 + INSTALLATION OPTIONS + + + + + + False + True + 0 + + + + + I don't need help; let me _review & customize disk partitioning to reclaim space. + False + True + True + False + False + True + 0 + True + + + + False + True + end + 1 + + + + + True + False + 0 + Here we'll describe how much space is needed for the current software selection. + True + + + False + True + 2 + + + + + True + False + 6 + 6 + 6 + True + + + True + False + 1 + disk free + + + + + + 0 + 0 + 1 + 1 + + + + + True + False + 0 + Free space available for use. + + + 1 + 0 + 1 + 1 + + + + + True + False + 1 + fs free + + + + + + 0 + 1 + 1 + 1 + + + + + True + False + 0 + Free space unavailable but reclaimable from existing partitions. + + + 1 + 1 + 1 + 1 + + + + + + + + + + + + + + + + + + + + False + True + 3 + + + + + True + False + 0 + Here we'll describe what your options are. + True + + + False + True + 4 + + + + + False + True + 1 + + + + + + options2_cancel_button + options2_modify_sw_button + options2_reclaim_button + + + + 400 + 300 + False + 5 + True + center-on-parent + True + dialog + False + False + + + False + vertical + 6 + + + False + + + _Quit installer + False + True + True + True + center + 6 + False + True + + + + False + True + 0 + + + + + _Modify software selection + False + True + True + True + center + 6 + False + True + + + + False + True + end + 1 + + + + + _Cancel + False + True + True + True + True + center + 6 + False + True + + + + False + True + end + 2 + + + + + False + True + end + 0 + + + + + True + False + vertical + 6 + + + True + False + 0 + INSTALLATION OPTIONS + + + + + + False + True + 0 + + + + + True + False + 0 + Here we'll describe how much space is needed for the current software selection. + True + + + False + True + 1 + + + + + True + False + 6 + 6 + 6 + True + + + True + False + 1 + disk free + + + + + + 0 + 0 + 1 + 1 + + + + + True + False + 0 + Free space available for use. + + + 1 + 0 + 1 + 1 + + + + + True + False + 1 + fs free + + + + + + 0 + 1 + 1 + 1 + + + + + True + False + 0 + Free space unavailable but reclaimable from existing partitions. + + + 1 + 1 + 1 + 1 + + + + + + + + + + + + + + + + + + + + False + True + 2 + + + + + True + False + 0 + Here we'll describe what your options are. + True + + + False + True + 3 + + + + + False + True + 1 + + + + + + options3_quit_button + options3_modify_sw_button + options3_cancel_button + + + + + + + + + + filler + False + filler + False + INSTALLATION DESTINATION + + + + False + vertical + 6 + + + False + + + False + False + 0 + + + + + False + 0 + 0.89999997615814209 + 0.5 + + + False + vertical + 6 + + + True + False + 0 + LOCAL STANDARD DISKS + False + + + + + + False + True + 0 + + + + + True + True + True + never + in + + + True + False + + + True + False + 6 + 30 + + + + + + + + + + False + True + 1 + + + + + + + True + True + 3 + + + + + True + False + 6 + 6 + 6 + 6 + + + summary + False + True + True + True + False + none + True + False + 0 + + + + False + True + 0 + + + + + _CONTINUE + False + True + True + True + False + True + 1 + + + + False + True + end + 1 + + + + + False + True + 4 + + + + + + diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py index fcf9ffe10..23b09770a 100644 --- a/pyanaconda/ui/gui/spokes/storage.py +++ b/pyanaconda/ui/gui/spokes/storage.py @@ -113,7 +113,7 @@ def size_str(mb): class InstallOptions1Dialog(UIObject): builderObjects = ["options1_dialog"] mainWidgetName = "options1_dialog" - uiFile = "spokes/storage.ui" + uiFile = "spokes/storage.glade" RESPONSE_CANCEL = 0 RESPONSE_CONTINUE = 1 @@ -257,7 +257,7 @@ class StorageChecker(object): class StorageSpoke(NormalSpoke, StorageChecker): builderObjects = ["storageWindow"] mainWidgetName = "storageWindow" - uiFile = "spokes/storage.ui" + uiFile = "spokes/storage.glade" category = StorageCategory diff --git a/pyanaconda/ui/gui/spokes/storage.ui b/pyanaconda/ui/gui/spokes/storage.ui deleted file mode 100644 index 16fa40271..000000000 --- a/pyanaconda/ui/gui/spokes/storage.ui +++ /dev/null @@ -1,802 +0,0 @@ - - - - - - 500 - 200 - False - 5 - True - center-on-parent - True - dialog - False - False - - - False - vertical - 6 - - - False - - - Cancel & _add more disks - False - True - True - True - center - 6 - False - True - - - - False - True - 0 - - - - - _Continue - False - True - True - True - True - center - 6 - False - True - - - - False - True - end - 1 - - - - - False - True - end - 0 - - - - - True - False - vertical - 6 - - - True - False - 0 - INSTALLATION OPTIONS - - - - - - False - True - 0 - - - - - True - False - 0 - Here we'll describe what your options are. - True - - - False - True - 1 - - - - - Let me _review & customize the partitioning of the disks anyway. - False - True - True - False - False - True - 0 - True - - - - False - True - end - 2 - - - - - False - True - 1 - - - - - - options1_cancel_button - options_continue_button1 - - - - 600 - 400 - False - 5 - True - center-on-parent - True - dialog - False - False - - - False - vertical - 6 - - - False - - - Cancel & _add more disks - False - True - True - True - center - 6 - False - True - - - - False - True - 0 - - - - - _Modify software selection - False - True - True - True - center - 6 - False - True - - - - False - True - end - 1 - - - - - Reclaim _space - False - True - True - True - True - center - 6 - False - True - - - - False - True - 2 - - - - - False - True - end - 0 - - - - - True - False - vertical - 6 - - - True - False - 0 - INSTALLATION OPTIONS - - - - - - False - True - 0 - - - - - I don't need help; let me _review & customize disk partitioning to reclaim space. - False - True - True - False - False - True - 0 - True - - - - False - True - end - 1 - - - - - True - False - 0 - Here we'll describe how much space is needed for the current software selection. - True - - - False - True - 2 - - - - - True - False - 6 - 6 - 6 - True - - - True - False - 1 - disk free - - - - - - 0 - 0 - 1 - 1 - - - - - True - False - 0 - Free space available for use. - - - 1 - 0 - 1 - 1 - - - - - True - False - 1 - fs free - - - - - - 0 - 1 - 1 - 1 - - - - - True - False - 0 - Free space unavailable but reclaimable from existing partitions. - - - 1 - 1 - 1 - 1 - - - - - - - - - - - - - - - - - - - - False - True - 3 - - - - - True - False - 0 - Here we'll describe what your options are. - True - - - False - True - 4 - - - - - False - True - 1 - - - - - - options2_cancel_button - options2_modify_sw_button - options2_reclaim_button - - - - 400 - 300 - False - 5 - True - center-on-parent - True - dialog - False - False - - - False - vertical - 6 - - - False - - - _Quit installer - False - True - True - True - center - 6 - False - True - - - - False - True - 0 - - - - - _Modify software selection - False - True - True - True - center - 6 - False - True - - - - False - True - end - 1 - - - - - _Cancel - False - True - True - True - True - center - 6 - False - True - - - - False - True - end - 2 - - - - - False - True - end - 0 - - - - - True - False - vertical - 6 - - - True - False - 0 - INSTALLATION OPTIONS - - - - - - False - True - 0 - - - - - True - False - 0 - Here we'll describe how much space is needed for the current software selection. - True - - - False - True - 1 - - - - - True - False - 6 - 6 - 6 - True - - - True - False - 1 - disk free - - - - - - 0 - 0 - 1 - 1 - - - - - True - False - 0 - Free space available for use. - - - 1 - 0 - 1 - 1 - - - - - True - False - 1 - fs free - - - - - - 0 - 1 - 1 - 1 - - - - - True - False - 0 - Free space unavailable but reclaimable from existing partitions. - - - 1 - 1 - 1 - 1 - - - - - - - - - - - - - - - - - - - - False - True - 2 - - - - - True - False - 0 - Here we'll describe what your options are. - True - - - False - True - 3 - - - - - False - True - 1 - - - - - - options3_quit_button - options3_modify_sw_button - options3_cancel_button - - - - - - - - - - filler - False - filler - False - INSTALLATION DESTINATION - - - - False - vertical - 6 - - - False - - - False - False - 0 - - - - - False - 0 - 0.89999997615814209 - 0.5 - - - False - vertical - 6 - - - True - False - 0 - LOCAL STANDARD DISKS - False - - - - - - False - True - 0 - - - - - True - True - True - never - in - - - True - False - - - True - False - 6 - 30 - - - - - - - - - - False - True - 1 - - - - - - - True - True - 3 - - - - - True - False - 6 - 6 - 6 - 6 - - - summary - False - True - True - True - False - none - True - False - 0 - - - - False - True - 0 - - - - - _CONTINUE - False - True - True - True - False - True - 1 - - - - False - True - end - 1 - - - - - False - True - 4 - - - - - - diff --git a/pyanaconda/ui/gui/spokes/welcome.glade b/pyanaconda/ui/gui/spokes/welcome.glade new file mode 100644 index 000000000..e5bcc0f7d --- /dev/null +++ b/pyanaconda/ui/gui/spokes/welcome.glade @@ -0,0 +1,380 @@ + + + + + + False + 5 + dialog + False + + + False + vertical + 2 + + + False + end + + + _Get me out of here! + False + True + True + True + False + True + + + False + True + 0 + + + + + _I accept my fate. + False + True + True + True + False + True + + + False + True + 1 + + + + + False + True + end + 0 + + + + + True + False + 12 + 6 + + + True + False + start + This is unstable, pre-release software. + + + + + + 1 + 0 + 1 + 1 + + + + + True + False + gtk-quit + 6 + + + 0 + 0 + 1 + 1 + + + + + True + False + start + You wake up inside an OS installer in Timbuktu, and it's six +months in the future. But, there are bugs. Bugs everywhere. +Bugs you must live with. This OS of the future isn't a stable +OS you can rely on. It's for testing purposes only. + + + 1 + 1 + 1 + 1 + + + + + + + + + + + + + + True + True + 1 + + + + + + quitButton + continueButton + + + + languageStore + + + + filler + False + filler + + + + False + vertical + 6 + + + False + 6 + 6 + 6 + + + False + False + 0 + + + + + False + 0 + 0 + 0.5 + + + False + vertical + 6 + + + + + + + + True + True + 1 + + + + + + + + + + + + + + + + + + + + filler + False + filler + False + False + + + + False + vertical + + + False + + + + + + False + False + 0 + + + + + False + 0 + 0 + 0.5 + + + False + vertical + 5 + + + True + False + 6 + WELCOME TO %s %s. + + + + + + False + True + 0 + + + + + 50 + True + False + center + What language would you like to use during the installation process? + + + + + + False + True + 1 + + + + + True + False + center + True + 0 + + + True + False + vertical + + + True + True + True + never + in + + + True + True + languageStore + False + 0 + + + + + + + + nativeName + True + True + 0 + + + Sans 14 + + + 0 + + + + + + + englishName + True + True + 1 + + + Sans Italic 14 + gray + + + 1 + + + + + + + + + False + True + 0 + + + + + True + True + ● + True + edit-clear-symbolic + languageEntryCompletion + + + + False + True + 1 + + + + + + + False + True + 2 + + + + + + + True + True + 1 + + + + + + diff --git a/pyanaconda/ui/gui/spokes/welcome.py b/pyanaconda/ui/gui/spokes/welcome.py index 9c899eb4a..dc4c733ce 100644 --- a/pyanaconda/ui/gui/spokes/welcome.py +++ b/pyanaconda/ui/gui/spokes/welcome.py @@ -190,7 +190,7 @@ class LanguageMixIn(object): class WelcomeLanguageSpoke(LanguageMixIn, StandaloneSpoke): mainWidgetName = "welcomeWindow" - uiFile = "spokes/welcome.ui" + uiFile = "spokes/welcome.glade" builderObjects = LanguageMixIn.builderObjects + [mainWidgetName, "betaWarnDialog"] preForHub = SummaryHub @@ -234,7 +234,7 @@ class WelcomeLanguageSpoke(LanguageMixIn, StandaloneSpoke): class LanguageSpoke(LanguageMixIn, NormalSpoke): mainWidgetName = "languageSpokeWindow" - uiFile = "spokes/welcome.ui" + uiFile = "spokes/welcome.glade" builderObjects = LanguageMixIn.builderObjects + [mainWidgetName, WelcomeLanguageSpoke.mainWidgetName] category = LocalizationCategory diff --git a/pyanaconda/ui/gui/spokes/welcome.ui b/pyanaconda/ui/gui/spokes/welcome.ui deleted file mode 100644 index e5bcc0f7d..000000000 --- a/pyanaconda/ui/gui/spokes/welcome.ui +++ /dev/null @@ -1,380 +0,0 @@ - - - - - - False - 5 - dialog - False - - - False - vertical - 2 - - - False - end - - - _Get me out of here! - False - True - True - True - False - True - - - False - True - 0 - - - - - _I accept my fate. - False - True - True - True - False - True - - - False - True - 1 - - - - - False - True - end - 0 - - - - - True - False - 12 - 6 - - - True - False - start - This is unstable, pre-release software. - - - - - - 1 - 0 - 1 - 1 - - - - - True - False - gtk-quit - 6 - - - 0 - 0 - 1 - 1 - - - - - True - False - start - You wake up inside an OS installer in Timbuktu, and it's six -months in the future. But, there are bugs. Bugs everywhere. -Bugs you must live with. This OS of the future isn't a stable -OS you can rely on. It's for testing purposes only. - - - 1 - 1 - 1 - 1 - - - - - - - - - - - - - - True - True - 1 - - - - - - quitButton - continueButton - - - - languageStore - - - - filler - False - filler - - - - False - vertical - 6 - - - False - 6 - 6 - 6 - - - False - False - 0 - - - - - False - 0 - 0 - 0.5 - - - False - vertical - 6 - - - - - - - - True - True - 1 - - - - - - - - - - - - - - - - - - - - filler - False - filler - False - False - - - - False - vertical - - - False - - - - - - False - False - 0 - - - - - False - 0 - 0 - 0.5 - - - False - vertical - 5 - - - True - False - 6 - WELCOME TO %s %s. - - - - - - False - True - 0 - - - - - 50 - True - False - center - What language would you like to use during the installation process? - - - - - - False - True - 1 - - - - - True - False - center - True - 0 - - - True - False - vertical - - - True - True - True - never - in - - - True - True - languageStore - False - 0 - - - - - - - - nativeName - True - True - 0 - - - Sans 14 - - - 0 - - - - - - - englishName - True - True - 1 - - - Sans Italic 14 - gray - - - 1 - - - - - - - - - False - True - 0 - - - - - True - True - ● - True - edit-clear-symbolic - languageEntryCompletion - - - - False - True - 1 - - - - - - - False - True - 2 - - - - - - - True - True - 1 - - - - - - -- cgit