[glom] Find bar adjustments.
- From: Daniel Borgmann <dborg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] Find bar adjustments.
- Date: Wed, 7 Apr 2010 11:12:10 +0000 (UTC)
commit 82b1bdda1e46d48fa26f4babb74dc75ab59f140e
Author: Daniel Borgmann <danielb openismus com>
Date: Wed Apr 7 12:11:57 2010 +0100
Find bar adjustments.
* glom/frame_glom.cc: Rename Quick Find to Quick Search and add
mneomnic.
* glom/glom.glade: Update find id dialog and remove frame.
* glom/utility_widgets/datawidget.cc: Add window icon to find id
dialog.
ChangeLog | 10 +++
glom/frame_glom.cc | 4 +-
glom/glom.glade | 157 ++++++++++++++++--------------------
glom/utility_widgets/datawidget.cc | 1 +
4 files changed, 85 insertions(+), 87 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 0605e0a..0943a08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-04-07 Daniel Borgmann <danielb openismus com>
+
+ Find bar adjustments.
+
+ * glom/frame_glom.cc: Rename Quick Find to Quick Search and add
+ mneomnic.
+ * glom/glom.glade: Update find id dialog and remove frame.
+ * glom/utility_widgets/datawidget.cc: Add window icon to find id
+ dialog.
+
2010-04-07 David King <davidk openismus com>
Fix boost:python m4 macro with -Wl,--as-needed
diff --git a/glom/frame_glom.cc b/glom/frame_glom.cc
index 28a8776..c18af37 100644
--- a/glom/frame_glom.cc
+++ b/glom/frame_glom.cc
@@ -133,7 +133,7 @@ Frame_Glom::Frame_Glom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>
//QuickFind widgets:
//We don't use Glade for these, so it easier to modify them for the Maemo port.
m_pBox_QuickFind = Gtk::manage(new Gtk::HBox(false, Utils::DEFAULT_SPACING_SMALL));
- Gtk::Label* label = Gtk::manage(new Gtk::Label(_("Quick Find")));
+ Gtk::Label* label = Gtk::manage(new Gtk::Label(_("Quick _search:"), true));
m_pBox_QuickFind->pack_start(*label, Gtk::PACK_SHRINK);
#ifndef GLOM_ENABLE_MAEMO
@@ -144,6 +144,8 @@ Frame_Glom::Frame_Glom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>
m_pEntry_QuickFind->signal_activate().connect(
sigc::mem_fun(*this, &Frame_Glom::on_button_quickfind) ); //Pressing Enter here is like pressing Find.
+ label->set_mnemonic_widget(*m_pEntry_QuickFind);
+
m_pBox_QuickFind->pack_start(*m_pEntry_QuickFind, Gtk::PACK_EXPAND_WIDGET);
#ifndef GLOM_ENABLE_MAEMO
m_pButton_QuickFind = Gtk::manage(new Gtk::Button(_("_Find"), true));
diff --git a/glom/glom.glade b/glom/glom.glade
index ff78adc..2bdd57f 100644
--- a/glom/glom.glade
+++ b/glom/glom.glade
@@ -299,48 +299,24 @@
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkFrame" id="frame34">
+ <object class="GtkAlignment" id="alignment_parent">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment_parent">
+ <object class="GtkVBox" id="vbox83">
<property name="visible">True</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkVBox" id="vbox83">
+ <object class="GtkHBox" id="hbox81">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkHBox" id="hbox81">
+ <object class="GtkLabel" id="label203">
<property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label203">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Table:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label_table_name">
- <property name="visible">True</property>
- <property name="label" translatable="yes">table_name</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="label" translatable="yes"><b>Table:</b></property>
+ <property name="use_markup">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -349,74 +325,83 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox_quickfind">
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="label206">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Quick Find</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="entry_quickfind">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="activates_default">True</property>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button_quickfind">
- <property name="label">gtk-find</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_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">2</property>
- </packing>
- </child>
+ <object class="GtkLabel" id="label_table_name">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">table_name</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox_quickfind">
+ <property name="spacing">12</property>
<child>
- <object class="GtkAlignment" id="alignment_parent1">
+ <object class="GtkLabel" id="label206">
<property name="visible">True</property>
- <child>
- <placeholder/>
- </child>
+ <property name="label" translatable="yes">Quick _search:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">entry_quickfind</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="entry_quickfind">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
+ <property name="activates_default">True</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button_quickfind">
+ <property name="label">gtk-find</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</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>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment_parent1">
+ <property name="visible">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
</child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label202">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Find Related Record</b></property>
- <property name="use_markup">True</property>
</object>
</child>
</object>
diff --git a/glom/utility_widgets/datawidget.cc b/glom/utility_widgets/datawidget.cc
index bcb83ae..b649a16 100644
--- a/glom/utility_widgets/datawidget.cc
+++ b/glom/utility_widgets/datawidget.cc
@@ -761,6 +761,7 @@ bool DataWidget::offer_related_record_id_find(Gnome::Gda::Value& chosen_id)
if(dialog)
{
+ dialog->set_icon_name("glom");
//dialog->set_document(get_document(), table_name, field);
Gtk::Window* parent = get_application();
if(parent)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
