[glom] Remove frame label on Fields dialog.
- From: Daniel Borgmann <dborg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] Remove frame label on Fields dialog.
- Date: Mon, 29 Mar 2010 19:00:44 +0000 (UTC)
commit 4d53f4127f0596ef2f4d22993692adb3fdde6d98
Author: Daniel Borgmann <danielb openismus com>
Date: Mon Mar 29 20:00:34 2010 +0100
Remove frame label on Fields dialog.
* glom/box_reports.cc: Remove references to frame label.
* glom/box_reports.h: Remove frame label member.
* glom/frame_glom.cc: Set window icon for Fields and Relationships
dialogs.
* glom/glom_developer.glade: Adjust Fields and Relationships dialogs.
* glom/mode_design/dialog_design.cc: Remove references to frame label.
* glom/mode_design/dialog_design.h: Remove frame label member.
* glom/mode_design/dialog_fields.cc: Remove references to frame label.
* glom/mode_design/dialog_relationships.cc: Remove references to frame
label.
* glom/mode_design/print_layouts/box_print_layouts.cc: Remove
references to frame label.
* glom/mode_design/print_layouts/box_print_layouts.h: Remove frame
label member.
* glom/navigation/box_tables.cc: Remove references to frame label.
ChangeLog | 20 ++++
glom/box_reports.cc | 7 --
glom/box_reports.h | 1 -
glom/frame_glom.cc | 3 +
glom/glom_developer.glade | 96 ++++++++------------
glom/mode_design/dialog_design.cc | 4 +-
glom/mode_design/dialog_design.h | 1 -
glom/mode_design/dialog_fields.cc | 3 -
glom/mode_design/dialog_relationships.cc | 2 -
.../mode_design/print_layouts/box_print_layouts.cc | 7 --
glom/mode_design/print_layouts/box_print_layouts.h | 1 -
glom/navigation/box_tables.cc | 4 -
12 files changed, 63 insertions(+), 86 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index e37f9d0..eb436eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2010-03-29 Daniel Borgmann <danielb openismus com>
+
+ Remove frame label on Fields dialog.
+
+ * glom/box_reports.cc: Remove references to frame label.
+ * glom/box_reports.h: Remove frame label member.
+ * glom/frame_glom.cc: Set window icon for Fields and Relationships
+ dialogs.
+ * glom/glom_developer.glade: Adjust Fields and Relationships dialogs.
+ * glom/mode_design/dialog_design.cc: Remove references to frame label.
+ * glom/mode_design/dialog_design.h: Remove frame label member.
+ * glom/mode_design/dialog_fields.cc: Remove references to frame label.
+ * glom/mode_design/dialog_relationships.cc: Remove references to frame
+ label.
+ * glom/mode_design/print_layouts/box_print_layouts.cc: Remove
+ references to frame label.
+ * glom/mode_design/print_layouts/box_print_layouts.h: Remove frame
+ label member.
+ * glom/navigation/box_tables.cc: Remove references to frame label.
+
2010-03-29 Murray Cumming <murrayc murrayc com>
Avoid Operation Not Supported warnings at startup.
diff --git a/glom/box_reports.cc b/glom/box_reports.cc
index 0419457..7aea5d6 100644
--- a/glom/box_reports.cc
+++ b/glom/box_reports.cc
@@ -27,7 +27,6 @@ namespace Glom
Box_Reports::Box_Reports(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Box_DB_Table(cobject, builder),
- m_pLabelFrameTitle(0),
m_colReportName(0),
m_colTitle(0)
{
@@ -40,8 +39,6 @@ Box_Reports::Box_Reports(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builde
builder->get_widget("alignment_placeholder_adddel", pAligmentPlaceholder);
pAligmentPlaceholder->add(m_AddDel);
- //builder->get_widget("label_frame_title", m_pLabelFrameTitle);
-
m_AddDel.signal_user_added().connect(sigc::mem_fun(*this, &Box_Reports::on_adddel_Add));
m_AddDel.signal_user_requested_delete().connect(sigc::mem_fun(*this, &Box_Reports::on_adddel_Delete));
m_AddDel.signal_user_requested_edit().connect(sigc::mem_fun(*this, &Box_Reports::on_adddel_Edit));
@@ -93,10 +90,6 @@ bool Box_Reports::fill_from_database()
m_colTitle = m_AddDel.add_column(_("Title"), AddDelColumnInfo::STYLE_Text, editable, true);
- //_("Server: ") + m_strServerName + ", " +
- //Glib::ustring strTitle = Glib::ustring("<b>") + _("Tables from Database: ") + get_database_name() + "");
- //m_pLabelFrameTitle->set_markup(strTitle);
-
Document::type_listReports listTableReports;
Document* document = get_document();
if(document)
diff --git a/glom/box_reports.h b/glom/box_reports.h
index aab474c..be98c60 100644
--- a/glom/box_reports.h
+++ b/glom/box_reports.h
@@ -50,7 +50,6 @@ private:
virtual void on_userlevel_changed(AppState::userlevels userlevel);
- Gtk::Label* m_pLabelFrameTitle;
guint m_colReportName;
guint m_colTitle;
diff --git a/glom/frame_glom.cc b/glom/frame_glom.cc
index 3a1b137..fa253b8 100644
--- a/glom/frame_glom.cc
+++ b/glom/frame_glom.cc
@@ -1733,6 +1733,7 @@ void Frame_Glom::do_menu_developer_fields(Gtk::Window& parent, const Glib::ustri
Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "window_design");
refXml->get_widget_derived("window_design", m_pDialog_Fields);
+ m_pDialog_Fields->set_icon_name("glom");
m_pDialog_Fields->signal_hide().connect( sigc::mem_fun(*this, &Frame_Glom::on_developer_dialog_hide));
}
catch(const Gtk::BuilderError& ex)
@@ -1781,6 +1782,7 @@ void Frame_Glom::on_menu_developer_relationships_overview()
if(m_dialog_relationships_overview)
{
+ m_dialog_relationships_overview->set_icon_name("glom");
m_dialog_relationships_overview->set_transient_for(*(get_app_window()));
m_dialog_relationships_overview->load_from_document();
@@ -1798,6 +1800,7 @@ void Frame_Glom::do_menu_developer_relationships(Gtk::Window& parent, const Glib
if(!m_pDialog_Relationships)
{
Utils::get_glade_developer_widget_derived_with_warning("window_design", m_pDialog_Relationships);
+ m_pDialog_Relationships->set_icon_name("glom");
m_pDialog_Relationships->set_title("Relationships");
m_pDialog_Relationships->signal_hide().connect( sigc::mem_fun(*this, &Frame_Glom::on_developer_dialog_hide));
add_view(m_pDialog_Relationships); //Also a composite view.
diff --git a/glom/glom_developer.glade b/glom/glom_developer.glade
index ccbc5cf..249a05b 100644
--- a/glom/glom_developer.glade
+++ b/glom/glom_developer.glade
@@ -720,82 +720,63 @@
</object>
<object class="GtkWindow" id="window_design">
<property name="title" translatable="yes">Field Definitions</property>
+ <property name="window_position">center-on-parent</property>
<property name="default_width">700</property>
<property name="default_height">500</property>
<child>
<object class="GtkVBox" id="vbox14">
<property name="visible">True</property>
- <property name="border_width">12</property>
+ <property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkFrame" id="frame4">
+ <object class="GtkVBox" id="vbox16">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkAlignment" id="alignment12">
+ <object class="GtkHBox" id="hbox10">
<property name="visible">True</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="border_width">6</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkVBox" id="vbox16">
+ <object class="GtkLabel" id="label45">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkHBox" id="hbox10">
- <property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="label45">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Table:</b></property>
- <property name="use_markup">True</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">None selected</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox_placeholder">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <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>
+ <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">None selected</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
- <child type="label">
- <object class="GtkLabel" id="label_frame_title">
+ <child>
+ <object class="GtkVBox" id="vbox_placeholder">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Field Definitions</b></property>
- <property name="use_markup">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <placeholder/>
+ </child>
</object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
<packing>
@@ -805,6 +786,7 @@
<child>
<object class="GtkHButtonBox" id="hbuttonbox11">
<property name="visible">True</property>
+ <property name="border_width">6</property>
<property name="spacing">6</property>
<property name="layout_style">end</property>
<child>
diff --git a/glom/mode_design/dialog_design.cc b/glom/mode_design/dialog_design.cc
index e1fda76..afd9e95 100644
--- a/glom/mode_design/dialog_design.cc
+++ b/glom/mode_design/dialog_design.cc
@@ -28,15 +28,13 @@ namespace Glom
Dialog_Design::Dialog_Design(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Window(cobject),
- m_label_table(0),
- m_label_frame(0)
+ m_label_table(0)
{
Gtk::Button* button_close = 0;
builder->get_widget("button_close", button_close);
button_close->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Design::on_button_close) );
builder->get_widget("label_table_name", m_label_table);
- builder->get_widget("label_frame_title", m_label_frame);
set_modal(); //We don't want people to edit the main window while we are changing structure.
diff --git a/glom/mode_design/dialog_design.h b/glom/mode_design/dialog_design.h
index 06744b3..209595e 100644
--- a/glom/mode_design/dialog_design.h
+++ b/glom/mode_design/dialog_design.h
@@ -45,7 +45,6 @@ private:
protected:
Gtk::Label* m_label_table;
- Gtk::Label* m_label_frame;
};
} //namespace Glom
diff --git a/glom/mode_design/dialog_fields.cc b/glom/mode_design/dialog_fields.cc
index 4842eb1..3e07b42 100644
--- a/glom/mode_design/dialog_fields.cc
+++ b/glom/mode_design/dialog_fields.cc
@@ -33,9 +33,6 @@ Dialog_Fields::Dialog_Fields(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Bu
{
builder->get_widget_derived("vbox_placeholder", m_box);
- m_label_frame->set_markup( Utils::bold_message(_("Field Definitions")) );
-
-
//Fill composite view:
add_view(m_box);
diff --git a/glom/mode_design/dialog_relationships.cc b/glom/mode_design/dialog_relationships.cc
index c772e3b..b620c53 100644
--- a/glom/mode_design/dialog_relationships.cc
+++ b/glom/mode_design/dialog_relationships.cc
@@ -33,8 +33,6 @@ Dialog_Relationships::Dialog_Relationships(BaseObjectType* cobject, const Glib::
{
builder->get_widget_derived("vbox_placeholder", m_box);
- m_label_frame->set_markup( Utils::bold_message(_("Relationships")) );
-
//Fill composite view:
add_view(m_box);
diff --git a/glom/mode_design/print_layouts/box_print_layouts.cc b/glom/mode_design/print_layouts/box_print_layouts.cc
index 153c8d2..ebdf018 100644
--- a/glom/mode_design/print_layouts/box_print_layouts.cc
+++ b/glom/mode_design/print_layouts/box_print_layouts.cc
@@ -27,7 +27,6 @@ namespace Glom
Box_Print_Layouts::Box_Print_Layouts(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Box_DB_Table(cobject, builder),
- m_pLabelFrameTitle(0),
m_colName(0),
m_colTitle(0)
{
@@ -40,8 +39,6 @@ Box_Print_Layouts::Box_Print_Layouts(BaseObjectType* cobject, const Glib::RefPtr
builder->get_widget("alignment_placeholder_adddel", pAligmentPlaceholder);
pAligmentPlaceholder->add(m_AddDel);
- //builder->get_widget("label_frame_title", m_pLabelFrameTitle);
-
m_AddDel.signal_user_added().connect(sigc::mem_fun(*this, &Box_Print_Layouts::on_adddel_user_added));
m_AddDel.signal_user_requested_delete().connect(sigc::mem_fun(*this, &Box_Print_Layouts::on_adddel_user_requested_delete));
m_AddDel.signal_user_requested_edit().connect(sigc::mem_fun(*this, &Box_Print_Layouts::on_adddel_user_requested_edit));
@@ -93,10 +90,6 @@ bool Box_Print_Layouts::fill_from_database()
m_colTitle = m_AddDel.add_column(_("Title"), AddDelColumnInfo::STYLE_Text, editable, true);
- //_("Server: ") + m_strServerName + ", " +
- //Glib::ustring strTitle = Glib::ustring("<b>") + _("Tables from Database: ") + get_database_name() + "");
- //m_pLabelFrameTitle->set_markup(strTitle);
-
Document::type_listPrintLayouts listItems;
Document* document = get_document();
if(document)
diff --git a/glom/mode_design/print_layouts/box_print_layouts.h b/glom/mode_design/print_layouts/box_print_layouts.h
index 0e2498f..38370d5 100644
--- a/glom/mode_design/print_layouts/box_print_layouts.h
+++ b/glom/mode_design/print_layouts/box_print_layouts.h
@@ -49,7 +49,6 @@ private:
virtual void on_userlevel_changed(AppState::userlevels userlevel);
- Gtk::Label* m_pLabelFrameTitle;
guint m_colName;
guint m_colTitle;
diff --git a/glom/navigation/box_tables.cc b/glom/navigation/box_tables.cc
index 396b3e8..5455d30 100644
--- a/glom/navigation/box_tables.cc
+++ b/glom/navigation/box_tables.cc
@@ -135,10 +135,6 @@ bool Box_Tables::fill_from_database()
if(developer_mode)
m_colTitleSingular = m_AddDel.add_column(_("Title (Singular Form)"), AddDelColumnInfo::STYLE_Text, editable, true);
- //_("Server: ") + m_strServerName + ", " +
- //Glib::ustring strTitle = Glib::ustring("<b>") + _("Tables from Database: ") + get_database_name() + "");
- //m_pLabelFrameTitle->set_markup(strTitle);
-
//Get the list of hidden tables:
Document::type_listTableInfo listTablesDocument;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
