Commit 34e6b88a authored by Murray Cumming's avatar Murray Cumming
Browse files

Moved many developer-mode files into glom/mode_design/ now that our

	non-recursive build allows that without linker errors.

	* glom/combobox_fields.[h|cc]:
	* glom/combobox_relationship.[h|cc]:
	* glom/layout_item_dialogs/:
	* glom/mode_data/dialog_choose_field.[h|cc]:
	* glom/mode_data/dialog_choose_relationship.[h|cc]:
	* glom/mode_data/dialog_layout*.[h|cc]:
	* glom/mode_data/treestore_layout.[h|cc]:
	* glom/layout_item_dialogs/:
	Moved to glom/mode_design/layout/
	* glom/reports/report_builder.[h|cc]: Moved to glom/
	* glom/reports/dialog_layout_report.[h|cc]"
	* glom/reports/treestore_report_layout.[h|cc]:
	Moved to glom/mode_design/report_layout/
	* glom/database_preferences.[h|cc]:
	* glom/relationships_overview/: Moved to
	glom/mode_design/
	* glom/glom_developer.glade:
	* glom/dialog_new_self_hosted_connection.[h|cc]:Rename to
	glom/mode_design/dialog_initial_password.[h|cc], renaming the class too,
	because that's what this is now.
	* glom/utility_widgets/dialog_layoutitem_properties.[h|cc]: Removed
	this unused class.
	* glom/Makefile_glom.am, *.[h|cc]: Adapted.
parent 93d75892
2009-09-03 Murray Cumming <murrayc@murrayc.com>
Moved many developer-mode files into glom/mode_design/ now that our
non-recursive build allows that without linker errors.
* glom/combobox_fields.[h|cc]:
* glom/combobox_relationship.[h|cc]:
* glom/layout_item_dialogs/:
* glom/mode_data/dialog_choose_field.[h|cc]:
* glom/mode_data/dialog_choose_relationship.[h|cc]:
* glom/mode_data/dialog_layout*.[h|cc]:
* glom/mode_data/treestore_layout.[h|cc]:
* glom/layout_item_dialogs/:
Moved to glom/mode_design/layout/
* glom/reports/report_builder.[h|cc]: Moved to glom/
* glom/reports/dialog_layout_report.[h|cc]"
* glom/reports/treestore_report_layout.[h|cc]:
Moved to glom/mode_design/report_layout/
* glom/database_preferences.[h|cc]:
* glom/relationships_overview/: Moved to
glom/mode_design/
* glom/glom_developer.glade:
* glom/dialog_new_self_hosted_connection.[h|cc]:Rename to
glom/mode_design/dialog_initial_password.[h|cc], renaming the class too,
because that's what this is now.
* glom/utility_widgets/dialog_layoutitem_properties.[h|cc]: Removed
this unused class.
* glom/Makefile_glom.am, *.[h|cc]: Adapted.
2009-09-03 Murray Cumming <murrayc@murrayc.com>
 
libglom: Avoid client-only build changes: partial recommit of revert.
......
......@@ -30,10 +30,6 @@ glom_glom_SOURCES = \
glom/box_reports.h \
glom/box_withbuttons.cc \
glom/box_withbuttons.h \
glom/combobox_fields.cc \
glom/combobox_fields.h \
glom/combobox_relationship.cc \
glom/combobox_relationship.h \
glom/dialog_connection.cc \
glom/dialog_connection.h \
glom/dialog_existing_or_new.cc \
......@@ -68,6 +64,8 @@ glom_glom_SOURCES = \
glom/variablesmap.h \
glom/xsl_utils.cc \
glom/xsl_utils.h \
glom/printoperation_printlayout.cc \
glom/printoperation_printlayout.h \
glom/bakery/app.cc \
glom/bakery/app.h \
glom/bakery/app_withdoc.cc \
......@@ -92,14 +90,6 @@ glom_glom_SOURCES = \
glom/mode_data/box_data_manyrecords.h \
glom/mode_data/box_data_portal.cc \
glom/mode_data/box_data_portal.h \
glom/mode_data/dialog_choose_field.cc \
glom/mode_data/dialog_choose_field.h \
glom/mode_data/dialog_choose_relationship.cc \
glom/mode_data/dialog_choose_relationship.h \
glom/mode_data/dialog_layout.cc \
glom/mode_data/dialog_layout.h \
glom/mode_data/dialog_layout_export.cc \
glom/mode_data/dialog_layout_export.h \
glom/mode_data/flowtablewithfields.cc \
glom/mode_data/flowtablewithfields.h \
glom/mode_data/notebook_data.cc \
......@@ -114,8 +104,8 @@ glom_glom_SOURCES = \
glom/navigation/box_tables.h \
glom/python_embed/glom_python.cc \
glom/python_embed/glom_python.h \
glom/reports/report_builder.cc \
glom/reports/report_builder.h \
glom/report_builder.cc \
glom/report_builder.h \
glom/utility_widgets/alignment_justified.cc \
glom/utility_widgets/alignment_justified.h \
glom/utility_widgets/buttonglom.cc \
......@@ -142,8 +132,6 @@ glom_glom_SOURCES = \
glom/utility_widgets/dialog_flowtable.h \
glom/utility_widgets/dialog_image_progress.cc \
glom/utility_widgets/dialog_image_progress.h \
glom/utility_widgets/dialog_layoutitem_properties.cc \
glom/utility_widgets/dialog_layoutitem_properties.h \
glom/utility_widgets/dialog_properties.cc \
glom/utility_widgets/dialog_properties.h \
glom/utility_widgets/entryglom.cc \
......@@ -215,46 +203,10 @@ glom_glom_SOURCES = \
if !GLOM_ENABLE_CLIENT_ONLY
glom_glom_SOURCES += \
glom/dialog_database_preferences.cc \
glom/dialog_database_preferences.h \
glom/dialog_new_self_hosted_connection.cc \
glom/dialog_new_self_hosted_connection.h \
glom/printoperation_printlayout.cc \
glom/printoperation_printlayout.h \
glom/layout_item_dialogs/box_formatting.cc \
glom/layout_item_dialogs/box_formatting.h \
glom/layout_item_dialogs/combo_summarytype.cc \
glom/layout_item_dialogs/combo_summarytype.h \
glom/layout_item_dialogs/comboentry_borderwidth.cc \
glom/layout_item_dialogs/comboentry_borderwidth.h \
glom/layout_item_dialogs/dialog_buttonscript.cc \
glom/layout_item_dialogs/dialog_buttonscript.h \
glom/layout_item_dialogs/dialog_field_layout.cc \
glom/layout_item_dialogs/dialog_field_layout.h \
glom/layout_item_dialogs/dialog_field_summary.cc \
glom/layout_item_dialogs/dialog_field_summary.h \
glom/layout_item_dialogs/dialog_group_by.cc \
glom/layout_item_dialogs/dialog_group_by.h \
glom/layout_item_dialogs/dialog_groupby_secondaryfields.cc \
glom/layout_item_dialogs/dialog_groupby_secondaryfields.h \
glom/layout_item_dialogs/dialog_groupby_sortfields.cc \
glom/layout_item_dialogs/dialog_groupby_sortfields.h \
glom/layout_item_dialogs/dialog_imageobject.cc \
glom/layout_item_dialogs/dialog_imageobject.h \
glom/layout_item_dialogs/dialog_notebook.cc \
glom/layout_item_dialogs/dialog_notebook.h \
glom/layout_item_dialogs/dialog_textobject.cc \
glom/layout_item_dialogs/dialog_textobject.h \
glom/mode_data/dialog_layout_calendar_related.cc \
glom/mode_data/dialog_layout_calendar_related.h \
glom/mode_data/dialog_layout_details.cc \
glom/mode_data/dialog_layout_details.h \
glom/mode_data/dialog_layout_list.cc \
glom/mode_data/dialog_layout_list.h \
glom/mode_data/dialog_layout_list_related.cc \
glom/mode_data/dialog_layout_list_related.h \
glom/mode_data/treestore_layout.cc \
glom/mode_data/treestore_layout.h \
glom/mode_design/dialog_database_preferences.cc \
glom/mode_design/dialog_database_preferences.h \
glom/mode_design/dialog_initial_password.cc \
glom/mode_design/dialog_initial_password.h \
glom/mode_design/box_db_table_relationships.cc \
glom/mode_design/box_db_table_relationships.h \
glom/mode_design/dialog_add_related_table.cc \
......@@ -273,6 +225,58 @@ glom_glom_SOURCES += \
glom/mode_design/fields/dialog_fieldcalculation.h \
glom/mode_design/fields/dialog_fielddefinition.cc \
glom/mode_design/fields/dialog_fielddefinition.h \
glom/mode_design/layout/combobox_fields.cc \
glom/mode_design/layout/combobox_fields.h \
glom/mode_design/layout/combobox_relationship.cc \
glom/mode_design/layout/combobox_relationship.h \
glom/mode_design/layout/dialog_choose_field.cc \
glom/mode_design/layout/dialog_choose_field.h \
glom/mode_design/layout/dialog_choose_relationship.cc \
glom/mode_design/layout/dialog_choose_relationship.h \
glom/mode_design/layout/dialog_layout.cc \
glom/mode_design/layout/dialog_layout.h \
glom/mode_design/layout/dialog_layout_export.cc \
glom/mode_design/layout/dialog_layout_export.h \
glom/mode_design/layout/dialog_layout_calendar_related.cc \
glom/mode_design/layout/dialog_layout_calendar_related.h \
glom/mode_design/layout/dialog_layout_details.cc \
glom/mode_design/layout/dialog_layout_details.h \
glom/mode_design/layout/dialog_layout_list.cc \
glom/mode_design/layout/dialog_layout_list.h \
glom/mode_design/layout/dialog_layout_list_related.cc \
glom/mode_design/layout/dialog_layout_list_related.h \
glom/mode_design/layout/treestore_layout.cc \
glom/mode_design/layout/treestore_layout.h \
glom/mode_design/layout/layout_item_dialogs/box_formatting.cc \
glom/mode_design/layout/layout_item_dialogs/box_formatting.h \
glom/mode_design/layout/layout_item_dialogs/combo_summarytype.cc \
glom/mode_design/layout/layout_item_dialogs/combo_summarytype.h \
glom/mode_design/layout/layout_item_dialogs/comboentry_borderwidth.cc \
glom/mode_design/layout/layout_item_dialogs/comboentry_borderwidth.h \
glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.cc \
glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.h \
glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.cc \
glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.h \
glom/mode_design/layout/layout_item_dialogs/dialog_field_summary.cc \
glom/mode_design/layout/layout_item_dialogs/dialog_field_summary.h \
glom/mode_design/layout/layout_item_dialogs/dialog_group_by.cc \
glom/mode_design/layout/layout_item_dialogs/dialog_group_by.h \
glom/mode_design/layout/layout_item_dialogs/dialog_groupby_secondaryfields.cc \
glom/mode_design/layout/layout_item_dialogs/dialog_groupby_secondaryfields.h \
glom/mode_design/layout/layout_item_dialogs/dialog_groupby_sortfields.cc \
glom/mode_design/layout/layout_item_dialogs/dialog_groupby_sortfields.h \
glom/mode_design/layout/layout_item_dialogs/dialog_imageobject.cc \
glom/mode_design/layout/layout_item_dialogs/dialog_imageobject.h \
glom/mode_design/layout/layout_item_dialogs/dialog_notebook.cc \
glom/mode_design/layout/layout_item_dialogs/dialog_notebook.h \
glom/mode_design/layout/layout_item_dialogs/dialog_textobject.cc \
glom/mode_design/layout/layout_item_dialogs/dialog_textobject.h \
glom/mode_design/relationships_overview/canvas_group_dbtable.cc \
glom/mode_design/relationships_overview/canvas_group_dbtable.h \
glom/mode_design/relationships_overview/dialog_relationships_overview.cc \
glom/mode_design/relationships_overview/dialog_relationships_overview.h \
glom/mode_design/relationships_overview/printoperation_relationshipsoverview.cc \
glom/mode_design/relationships_overview/printoperation_relationshipsoverview.h \
glom/mode_design/print_layouts/box_print_layouts.cc \
glom/mode_design/print_layouts/box_print_layouts.h \
glom/mode_design/print_layouts/canvas_layout_item.cc \
......@@ -287,6 +291,10 @@ glom_glom_SOURCES += \
glom/mode_design/print_layouts/print_layout_toolbar_button.h \
glom/mode_design/print_layouts/window_print_layout_edit.cc \
glom/mode_design/print_layouts/window_print_layout_edit.h \
glom/mode_design/report_layout/dialog_layout_report.cc \
glom/mode_design/report_layout/dialog_layout_report.h \
glom/mode_design/report_layout/treestore_report_layout.cc \
glom/mode_design/report_layout/treestore_report_layout.h \
glom/mode_design/script_library/dialog_new_script.cc \
glom/mode_design/script_library/dialog_new_script.h \
glom/mode_design/script_library/dialog_script_library.cc \
......@@ -301,16 +309,6 @@ glom_glom_SOURCES += \
glom/mode_design/users/dialog_user.h \
glom/mode_design/users/dialog_users_list.cc \
glom/mode_design/users/dialog_users_list.h \
glom/relationships_overview/canvas_group_dbtable.cc \
glom/relationships_overview/canvas_group_dbtable.h \
glom/relationships_overview/dialog_relationships_overview.cc \
glom/relationships_overview/dialog_relationships_overview.h \
glom/relationships_overview/printoperation_relationshipsoverview.cc \
glom/relationships_overview/printoperation_relationshipsoverview.h \
glom/reports/dialog_layout_report.cc \
glom/reports/dialog_layout_report.h \
glom/reports/treestore_report_layout.cc \
glom/reports/treestore_report_layout.h \
glom/translation/combobox_locale.cc \
glom/translation/combobox_locale.h \
glom/translation/dialog_change_language.cc \
......
......@@ -1041,7 +1041,7 @@ bool App_Glom::on_document_load()
connection_pool->set_get_document_func( sigc::mem_fun(*this, &App_Glom::on_connection_pool_get_document) );
#endif
connection_pool->set_ready_to_connect(true); //Box_WithButtons::connect_to_server() will now attempt the connection-> Shared instances of m_Connection will also be usable.
connection_pool->set_ready_to_connect(true); //connect_to_server() will now attempt the connection-> Shared instances of m_Connection will also be usable.
//Attempt to connect to the specified database:
bool test = false;
......
......@@ -22,7 +22,7 @@
#define HEADER_APP_GLOM
#include <glom/bakery/app_withdoc_gtk.h>
#include "frame_glom.h"
#include <glom/frame_glom.h>
#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
......
......@@ -119,7 +119,7 @@ void App_WithDoc_Gtk::init_layout()
//Add menu bar at the top:
//These were defined in init_uimanager().
#ifdef GLOM_ENABLE_MAEMO
#ifdef GLOM_ENABLE_MAEMO //TODO: Use Hildon::AppMenu
Gtk::Menu* pMenu = static_cast<Gtk::Menu*>(m_refUIManager->get_widget("/Bakery_MainMenu"));
set_menu(*pMenu);
#else
......
......@@ -20,22 +20,21 @@
#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
#include "base_db.h"
#include <glom/base_db.h>
#include "application.h" //App_Glom.
#include <libglom/appstate.h>
#include <libglom/standard_table_prefs_fields.h>
#include <libglom/document/document.h>
#include <libglom/data_structure/glomconversions.h>
#include "mode_data/dialog_choose_field.h"
#include <glom/mode_design/layout/dialog_choose_field.h>
//#ifndef GLOM_ENABLE_CLIENT_ONLY
#include "layout_item_dialogs/dialog_field_layout.h"
#include "layout_item_dialogs/dialog_notebook.h"
#include "layout_item_dialogs/dialog_textobject.h"
#include "layout_item_dialogs/dialog_imageobject.h"
#include <glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.h>
#include <glom/mode_design/layout/layout_item_dialogs/dialog_notebook.h>
#include <glom/mode_design/layout/layout_item_dialogs/dialog_textobject.h>
#include <glom/mode_design/layout/layout_item_dialogs/dialog_imageobject.h>
//#endif // !GLOM_ENABLE_CLIENT_ONLY
//#include "reports/dialog_layout_report.h"
#include <glom/utils_ui.h>
#include <glom/glade_utils.h>
#include <libglom/data_structure/glomconversions.h>
......@@ -45,7 +44,7 @@
#include <libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.h>
#include <libglom/data_structure/layout/report_parts/layoutitem_header.h>
#include <libglom/data_structure/layout/report_parts/layoutitem_footer.h>
#include "python_embed/glom_python.h"
#include <glom/python_embed/glom_python.h>
#include <glom/glom_postgres.h>
#include <glom/glom_privs.h>
#include <glibmm/i18n.h>
......
......@@ -21,7 +21,7 @@
#include "base_db_table.h"
#include <libglom/data_structure/glomconversions.h>
#include <glom/application.h>
#include "python_embed/glom_python.h"
#include <glom/python_embed/glom_python.h>
#include <sstream>
namespace Glom
......
......@@ -22,7 +22,7 @@
#ifndef BASE_DB_TABLE_H
#define BASE_DB_TABLE_H
#include "base_db.h"
#include <glom/base_db.h>
#include <libglom/data_structure/field.h>
#include <algorithm> //find_if used in various places.
......
......@@ -22,7 +22,7 @@
#include "base_db_table_data.h"
#include <libglom/data_structure/glomconversions.h>
#include <glom/application.h>
#include "python_embed/glom_python.h"
#include <glom/python_embed/glom_python.h>
#include <glom/utils_ui.h>
#include <sstream>
#include <glibmm/i18n.h>
......
......@@ -20,7 +20,7 @@
#include "box_db_table.h"
#include <libglom/data_structure/glomconversions.h>
#include "python_embed/glom_python.h"
#include <glom/python_embed/glom_python.h>
#include <sstream>
namespace Glom
......
......@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
#include "box_withbuttons.h"
#include <glom/box_withbuttons.h>
#include <glom/application.h> //App_Glom.
#include <glom/utils_ui.h>
#include <libglom/appstate.h>
......
......@@ -20,7 +20,6 @@
#include "config.h" //For GLOM_ENABLE_POSTGRESQL
#include "dialog_connection.h"
#include "box_withbuttons.h" //For Box_WithButtons::connect_to_server().
#include <glibmm/i18n.h>
#include <libglom/connectionpool.h>
......
......@@ -25,7 +25,7 @@
#include <gtkmm/entry.h>
#include <gtkmm/label.h>
#include <gtkmm/builder.h>
#include "base_db.h"
#include <glom/base_db.h>
#include <libglom/connectionpool.h>
namespace Glom
......
......@@ -21,7 +21,7 @@
#ifndef DIALOG_GLOM_H
#define DIALOG_GLOM_H
#include "box_withbuttons.h"
#include <glom/box_withbuttons.h>
#include <gtkmm/dialog.h>
#include <gtkmm/button.h>
......
......@@ -21,7 +21,7 @@
#ifndef GLOM_DIALOG_IMPORT_CSV_H
#define GLOM_DIALOG_IMPORT_CSV_H
#include "base_db.h"
#include <glom/base_db.h>
#include <memory>
#include <giomm/asyncresult.h>
......
......@@ -19,7 +19,7 @@
*/
#include "filechooser_export.h"
#include "mode_data/dialog_layout_export.h"
#include <glom/mode_design/layout/dialog_layout_export.h>
#include <glom/utils_ui.h>
#include <glom/glade_utils.h>
#include <gtkmm/stock.h>
......
......@@ -39,14 +39,14 @@
#endif
#ifndef GLOM_ENABLE_CLIENT_ONLY
#include "mode_design/users/dialog_groups_list.h"
#include "dialog_database_preferences.h"
#include "reports/dialog_layout_report.h"
#include <glom/mode_design/users/dialog_groups_list.h>
#include <glom/mode_design/dialog_database_preferences.h>
#include <glom/mode_design/report_layout/dialog_layout_report.h>
#include <glom/mode_design/print_layouts/window_print_layout_edit.h>
#include <glom/mode_design/dialog_add_related_table.h>
#include <glom/mode_design/script_library/dialog_script_library.h>
#include <glom/dialog_new_self_hosted_connection.h>
#include "relationships_overview/dialog_relationships_overview.h"
#include <glom/mode_design/dialog_initial_password.h>
#include <glom/mode_design/relationships_overview/dialog_relationships_overview.h>
#endif // !GLOM_ENABLE_CLIENT_ONLY
#include <glom/utils_ui.h>
......@@ -55,7 +55,7 @@
#include <libglom/data_structure/layout/report_parts/layoutitem_summary.h>
#include <libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h>
#include <glom/reports/report_builder.h>
#include <glom/report_builder.h>
#ifndef GLOM_ENABLE_CLIENT_ONLY
#include <glom/mode_design/dialog_add_related_table.h>
#include <glom/mode_design/script_library/dialog_script_library.h>
......@@ -2008,13 +2008,13 @@ bool Frame_Glom::connection_request_initial_password(Glib::ustring& user, Glib::
return false;
//Ask for a new username and password to specify when creating a new self-hosted database.
Dialog_NewSelfHostedConnection* dialog = 0;
Dialog_InitialPassword* dialog = 0;
Glib::RefPtr<Gtk::Builder> refXml;
#ifdef GLIBMM_EXCEPTIONS_ENABLED
try
{
refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_new_self_hosted_connection");
refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_initial_password");
}
catch(const Gtk::BuilderError& ex)
{
......@@ -2023,7 +2023,7 @@ bool Frame_Glom::connection_request_initial_password(Glib::ustring& user, Glib::
}
#else
std::auto_ptr<Gtk::BuilderError> error;
refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_new_self_hosted_connection", error);
refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_initial_password", error);
if(error.get())
{
std::cerr << error->what() << std::endl;
......@@ -2031,7 +2031,7 @@ bool Frame_Glom::connection_request_initial_password(Glib::ustring& user, Glib::
}
#endif //GLIBMM_EXCEPTIONS_ENABLED
refXml->get_widget_derived("dialog_new_self_hosted_connection", dialog);
refXml->get_widget_derived("dialog_initial_password", dialog);
if(!dialog)
return false;
......
......@@ -2115,7 +2115,7 @@
</object>
</child>
</object>
<object class="GtkDialog" id="dialog_new_self_hosted_connection">
<object class="GtkDialog" id="dialog_initial_password">
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkVBox" id="vbox27">
......
......@@ -59,7 +59,7 @@ main()
#endif //GLOM_ENABLE_POSTGRESQL
connection_pool->set_backend(std::auto_ptr<Glom::ConnectionPool::Backend>(backend));
connection_pool->set_ready_to_connect(); //Box_WithButtons::connect_to_server() will now attempt the connection-> Shared instances of m_Connection will also be usable.
connection_pool->set_ready_to_connect(); //connect_to_server() will now attempt the connection-> Shared instances of m_Connection will also be usable.
}
//Connect:
......
......@@ -25,7 +25,7 @@
#include <glom/utils_ui.h>
#include <libglom/data_structure/layout/layoutitem_field.h>
#include <glom/glom_privs.h>
#include "../python_embed/glom_python.h"
#include <glom/python_embed/glom_python.h>
#include <algorithm> //For std::find()
#include <libglom/libglom_config.h>
#include <glibmm/i18n.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment