* [gentoo-commits] proj/anaconda:master commit in: ui/, iw/
@ 2011-07-03 17:47 Wiktor W Brodlo
0 siblings, 0 replies; 8+ messages in thread
From: Wiktor W Brodlo @ 2011-07-03 17:47 UTC (permalink / raw
To: gentoo-commits
commit: 49aa7135075e3d5395b44edef9d061dffe4eac3f
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Jul 3 17:47:29 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Jul 3 17:47:29 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=49aa7135
mirrorselect: a bit more tweaking
---
iw/mirrorselect_gui.py | 4 ++--
ui/mirrorselect.glade | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index 9740164..43a7d1a 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -93,8 +93,8 @@ class MirrorselectWindow(InstallWindow):
flags = gtk.Label(flags_text)
table.attach(cb, 0, 1, rows, rows+1)
- table.attach(cb, 1, 2, rows, rows+1)
- table.attach(cb, 2, 3, rows, rows+1)
+ table.attach(name, 1, 2, rows, rows+1)
+ table.attach(flags, 2, 3, rows, rows+1)
def downloadMirrorlist(self):
try:
diff --git a/ui/mirrorselect.glade b/ui/mirrorselect.glade
index ffbd5ad..1efcd92 100644
--- a/ui/mirrorselect.glade
+++ b/ui/mirrorselect.glade
@@ -24,6 +24,7 @@ In order to download source code quickly it is recommended to select a fast mirr
<property name="justify">center</property>
</widget>
<packing>
+ <property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: ui/, iw/
@ 2011-07-03 18:59 Wiktor W Brodlo
0 siblings, 0 replies; 8+ messages in thread
From: Wiktor W Brodlo @ 2011-07-03 18:59 UTC (permalink / raw
To: gentoo-commits
commit: ea34b0f174d3f4ee1834c3743fc0c8ee1460894a
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Jul 3 18:51:17 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Jul 3 18:51:17 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=ea34b0f1
I'm not touching mirrorselect again!
---
iw/mirrorselect_gui.py | 2 ++
ui/mirrorselect.glade | 9 +++++++++
2 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index 997f88d..0bfd275 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -84,6 +84,7 @@ class MirrorselectWindow(InstallWindow):
cb = gtk.CheckButton(label=data["url"], use_underline=False)
name = gtk.Label("%s: %s\n%s" % (region, country, mirror))
+ name.set_alignment(0, 0)
flags_text = data["proto"]
if data["ipv4"] == "y":
@@ -91,6 +92,7 @@ class MirrorselectWindow(InstallWindow):
if data["ipv6"] == "y":
flags_text += " ipv6"
flags = gtk.Label(flags_text)
+ flags.set_alignment(0, 0)
table.attach(cb, 0, 1, rows, rows+1, gtk.Fill)
table.attach(name, 1, 2, rows, rows+1)
diff --git a/ui/mirrorselect.glade b/ui/mirrorselect.glade
index 7407f9a..9964f03 100644
--- a/ui/mirrorselect.glade
+++ b/ui/mirrorselect.glade
@@ -43,12 +43,19 @@ In order to download source code quickly it is recommended to select a fast mirr
<child>
<widget class="GtkLabel" id="label2">
<property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
<property name="label" translatable="yes">Mirror URL</property>
</widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
</child>
<child>
<widget class="GtkLabel" id="label3">
<property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
<property name="label" translatable="yes">Region: Country
Mirror Name</property>
</widget>
@@ -60,6 +67,8 @@ Mirror Name</property>
<child>
<widget class="GtkLabel" id="label4">
<property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
<property name="label" translatable="yes">Flags</property>
</widget>
<packing>
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: ui/, iw/
@ 2011-07-03 19:36 Wiktor W Brodlo
0 siblings, 0 replies; 8+ messages in thread
From: Wiktor W Brodlo @ 2011-07-03 19:36 UTC (permalink / raw
To: gentoo-commits
commit: c178c079e4484637b187bf4b21541a1bdcde2207
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sun Jul 3 19:36:22 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sun Jul 3 19:36:22 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=c178c079
ui/mirrorselect.glade: forgot to save the intro_label
---
iw/mirrorselect-sync_gui.py | 4 ++--
ui/mirrorselect.glade | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/iw/mirrorselect-sync_gui.py b/iw/mirrorselect-sync_gui.py
index 26b5d60..15a6bb5 100644
--- a/iw/mirrorselect-sync_gui.py
+++ b/iw/mirrorselect-sync_gui.py
@@ -46,8 +46,8 @@ class MirrorselectSyncWindow(InstallWindow):
(self.xml, self.align) = gui.getGladeWidget("mirrorselect.glade", "mirrorselect_align")
- intro_label = self.xml.get_widget("intro_label")
- intro_label.set_label(_("Choose your Portage sync mirror(s).\nThese are used to sync your Portage tree."))
+ self.intro_label = self.xml.get_widget("intro_label")
+ self.intro_label.set_label(_("Choose your Portage sync mirror(s).\nThese are used to sync your Portage tree."))
mirrorsf = None
diff --git a/ui/mirrorselect.glade b/ui/mirrorselect.glade
index 9964f03..317a225 100644
--- a/ui/mirrorselect.glade
+++ b/ui/mirrorselect.glade
@@ -17,7 +17,7 @@
<property name="orientation">vertical</property>
<property name="spacing">10</property>
<child>
- <widget class="GtkLabel" id="label1">
+ <widget class="GtkLabel" id="intro_label">
<property name="visible">True</property>
<property name="label" translatable="yes">Choose your portage mirror(s).
In order to download source code quickly it is recommended to select a fast mirror that's close to you.</property>
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: ui/, iw/
@ 2011-07-04 13:42 Wiktor W Brodlo
0 siblings, 0 replies; 8+ messages in thread
From: Wiktor W Brodlo @ 2011-07-04 13:42 UTC (permalink / raw
To: gentoo-commits
commit: 2d2eaad9223641e7728c4eca6dd9ec3f22cb2fb1
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jul 4 13:41:53 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jul 4 13:41:53 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=2d2eaad9
USE dialog: keep descriptions to the left
---
iw/use_gui.py | 4 +++-
ui/use.glade | 4 ++++
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/iw/use_gui.py b/iw/use_gui.py
index f2980ae..d903c42 100644
--- a/iw/use_gui.py
+++ b/iw/use_gui.py
@@ -67,8 +67,10 @@ class UseWindow(InstallWindow):
rows = table.get_property("n-rows")
table.resize(rows+1, cols)
+ l = gtk.Label(use[flag])
+ l.set_alignment(0,0)
table.attach(gtk.CheckButton(label=flag), 0, 1, rows, rows+1, gtk.FILL)
- table.attach(gtk.Label(use[flag]), 1, 2, rows, rows+1)
+ table.attach(l, 1, 2, rows, rows+1)
return self.align
diff --git a/ui/use.glade b/ui/use.glade
index fea3bff..cf760b2 100644
--- a/ui/use.glade
+++ b/ui/use.glade
@@ -53,6 +53,8 @@ Pick your flags by selecting them. Your profile already set some of the flags, b
<child>
<widget class="GtkLabel" id="label2">
<property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
<property name="label" translatable="yes">Flag</property>
</widget>
<packing>
@@ -63,6 +65,8 @@ Pick your flags by selecting them. Your profile already set some of the flags, b
<child>
<widget class="GtkLabel" id="label3">
<property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
<property name="label" translatable="yes">Description</property>
</widget>
<packing>
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: ui/, iw/
@ 2011-07-09 18:18 Wiktor W Brodlo
0 siblings, 0 replies; 8+ messages in thread
From: Wiktor W Brodlo @ 2011-07-09 18:18 UTC (permalink / raw
To: gentoo-commits
commit: 96bd0146470b7f0c8d79dfc1a00d89be76f39e66
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sat Jul 9 18:18:20 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sat Jul 9 18:18:20 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=96bd0146
The Xorg selection screen
---
iw/xorg_gui.py | 57 +++++++++++++
ui/xorg.glade | 253 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 310 insertions(+), 0 deletions(-)
diff --git a/iw/xorg_gui.py b/iw/xorg_gui.py
new file mode 100644
index 0000000..9b0f8e2
--- /dev/null
+++ b/iw/xorg_gui.py
@@ -0,0 +1,57 @@
+#
+# xorg_gui.py: gui Xorg/DE/WM settings.
+#
+# Copyright (C) 2011 wiktor w brodlo
+# Copyright (C) 2011 Gentoo Foundation
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+import string
+import gtk
+import gtk.glade
+import gtk.gdk
+import gobject
+import pango
+import sys
+import gui
+
+from iw_gui import *
+
+from constants import *
+import gettext
+_ = lambda x: gettext.ldgettext("anaconda", x)
+
+class XorgWindow(InstallWindow):
+ des = ["fluxbox", "gnome", "kde", "lxde", "xfce4"]
+
+ def getNext(self):
+ for de in des:
+ cb = self.xml.get_widget(de)
+ if cb.get_property("active")
+ self.anaconda.xorg = de
+ return None
+
+ def getScreen(self, anaconda):
+ self.anaconda = anaconda
+ self.intf = anaconda.intf
+
+ (self.xml, self.align) = gui.getGladeWidget("makeconf.glade", "makeconf_align")
+
+ for de in des:
+ icon = self.xml.get_widget(de+"_icon")
+ gui.readImageFromFile(de+".png", image=icon)
+
+ return self.align
+
diff --git a/ui/xorg.glade b/ui/xorg.glade
new file mode 100644
index 0000000..4fa8fd3
--- /dev/null
+++ b/ui/xorg.glade
@@ -0,0 +1,253 @@
+<?xml version="1.0"?>
+<glade-interface>
+ <!-- interface-requires gtk+ 2.6 -->
+ <!-- interface-naming-policy toplevel-contextual -->
+ <widget class="GtkWindow" id="xorg_window">
+ <property name="border_width">18</property>
+ <child>
+ <widget class="GtkAlignment" id="xorg_align">
+ <property name="width_request">400</property>
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <child>
+ <widget class="GtkVBox" id="xorg_box">
+ <property name="visible">True</property>
+ <property name="border_width">5</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes">Would you like to install Xorg and a desktop environment?</property>
+ <property name="justify">center</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <child>
+ <widget class="GtkViewport" id="viewport1">
+ <property name="visible">True</property>
+ <property name="resize_mode">queue</property>
+ <child>
+ <widget class="GtkVBox" id="des_box">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <widget class="GtkRadioButton" id="noxorg">
+ <property name="label" translatable="yes">Do not install Xorg</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="fluxbox">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">noxorg</property>
+ <child>
+ <widget class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkImage" id="fluxbox_icon">
+ <property name="visible">True</property>
+ <property name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="xpad">10</property>
+ <property name="label" translatable="yes">Fluxbox</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="gnome">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">noxorg</property>
+ <child>
+ <widget class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkImage" id="gnome_icon">
+ <property name="visible">True</property>
+ <property name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="xpad">10</property>
+ <property name="label" translatable="yes">Gnome</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="kde">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">noxorg</property>
+ <child>
+ <widget class="GtkHBox" id="hbox3">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkImage" id="kde_icon">
+ <property name="visible">True</property>
+ <property name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="xpad">10</property>
+ <property name="label" translatable="yes">KDE</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="lxde">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">noxorg</property>
+ <child>
+ <widget class="GtkHBox" id="hbox4">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkImage" id="lxde_icon">
+ <property name="visible">True</property>
+ <property name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="xpad">10</property>
+ <property name="label" translatable="yes">LXDE</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="xfce4">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">noxorg</property>
+ <child>
+ <widget class="GtkHBox" id="hbox5">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkImage" id="xfce4_icon">
+ <property name="visible">True</property>
+ <property name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="xpad">10</property>
+ <property name="label" translatable="yes">Xfce4</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+</glade-interface>
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: ui/, iw/
@ 2011-07-30 3:16 Wiktor W Brodlo
0 siblings, 0 replies; 8+ messages in thread
From: Wiktor W Brodlo @ 2011-07-30 3:16 UTC (permalink / raw
To: gentoo-commits
commit: 3ef41ac3c1b8f37fd95265992833a2876a25e154
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Sat Jul 30 02:46:04 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Sat Jul 30 02:46:04 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=3ef41ac3
Updated the glade file for mirrorselect
---
iw/mirrorselect_gui.py | 2 +
ui/mirrorselect.glade | 54 +++++++++--------------------------------------
2 files changed, 13 insertions(+), 43 deletions(-)
diff --git a/iw/mirrorselect_gui.py b/iw/mirrorselect_gui.py
index 35462a8..a41af24 100644
--- a/iw/mirrorselect_gui.py
+++ b/iw/mirrorselect_gui.py
@@ -86,6 +86,8 @@ class MirrorselectWindow(InstallWindow):
treeview.append_column(_("Mirror Name"))
treeview.append_column("IPv4?")
treeview.append_column("IPv6?")
+ self.xml.get_widget("mirrors_viewport").add(treeview)
+
def addMirrorRow(self, ts, country_ts, region, country, mirror, data):
cb = gtk.CheckButton(label=data["url"], use_underline=False)
diff --git a/ui/mirrorselect.glade b/ui/mirrorselect.glade
index 317a225..5dd518f 100644
--- a/ui/mirrorselect.glade
+++ b/ui/mirrorselect.glade
@@ -1,30 +1,34 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<glade-interface>
<!-- interface-requires gtk+ 2.6 -->
<!-- interface-naming-policy toplevel-contextual -->
<widget class="GtkWindow" id="mirrorselect_window">
+ <property name="can_focus">False</property>
<property name="border_width">18</property>
<child>
<widget class="GtkAlignment" id="mirrorselect_align">
<property name="width_request">400</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<child>
<widget class="GtkVBox" id="mirrorselect_box">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">5</property>
- <property name="orientation">vertical</property>
<property name="spacing">10</property>
<child>
<widget class="GtkLabel" id="intro_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Choose your portage mirror(s).
In order to download source code quickly it is recommended to select a fast mirror that's close to you.</property>
<property name="justify">center</property>
</widget>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -33,55 +37,19 @@ In order to download source code quickly it is recommended to select a fast mirr
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <widget class="GtkViewport" id="viewport1">
+ <widget class="GtkViewport" id="mirrors_viewport">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="resize_mode">queue</property>
<child>
- <widget class="GtkTable" id="mirrors_table">
- <property name="visible">True</property>
- <property name="n_columns">3</property>
- <child>
- <widget class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes">Mirror URL</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes">Region: Country
-Mirror Name</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes">Flags</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- </packing>
- </child>
- </widget>
+ <placeholder/>
</child>
</widget>
</child>
</widget>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: ui/, iw/
@ 2011-08-03 8:24 Wiktor W Brodlo
0 siblings, 0 replies; 8+ messages in thread
From: Wiktor W Brodlo @ 2011-08-03 8:24 UTC (permalink / raw
To: gentoo-commits
commit: 7e4399d21dc221e29b0392e80c8895a17fa3fcda
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Wed Aug 3 08:23:37 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Wed Aug 3 08:23:37 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=7e4399d2
Tweak the timezone window
---
iw/timezone_gui.py | 6 ++--
ui/timezone.glade | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 65 insertions(+), 3 deletions(-)
diff --git a/iw/timezone_gui.py b/iw/timezone_gui.py
index 0e96069..cf91ce6 100644
--- a/iw/timezone_gui.py
+++ b/iw/timezone_gui.py
@@ -55,10 +55,9 @@ class TimezoneWindow(InstallWindow):
self.zonetab = zonetab.ZoneTab()
# Pull in a bunch of widgets.
- self.xml = gtk.glade.XML("/usr/share/system-config-date/system-config-date.glade", domain="system-config-date")
+ self.xml = gtk.glade.XML("timezone.glade", domain="system-config-date")
self.vbox = self.xml.get_widget("tz_vbox")
self.utcCheckbox = self.xml.get_widget("utc_check")
- self.notebook = self.xml.get_widget("notebook")
ics.setTitle(_("Time Zone Selection"))
ics.setNextEnabled(1)
@@ -80,7 +79,7 @@ class TimezoneWindow(InstallWindow):
ratio = float(p_w)/p_h
screen_x, screen_y = self.ics.cw.window.get_size()
screen_x -= 80
- screen_y -= 300
+ screen_y -= 200
p_w -= 80
if screen_x < p_w:
@@ -174,6 +173,7 @@ class AnacondaTZMap(TimezoneMap):
self.tzCombo.add_attribute(cell, 'text', 0)
self.tzCombo.connect("changed", self.selectionChanged)
self.hbox.pack_start(self.tzCombo, False, False)
+ self.hbox.pack_start(self.utcCheckbox, False, False)
self.pack_start(self.hbox, False, False)
diff --git a/ui/timezone.glade b/ui/timezone.glade
new file mode 100644
index 0000000..fc03a36
--- /dev/null
+++ b/ui/timezone.glade
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glade-interface>
+ <!-- interface-requires gtk+ 2.6 -->
+ <!-- interface-naming-policy toplevel-contextual -->
+ <widget class="GtkWindow" id="window">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Date/Time Properties</property>
+ <property name="default_width">400</property>
+ <property name="default_height">550</property>
+ <child>
+ <widget class="GtkVBox" id="tz_vbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="spacing">5</property>
+ <child>
+ <widget class="GtkLabel" id="tzActionLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Please select the nearest city in your time zone:</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="Custom" id="tz">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="utc_check">
+ <property name="label" translatable="yes">_System clock uses UTC</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes" comments="The times are called "winter time" and "summer time" in some localities.">Use this if you want to automatically switch between normal and daylight savings time. Don't use this if you have other operating systems on this computer which adjust the hardware clock to achieve this, e.g. Microsoft Windows(tm).</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+</glade-interface>
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/anaconda:master commit in: ui/, iw/
@ 2011-08-04 2:16 Wiktor W Brodlo
0 siblings, 0 replies; 8+ messages in thread
From: Wiktor W Brodlo @ 2011-08-04 2:16 UTC (permalink / raw
To: gentoo-commits
commit: 1a92c9d999287ffb56a892ce4480c8f5bb22cbda
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Thu Aug 4 02:15:25 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Thu Aug 4 02:15:25 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=1a92c9d9
iw/systools_gui.py: validation
---
iw/systools_gui.py | 3 +++
ui/systools.glade | 5 +++++
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/iw/systools_gui.py b/iw/systools_gui.py
index b8c67ac..5c0ccbd 100644
--- a/iw/systools_gui.py
+++ b/iw/systools_gui.py
@@ -37,6 +37,9 @@ class SystoolsWindow(InstallWindow):
def getNext(self):
self.anaconda.cron = self.cron.get_active_text()
self.anaconda.syslog = self.syslog.get_active_text()
+ if self.anaconda.syslog == "":
+ self.anaconda.intf.messageWindow(_("Select syslog"), _("You must select a system logger!"))
+ raise gui.StayOnScreen
return None
def getScreen(self, anaconda):
diff --git a/ui/systools.glade b/ui/systools.glade
index 69ebcbc..70a40bd 100644
--- a/ui/systools.glade
+++ b/ui/systools.glade
@@ -22,6 +22,8 @@
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
<property name="label" translatable="yes">Pick your system logger:</property>
<property name="justify">right</property>
</widget>
@@ -30,6 +32,8 @@
<widget class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
<property name="label" translatable="yes">Pick your cron:</property>
<property name="justify">right</property>
</widget>
@@ -56,6 +60,7 @@ metalog</property>
<widget class="GtkComboBox" id="cron">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="active">0</property>
<property name="items" translatable="yes">(none)
dcron
fcron
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2011-08-04 2:16 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-03 17:47 [gentoo-commits] proj/anaconda:master commit in: ui/, iw/ Wiktor W Brodlo
-- strict thread matches above, loose matches on Subject: below --
2011-07-03 18:59 Wiktor W Brodlo
2011-07-03 19:36 Wiktor W Brodlo
2011-07-04 13:42 Wiktor W Brodlo
2011-07-09 18:18 Wiktor W Brodlo
2011-07-30 3:16 Wiktor W Brodlo
2011-08-03 8:24 Wiktor W Brodlo
2011-08-04 2:16 Wiktor W Brodlo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox