From b7261d397b6dc4218b894d22e85df98461c4cb15 Mon Sep 17 00:00:00 2001
From: Tomasz Melcer <liori@exroot.org>
Date: Mon, 20 Nov 2006 23:10:12 +0000
Subject: [PATCH] Further changes to commands' dialog.
---
data/glade/adhoc_commands_window.glade | 55 ++++++++------------------
src/dataforms_widget.py | 2 +-
2 files changed, 17 insertions(+), 40 deletions(-)
diff --git a/data/glade/adhoc_commands_window.glade b/data/glade/adhoc_commands_window.glade
index 6d68854763..9c46d82dba 100644
--- a/data/glade/adhoc_commands_window.glade
+++ b/data/glade/adhoc_commands_window.glade
@@ -664,90 +664,67 @@
</child>
<child>
- <widget class="GtkHBox" id="hbox2953">
+ <widget class="GtkHButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
<property name="spacing">0</property>
<child>
- <placeholder/>
- </child>
-
- <child>
- <widget class="GtkButton" id="execute_button">
+ <widget class="GtkButton" id="back_button">
<property name="visible">True</property>
+ <property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-execute</property>
+ <property name="label">gtk-go-back</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_execute_button_clicked" last_modification_time="Mon, 10 Jul 2006 16:24:42 GMT"/>
+ <signal name="clicked" handler="on_back_button_clicked" last_modification_time="Mon, 20 Nov 2006 23:04:43 GMT"/>
</widget>
- <packing>
- <property name="padding">3</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
</child>
<child>
<widget class="GtkButton" id="forward_button">
<property name="visible">True</property>
+ <property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-go-forward</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_forward_button_clicked" last_modification_time="Mon, 10 Jul 2006 16:24:47 GMT"/>
+ <signal name="clicked" handler="on_forward_button_clicked" last_modification_time="Mon, 20 Nov 2006 23:05:15 GMT"/>
</widget>
- <packing>
- <property name="padding">3</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
</child>
<child>
- <widget class="GtkButton" id="back_button">
+ <widget class="GtkButton" id="execute_button">
<property name="visible">True</property>
+ <property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="label">gtk-go-back</property>
+ <property name="label">gtk-execute</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_back_button_clicked" last_modification_time="Mon, 10 Jul 2006 16:24:50 GMT"/>
+ <signal name="clicked" handler="on_execute_button_clicked" last_modification_time="Mon, 20 Nov 2006 23:06:00 GMT"/>
</widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
</child>
<child>
<widget class="GtkButton" id="close_button">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-close</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_close_button_clicked" last_modification_time="Mon, 10 Jul 2006 16:24:38 GMT"/>
+ <signal name="clicked" handler="on_close_button_clicked" last_modification_time="Mon, 20 Nov 2006 23:06:29 GMT"/>
</widget>
- <packing>
- <property name="padding">3</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
</packing>
</child>
</widget>
diff --git a/src/dataforms_widget.py b/src/dataforms_widget.py
index 0c47832c7b..68f973e821 100644
--- a/src/dataforms_widget.py
+++ b/src/dataforms_widget.py
@@ -418,7 +418,7 @@ def __init__(self, dataform):
if commonlabel and field.label is not None:
label = gtk.Label(field.label)
- label.set_alignment(1.0, 0.5)
+ label.set_alignment(0.0, 0.5)
self.attach(label, 0, 1, linecounter, linecounter+1,
xoptions=gtk.FILL, yoptions=gtk.FILL)
--
GitLab