[glom/maemo5: 8/8] Revert unwanted merge change.
- From: Murray Cumming <murrayc src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [glom/maemo5: 8/8] Revert unwanted merge change.
- Date: Mon, 5 Oct 2009 09:45:37 +0000 (UTC)
commit 682d75f2c9e64035f0810e85f8385232f884902d
Author: Murray Cumming <murrayc murrayc com>
Date: Mon Oct 5 11:45:20 2009 +0200
Revert unwanted merge change.
glom/glom.glade | 160 +++++++++++++++----------------------------------------
1 files changed, 43 insertions(+), 117 deletions(-)
---
diff --git a/glom/glom.glade b/glom/glom.glade
index 60f9246..9491dd6 100644
--- a/glom/glom.glade
+++ b/glom/glom.glade
@@ -68,6 +68,7 @@
<object class="GtkHButtonBox" id="hbuttonbox3">
<property name="visible">True</property>
<property name="layout_style">end</property>
+ <!-- Maemo: Dialogs should have no quit or cancel dialogs since Maemo5:
<child>
<object class="GtkButton" id="button_cancel">
<property name="label">gtk-close</property>
@@ -83,6 +84,7 @@
<property name="position">0</property>
</packing>
</child>
+ -->
</object>
<packing>
<property name="expand">False</property>
@@ -107,6 +109,7 @@
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="spacing">6</property>
+ <!-- Maemo: No icons in dialogs.
<child>
<object class="GtkImage" id="image3">
<property name="visible">True</property>
@@ -121,6 +124,7 @@
<property name="position">0</property>
</packing>
</child>
+ -->
<child>
<object class="GtkVBox" id="vbox4">
<property name="visible">True</property>
@@ -145,11 +149,6 @@
<object class="GtkNotebook" id="existing_or_new_notebook">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="existing_or_new_notebook-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Open or create Document</property>
- </object>
- </child>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow2">
<property name="visible">True</property>
@@ -162,11 +161,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="existing_or_new_existing_treeview-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Open Existing Document</property>
- </object>
- </child>
</object>
</child>
</object>
@@ -193,11 +187,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="existing_or_new_new_treeview-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Create New Document</property>
- </object>
- </child>
</object>
</child>
</object>
@@ -235,20 +224,7 @@
<object class="GtkHButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
<property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="helpbutton1">
- <property name="label">gtk-help</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <!-- Maemo: Dialogs should have no quit or cancel dialogs since Maemo5:
<child>
<object class="GtkButton" id="cancelbutton1">
<property name="label">gtk-quit</property>
@@ -261,9 +237,10 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
+ -->
<child>
<object class="GtkButton" id="existing_or_new_button_select">
<property name="label" translatable="yes">_Select</property>
@@ -275,7 +252,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -288,8 +265,9 @@
</object>
</child>
<action-widgets>
- <action-widget response="-11">helpbutton1</action-widget>
+ <!-- Maemo: Dialogs should have no quit or cancel dialogs since Maemo5:
<action-widget response="-7">cancelbutton1</action-widget>
+ -->
<action-widget response="0">existing_or_new_button_select</action-widget>
</action-widgets>
</object>
@@ -304,6 +282,7 @@
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="spacing">6</property>
+ <!-- Maemo: No icons in dialogs.
<child>
<object class="GtkImage" id="image12">
<property name="visible">True</property>
@@ -318,6 +297,7 @@
<property name="position">0</property>
</packing>
</child>
+ -->
<child>
<object class="GtkVBox" id="vbox28">
<property name="visible">True</property>
@@ -368,11 +348,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="entry_host-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Host</property>
- </object>
- </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -388,11 +363,6 @@
<property name="visibility">False</property>
<property name="invisible_char">•</property>
<property name="activates_default">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="entry_password-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Password</property>
- </object>
- </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -407,11 +377,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="entry_user-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">User</property>
- </object>
- </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -491,11 +456,6 @@
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="selectable">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="label_database-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes">Database</property>
- </object>
- </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -528,21 +488,7 @@
<object class="GtkHButtonBox" id="hbuttonbox16">
<property name="visible">True</property>
<property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="button11">
- <property name="label">gtk-help</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <!-- Maemo: Dialogs should have no quit or cancel dialogs since Maemo5:
<child>
<object class="GtkButton" id="button12">
<property name="label">gtk-cancel</property>
@@ -555,9 +501,10 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
+ -->
<child>
<object class="GtkButton" id="button13">
<property name="visible">True</property>
@@ -605,7 +552,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -618,7 +565,6 @@
</object>
</child>
<action-widgets>
- <action-widget response="-11">button11</action-widget>
<action-widget response="-6">button12</action-widget>
<action-widget response="-5">button13</action-widget>
</action-widgets>
@@ -768,6 +714,7 @@
<object class="GtkHButtonBox" id="hbuttonbox39">
<property name="visible">True</property>
<property name="layout_style">end</property>
+ <!-- Maemo: Dialogs should have no quit or cancel dialogs since Maemo5:
<child>
<object class="GtkButton" id="button_cancel">
<property name="label">gtk-cancel</property>
@@ -783,6 +730,7 @@
<property name="position">0</property>
</packing>
</child>
+ -->
</object>
<packing>
<property name="expand">False</property>
@@ -793,7 +741,9 @@
</object>
</child>
<action-widgets>
+ <!-- Maemo: Dialogs should have no quit or cancel dialogs since Maemo5:
<action-widget response="-6">button_cancel</action-widget>
+ -->
</action-widgets>
</object>
<object class="GtkWindow" id="window_progress">
@@ -827,7 +777,7 @@
</object>
</child>
</object>
- <object class="GtkWindow" id="window_main">
+ <object class="HildonWindow" id="window_main">
<property name="title" translatable="yes">Glom</property>
<property name="default_width">900</property>
<property name="default_height">700</property>
@@ -973,13 +923,13 @@
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <object class="GtkHBox" id="hbox_records">
+ <object class="GtkHBox" id="hbox_found">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label205">
+ <object class="GtkLabel" id="label204">
<property name="visible">True</property>
- <property name="label" translatable="yes">Records: </property>
+ <property name="label" translatable="yes">Found:</property>
</object>
<packing>
<property name="expand">False</property>
@@ -988,31 +938,31 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_records_count">
+ <object class="GtkLabel" id="label_records_found_count">
<property name="visible">True</property>
<property name="label" translatable="yes">0</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="pack_type">end</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox_found">
+ <object class="GtkHBox" id="hbox_records">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label204">
+ <object class="GtkLabel" id="label205">
<property name="visible">True</property>
- <property name="label" translatable="yes">Found:</property>
+ <property name="label" translatable="yes">Records: </property>
</object>
<packing>
<property name="expand">False</property>
@@ -1021,21 +971,21 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_records_found_count">
+ <object class="GtkLabel" id="label_records_count">
<property name="visible">True</property>
<property name="label" translatable="yes">0</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="pack_type">end</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -1344,6 +1294,7 @@
<object class="GtkHButtonBox" id="dialog-action_area5">
<property name="visible">True</property>
<property name="layout_style">end</property>
+ <!-- Maemo: Dialogs should have no quit or cancel dialogs since Maemo5:
<child>
<object class="GtkButton" id="import_csv_cancel_button">
<property name="label">gtk-cancel</property>
@@ -1358,6 +1309,7 @@
<property name="position">0</property>
</packing>
</child>
+ -->
<child>
<object class="GtkButton" id="import_csv_import_button">
<property name="visible">True</property>
@@ -1395,20 +1347,6 @@
<property name="position">1</property>
</packing>
</child>
- <child>
- <object class="GtkButton" id="import_csv_help_button">
- <property name="label">gtk-help</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -1419,9 +1357,10 @@
</object>
</child>
<action-widgets>
+ <!-- Maemo: Dialogs should have no quit or cancel dialogs since Maemo5:
<action-widget response="-6">import_csv_cancel_button</action-widget>
+ -->
<action-widget response="-3">import_csv_import_button</action-widget>
- <action-widget response="-11">import_csv_help_button</action-widget>
</action-widgets>
</object>
<object class="GtkDialog" id="dialog_data_invalid_format">
@@ -1434,6 +1373,7 @@
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="spacing">6</property>
+ <!-- Maemo: No icons in dialogs.
<child>
<object class="GtkImage" id="image4">
<property name="visible">True</property>
@@ -1448,6 +1388,7 @@
<property name="position">0</property>
</packing>
</child>
+ -->
<child>
<object class="GtkVBox" id="vbox18">
<property name="visible">True</property>
@@ -1500,21 +1441,6 @@ The data in the field was not recognized. Please try to correct the data or reve
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="button1">
- <property name="label">gtk-help</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<object class="GtkButton" id="button_revert">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -1560,7 +1486,7 @@ The data in the field was not recognized. Please try to correct the data or reve
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -1576,7 +1502,7 @@ The data in the field was not recognized. Please try to correct the data or reve
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -1589,7 +1515,6 @@ The data in the field was not recognized. Please try to correct the data or reve
</object>
</child>
<action-widgets>
- <action-widget response="-11">button1</action-widget>
<action-widget response="2">button_revert</action-widget>
<action-widget response="-5">button4</action-widget>
</action-widgets>
@@ -1658,6 +1583,7 @@ The data in the field was not recognized. Please try to correct the data or reve
<object class="GtkHButtonBox" id="dialog-action_area7">
<property name="visible">True</property>
<property name="layout_style">end</property>
+ <!-- Maemo: We want a cancel button on this progress dialog even on Maemo. -->
<child>
<object class="GtkButton" id="import_csv_progress_cancel_button">
<property name="label">gtk-cancel</property>
@@ -1731,6 +1657,7 @@ The data in the field was not recognized. Please try to correct the data or reve
<object class="GtkHButtonBox" id="dialog-action_area7">
<property name="visible">True</property>
<property name="layout_style">end</property>
+ <!-- Maemo: We want a cancel button on this progress dialog even on Maemo. -->
<child>
<object class="GtkButton" id="button1">
<property name="label">gtk-cancel</property>
@@ -1760,4 +1687,3 @@ The data in the field was not recognized. Please try to correct the data or reve
</object>
</interface>
-
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
