[glom] Create QuickFind buttons in code, instead of Glade.
- From: Murray Cumming <murrayc src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [glom] Create QuickFind buttons in code, instead of Glade.
- Date: Mon, 28 Sep 2009 15:05:08 +0000 (UTC)
commit f840250e90875fb2d79a07d95fafe40442bb578d
Author: Murray Cumming <murrayc murrayc com>
Date: Mon Sep 28 17:03:45 2009 +0200
Create QuickFind buttons in code, instead of Glade.
* glom/frame_glom.cc:
* glom/glom.glade: Create the QuickFind widgets in code instead of in
Glade so we can adapt them for Maemo and put them in the separate Find
window.
ChangeLog | 9 +++
glom/frame_glom.cc | 24 +++++--
glom/glom.glade | 185 +++++-----------------------------------------------
3 files changed, 44 insertions(+), 174 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 688641c..15c7911 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2009-09-28 Murray Cumming <murrayc murrayc com>
+ Create QuickFind buttons in code, instead of Glade.
+
+ * glom/frame_glom.cc:
+ * glom/glom.glade: Create the QuickFind widgets in code instead of in
+ Glade so we can adapt them for Maemo and put them in the separate Find
+ window.
+
+2009-09-28 Murray Cumming <murrayc murrayc com>
+
Initial dialog: Expand the network item.
* glom/dialog_existing_or_new.cc: Constructor: Expand the Network
diff --git a/glom/frame_glom.cc b/glom/frame_glom.cc
index f78ea3c..2d1027e 100644
--- a/glom/frame_glom.cc
+++ b/glom/frame_glom.cc
@@ -127,16 +127,30 @@ Frame_Glom::Frame_Glom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>
set_border_width(Glom::Utils::DEFAULT_SPACING_LARGE);
#endif
- builder->get_widget("hbox_quickfind", m_pBox_QuickFind);
- m_pBox_QuickFind->hide();
-
- builder->get_widget("entry_quickfind", m_pEntry_QuickFind);
+ //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, 6));
+ Gtk::Label* label = Gtk::manage(new Gtk::Label(_("Quick Find")));
+ m_pBox_QuickFind->pack_start(*label, Gtk::PACK_SHRINK);
+ m_pEntry_QuickFind = Gtk::manage(new Gtk::Entry());
m_pEntry_QuickFind->signal_activate().connect(
sigc::mem_fun(*this, &Frame_Glom::on_button_quickfind) ); //Pressing Enter here is like pressing Find.
- builder->get_widget("button_quickfind", m_pButton_QuickFind);
+ m_pBox_QuickFind->pack_start(*m_pEntry_QuickFind, Gtk::PACK_EXPAND_WIDGET);
+ m_pButton_QuickFind = Gtk::manage(new Gtk::Button(_("_Find"), true));
m_pButton_QuickFind->signal_clicked().connect(
sigc::mem_fun(*this, &Frame_Glom::on_button_quickfind) );
+ m_pBox_QuickFind->pack_start(*m_pButton_QuickFind, Gtk::PACK_SHRINK);
+
+ m_pBox_QuickFind->show_all_children();
+ m_pBox_QuickFind->hide();
+
+ #ifndef GLOM_ENABLE_MAEMO
+ PlaceHolder* placeholder_quickfind = 0;
+ builder->get_widget_derived("vbox_quickfind", placeholder_quickfind);
+ placeholder_quickfind->add(*m_pBox_QuickFind);
+ #endif //GLOM_ENABLE_MAEMO
+
builder->get_widget("hbox_records_count", m_pBox_RecordsCount);
builder->get_widget("label_records_count", m_pLabel_RecordsCount);
diff --git a/glom/glom.glade b/glom/glom.glade
index 5bf52b1..c08bfae 100644
--- a/glom/glom.glade
+++ b/glom/glom.glade
@@ -93,126 +93,6 @@
</object>
</child>
</object>
- <object class="GtkWindow" id="window_adddel">
- <property name="title" translatable="yes">window2</property>
- <child>
- <object class="GtkVBox" id="vbox6">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object 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>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkTreeView" id="treeview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="reorderable">True</property>
- <property name="rules_hint">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHButtonBox" id="hbuttonbox4">
- <property name="visible">True</property>
- <property name="spacing">6</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="button_add">
- <property name="label">gtk-add</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_remove">
- <property name="label">gtk-remove</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">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button_edit">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <child>
- <object class="GtkAlignment" id="alignment6">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox2">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image2">
- <property name="visible">True</property>
- <property name="stock">gtk-ok</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="label18">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Edit</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- </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="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
<object class="GtkDialog" id="dialog_existing_or_new">
<property name="title" translatable="yes">Welcome to Glom</property>
<property name="default_width">480</property>
@@ -1019,44 +899,11 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox_quickfind">
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label_quickfind">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Quick Find</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>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
+ <object class="GtkVBox" id="vbox_quickfind">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
<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>
+ <placeholder/>
</child>
</object>
<packing>
@@ -1126,13 +973,13 @@
<property name="visible">True</property>
<property name="spacing">6</property>
<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>
@@ -1141,31 +988,31 @@
</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>
- <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>
@@ -1174,21 +1021,21 @@
</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>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
