[glom] Many files: Rename App_Glom to Application (in namespace Glom).
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] Many files: Rename App_Glom to Application (in namespace Glom).
- Date: Sun, 28 Feb 2010 01:46:29 +0000 (UTC)
commit 630753466b70698cf10024d7982cadbb60d2a10a
Author: Murray Cumming <murrayc murrayc com>
Date: Sun Feb 28 02:46:19 2010 +0100
Many files: Rename App_Glom to Application (in namespace Glom).
ChangeLog | 55 +++++
glom/application.cc | 216 ++++++++++----------
glom/application.h | 8 +-
glom/base_db.cc | 12 +-
glom/base_db_table_data.cc | 16 +-
glom/box_withbuttons.cc | 2 +-
glom/frame_glom.cc | 22 +-
glom/glom_privs.cc | 4 +-
glom/libglom/connectionpool.h | 2 +-
glom/libglom/document/bakery/document.cc | 2 +-
glom/libglom/python_embed/py_glom_relatedrecord.cc | 2 +-
glom/main.cc | 20 +-
glom/mode_data/box_data.cc | 4 +-
glom/mode_data/box_data_calendar_related.cc | 4 +-
glom/mode_data/box_data_portal.cc | 4 +-
glom/mode_data/flowtablewithfields.cc | 4 +-
.../dialog_relationships_overview.cc | 4 +-
glom/navigation/box_tables.cc | 14 +-
glom/notebook_glom.cc | 2 +-
glom/utility_widgets/buttonglom.cc | 6 +-
glom/utility_widgets/buttonglom.h | 4 +-
.../utility_widgets/canvas/canvas_image_movable.cc | 2 +-
glom/utility_widgets/checkglom.cc | 6 +-
glom/utility_widgets/checkglom.h | 4 +-
glom/utility_widgets/comboentryglom.cc | 6 +-
glom/utility_widgets/comboentryglom.h | 4 +-
glom/utility_widgets/comboglom.cc | 6 +-
glom/utility_widgets/comboglom.h | 4 +-
glom/utility_widgets/datawidget.cc | 8 +-
glom/utility_widgets/datawidget.h | 6 +-
glom/utility_widgets/db_adddel/db_adddel.cc | 12 +-
glom/utility_widgets/db_adddel/db_adddel.h | 4 +-
.../utility_widgets/db_adddel/glom_db_treemodel.cc | 2 +-
glom/utility_widgets/entryglom.cc | 6 +-
glom/utility_widgets/entryglom.h | 4 +-
glom/utility_widgets/imageglom.cc | 8 +-
glom/utility_widgets/imageglom.h | 4 +-
glom/utility_widgets/labelglom.cc | 6 +-
glom/utility_widgets/labelglom.h | 4 +-
glom/utility_widgets/layoutwidgetbase.cc | 2 +-
glom/utility_widgets/layoutwidgetbase.h | 4 +-
glom/utility_widgets/layoutwidgetmenu.cc | 2 +-
glom/utility_widgets/notebookglom.cc | 4 +-
glom/utility_widgets/notebookglom.h | 4 +-
glom/utility_widgets/notebooklabelglom.cc | 6 +-
glom/utility_widgets/notebooklabelglom.h | 4 +-
glom/utility_widgets/placeholder-glom.cc | 4 +-
glom/utility_widgets/placeholder-glom.h | 2 +-
glom/utility_widgets/textviewglom.cc | 6 +-
glom/utility_widgets/textviewglom.h | 4 +-
50 files changed, 300 insertions(+), 245 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 7cffdd1..8af6316 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,58 @@
+2010-02-28 Murray Cumming <murrayc murrayc-x61>
+
+ reviewed by: <delete if not using a buddy>
+
+ * glom/application.cc:
+ * glom/application.h:
+ * glom/base_db.cc:
+ * glom/base_db_table_data.cc:
+ * glom/box_withbuttons.cc:
+ * glom/frame_glom.cc:
+ * glom/glom_privs.cc:
+ * glom/libglom/connectionpool.h:
+ * glom/libglom/document/bakery/document.cc:
+ * glom/libglom/python_embed/py_glom_relatedrecord.cc:
+ * glom/main.cc:
+ * glom/mode_data/box_data.cc:
+ * glom/mode_data/box_data_calendar_related.cc:
+ * glom/mode_data/box_data_portal.cc:
+ * glom/mode_data/flowtablewithfields.cc:
+ * glom/mode_design/relationships_overview/dialog_relationships_over
+ view.cc:
+ * glom/navigation/box_tables.cc:
+ * glom/notebook_glom.cc:
+ * glom/utility_widgets/buttonglom.cc:
+ * glom/utility_widgets/buttonglom.h:
+ * glom/utility_widgets/canvas/canvas_image_movable.cc:
+ * glom/utility_widgets/checkglom.cc:
+ * glom/utility_widgets/checkglom.h:
+ * glom/utility_widgets/comboentryglom.cc:
+ * glom/utility_widgets/comboentryglom.h:
+ * glom/utility_widgets/comboglom.cc:
+ * glom/utility_widgets/comboglom.h:
+ * glom/utility_widgets/datawidget.cc:
+ * glom/utility_widgets/datawidget.h:
+ * glom/utility_widgets/db_adddel/db_adddel.cc:
+ * glom/utility_widgets/db_adddel/db_adddel.h:
+ * glom/utility_widgets/db_adddel/glom_db_treemodel.cc:
+ * glom/utility_widgets/entryglom.cc:
+ * glom/utility_widgets/entryglom.h:
+ * glom/utility_widgets/imageglom.cc:
+ * glom/utility_widgets/imageglom.h:
+ * glom/utility_widgets/labelglom.cc:
+ * glom/utility_widgets/labelglom.h:
+ * glom/utility_widgets/layoutwidgetbase.cc:
+ * glom/utility_widgets/layoutwidgetbase.h:
+ * glom/utility_widgets/layoutwidgetmenu.cc:
+ * glom/utility_widgets/notebookglom.cc:
+ * glom/utility_widgets/notebookglom.h:
+ * glom/utility_widgets/notebooklabelglom.cc:
+ * glom/utility_widgets/notebooklabelglom.h:
+ * glom/utility_widgets/placeholder-glom.cc:
+ * glom/utility_widgets/placeholder-glom.h:
+ * glom/utility_widgets/textviewglom.cc:
+ * glom/utility_widgets/textviewglom.h:
+
2010-02-28 Murray Cumming <murrayc murrayc com>
Python button scripts: Add show_table_details() and show_table_list().
diff --git a/glom/application.cc b/glom/application.cc
index b4fb50d..2ab7a80 100644
--- a/glom/application.cc
+++ b/glom/application.cc
@@ -68,9 +68,9 @@ namespace Glom
//static const int GLOM_RESPONSE_BROWSE_NETWORK = 1;
// Global application variable
-App_Glom* global_application = 0;
+Application* global_application = 0;
-App_Glom::App_Glom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
+Application::Application(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: type_base(cobject, "Glom"),
m_pBoxTop(0),
m_pFrame(0),
@@ -103,16 +103,16 @@ App_Glom::App_Glom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& bu
ConnectionPool* connection_pool = ConnectionPool::get_instance();
if(!connection_pool)
connection_pool->set_avahi_publish_callbacks(
- sigc::mem_fun(*this, &App_Glom::on_connection_avahi_begin),
- sigc::mem_fun(*this, &App_Glom::on_connection_avahi_progress),
- sigc::mem_fun(*this, &App_Glom::on_connection_avahi_done) );
+ sigc::mem_fun(*this, &Application::on_connection_avahi_begin),
+ sigc::mem_fun(*this, &Application::on_connection_avahi_progress),
+ sigc::mem_fun(*this, &Application::on_connection_avahi_done) );
#endif
#endif // !GLOM_ENABLE_CLIENT_ONLY
global_application = this;
}
-App_Glom::~App_Glom()
+Application::~Application()
{
#ifndef GLOM_ENABLE_CLIENT_ONLY
if(m_window_translations)
@@ -134,7 +134,7 @@ App_Glom::~App_Glom()
}
#ifndef GLOM_ENABLE_CLIENT_ONLY
-void App_Glom::on_connection_avahi_begin()
+void Application::on_connection_avahi_begin()
{
//Create the dialog:
if(m_avahi_progress_dialog)
@@ -149,14 +149,14 @@ void App_Glom::on_connection_avahi_begin()
m_avahi_progress_dialog->show();
}
-void App_Glom::on_connection_avahi_progress()
+void Application::on_connection_avahi_progress()
{
//Allow GTK+ to process events, so that the UI is responsive:
while(Gtk::Main::events_pending())
Gtk::Main::iteration();
}
-void App_Glom::on_connection_avahi_done()
+void Application::on_connection_avahi_done()
{
//Delete the dialog:
if(m_avahi_progress_dialog)
@@ -167,7 +167,7 @@ void App_Glom::on_connection_avahi_done()
}
#endif // !GLOM_ENABLE_CLIENT_ONLY
-bool App_Glom::init(const Glib::ustring& document_uri)
+bool Application::init(const Glib::ustring& document_uri)
{
type_vec_strings vecAuthors;
vecAuthors.push_back("Murray Cumming <murrayc murrayc com>");
@@ -196,17 +196,17 @@ bool App_Glom::init(const Glib::ustring& document_uri)
//show_all();
}
-bool App_Glom::get_show_sql_debug() const
+bool Application::get_show_sql_debug() const
{
return m_show_sql_debug;
}
-void App_Glom::set_show_sql_debug(bool val)
+void Application::set_show_sql_debug(bool val)
{
m_show_sql_debug = val;
}
-void App_Glom::init_layout()
+void Application::init_layout()
{
//We override this method so that we can put everything in the vbox from the glade file, instead of the vbox from App_Gtk.
@@ -224,7 +224,7 @@ void App_Glom::init_layout()
//m_VBox_PlaceHolder.show();
}
-void App_Glom::init_toolbars()
+void Application::init_toolbars()
{
//We override this because
//a) We don't want a toolbar, and
@@ -248,7 +248,7 @@ void App_Glom::init_toolbars()
}
#ifndef GLOM_ENABLE_MAEMO
-void App_Glom::init_menus_file()
+void Application::init_menus_file()
{
//Overridden to remove the Save and Save-As menu items,
//because all changes are saved immediately and automatically.
@@ -272,7 +272,7 @@ void App_Glom::init_menus_file()
#ifndef GLOM_ENABLE_CLIENT_ONLY
m_refFileActionGroup->add(action,
- sigc::mem_fun((App_Glom&)*this, &App_Glom::on_menu_file_save_as_example));
+ sigc::mem_fun((Application&)*this, &Application::on_menu_file_save_as_example));
m_refFileActionGroup->add(Gtk::Action::create("BakeryAction_Menu_File_Export", _("_Export")),
sigc::mem_fun(*m_pFrame, &Frame_Glom::on_menu_file_export));
@@ -287,7 +287,7 @@ void App_Glom::init_menus_file()
#ifndef GLOM_ENABLE_CLIENT_ONLY
m_connection_toggleaction_network_shared =
m_toggleaction_network_shared->signal_toggled().connect(
- sigc::mem_fun(*this, &App_Glom::on_menu_file_toggle_share) );
+ sigc::mem_fun(*this, &Application::on_menu_file_toggle_share) );
m_listDeveloperActions.push_back(m_toggleaction_network_shared);
#endif //!GLOM_ENABLE_CLIENT_ONLY
@@ -347,7 +347,7 @@ void App_Glom::init_menus_file()
#endif //GLOM_ENABLE_MAEMO
#ifdef GLOM_ENABLE_MAEMO
-void App_Glom::on_appmenu_button_table_value_changed()
+void Application::on_appmenu_button_table_value_changed()
{
const Glib::ustring table_name = m_appmenu_button_table.get_table_name();
if(m_pFrame)
@@ -369,14 +369,14 @@ static void add_button_to_appmenu(Hildon::AppMenu& appmenu, const Glib::ustring&
appmenu.append(*button);
}
-void App_Glom::init_menus()
+void Application::init_menus()
{
//There is no real menu on Maemo. We use HildonAppMenu instead.
m_pFrame->add_view(&m_appmenu_button_table);
m_appmenu_button_table.show();
m_appmenu_button_table.signal_value_changed().connect(
- sigc::mem_fun(*this, &App_Glom::on_appmenu_button_table_value_changed) );
+ sigc::mem_fun(*this, &Application::on_appmenu_button_table_value_changed) );
m_maemo_appmenu.append(m_appmenu_button_table);
add_button_to_appmenu(m_maemo_appmenu,
@@ -391,7 +391,7 @@ void App_Glom::init_menus()
Hildon::Program::get_instance()->set_common_app_menu(m_maemo_appmenu);
}
#else
-void App_Glom::init_menus()
+void Application::init_menus()
{
init_menus_file();
init_menus_edit();
@@ -438,11 +438,11 @@ void App_Glom::init_menus()
m_action_menu_userlevel_developer = Gtk::RadioAction::create(group_userlevel, "GlomAction_Menu_userlevel_Developer", _("_Developer"));
m_refActionGroup_Others->add(m_action_menu_userlevel_developer,
- sigc::mem_fun(*this, &App_Glom::on_menu_userlevel_developer) );
+ sigc::mem_fun(*this, &Application::on_menu_userlevel_developer) );
m_action_menu_userlevel_operator = Gtk::RadioAction::create(group_userlevel, "GlomAction_Menu_userlevel_Operator", _("_Operator"));
m_refActionGroup_Others->add(m_action_menu_userlevel_operator,
- sigc::mem_fun(*this, &App_Glom::on_menu_userlevel_operator) );
+ sigc::mem_fun(*this, &Application::on_menu_userlevel_operator) );
#endif // !GLOM_ENABLE_CLIENT_ONLY
//"Mode" menu:
@@ -504,11 +504,11 @@ void App_Glom::init_menus()
action = Gtk::Action::create("GlomAction_Menu_Developer_ChangeLanguage", _("_Test Translation"));
m_listDeveloperActions.push_back(action);
- m_refActionGroup_Others->add(action, sigc::mem_fun(*this, &App_Glom::on_menu_developer_changelanguage));
+ m_refActionGroup_Others->add(action, sigc::mem_fun(*this, &Application::on_menu_developer_changelanguage));
action = Gtk::Action::create("GlomAction_Menu_Developer_Translations", _("_Translations"));
m_listDeveloperActions.push_back(action);
- m_refActionGroup_Others->add(action, sigc::mem_fun(*this, &App_Glom::on_menu_developer_translations));
+ m_refActionGroup_Others->add(action, sigc::mem_fun(*this, &Application::on_menu_developer_translations));
//"Active Platform" menu:
@@ -519,17 +519,17 @@ void App_Glom::init_menus()
action = Gtk::RadioAction::create(group_active_platform, "GlomAction_Menu_Developer_ActivePlatform_Normal",
_("_Normal"), _("The layout to use for normal desktop environments."));
m_listDeveloperActions.push_back(action);
- m_refActionGroup_Others->add(action, sigc::mem_fun(*this, &App_Glom::on_menu_developer_active_platform_normal));
+ m_refActionGroup_Others->add(action, sigc::mem_fun(*this, &Application::on_menu_developer_active_platform_normal));
action = Gtk::RadioAction::create(group_active_platform, "GlomAction_Menu_Developer_ActivePlatform_Maemo",
_("_Maemo"), _("The layout to use for Maemo devices."));
m_listDeveloperActions.push_back(action);
- m_refActionGroup_Others->add(action, sigc::mem_fun(*this, &App_Glom::on_menu_developer_active_platform_maemo));
+ m_refActionGroup_Others->add(action, sigc::mem_fun(*this, &Application::on_menu_developer_active_platform_maemo));
m_action_show_layout_toolbar = Gtk::ToggleAction::create("GlomAction_Menu_Developer_ShowLayoutToolbar", _("_Show Layout Toolbar"));
m_listDeveloperActions.push_back(m_action_show_layout_toolbar);
- m_refActionGroup_Others->add(m_action_show_layout_toolbar, sigc::mem_fun(*this, &App_Glom::on_menu_developer_show_layout_toolbar));
+ m_refActionGroup_Others->add(m_action_show_layout_toolbar, sigc::mem_fun(*this, &Application::on_menu_developer_show_layout_toolbar));
#endif // !GLOM_ENABLE_CLIENT_ONLY
@@ -602,7 +602,7 @@ void App_Glom::init_menus()
#endif //GLOM_ENABLE_MAEMO
#ifndef GLOM_ENABLE_CLIENT_ONLY
-void App_Glom::on_menu_file_toggle_share()
+void Application::on_menu_file_toggle_share()
{
if(!m_pFrame)
return;
@@ -610,7 +610,7 @@ void App_Glom::on_menu_file_toggle_share()
m_pFrame->on_menu_file_toggle_share(m_toggleaction_network_shared);
}
-void App_Glom::on_menu_userlevel_developer()
+void Application::on_menu_userlevel_developer()
{
if(!m_pFrame)
return;
@@ -619,7 +619,7 @@ void App_Glom::on_menu_userlevel_developer()
m_pFrame->show_layout_toolbar(m_action_show_layout_toolbar->get_active());
}
-void App_Glom::on_menu_userlevel_operator()
+void Application::on_menu_userlevel_operator()
{
if(m_pFrame)
{
@@ -657,7 +657,7 @@ static bool hostname_is_localhost(const Glib::ustring& hostname)
return true;
}
-void App_Glom::ui_warning_load_failed(int failure_code)
+void Application::ui_warning_load_failed(int failure_code)
{
if(failure_code == Document::LOAD_FAILURE_CODE_FILE_VERSION_TOO_NEW)
{
@@ -670,7 +670,7 @@ void App_Glom::ui_warning_load_failed(int failure_code)
#ifndef G_OS_WIN32
-void App_Glom::open_browsed_document(const EpcServiceInfo* server, const Glib::ustring& service_name)
+void Application::open_browsed_document(const EpcServiceInfo* server, const Glib::ustring& service_name)
{
gsize length = 0;
gchar *document_contents = 0;
@@ -832,7 +832,7 @@ static bool uri_is_writable(const Glib::RefPtr<const Gio::File>& uri)
}
#endif // !GLOM_ENABLE_CLIENT_ONLY
-Glib::ustring App_Glom::get_file_uri_without_extension(const Glib::ustring& uri)
+Glib::ustring Application::get_file_uri_without_extension(const Glib::ustring& uri)
{
Glib::RefPtr<Gio::File> file = Gio::File::create_for_uri(uri);
if(!file)
@@ -855,7 +855,7 @@ Glib::ustring App_Glom::get_file_uri_without_extension(const Glib::ustring& uri)
}
}
-void App_Glom::new_instance(const Glib::ustring& uri) //Override
+void Application::new_instance(const Glib::ustring& uri) //Override
{
Glib::ustring command = "glom";
if(!uri.empty())
@@ -867,11 +867,11 @@ void App_Glom::new_instance(const Glib::ustring& uri) //Override
&gerror);
if(gerror)
{
- std::cerr << "App_Glom::new_instance(): error calling gdk_spawn_command_line_on_screen(): " << gerror->message << std::endl;
+ std::cerr << "Application::new_instance(): error calling gdk_spawn_command_line_on_screen(): " << gerror->message << std::endl;
}
}
-void App_Glom::init_create_document()
+void Application::init_create_document()
{
if(!m_pDocument)
{
@@ -890,7 +890,7 @@ void App_Glom::init_create_document()
type_base::init_create_document(); //Sets window title. Doesn't recreate doc.
}
-bool App_Glom::check_document_hosting_mode_is_supported(Document* document)
+bool Application::check_document_hosting_mode_is_supported(Document* document)
{
//If it's an example then the document's hosting mode doesn't matter,
//because the user will be asked to choose one when saving anyway.
@@ -948,7 +948,7 @@ bool App_Glom::check_document_hosting_mode_is_supported(Document* document)
return false;
}
-bool App_Glom::on_document_load()
+bool Application::on_document_load()
{
//Link to the database described in the document.
//Need to ask user for user/password:
@@ -968,7 +968,7 @@ bool App_Glom::on_document_load()
#ifndef GLOM_ENABLE_CLIENT_ONLY
//Connect signals:
- pDocument->signal_userlevel_changed().connect( sigc::mem_fun(*this, &App_Glom::on_userlevel_changed) );
+ pDocument->signal_userlevel_changed().connect( sigc::mem_fun(*this, &Application::on_userlevel_changed) );
//Disable/Enable actions, depending on userlevel:
pDocument->emit_userlevel_changed();
@@ -1081,7 +1081,7 @@ bool App_Glom::on_document_load()
else
{
#ifndef GLOM_ENABLE_CLIENT_ONLY
- connection_pool->set_get_document_func( sigc::mem_fun(*this, &App_Glom::on_connection_pool_get_document) );
+ connection_pool->set_get_document_func( sigc::mem_fun(*this, &Application::on_connection_pool_get_document) );
#endif
connection_pool->set_ready_to_connect(true); //connect_to_server() will now attempt the connection-> Shared instances of m_Connection will also be usable.
@@ -1127,11 +1127,11 @@ bool App_Glom::on_document_load()
}
else
#endif // !GLOM_ENABLE_CLIENT_ONLY
- std::cerr << "App_Glom::on_document_load(): unexpected database_not_found error when opening example." << std::endl;
+ std::cerr << "Application::on_document_load(): unexpected database_not_found error when opening example." << std::endl;
}
else if(!test)
{
- std::cerr << "App_Glom::on_document_load(): unexpected error." << std::endl;
+ std::cerr << "Application::on_document_load(): unexpected error." << std::endl;
}
}
@@ -1149,14 +1149,14 @@ bool App_Glom::on_document_load()
{
// TODO: Do we need to call connection_pool->cleanup() here, for
// stopping self-hosted databases? armin.
- connection_pool->cleanup( sigc::mem_fun(*this, &App_Glom::on_connection_close_progress) );
+ connection_pool->cleanup( sigc::mem_fun(*this, &Application::on_connection_close_progress) );
//If the database was not successfully recreated:
if(!user_cancelled)
{
//Let the user try again.
//A warning has already been shown.
//TODO: No, I don't think there is a warning.
- std::cerr << "App_Glom::on_document_load(): recreate_database() failed." << std::endl;
+ std::cerr << "Application::on_document_load(): recreate_database() failed." << std::endl;
return offer_new_or_existing();
}
else
@@ -1196,12 +1196,12 @@ bool App_Glom::on_document_load()
return true; //Loading of the document into the application succeeded.
}
-void App_Glom::on_connection_close_progress()
+void Application::on_connection_close_progress()
{
//TODO_murrayc
}
-void App_Glom::on_document_close()
+void Application::on_document_close()
{
#ifndef GLOM_ENABLE_CLIENT_ONLY
//TODO: It would be better to do this in a Application::on_document_closed() virtual method,
@@ -1210,24 +1210,24 @@ void App_Glom::on_document_close()
if(!connection_pool)
return;
- connection_pool->cleanup( sigc::mem_fun(*this, &App_Glom::on_connection_close_progress) );
+ connection_pool->cleanup( sigc::mem_fun(*this, &Application::on_connection_close_progress) );
#endif // !GLOM_ENABLE_CLIENT_ONLY
}
/*
-void App_Glom::statusbar_set_text(const Glib::ustring& strText)
+void Application::statusbar_set_text(const Glib::ustring& strText)
{
m_pStatus->set_text(strText);
}
-void App_Glom::statusbar_clear()
+void Application::statusbar_clear()
{
statusbar_set_text("");
}
*/
-void App_Glom::update_network_shared_ui()
+void Application::update_network_shared_ui()
{
Document* document = dynamic_cast<Document*>(get_document());
if(!document)
@@ -1256,12 +1256,12 @@ void App_Glom::update_network_shared_ui()
}
#ifndef GLOM_ENABLE_CLIENT_ONLY
-void App_Glom::on_userlevel_changed(AppState::userlevels /* userlevel */)
+void Application::on_userlevel_changed(AppState::userlevels /* userlevel */)
{
update_userlevel_ui();
}
-void App_Glom::update_userlevel_ui()
+void Application::update_userlevel_ui()
{
AppState::userlevels userlevel = get_userlevel();
@@ -1298,19 +1298,19 @@ void App_Glom::update_userlevel_ui()
#endif // !GLOM_ENABLE_CLIENT_ONLY
#ifndef GLOM_ENABLE_MAEMO
-Glib::RefPtr<Gtk::UIManager> App_Glom::get_ui_manager()
+Glib::RefPtr<Gtk::UIManager> Application::get_ui_manager()
{
return m_refUIManager;
}
#else
-Hildon::AppMenu* App_Glom::get_maemo_appmenu()
+Hildon::AppMenu* Application::get_maemo_appmenu()
{
return &m_maemo_appmenu;
}
#endif //GLOM_ENABLE_MAEMO
-bool App_Glom::offer_new_or_existing()
+bool Application::offer_new_or_existing()
{
//Offer to load an existing document, or start a new one.
const Glib::ustring glade_path = Utils::get_glade_file_path("glom.glade");
@@ -1322,14 +1322,14 @@ bool App_Glom::offer_new_or_existing()
}
catch(const Glib::Error& ex)
{
- std::cerr << "App_Glom::offer_new_or_existing(): Gtk::Builder::create_from_file() failed: " << ex.what() << std::endl;
+ std::cerr << "Application::offer_new_or_existing(): Gtk::Builder::create_from_file() failed: " << ex.what() << std::endl;
}
#else
std::auto_ptr<Glib::Error> ex;
refXml = Gtk::Builder::create_from_file(glade_path, "dialog_existing_or_new", ex);
if(ex.get())
{
- std::cerr << "App_Glom::offer_new_or_existing(): Gtk::Builder::create_from_file() failed:" << ex->what() << std::endl;
+ std::cerr << "Application::offer_new_or_existing(): Gtk::Builder::create_from_file() failed:" << ex->what() << std::endl;
}
#endif
@@ -1340,9 +1340,9 @@ bool App_Glom::offer_new_or_existing()
std::auto_ptr<Dialog_ExistingOrNew> dialog(dialog_raw);
dialog->set_transient_for(*this);
/*
- dialog->signal_new().connect(sigc::mem_fun(*this, &App_Glom::on_existing_or_new_new));
- dialog->signal_open_from_uri().connect(sigc::mem_fun(*this, &App_Glom::on_existing_or_new_open_from_uri));
- dialog->signal_open_from_remote().connect(sigc::mem_fun(*this, &App_Glom::on_existing_or_new_open_from_remote));
+ dialog->signal_new().connect(sigc::mem_fun(*this, &Application::on_existing_or_new_new));
+ dialog->signal_open_from_uri().connect(sigc::mem_fun(*this, &Application::on_existing_or_new_open_from_uri));
+ dialog->signal_open_from_remote().connect(sigc::mem_fun(*this, &Application::on_existing_or_new_open_from_remote));
*/
bool ask_again = true;
while(ask_again)
@@ -1370,7 +1370,7 @@ bool App_Glom::offer_new_or_existing()
#endif
case Dialog_ExistingOrNew::NONE:
default:
- std::cerr << "App_Glom::offer_new_or_existing(): Unhandled action: " << dialog->get_action() << std::endl;
+ std::cerr << "Application::offer_new_or_existing(): Unhandled action: " << dialog->get_action() << std::endl;
g_assert_not_reached();
break;
}
@@ -1379,7 +1379,7 @@ bool App_Glom::offer_new_or_existing()
Document* document = dynamic_cast<Document*>(get_document());
if(!document)
{
- std::cerr << "App_Glom::offer_new_or_existing(): document was NULL." << std::endl;
+ std::cerr << "Application::offer_new_or_existing(): document was NULL." << std::endl;
return false;
}
@@ -1401,7 +1401,7 @@ bool App_Glom::offer_new_or_existing()
}
#ifndef GLOM_ENABLE_CLIENT_ONLY
-void App_Glom::existing_or_new_new()
+void Application::existing_or_new_new()
{
// New empty document
@@ -1449,7 +1449,7 @@ void App_Glom::existing_or_new_new()
//Tell the connection pool about the document:
ConnectionPool* connection_pool = ConnectionPool::get_instance();
if(connection_pool)
- connection_pool->set_get_document_func( sigc::mem_fun(*this, &App_Glom::on_connection_pool_get_document) );
+ connection_pool->set_get_document_func( sigc::mem_fun(*this, &Application::on_connection_pool_get_document) );
const bool connected = m_pFrame->connection_request_password_and_choose_new_database_name();
if(!connected)
@@ -1484,24 +1484,24 @@ void App_Glom::existing_or_new_new()
}
#endif // !GLOM_ENABLE_CLIENT_ONLY
-void App_Glom::set_mode_data()
+void Application::set_mode_data()
{
m_action_mode_data->activate();
}
-void App_Glom::set_mode_find()
+void Application::set_mode_find()
{
m_action_mode_find->activate();
}
#ifndef GLOM_ENABLE_MAEMO
-void App_Glom::init_menus_help()
+void Application::init_menus_help()
{
//Call base class:
App_WithDoc_Gtk::init_menus_help();
m_refHelpActionGroup->add( Gtk::Action::create("BakeryAction_Help_Contents",
_("_Contents"), _("Help with the application")),
- sigc::mem_fun(*this, &App_Glom::on_menu_help_contents) );
+ sigc::mem_fun(*this, &Application::on_menu_help_contents) );
//Build part of the menu structure, to be merged in by using the "PH" plaeholders:
static const Glib::ustring ui_description =
@@ -1519,14 +1519,14 @@ void App_Glom::init_menus_help()
add_ui_from_string(ui_description);
}
-void App_Glom::on_menu_help_contents()
+void Application::on_menu_help_contents()
{
Glom::Utils::show_help();
}
#endif //GLOM_ENABLE_MAEMO
#ifndef GLOM_ENABLE_CLIENT_ONLY
-bool App_Glom::recreate_database(bool& user_cancelled)
+bool Application::recreate_database(bool& user_cancelled)
{
//Create a database, based on the information in the current document:
Document* pDocument = static_cast<Document*>(get_document());
@@ -1557,7 +1557,7 @@ bool App_Glom::recreate_database(bool& user_cancelled)
if(!error.get())
{
#endif // GLIBMM_EXCEPTIONS_ENABLED
- g_warning("App_Glom::recreate_database(): Failed because database exists already.");
+ g_warning("Application::recreate_database(): Failed because database exists already.");
return false; //Connection to the database succeeded, because no exception was thrown. so the database exists already.
#ifndef GLIBMM_EXCEPTIONS_ENABLED
@@ -1578,7 +1578,7 @@ bool App_Glom::recreate_database(bool& user_cancelled)
if(ex.get_failure_type() == ExceptionConnection::FAILURE_NO_SERVER)
{
user_cancelled = true; //Eventually, the user will cancel after retrying.
- g_warning("App_Glom::recreate_database(): Failed because connection to server failed, without specifying a database.");
+ g_warning("Application::recreate_database(): Failed because connection to server failed, without specifying a database.");
return false;
}
#ifndef GLIBMM_EXCEPTIONS_ENABLED
@@ -1647,7 +1647,7 @@ bool App_Glom::recreate_database(bool& user_cancelled)
{
const std::exception& ex = *error.get();
#endif // GLIBMM_EXCEPTIONS_ENABLED
- g_warning("App_Glom::recreate_database(): Failed to connect to the newly-created database.");
+ g_warning("Application::recreate_database(): Failed to connect to the newly-created database.");
return false;
}
@@ -1668,7 +1668,7 @@ bool App_Glom::recreate_database(bool& user_cancelled)
dialog_progress->pulse();
if(!table_creation_succeeded)
{
- g_warning("App_Glom::recreate_database(): CREATE TABLE failed with the newly-created database.");
+ g_warning("Application::recreate_database(): CREATE TABLE failed with the newly-created database.");
return false;
}
}
@@ -1696,13 +1696,13 @@ bool App_Glom::recreate_database(bool& user_cancelled)
if(!table_insert_succeeded)
{
- g_warning("App_Glom::recreate_database(): INSERT of example data failed with the newly-created database.");
+ g_warning("Application::recreate_database(): INSERT of example data failed with the newly-created database.");
return false;
}
//}
//catch(const std::exception& ex)
//{
- // std::cerr << "App_Glom::recreate_database(): exception: " << ex.what() << std::endl;
+ // std::cerr << "Application::recreate_database(): exception: " << ex.what() << std::endl;
//HandleError(ex);
//}
@@ -1712,7 +1712,7 @@ bool App_Glom::recreate_database(bool& user_cancelled)
}
#endif // !GLOM_ENABLE_CLIENT_ONLY
-AppState::userlevels App_Glom::get_userlevel() const
+AppState::userlevels Application::get_userlevel() const
{
const Document* document = dynamic_cast<const Document*>(get_document());
if(document)
@@ -1725,7 +1725,7 @@ AppState::userlevels App_Glom::get_userlevel() const
}
#ifndef GLOM_ENABLE_CLIENT_ONLY
-void App_Glom::add_developer_action(const Glib::RefPtr<Gtk::Action>& refAction)
+void Application::add_developer_action(const Glib::RefPtr<Gtk::Action>& refAction)
{
//Prevent it from being added twice:
remove_developer_action(refAction);
@@ -1733,7 +1733,7 @@ void App_Glom::add_developer_action(const Glib::RefPtr<Gtk::Action>& refAction)
m_listDeveloperActions.push_back(refAction);
}
-void App_Glom::remove_developer_action(const Glib::RefPtr<Gtk::Action>& refAction)
+void Application::remove_developer_action(const Glib::RefPtr<Gtk::Action>& refAction)
{
for(type_listActions::iterator iter = m_listDeveloperActions.begin(); iter != m_listDeveloperActions.end(); ++iter)
{
@@ -1747,12 +1747,12 @@ void App_Glom::remove_developer_action(const Glib::RefPtr<Gtk::Action>& refActio
#endif // !GLOM_ENABLE_CLIENT_ONLY
#ifdef GLOM_ENABLE_MAEMO
-void App_Glom::fill_menu_tables()
+void Application::fill_menu_tables()
{
m_appmenu_button_table.fill_from_database();
}
#else
-void App_Glom::fill_menu_tables()
+void Application::fill_menu_tables()
{
//TODO: There must be a better way than building a ui_string like this:
@@ -1835,19 +1835,19 @@ void App_Glom::fill_menu_tables()
{
const Glib::Error& ex = *error.get();
#endif // GLIBMM_EXCEPTIONS_ENABLED
- std::cerr << " App_Glom::fill_menu_tables(): building menus failed: " << ex.what() << std::endl;
+ std::cerr << " Application::fill_menu_tables(): building menus failed: " << ex.what() << std::endl;
std::cerr << " The ui_description was: " << ui_description << std::endl;
}
}
#endif //GLOM_ENABLE_MAEMO
#ifdef GLOM_ENABLE_MAEMO
-void App_Glom::fill_menu_reports(const Glib::ustring& /* table_name */)
+void Application::fill_menu_reports(const Glib::ustring& /* table_name */)
{
//TODO: Change the Hildon::AppMenu.
}
#else
-void App_Glom::fill_menu_reports(const Glib::ustring& table_name)
+void Application::fill_menu_reports(const Glib::ustring& table_name)
{
//TODO: There must be a better way than building a ui_string like this:
@@ -1934,18 +1934,18 @@ void App_Glom::fill_menu_reports(const Glib::ustring& table_name)
{
const Glib::Error& ex = *error.get();
#endif // GLIBMM_EXCEPTIONS_ENABLED
- std::cerr << " App_Glom::fill_menu_reports(): building menus failed: " << ex.what();
+ std::cerr << " Application::fill_menu_reports(): building menus failed: " << ex.what();
}
}
#endif //GLOM_ENABLE_MAEMO
#ifdef GLOM_ENABLE_MAEMO
-void App_Glom::fill_menu_print_layouts(const Glib::ustring& /* table_name */)
+void Application::fill_menu_print_layouts(const Glib::ustring& /* table_name */)
{
//TODO: Change the Hildon::AppMenu.
}
#else
-void App_Glom::fill_menu_print_layouts(const Glib::ustring& table_name)
+void Application::fill_menu_print_layouts(const Glib::ustring& table_name)
{
//TODO: This is copy/pasted from fill_menu_print_reports. Can we generalize it?
@@ -2046,13 +2046,13 @@ void App_Glom::fill_menu_print_layouts(const Glib::ustring& table_name)
{
const Glib::Error& ex = *error.get();
#endif // GLIBMM_EXCEPTIONS_ENABLED
- std::cerr << " App_Glom::fill_menu_reports(): building menus failed: " << ex.what();
+ std::cerr << " Application::fill_menu_reports(): building menus failed: " << ex.what();
}
}
#endif //GLOM_ENABLE_MAEMO
#ifndef GLOM_ENABLE_CLIENT_ONLY
-void App_Glom::on_menu_file_save_as_example()
+void Application::on_menu_file_save_as_example()
{
//Based on the implementation of GlomBakery::App_WithDoc::on_menu_file_saveas()
@@ -2152,7 +2152,7 @@ void App_Glom::on_menu_file_save_as_example()
}
}
-Glib::ustring App_Glom::ui_file_select_save(const Glib::ustring& old_file_uri) //override
+Glib::ustring Application::ui_file_select_save(const Glib::ustring& old_file_uri) //override
{
//Reimplement this whole function, just so we can use our custom FileChooserDialog class:
App& app = *this;
@@ -2355,7 +2355,7 @@ Glib::ustring App_Glom::ui_file_select_save(const Glib::ustring& old_file_uri) /
return Glib::ustring();
}
-void App_Glom::stop_self_hosting_of_document_database()
+void Application::stop_self_hosting_of_document_database()
{
Document* pDocument = static_cast<Document*>(get_document());
if(pDocument)
@@ -2364,11 +2364,11 @@ void App_Glom::stop_self_hosting_of_document_database()
if(!connection_pool)
return;
- connection_pool->cleanup( sigc::mem_fun(*this, &App_Glom::on_connection_close_progress ));
+ connection_pool->cleanup( sigc::mem_fun(*this, &Application::on_connection_close_progress ));
}
}
-void App_Glom::on_menu_developer_changelanguage()
+void Application::on_menu_developer_changelanguage()
{
Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_change_language");
if(refXml)
@@ -2398,7 +2398,7 @@ void App_Glom::on_menu_developer_changelanguage()
}
}
-void App_Glom::on_menu_developer_translations()
+void Application::on_menu_developer_translations()
{
if(!m_window_translations)
{
@@ -2412,7 +2412,7 @@ void App_Glom::on_menu_developer_translations()
m_window_translations->load_from_document();
m_window_translations->show();
- m_window_translations->signal_hide().connect(sigc::mem_fun(*this, &App_Glom::on_window_translations_hide));
+ m_window_translations->signal_hide().connect(sigc::mem_fun(*this, &Application::on_window_translations_hide));
}
}
else
@@ -2422,7 +2422,7 @@ void App_Glom::on_menu_developer_translations()
}
}
-void App_Glom::on_menu_developer_active_platform_normal()
+void Application::on_menu_developer_active_platform_normal()
{
Document* document = dynamic_cast<Document*>(get_document());
if(document)
@@ -2431,7 +2431,7 @@ void App_Glom::on_menu_developer_active_platform_normal()
m_pFrame->show_table_refresh();
}
-void App_Glom::on_menu_developer_active_platform_maemo()
+void Application::on_menu_developer_active_platform_maemo()
{
Document* document = dynamic_cast<Document*>(get_document());
if(document)
@@ -2440,13 +2440,13 @@ void App_Glom::on_menu_developer_active_platform_maemo()
m_pFrame->show_table_refresh();
}
-void App_Glom::on_menu_developer_show_layout_toolbar()
+void Application::on_menu_developer_show_layout_toolbar()
{
m_pFrame->show_layout_toolbar(m_action_show_layout_toolbar->get_active());
}
-void App_Glom::on_window_translations_hide()
+void Application::on_window_translations_hide()
{
if(m_window_translations)
{
@@ -2455,12 +2455,12 @@ void App_Glom::on_window_translations_hide()
}
#endif // !GLOM_ENABLE_CLIENT_ONLY
-App_Glom* App_Glom::get_application()
+Application* Application::get_application()
{
return global_application;
}
-void App_Glom::document_history_add(const Glib::ustring& file_uri)
+void Application::document_history_add(const Glib::ustring& file_uri)
{
// We override this so we can prevent example files from being saved in the recently-used list:
@@ -2476,24 +2476,24 @@ void App_Glom::document_history_add(const Glib::ustring& file_uri)
}
#ifndef GLOM_ENABLE_CLIENT_ONLY
-void App_Glom::do_menu_developer_fields(Gtk::Window& parent, const Glib::ustring table_name)
+void Application::do_menu_developer_fields(Gtk::Window& parent, const Glib::ustring table_name)
{
m_pFrame->do_menu_developer_fields(parent, table_name);
}
-void App_Glom::do_menu_developer_relationships(Gtk::Window& parent, const Glib::ustring table_name)
+void Application::do_menu_developer_relationships(Gtk::Window& parent, const Glib::ustring table_name)
{
m_pFrame->do_menu_developer_relationships(parent, table_name);
}
-Document* App_Glom::on_connection_pool_get_document()
+Document* Application::on_connection_pool_get_document()
{
return dynamic_cast<Document*>(get_document());
}
#endif //GLOM_ENABLE_CLIENT_ONLY
//overridden to show the current table name in the window's title:
-void App_Glom::update_window_title()
+void Application::update_window_title()
{
//Set application's main window title:
@@ -2539,7 +2539,7 @@ void App_Glom::update_window_title()
#endif //GLOM_ENABLE_MAEMO
}
-void App_Glom::show_table_details(const Glib::ustring& table_name, const Gnome::Gda::Value& primary_key_value)
+void Application::show_table_details(const Glib::ustring& table_name, const Gnome::Gda::Value& primary_key_value)
{
if(!m_pFrame)
return;
@@ -2547,7 +2547,7 @@ void App_Glom::show_table_details(const Glib::ustring& table_name, const Gnome::
m_pFrame->show_table(table_name, primary_key_value);
}
-void App_Glom::show_table_list(const Glib::ustring& table_name)
+void Application::show_table_list(const Glib::ustring& table_name)
{
if(!m_pFrame)
return;
diff --git a/glom/application.h b/glom/application.h
index c7c30a9..ef509cb 100644
--- a/glom/application.h
+++ b/glom/application.h
@@ -53,11 +53,11 @@ namespace Glom
class Window_Translations;
-class App_Glom : public GlomBakery::App_WithDoc_Gtk
+class Application : public GlomBakery::App_WithDoc_Gtk
{
public:
- App_Glom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
- virtual ~App_Glom();
+ Application(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
+ virtual ~Application();
virtual bool init(const Glib::ustring& document_uri = Glib::ustring()); //override
@@ -109,7 +109,7 @@ public:
void show_table_details(const Glib::ustring& table_name, const Gnome::Gda::Value& primary_key_value);
void show_table_list(const Glib::ustring& table_name);
- static App_Glom* get_application();
+ static Application* get_application();
protected:
virtual void ui_warning_load_failed(int failure_code = 0); //Override.
diff --git a/glom/base_db.cc b/glom/base_db.cc
index eafcaf2..ef44ea1 100644
--- a/glom/base_db.cc
+++ b/glom/base_db.cc
@@ -21,7 +21,7 @@
#include "config.h" // For GLOM_ENABLE_CLIENT_ONLY
#include <glom/base_db.h>
-#include "application.h" //App_Glom.
+#include "application.h" //Application.
#include <libglom/appstate.h>
#include <libglom/standard_table_prefs_fields.h>
#include <libglom/document/document.h>
@@ -209,7 +209,7 @@ Glib::RefPtr<Gnome::Gda::DataModel> Base_DB::query_execute_select(const Glib::us
//Debug output:
- const App_Glom* app = App_Glom::get_application();
+ const Application* app = Application::get_application();
if(stmt && app && app->get_show_sql_debug())
{
#ifdef GLIBMM_EXCEPTIONS_ENABLED
@@ -312,7 +312,7 @@ bool Base_DB::query_execute(const Glib::ustring& strQuery,
//Debug output:
- const App_Glom* app = App_Glom::get_application();
+ const Application* app = Application::get_application();
if(stmt && app && app->get_show_sql_debug())
{
#ifdef GLIBMM_EXCEPTIONS_ENABLED
@@ -3410,7 +3410,7 @@ int Base_DB::count_rows_returned_by(const Glib::ustring& sql_query)
//Be careful not to include ORDER BY clauses in this, because that would make it unnecessarily slow:
const Glib::ustring query_count = "SELECT COUNT (*) FROM (" + sql_query + ") AS glomarbitraryalias";
- const App_Glom* app = App_Glom::get_application();
+ const Application* app = Application::get_application();
if(app && app->get_show_sql_debug())
{
try
@@ -3553,10 +3553,10 @@ void Base_DB::set_found_set_where_clause_for_portal(FoundSet& found_set, const s
void Base_DB::update_gda_metastore_for_table(const Glib::ustring& table_name) const
{
#ifdef GLIBMM_EXCEPTIONS_ENABLED
- sharedptr<SharedConnection> sharedconnection = connect_to_server(App_Glom::get_application());
+ sharedptr<SharedConnection> sharedconnection = connect_to_server(Application::get_application());
#else
std::auto_ptr<Glom::ExceptionConnection> ex;
- sharedptr<SharedConnection> sharedconnection = connect_to_server(App_Glom::get_application(), ex);
+ sharedptr<SharedConnection> sharedconnection = connect_to_server(Application::get_application(), ex);
#endif
if(!sharedconnection)
{
diff --git a/glom/base_db_table_data.cc b/glom/base_db_table_data.cc
index be5ac82..271799d 100644
--- a/glom/base_db_table_data.cc
+++ b/glom/base_db_table_data.cc
@@ -118,10 +118,10 @@ bool Base_DB_Table_Data::record_new(bool use_entered_data, const Gnome::Gda::Val
//We need the connection when we run the script, so that the script may use it.
#ifdef GLIBMM_EXCEPTIONS_ENABLED
// TODO: Is this function supposed to throw an exception?
- sharedptr<SharedConnection> sharedconnection = connect_to_server(App_Glom::get_application());
+ sharedptr<SharedConnection> sharedconnection = connect_to_server(Application::get_application());
#else
std::auto_ptr<ExceptionConnection> error;
- sharedptr<SharedConnection> sharedconnection = connect_to_server(App_Glom::get_application(), error);
+ sharedptr<SharedConnection> sharedconnection = connect_to_server(Application::get_application(), error);
if(!error.get())
{
// Don't evaluate function on error
@@ -264,7 +264,7 @@ bool Base_DB_Table_Data::record_new(bool use_entered_data, const Gnome::Gda::Val
bool Base_DB_Table_Data::get_related_record_exists(const sharedptr<const Relationship>& relationship, const sharedptr<const Field>& key_field, const Gnome::Gda::Value& key_value)
{
- BusyCursor cursor(App_Glom::get_application());
+ BusyCursor cursor(Application::get_application());
bool result = false;
@@ -317,11 +317,11 @@ bool Base_DB_Table_Data::add_related_record_for_field(const sharedptr<const Layo
const Glib::ustring message = _("Data may not be entered into this related field, because the related record does not yet exist, and the relationship does not allow automatic creation of new related records.");
#undef GLOM_ENABLE_MAEMO
#ifdef GLOM_ENABLE_MAEMO
- Hildon::Note dialog(Hildon::NOTE_TYPE_INFORMATION, *App_Glom::get_application(), message);
+ Hildon::Note dialog(Hildon::NOTE_TYPE_INFORMATION, *Application::get_application(), message);
#else
Gtk::MessageDialog dialog(Utils::bold_message(_("Related Record Does Not Exist")), true);
dialog.set_secondary_text(message);
- dialog.set_transient_for(*App_Glom::get_application());
+ dialog.set_transient_for(*Application::get_application());
#endif
dialog.run();
@@ -342,12 +342,12 @@ bool Base_DB_Table_Data::add_related_record_for_field(const sharedptr<const Layo
const Glib::ustring message = _("Data may not be entered into this related field, because the related record does not yet exist, and the key in the related record is auto-generated and therefore can not be created with the key value in this record.");
#ifdef GLOM_ENABLE_MAEMO
- Hildon::Note dialog(Hildon::NOTE_TYPE_INFORMATION, *App_Glom::get_application(), message);
+ Hildon::Note dialog(Hildon::NOTE_TYPE_INFORMATION, *Application::get_application(), message);
#else
Gtk::MessageDialog dialog(Utils::bold_message(_("Related Record Cannot Be Created")), true);
//TODO: This is a very complex error message:
dialog.set_secondary_text(message);
- dialog.set_transient_for(*App_Glom::get_application());
+ dialog.set_transient_for(*Application::get_application());
#endif
dialog.run();
@@ -452,7 +452,7 @@ bool Base_DB_Table_Data::confirm_delete_record()
#else
Gtk::MessageDialog dialog(Utils::bold_message(_("Delete record")), true, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_NONE);
dialog.set_secondary_text(message);
- dialog.set_transient_for(*App_Glom::get_application());
+ dialog.set_transient_for(*Application::get_application());
#endif
dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
dialog.add_button(Gtk::Stock::DELETE, Gtk::RESPONSE_OK);
diff --git a/glom/box_withbuttons.cc b/glom/box_withbuttons.cc
index cad3ca7..49d7afa 100644
--- a/glom/box_withbuttons.cc
+++ b/glom/box_withbuttons.cc
@@ -19,7 +19,7 @@
*/
#include <glom/box_withbuttons.h>
-#include <glom/application.h> //App_Glom.
+#include <glom/application.h> //Application.
#include <glom/utils_ui.h>
#include <libglom/appstate.h>
//#include <libgnomeui/gnome-app-helper.h>
diff --git a/glom/frame_glom.cc b/glom/frame_glom.cc
index b7fca96..701d11a 100644
--- a/glom/frame_glom.cc
+++ b/glom/frame_glom.cc
@@ -335,7 +335,7 @@ void Frame_Glom::set_mode_widget(Gtk::Widget& widget)
//Trying to remove all of them leads to warnings,
//and I don't see a way to get a list of children.
- App_Glom* pApp = dynamic_cast<App_Glom*>(get_app_window());
+ Application* pApp = dynamic_cast<Application*>(get_app_window());
if(pApp)
{
//Glib::RefPtr<Gtk::UIManager> ui_manager = pApp->get_ui_manager();
@@ -410,7 +410,7 @@ void Frame_Glom::show_table_refresh()
void Frame_Glom::show_table_allow_empty(const Glib::ustring& table_name, const Gnome::Gda::Value& primary_key_value_for_details)
{
- App_Glom* pApp = dynamic_cast<App_Glom*>(get_app_window());
+ Application* pApp = dynamic_cast<Application*>(get_app_window());
//This can take quite a long time, so we show the busy cursor while it's working:
BusyCursor busy_cursor(pApp);
@@ -1142,7 +1142,7 @@ void Frame_Glom::on_menu_file_toggle_share(const Glib::RefPtr<Gtk::ToggleAction>
}
//Update the UI:
- App_Glom* pApp = dynamic_cast<App_Glom*>(get_app_window());
+ Application* pApp = dynamic_cast<Application*>(get_app_window());
if(pApp)
{
pApp->update_network_shared_ui();
@@ -1499,7 +1499,7 @@ void Frame_Glom::on_notebook_find_criteria(const Glib::ustring& where_clause)
//std::cout << "Frame_Glom::on_notebook_find_criteria(): " << where_clause << std::endl;
//on_menu_Mode_Data();
- App_Glom* pApp = dynamic_cast<App_Glom*>(get_app_window());
+ Application* pApp = dynamic_cast<Application*>(get_app_window());
if(pApp)
{
bool records_found = false;
@@ -2774,7 +2774,7 @@ void Frame_Glom::on_menu_print_layout_selected(const Glib::ustring& print_layout
try
{
- App_Glom* pApp = dynamic_cast<App_Glom*>(get_app_window());
+ Application* pApp = dynamic_cast<Application*>(get_app_window());
if(pApp)
print->run(Gtk::PRINT_OPERATION_ACTION_PRINT_DIALOG, *pApp);
}
@@ -2805,7 +2805,7 @@ void Frame_Glom::on_dialog_layout_report_hide()
}
//Update the reports menu:
- App_Glom* pApp = dynamic_cast<App_Glom*>(get_app_window());
+ Application* pApp = dynamic_cast<Application*>(get_app_window());
if(pApp)
pApp->fill_menu_reports(m_table_name);
}
@@ -2825,7 +2825,7 @@ void Frame_Glom::on_dialog_layout_print_hide()
}
//Update the reports menu:
- App_Glom* pApp = dynamic_cast<App_Glom*>(get_app_window());
+ Application* pApp = dynamic_cast<Application*>(get_app_window());
if(pApp)
pApp->fill_menu_print_layouts(m_table_name);
}
@@ -2833,7 +2833,7 @@ void Frame_Glom::on_dialog_layout_print_hide()
void Frame_Glom::on_dialog_reports_hide()
{
//Update the reports menu:
- App_Glom* pApp = dynamic_cast<App_Glom*>(get_app_window());
+ Application* pApp = dynamic_cast<Application*>(get_app_window());
if(pApp)
pApp->fill_menu_reports(m_table_name);
}
@@ -2841,7 +2841,7 @@ void Frame_Glom::on_dialog_reports_hide()
void Frame_Glom::on_dialog_print_layouts_hide()
{
//Update the reports menu:
- App_Glom* pApp = dynamic_cast<App_Glom*>(get_app_window());
+ Application* pApp = dynamic_cast<Application*>(get_app_window());
if(pApp)
pApp->fill_menu_print_layouts(m_table_name);
}
@@ -2858,7 +2858,7 @@ void Frame_Glom::on_dialog_tables_hide()
#ifndef GLOM_ENABLE_CLIENT_ONLY
if(document->get_userlevel() == AppState::USERLEVEL_DEVELOPER)
{
- App_Glom* pApp = dynamic_cast<App_Glom*>(get_app_window());
+ Application* pApp = dynamic_cast<Application*>(get_app_window());
if(pApp)
pApp->fill_menu_tables();
@@ -2880,7 +2880,7 @@ void Frame_Glom::on_dialog_tables_hide()
void Frame_Glom::on_notebook_data_switch_page(GtkNotebookPage* /* page */, guint /* page_num */)
{
//Refill this menu, because it depends on whether list or details are visible:
- App_Glom* pApp = dynamic_cast<App_Glom*>(get_app_window());
+ Application* pApp = dynamic_cast<Application*>(get_app_window());
if(pApp)
pApp->fill_menu_print_layouts(m_table_name);
}
diff --git a/glom/glom_privs.cc b/glom/glom_privs.cc
index 1c08d69..2b025f5 100644
--- a/glom/glom_privs.cc
+++ b/glom/glom_privs.cc
@@ -94,7 +94,7 @@ Glib::ustring Privs::get_default_developer_user_name(Glib::ustring& password)
Privs::type_vec_strings Privs::get_database_users(const Glib::ustring& group_name)
{
- BusyCursor cursor(App_Glom::get_application());
+ BusyCursor cursor(Application::get_application());
type_vec_strings result;
@@ -406,7 +406,7 @@ Privileges Privs::get_current_privs(const Glib::ustring& table_name)
//TODO_Performance: There's lots of database access here.
//We could maybe replace some with the postgres has_table_* function().
- BusyCursor cursor(App_Glom::get_application());
+ BusyCursor cursor(Application::get_application());
//Return a cached value if possible.
//(If it is in the cache then it's fairly recent)
diff --git a/glom/libglom/connectionpool.h b/glom/libglom/connectionpool.h
index 8da63fc..ac1426f 100644
--- a/glom/libglom/connectionpool.h
+++ b/glom/libglom/connectionpool.h
@@ -235,7 +235,7 @@ public:
#endif
/** Specify a callback that the ConnectionPool can call to get a pointer to the document.
- * This callback avoids Connection having to link to App_Glom,
+ * This callback avoids Connection having to link to Application,
* and avoids us worrying about whether a previously-set document (via a set_document() method) is still valid.
*/
typedef sigc::slot<Document*> SlotGetDocument;
diff --git a/glom/libglom/document/bakery/document.cc b/glom/libglom/document/bakery/document.cc
index 1e181a1..1e5b7d0 100644
--- a/glom/libglom/document/bakery/document.cc
+++ b/glom/libglom/document/bakery/document.cc
@@ -360,7 +360,7 @@ static Glib::ustring get_file_display_name(const Glib::ustring& uri)
}
catch(const Glib::Error& ex)
{
- std::cerr << "App_Glom::get_file_display_name(): error: " << ex.what() << std::endl;
+ std::cerr << "Application::get_file_display_name(): error: " << ex.what() << std::endl;
return result;
}
#else
diff --git a/glom/libglom/python_embed/py_glom_relatedrecord.cc b/glom/libglom/python_embed/py_glom_relatedrecord.cc
index 59c5949..7d7c23f 100644
--- a/glom/libglom/python_embed/py_glom_relatedrecord.cc
+++ b/glom/libglom/python_embed/py_glom_relatedrecord.cc
@@ -96,7 +96,7 @@ boost::python::object PyGlomRelatedRecord::getitem(const boost::python::object&
+ " WHERE \"" + related_table + "\".\"" + related_key_name + "\" = " + m_from_key_value_sqlized;
/* TODO: Fix linking problems
- const App_Glom* app = App_Glom::get_application();
+ const Application* app = Application::get_application();
if(app && app->get_show_sql_debug())
{
try
diff --git a/glom/main.cc b/glom/main.cc
index 29bbd45..06df329 100644
--- a/glom/main.cc
+++ b/glom/main.cc
@@ -630,26 +630,26 @@ main(int argc, char* argv[])
- Glom::App_Glom* pApp_Glom = 0;
- refXml->get_widget_derived("window_main", pApp_Glom);
- g_assert(pApp_Glom);
+ Glom::Application* pApplication = 0;
+ refXml->get_widget_derived("window_main", pApplication);
+ g_assert(pApplication);
- pApp_Glom->set_command_line_args(argc, argv);
- pApp_Glom->set_show_sql_debug(group.m_arg_debug_sql);
+ pApplication->set_command_line_args(argc, argv);
+ pApplication->set_show_sql_debug(group.m_arg_debug_sql);
- const bool test = pApp_Glom->init(input_uri); //Sets it up and shows it.
+ const bool test = pApplication->init(input_uri); //Sets it up and shows it.
#ifdef GLOM_ENABLE_MAEMO
//TODO: What is this really for?
- Hildon::Program::get_instance()->add_window(*pApp_Glom);
+ Hildon::Program::get_instance()->add_window(*pApplication);
#endif
if(test) //The user could cancel the offer of a new or existing database.
- Gtk::Main::run(*pApp_Glom); //Quit when the window is closed.
+ Gtk::Main::run(*pApplication); //Quit when the window is closed.
//Cleanup:
- delete pApp_Glom;
- pApp_Glom = 0;
+ delete pApplication;
+ pApplication = 0;
}
#ifdef GLIBMM_EXCEPTIONS_ENABLED
catch(const Glib::Exception& ex)
diff --git a/glom/mode_data/box_data.cc b/glom/mode_data/box_data.cc
index f875a1e..3854c7e 100644
--- a/glom/mode_data/box_data.cc
+++ b/glom/mode_data/box_data.cc
@@ -355,7 +355,7 @@ void Box_Data::on_python_requested_show_table_details(const Glib::ustring& table
{
std::cout << "debug: on_python_requested_show_table_details(): " << table_name << ", pk value: " << primary_key_value.to_string() << std::endl;
- App_Glom* app = App_Glom::get_application();
+ Application* app = Application::get_application();
if(app)
app->show_table_details(table_name, primary_key_value);
}
@@ -364,7 +364,7 @@ void Box_Data::on_python_requested_show_table_list(const Glib::ustring& table_na
{
//std::cout << "debug: on_python_requested_show_table_list(): " << table_name << std::endl;
- App_Glom* app = App_Glom::get_application();
+ Application* app = Application::get_application();
if(app)
app->show_table_list(table_name);
}
diff --git a/glom/mode_data/box_data_calendar_related.cc b/glom/mode_data/box_data_calendar_related.cc
index bf919c8..c246b46 100644
--- a/glom/mode_data/box_data_calendar_related.cc
+++ b/glom/mode_data/box_data_calendar_related.cc
@@ -503,7 +503,7 @@ void Box_Data_Calendar_Related::setup_menu()
sigc::mem_fun(*this, &Box_Data_Calendar_Related::on_MenuPopup_activate_layout) );
//TODO: This does not work until this widget is in a container in the window:
- App_Glom* pApp = get_application();
+ Application* pApp = get_application();
if(pApp)
{
pApp->add_developer_action(m_refContextLayout); //So that it can be disabled when not in developer mode.
@@ -564,7 +564,7 @@ void Box_Data_Calendar_Related::on_calendar_button_press_event(GdkEventButton *e
#ifndef GLOM_ENABLE_CLIENT_ONLY
//Enable/Disable items.
//We did this earlier, but get_application is more likely to work now:
- App_Glom* pApp = get_application();
+ Application* pApp = get_application();
if(pApp)
{
pApp->add_developer_action(m_refContextLayout); //So that it can be disabled when not in developer mode.
diff --git a/glom/mode_data/box_data_portal.cc b/glom/mode_data/box_data_portal.cc
index feef1a2..e7745a8 100644
--- a/glom/mode_data/box_data_portal.cc
+++ b/glom/mode_data/box_data_portal.cc
@@ -202,7 +202,7 @@ void Box_Data_Portal::on_realize()
Glib::ustring::compose(_("Add Related %1"), get_title_singular());
m_maemo_appmenubutton_add.set_title(title);
m_maemo_appmenubutton_add.set_value(_("Add related record"));
- App_Glom* app = App_Glom::get_application();
+ Application* app = Application::get_application();
g_assert(app);
if(app)
{
@@ -221,7 +221,7 @@ void Box_Data_Portal::on_realize()
void Box_Data_Portal::on_unrealize()
{
// Remove the AppMenu button when the portal is no longer shown:
- App_Glom* app = App_Glom::get_application();
+ Application* app = Application::get_application();
g_assert(app);
if(app)
{
diff --git a/glom/mode_data/flowtablewithfields.cc b/glom/mode_data/flowtablewithfields.cc
index a72f4b5..5d38504 100644
--- a/glom/mode_data/flowtablewithfields.cc
+++ b/glom/mode_data/flowtablewithfields.cc
@@ -1284,7 +1284,7 @@ void FlowTableWithFields::on_dnd_add_layout_item_field(LayoutWidgetBase* above)
//Ask the user to choose the layout item
sharedptr<LayoutItem_Field> layout_item_field =
DataWidget::offer_field_list(m_table_name, sharedptr<LayoutItem_Field>(),
- get_document(), App_Glom::get_application());
+ get_document(), Application::get_application());
if(!layout_item_field)
{
realize();
@@ -1527,7 +1527,7 @@ void FlowTableWithFields::on_menu_delete_activate()
bool FlowTableWithFields::on_button_press_event(GdkEventButton *event)
{
- App_Glom* pApp = App_Glom::get_application();
+ Application* pApp = Application::get_application();
if(pApp && pApp->get_userlevel() == AppState::USERLEVEL_DEVELOPER)
{
GdkModifierType mods;
diff --git a/glom/mode_design/relationships_overview/dialog_relationships_overview.cc b/glom/mode_design/relationships_overview/dialog_relationships_overview.cc
index 3f8e750..0ee5aa0 100644
--- a/glom/mode_design/relationships_overview/dialog_relationships_overview.cc
+++ b/glom/mode_design/relationships_overview/dialog_relationships_overview.cc
@@ -529,7 +529,7 @@ void Dialog_RelationshipsOverview::setup_context_menu()
void Dialog_RelationshipsOverview::on_context_menu_edit_fields(Glib::RefPtr<CanvasGroupDbTable> table)
{
- App_Glom* pApp = App_Glom::get_application();
+ Application* pApp = Application::get_application();
if(pApp && table)
{
pApp->do_menu_developer_fields(*this, table->get_table_name());
@@ -540,7 +540,7 @@ void Dialog_RelationshipsOverview::on_context_menu_edit_fields(Glib::RefPtr<Canv
void Dialog_RelationshipsOverview::on_context_menu_edit_relationships(Glib::RefPtr<CanvasGroupDbTable> table)
{
- App_Glom* pApp = App_Glom::get_application();
+ Application* pApp = Application::get_application();
if(pApp && table)
{
pApp->do_menu_developer_relationships(*this, table->get_table_name());
diff --git a/glom/navigation/box_tables.cc b/glom/navigation/box_tables.cc
index 87e3d5b..68888a5 100644
--- a/glom/navigation/box_tables.cc
+++ b/glom/navigation/box_tables.cc
@@ -101,7 +101,7 @@ void Box_Tables::fill_table_row(const Gtk::TreeModel::iterator& iter, const shar
bool Box_Tables::fill_from_database()
{
- BusyCursor busy_cursor(App_Glom::get_application());
+ BusyCursor busy_cursor(Application::get_application());
bool result = Base_DB::fill_from_database();
@@ -155,10 +155,10 @@ bool Box_Tables::fill_from_database()
//Get the list of tables in the database, from the server:
#ifdef GLIBMM_EXCEPTIONS_ENABLED
- sharedptr<SharedConnection> sharedconnection = connect_to_server(App_Glom::get_application());
+ sharedptr<SharedConnection> sharedconnection = connect_to_server(Application::get_application());
#else
std::auto_ptr<ExceptionConnection> error;
- sharedptr<SharedConnection> sharedconnection = connect_to_server(App_Glom::get_application(), error);
+ sharedptr<SharedConnection> sharedconnection = connect_to_server(Application::get_application(), error);
// Ignore error because sharedconnection presence is checked below.
#endif
@@ -241,7 +241,7 @@ void Box_Tables::on_adddel_Add(const Gtk::TreeModel::iterator& row)
//Ask the user if they want us to try to cope with this:
Gtk::MessageDialog dialog(Utils::bold_message(_("Table Already Exists")), true, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_OK_CANCEL);
dialog.set_secondary_text(_("This table already exists on the database server, though it is not mentioned in the .glom file. This should not happen. Would you like Glom to attempt to use the existing table?"));
- dialog.set_transient_for(*App_Glom::get_application());
+ dialog.set_transient_for(*Application::get_application());
const int response = dialog.run();
dialog.hide();
@@ -301,7 +301,7 @@ void Box_Tables::on_adddel_Delete(const Gtk::TreeModel::iterator& rowStart, cons
{
//TODO: Do not show tables that are not in the document.
Gtk::MessageDialog dialog(_("You cannot delete this table, because there is no information about this table in the document."));
- dialog.set_transient_for(*App_Glom::get_application());
+ dialog.set_transient_for(*Application::get_application());
dialog.run();
}
else
@@ -310,7 +310,7 @@ void Box_Tables::on_adddel_Delete(const Gtk::TreeModel::iterator& rowStart, cons
Glib::ustring strMsg = _("Are you sure that you want to delete this table?\nTable name: ") + table_name;
Gtk::MessageDialog dialog(Utils::bold_message(_("Delete Table")), true);
dialog.set_secondary_text(strMsg);
- dialog.set_transient_for(*App_Glom::get_application());
+ dialog.set_transient_for(*Application::get_application());
int iButtonClicked = dialog.run();
//Delete the table:
@@ -424,7 +424,7 @@ void Box_Tables::on_adddel_Edit(const Gtk::TreeModel::iterator& row)
{
Gtk::MessageDialog dialog(Utils::bold_message(_("Unknown Table")), true);
dialog.set_secondary_text(_("You cannot open this table, because there is no information about this table in the document."));
- dialog.set_transient_for(*App_Glom::get_application());
+ dialog.set_transient_for(*Application::get_application());
dialog.run();
}
else
diff --git a/glom/notebook_glom.cc b/glom/notebook_glom.cc
index e7162cf..0ab4e79 100644
--- a/glom/notebook_glom.cc
+++ b/glom/notebook_glom.cc
@@ -88,7 +88,7 @@ void Notebook_Glom::on_switch_page_handler(GtkNotebookPage* /* pPage */, guint u
//pBox->load_from_document();
//Set the default button, if there is one:
- App_Glom* pAppGlom = dynamic_cast<App_Glom*>(pApp);
+ Application* pAppGlom = dynamic_cast<Application*>(pApp);
if(pAppGlom)
{
Gtk::Widget* default_button = pBox->get_default_button();
diff --git a/glom/utility_widgets/buttonglom.cc b/glom/utility_widgets/buttonglom.cc
index 647afcb..b6f08c7 100644
--- a/glom/utility_widgets/buttonglom.cc
+++ b/glom/utility_widgets/buttonglom.cc
@@ -52,12 +52,12 @@ void ButtonGlom::init()
}
-App_Glom* ButtonGlom::get_application()
+Application* ButtonGlom::get_application()
{
Gtk::Container* pWindow = get_toplevel();
//TODO: This only works when the child widget is already in its parent.
- return dynamic_cast<App_Glom*>(pWindow);
+ return dynamic_cast<Application*>(pWindow);
}
#ifndef GLOM_ENABLE_CLIENT_ONLY
@@ -94,7 +94,7 @@ void ButtonGlom::on_menu_properties_activate()
bool ButtonGlom::on_button_press_event(GdkEventButton *event)
{
- App_Glom* pApp = get_application();
+ Application* pApp = get_application();
if(pApp && pApp->get_userlevel() == AppState::USERLEVEL_DEVELOPER)
{
GdkModifierType mods;
diff --git a/glom/utility_widgets/buttonglom.h b/glom/utility_widgets/buttonglom.h
index ecf6e5c..31df593 100644
--- a/glom/utility_widgets/buttonglom.h
+++ b/glom/utility_widgets/buttonglom.h
@@ -29,7 +29,7 @@
namespace Glom
{
-class App_Glom;
+class Application;
class ButtonGlom
: public Gtk::Button,
@@ -43,7 +43,7 @@ public:
private:
void init();
- virtual App_Glom* get_application();
+ virtual Application* get_application();
#ifndef GLOM_ENABLE_CLIENT_ONLY
virtual void on_menu_properties_activate();
virtual bool on_button_press_event(GdkEventButton *event);
diff --git a/glom/utility_widgets/canvas/canvas_image_movable.cc b/glom/utility_widgets/canvas/canvas_image_movable.cc
index 03d76cb..97e69d4 100644
--- a/glom/utility_widgets/canvas/canvas_image_movable.cc
+++ b/glom/utility_widgets/canvas/canvas_image_movable.cc
@@ -225,7 +225,7 @@ void CanvasImageMovable::set_image_empty()
Gtk::Widget *widget = get_canvas();
if(!widget)
- widget = App_Glom::get_application();
+ widget = Application::get_application();
Glib::RefPtr<Gdk::Pixbuf> pixbuf;
if(widget)
diff --git a/glom/utility_widgets/checkglom.cc b/glom/utility_widgets/checkglom.cc
index ee87e14..0975b8a 100644
--- a/glom/utility_widgets/checkglom.cc
+++ b/glom/utility_widgets/checkglom.cc
@@ -53,7 +53,7 @@ bool CheckGlom::on_button_press_event(GdkEventButton *event)
{
//Enable/Disable items.
//We did this earlier, but get_application is more likely to work now:
- App_Glom* pApp = get_application();
+ Application* pApp = get_application();
if(pApp)
{
pApp->add_developer_action(m_refContextLayout); //So that it can be disabled when not in developer mode.
@@ -81,12 +81,12 @@ bool CheckGlom::on_button_press_event(GdkEventButton *event)
}
#endif // !GLOM_ENABLE_CLIENT_ONLY
-App_Glom* CheckGlom::get_application()
+Application* CheckGlom::get_application()
{
Gtk::Container* pWindow = get_toplevel();
//TODO: This only works when the child widget is already in its parent.
- return dynamic_cast<App_Glom*>(pWindow);
+ return dynamic_cast<Application*>(pWindow);
}
void CheckGlom::set_value(const Gnome::Gda::Value& value)
diff --git a/glom/utility_widgets/checkglom.h b/glom/utility_widgets/checkglom.h
index 6d38247..558a764 100644
--- a/glom/utility_widgets/checkglom.h
+++ b/glom/utility_widgets/checkglom.h
@@ -31,7 +31,7 @@
namespace Glom
{
-class App_Glom;
+class Application;
class CheckGlom
: public Gtk::CheckButton,
@@ -51,7 +51,7 @@ private:
virtual bool on_button_press_event(GdkEventButton *event); //override
#endif // !GLOM_ENABLE_CLIENT_ONLY
- virtual App_Glom* get_application();
+ virtual Application* get_application();
};
} //namespace Glom
diff --git a/glom/utility_widgets/comboentryglom.cc b/glom/utility_widgets/comboentryglom.cc
index de931f9..3ffa341 100644
--- a/glom/utility_widgets/comboentryglom.cc
+++ b/glom/utility_widgets/comboentryglom.cc
@@ -304,7 +304,7 @@ bool ComboEntryGlom::on_entry_button_press_event(GdkEventButton *event)
{
//Enable/Disable items.
//We did this earlier, but get_application is more likely to work now:
- App_Glom* pApp = get_application();
+ Application* pApp = get_application();
if(pApp)
{
pApp->add_developer_action(m_refContextLayout); //So that it can be disabled when not in developer mode.
@@ -334,12 +334,12 @@ bool ComboEntryGlom::on_entry_button_press_event(GdkEventButton *event)
}
#endif // !GLOM_ENABLE_CLIENT_ONLY
-App_Glom* ComboEntryGlom::get_application()
+Application* ComboEntryGlom::get_application()
{
Gtk::Container* pWindow = get_toplevel();
//TODO: This only works when the child widget is already in its parent.
- return dynamic_cast<App_Glom*>(pWindow);
+ return dynamic_cast<Application*>(pWindow);
}
#ifndef GLOM_ENABLE_MAEMO
diff --git a/glom/utility_widgets/comboentryglom.h b/glom/utility_widgets/comboentryglom.h
index fab447f..9e874d8 100644
--- a/glom/utility_widgets/comboentryglom.h
+++ b/glom/utility_widgets/comboentryglom.h
@@ -35,7 +35,7 @@
namespace Glom
{
-class App_Glom;
+class Application;
/** A Gtk::ComboBoxEntry that can show choices of field values.
* Use this when the user should be allowed to enter values directly too,
@@ -99,7 +99,7 @@ private:
virtual bool on_entry_button_press_event(GdkEventButton *event);
#endif // !GLOM_ENABLE_CLIENT_ONLY
- virtual App_Glom* get_application();
+ virtual Application* get_application();
Gtk::Entry* get_entry();
const Gtk::Entry* get_entry() const;
diff --git a/glom/utility_widgets/comboglom.cc b/glom/utility_widgets/comboglom.cc
index 8350759..48a4d87 100644
--- a/glom/utility_widgets/comboglom.cc
+++ b/glom/utility_widgets/comboglom.cc
@@ -241,7 +241,7 @@ g_warning("ComboGlom::on_button_press_event()");
//Enable/Disable items.
//We did this earlier, but get_application is more likely to work now:
- App_Glom* pApp = get_application();
+ Application* pApp = get_application();
if(pApp)
{
pApp->add_developer_action(m_refContextLayout); //So that it can be disabled when not in developer mode.
@@ -271,12 +271,12 @@ g_warning("ComboGlom::on_button_press_event()");
}
#endif // !GLOM_ENABLE_CLIENT_ONLY
-App_Glom* ComboGlom::get_application()
+Application* ComboGlom::get_application()
{
Gtk::Container* pWindow = get_toplevel();
//TODO: This only works when the child widget is already in its parent.
- return dynamic_cast<App_Glom*>(pWindow);
+ return dynamic_cast<Application*>(pWindow);
}
diff --git a/glom/utility_widgets/comboglom.h b/glom/utility_widgets/comboglom.h
index 6365615..0cf34e4 100644
--- a/glom/utility_widgets/comboglom.h
+++ b/glom/utility_widgets/comboglom.h
@@ -35,7 +35,7 @@
namespace Glom
{
-class App_Glom;
+class Application;
/** A Gtk::ComboBox that can show choices of field values.
* Use this when the user should only be allowed to enter values that are in the choices.
@@ -91,7 +91,7 @@ private:
virtual bool on_button_press_event(GdkEventButton *event);
#endif // !GLOM_ENABLE_CLIENT_ONLY
- virtual App_Glom* get_application();
+ virtual Application* get_application();
Glib::ustring m_old_text;
diff --git a/glom/utility_widgets/datawidget.cc b/glom/utility_widgets/datawidget.cc
index 4dff5b5..68e0667 100644
--- a/glom/utility_widgets/datawidget.cc
+++ b/glom/utility_widgets/datawidget.cc
@@ -453,7 +453,7 @@ bool DataWidget::on_button_press_event(GdkEventButton *event)
//Enable/Disable items.
//We did this earlier, but get_application is more likely to work now:
- App_Glom* pApp = get_application();
+ Application* pApp = get_application();
if(pApp)
{
pApp->add_developer_action(m_refContextLayout); //So that it can be disabled when not in developer mode.
@@ -491,7 +491,7 @@ sharedptr<LayoutItem_Field> DataWidget::offer_field_list(const Glib::ustring& ta
return offer_field_list(table_name, start_field, get_document(), get_application());
}
-sharedptr<LayoutItem_Field> DataWidget::offer_field_list(const Glib::ustring& table_name, const sharedptr<const LayoutItem_Field>& start_field, Document* document, App_Glom* app)
+sharedptr<LayoutItem_Field> DataWidget::offer_field_list(const Glib::ustring& table_name, const sharedptr<const LayoutItem_Field>& start_field, Document* document, Application* app)
{
sharedptr<LayoutItem_Field> result;
@@ -625,12 +625,12 @@ void DataWidget::on_child_user_requested_layout()
}
#endif // !GLOM_ENABLE_CLIENT_ONLY
-App_Glom* DataWidget::get_application()
+Application* DataWidget::get_application()
{
Gtk::Container* pWindow = get_toplevel();
//TODO: This only works when the child widget is already in its parent.
- return dynamic_cast<App_Glom*>(pWindow);
+ return dynamic_cast<Application*>(pWindow);
}
#ifndef GLOM_ENABLE_CLIENT_ONLY
diff --git a/glom/utility_widgets/datawidget.h b/glom/utility_widgets/datawidget.h
index fd36f97..cb21962 100644
--- a/glom/utility_widgets/datawidget.h
+++ b/glom/utility_widgets/datawidget.h
@@ -34,7 +34,7 @@
namespace Glom
{
-class App_Glom;
+class Application;
class DataWidget
: public Gtk::EventBox,
@@ -61,7 +61,7 @@ public:
virtual void set_viewable(bool viewable = true);
#ifndef GLOM_ENABLE_CLIENT_ONLY
- static sharedptr<LayoutItem_Field> offer_field_list(const Glib::ustring& table_name, const sharedptr<const LayoutItem_Field>& start_field, Document* document, App_Glom* app);
+ static sharedptr<LayoutItem_Field> offer_field_list(const Glib::ustring& table_name, const sharedptr<const LayoutItem_Field>& start_field, Document* document, Application* app);
sharedptr<LayoutItem_Field> offer_field_list(const Glib::ustring& table_name);
sharedptr<LayoutItem_Field> offer_field_list(const Glib::ustring& table_name, const sharedptr<const LayoutItem_Field>& start_field);
@@ -105,7 +105,7 @@ private:
//virtual void on_menupopup_add_item(LayoutWidgetBase::enumType item);
#endif // !GLOM_ENABLE_CLIENT_ONLY
- App_Glom* get_application();
+ Application* get_application();
void set_child_size_by_field(const sharedptr<const LayoutItem_Field>& field);
int get_suitable_width(const sharedptr<const LayoutItem_Field>& field_layout);
diff --git a/glom/utility_widgets/db_adddel/db_adddel.cc b/glom/utility_widgets/db_adddel/db_adddel.cc
index 279b729..b8d0b62 100644
--- a/glom/utility_widgets/db_adddel/db_adddel.cc
+++ b/glom/utility_widgets/db_adddel/db_adddel.cc
@@ -163,7 +163,7 @@ DbAddDel::DbAddDel()
DbAddDel::~DbAddDel()
{
#ifndef GLOM_ENABLE_CLIENT_ONLY
- App_Glom* pApp = get_application();
+ Application* pApp = get_application();
if(pApp)
{
pApp->remove_developer_action(m_refContextLayout);
@@ -278,7 +278,7 @@ void DbAddDel::setup_menu()
sigc::mem_fun(*this, &DbAddDel::on_MenuPopup_activate_layout) );
//TODO: This does not work until this widget is in a container in the window:
- App_Glom* pApp = get_application();
+ Application* pApp = get_application();
if(pApp)
{
pApp->add_developer_action(m_refContextLayout); //So that it can be disabled when not in developer mode.
@@ -352,7 +352,7 @@ bool DbAddDel::on_button_press_event_Popup(GdkEventButton *event)
#ifndef GLOM_ENABLE_CLIENT_ONLY
//Enable/Disable items.
//We did this earlier, but get_application is more likely to work now:
- App_Glom* pApp = get_application();
+ Application* pApp = get_application();
if(pApp)
{
pApp->add_developer_action(m_refContextLayout); //So that it can be disabled when not in developer mode.
@@ -2336,12 +2336,12 @@ void DbAddDel::treeviewcolumn_on_cell_data(Gtk::CellRenderer* renderer, const Gt
}
}
-App_Glom* DbAddDel::get_application()
+Application* DbAddDel::get_application()
{
Gtk::Container* pWindow = get_toplevel();
//TODO: This only works when the child widget is already in its parent.
- return dynamic_cast<App_Glom*>(pWindow);
+ return dynamic_cast<Application*>(pWindow);
}
void DbAddDel::set_allow_view(bool val)
@@ -2627,7 +2627,7 @@ void DbAddDel::user_added(const Gtk::TreeModel::iterator& row)
//Tell user that they can't do that:
Gtk::MessageDialog dialog(Utils::bold_message(_("Extra Related Records Not Possible")), true, Gtk::MESSAGE_WARNING);
dialog.set_secondary_text(_("You attempted to add a new related record, but there can only be one related record, because the relationship uses a unique key.")),
- dialog.set_transient_for(*App_Glom::get_application());
+ dialog.set_transient_for(*Application::get_application());
dialog.run();
return;
diff --git a/glom/utility_widgets/db_adddel/db_adddel.h b/glom/utility_widgets/db_adddel/db_adddel.h
index 2340668..61ca867 100644
--- a/glom/utility_widgets/db_adddel/db_adddel.h
+++ b/glom/utility_widgets/db_adddel/db_adddel.h
@@ -41,7 +41,7 @@
namespace Glom
{
-class App_Glom;
+class Application;
class DbAddDelColumnInfo
{
@@ -381,7 +381,7 @@ private:
int get_fixed_cell_height();
//TODO: Remove this and use AppGlom::get_application() instead?
- App_Glom* get_application();
+ Application* get_application();
static void apply_formatting(Gtk::CellRenderer* renderer, const sharedptr<const LayoutItem_WithFormatting>& layout_item);
diff --git a/glom/utility_widgets/db_adddel/glom_db_treemodel.cc b/glom/utility_widgets/db_adddel/glom_db_treemodel.cc
index a83dc17..62cbb82 100644
--- a/glom/utility_widgets/db_adddel/glom_db_treemodel.cc
+++ b/glom/utility_widgets/db_adddel/glom_db_treemodel.cc
@@ -273,7 +273,7 @@ bool DbTreeModel::refresh_from_database(const FoundSet& found_set)
const Glib::ustring sql_query = Utils::build_sql_select_with_where_clause(m_found_set.m_table_name, m_column_fields, m_found_set.m_where_clause, m_found_set.m_extra_join, m_found_set.m_sort_clause, m_found_set.m_extra_group_by);
//std::cout << " Debug: DbTreeModel::refresh_from_database(): " << sql_query << std::endl;
- const App_Glom* app = App_Glom::get_application();
+ const Application* app = Application::get_application();
if(app && app->get_show_sql_debug())
{
#ifdef GLIBMM_EXCEPTIONS_ENABLED
diff --git a/glom/utility_widgets/entryglom.cc b/glom/utility_widgets/entryglom.cc
index ee2594a..c95f8bd 100644
--- a/glom/utility_widgets/entryglom.cc
+++ b/glom/utility_widgets/entryglom.cc
@@ -211,7 +211,7 @@ bool EntryGlom::on_button_press_event(GdkEventButton *event)
{
//Enable/Disable items.
//We did this earlier, but get_application is more likely to work now:
- App_Glom* pApp = get_application();
+ Application* pApp = get_application();
if(pApp)
{
pApp->add_developer_action(m_refContextLayout); //So that it can be disabled when not in developer mode.
@@ -241,12 +241,12 @@ bool EntryGlom::on_button_press_event(GdkEventButton *event)
}
#endif // !GLOM_ENABLE_CLIENT_ONLY
-App_Glom* EntryGlom::get_application()
+Application* EntryGlom::get_application()
{
Gtk::Container* pWindow = get_toplevel();
//TODO: This only works when the child widget is already in its parent.
- return dynamic_cast<App_Glom*>(pWindow);
+ return dynamic_cast<Application*>(pWindow);
}
void EntryGlom::set_read_only(bool read_only)
diff --git a/glom/utility_widgets/entryglom.h b/glom/utility_widgets/entryglom.h
index 72dbbe9..92f8154 100644
--- a/glom/utility_widgets/entryglom.h
+++ b/glom/utility_widgets/entryglom.h
@@ -35,7 +35,7 @@
namespace Glom
{
-class App_Glom;
+class Application;
class EntryGlom
@@ -84,7 +84,7 @@ private:
virtual bool on_button_press_event(GdkEventButton *event); //override
#endif // !GLOM_ENABLE_CLIENT_ONLY
- virtual App_Glom* get_application();
+ virtual Application* get_application();
Glib::ustring m_old_text;
Field::glom_field_type m_glom_type; //Store the type so we can validate the text accordingly.
diff --git a/glom/utility_widgets/imageglom.cc b/glom/utility_widgets/imageglom.cc
index 12629f6..f1f35d9 100644
--- a/glom/utility_widgets/imageglom.cc
+++ b/glom/utility_widgets/imageglom.cc
@@ -92,7 +92,7 @@ bool ImageGlom::on_button_press_event(GdkEventButton *event)
//Enable/Disable items.
//We did this earlier, but get_application is more likely to work now:
- App_Glom* pApp = get_application();
+ Application* pApp = get_application();
if(pApp)
{
#ifndef GLOM_ENABLE_CLIENT_ONLY
@@ -144,12 +144,12 @@ bool ImageGlom::on_button_press_event(GdkEventButton *event)
#endif // GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
}
-App_Glom* ImageGlom::get_application()
+Application* ImageGlom::get_application()
{
Gtk::Container* pWindow = get_toplevel();
//TODO: This only works when the child widget is already in its parent.
- return dynamic_cast<App_Glom*>(pWindow);
+ return dynamic_cast<Application*>(pWindow);
}
bool ImageGlom::get_has_original_data() const
@@ -434,7 +434,7 @@ void ImageGlom::on_menupopup_activate_select_file()
// Automatically delete the dialog when we no longer need it:
std::auto_ptr<Gtk::Dialog> dialog_keeper(dialog);
- App_Glom* pApp = get_application();
+ Application* pApp = get_application();
if(pApp)
dialog->set_transient_for(*pApp);
diff --git a/glom/utility_widgets/imageglom.h b/glom/utility_widgets/imageglom.h
index 0b56da6..64706f7 100644
--- a/glom/utility_widgets/imageglom.h
+++ b/glom/utility_widgets/imageglom.h
@@ -30,7 +30,7 @@
namespace Glom
{
-class App_Glom;
+class Application;
class ImageGlom
: public Gtk::EventBox,
@@ -76,7 +76,7 @@ private:
void on_clipboard_clear();
void on_clipboard_received_image(const Glib::RefPtr<Gdk::Pixbuf>& pixbuf);
- virtual App_Glom* get_application();
+ virtual Application* get_application();
void setup_menu_usermode();
void scale();
diff --git a/glom/utility_widgets/labelglom.cc b/glom/utility_widgets/labelglom.cc
index 551278b..63a6e51 100644
--- a/glom/utility_widgets/labelglom.cc
+++ b/glom/utility_widgets/labelglom.cc
@@ -60,12 +60,12 @@ void LabelGlom::init()
//but we also want to allow changing of the background color, so we don't use it: set_visible_window(false);
}
-App_Glom* LabelGlom::get_application()
+Application* LabelGlom::get_application()
{
Gtk::Container* pWindow = get_toplevel();
//TODO: This only works when the child widget is already in its parent.
- return dynamic_cast<App_Glom*>(pWindow);
+ return dynamic_cast<Application*>(pWindow);
}
#ifndef GLOM_ENABLE_CLIENT_ONLY
@@ -105,7 +105,7 @@ void LabelGlom::on_menu_properties_activate()
bool LabelGlom::on_button_press_event(GdkEventButton *event)
{
- App_Glom* pApp = get_application();
+ Application* pApp = get_application();
if(pApp && pApp->get_userlevel() == AppState::USERLEVEL_DEVELOPER)
{
GdkModifierType mods;
diff --git a/glom/utility_widgets/labelglom.h b/glom/utility_widgets/labelglom.h
index 45a5e68..5d389d7 100644
--- a/glom/utility_widgets/labelglom.h
+++ b/glom/utility_widgets/labelglom.h
@@ -30,7 +30,7 @@
namespace Glom
{
-class App_Glom;
+class Application;
class LabelGlom
: public Gtk::EventBox,
@@ -47,7 +47,7 @@ public:
private:
void init();
- virtual App_Glom* get_application();
+ virtual Application* get_application();
Gtk::Label m_label;
#ifndef GLOM_ENABLE_CLIENT_ONLY
diff --git a/glom/utility_widgets/layoutwidgetbase.cc b/glom/utility_widgets/layoutwidgetbase.cc
index 05233ad..c85071c 100644
--- a/glom/utility_widgets/layoutwidgetbase.cc
+++ b/glom/utility_widgets/layoutwidgetbase.cc
@@ -55,7 +55,7 @@ sharedptr<LayoutItem> LayoutWidgetBase::get_layout_item()
return m_pLayoutItem;
}
-App_Glom* LayoutWidgetBase::get_application() const
+Application* LayoutWidgetBase::get_application() const
{
return 0; //override to implement.
}
diff --git a/glom/utility_widgets/layoutwidgetbase.h b/glom/utility_widgets/layoutwidgetbase.h
index 64858eb..3fafb97 100644
--- a/glom/utility_widgets/layoutwidgetbase.h
+++ b/glom/utility_widgets/layoutwidgetbase.h
@@ -30,7 +30,7 @@
namespace Glom
{
-class App_Glom;
+class Application;
class LayoutWidgetBase : virtual public sigc::trackable
{
@@ -84,7 +84,7 @@ public:
#endif // !GLOM_ENABLE_CLIENT_ONLY
protected:
- virtual App_Glom* get_application() const; // = 0;
+ virtual Application* get_application() const; // = 0;
static void apply_formatting(Gtk::Widget& widget, const sharedptr<const LayoutItem_WithFormatting>& layout_item);
diff --git a/glom/utility_widgets/layoutwidgetmenu.cc b/glom/utility_widgets/layoutwidgetmenu.cc
index b23e523..ad50069 100644
--- a/glom/utility_widgets/layoutwidgetmenu.cc
+++ b/glom/utility_widgets/layoutwidgetmenu.cc
@@ -82,7 +82,7 @@ void LayoutWidgetMenu::setup_menu()
sigc::mem_fun(*this, &LayoutWidgetMenu::on_menupopup_activate_delete) );
//TODO: This does not work until this widget is in a container in the window:s
- App_Glom* pApp = get_application();
+ Application* pApp = get_application();
if(pApp)
{
pApp->add_developer_action(m_refContextLayout); //So that it can be disabled when not in developer mode.
diff --git a/glom/utility_widgets/notebookglom.cc b/glom/utility_widgets/notebookglom.cc
index 3e2ca32..f1e9243 100644
--- a/glom/utility_widgets/notebookglom.cc
+++ b/glom/utility_widgets/notebookglom.cc
@@ -59,12 +59,12 @@ void NotebookGlom::init()
}
-App_Glom* NotebookGlom::get_application()
+Application* NotebookGlom::get_application()
{
Gtk::Container* pWindow = get_toplevel();
//TODO: This only works when the child widget is already in its parent.
- return dynamic_cast<App_Glom*>(pWindow);
+ return dynamic_cast<Application*>(pWindow);
}
void NotebookGlom::delete_from_layout()
diff --git a/glom/utility_widgets/notebookglom.h b/glom/utility_widgets/notebookglom.h
index ceda67d..9130919 100644
--- a/glom/utility_widgets/notebookglom.h
+++ b/glom/utility_widgets/notebookglom.h
@@ -29,7 +29,7 @@
namespace Glom
{
-class App_Glom;
+class Application;
class NotebookGlom
: public Gtk::Notebook,
@@ -45,7 +45,7 @@ public:
protected:
void init();
- virtual App_Glom* get_application();
+ virtual Application* get_application();
};
} //namespace Glom
diff --git a/glom/utility_widgets/notebooklabelglom.cc b/glom/utility_widgets/notebooklabelglom.cc
index 610b351..cf599be 100644
--- a/glom/utility_widgets/notebooklabelglom.cc
+++ b/glom/utility_widgets/notebooklabelglom.cc
@@ -59,12 +59,12 @@ void NotebookLabelGlom::set_label (const Glib::ustring& title)
m_label.set_label (title);
}
-App_Glom* NotebookLabelGlom::get_application()
+Application* NotebookLabelGlom::get_application()
{
Gtk::Container* pWindow = get_toplevel();
//TODO: This only works when the child widget is already in its parent.
- return dynamic_cast<App_Glom*>(pWindow);
+ return dynamic_cast<Application*>(pWindow);
}
void NotebookLabelGlom::on_menu_new_group_activate()
@@ -146,7 +146,7 @@ void NotebookLabelGlom::setup_menu()
bool NotebookLabelGlom::on_button_press_event(GdkEventButton *event)
{
- App_Glom* pApp = get_application();
+ Application* pApp = get_application();
if(pApp && pApp->get_userlevel() == AppState::USERLEVEL_DEVELOPER)
{
GdkModifierType mods;
diff --git a/glom/utility_widgets/notebooklabelglom.h b/glom/utility_widgets/notebooklabelglom.h
index 0aa83e1..ee19513 100644
--- a/glom/utility_widgets/notebooklabelglom.h
+++ b/glom/utility_widgets/notebooklabelglom.h
@@ -28,7 +28,7 @@
namespace Glom
{
-class App_Glom;
+class Application;
class NotebookLabelGlom
: public Gtk::EventBox
@@ -43,7 +43,7 @@ public:
private:
void init();
- virtual App_Glom* get_application();
+ virtual Application* get_application();
Gtk::Label m_label;
NotebookGlom* m_notebook;
diff --git a/glom/utility_widgets/placeholder-glom.cc b/glom/utility_widgets/placeholder-glom.cc
index 3d0656d..1041734 100644
--- a/glom/utility_widgets/placeholder-glom.cc
+++ b/glom/utility_widgets/placeholder-glom.cc
@@ -50,12 +50,12 @@ PlaceholderGlom::~PlaceholderGlom()
{
}
-App_Glom* PlaceholderGlom::get_application()
+Application* PlaceholderGlom::get_application()
{
Gtk::Container* pWindow = get_toplevel();
//TODO: This only works when the child widget is already in its parent.
- return dynamic_cast<App_Glom*>(pWindow);
+ return dynamic_cast<Application*>(pWindow);
}
void PlaceholderGlom::on_size_request(Gtk::Requisition* requisition)
diff --git a/glom/utility_widgets/placeholder-glom.h b/glom/utility_widgets/placeholder-glom.h
index db7362c..42b2c4e 100644
--- a/glom/utility_widgets/placeholder-glom.h
+++ b/glom/utility_widgets/placeholder-glom.h
@@ -43,7 +43,7 @@ public:
virtual ~PlaceholderGlom();
private:
- virtual App_Glom* get_application();
+ virtual Application* get_application();
virtual void on_size_request(Gtk::Requisition* requisition);
virtual void on_size_allocate(Gtk::Allocation& allocation);
diff --git a/glom/utility_widgets/textviewglom.cc b/glom/utility_widgets/textviewglom.cc
index d8c80d3..f832ecd 100644
--- a/glom/utility_widgets/textviewglom.cc
+++ b/glom/utility_widgets/textviewglom.cc
@@ -181,7 +181,7 @@ bool TextViewGlom::on_button_press_event(GdkEventButton *event)
{
//Enable/Disable items.
//We did this earlier, but get_application is more likely to work now:
- App_Glom* pApp = get_application();
+ Application* pApp = get_application();
if(pApp)
{
pApp->add_developer_action(m_refContextLayout); //So that it can be disabled when not in developer mode.
@@ -211,12 +211,12 @@ bool TextViewGlom::on_button_press_event(GdkEventButton *event)
}
#endif // !GLOM_ENABLE_CLIENT_ONLY
-App_Glom* TextViewGlom::get_application()
+Application* TextViewGlom::get_application()
{
Gtk::Container* pWindow = get_toplevel();
//TODO: This only works when the child widget is already in its parent.
- return dynamic_cast<App_Glom*>(pWindow);
+ return dynamic_cast<Application*>(pWindow);
}
TextViewGlom::type_text_view* TextViewGlom::get_textview()
diff --git a/glom/utility_widgets/textviewglom.h b/glom/utility_widgets/textviewglom.h
index acc3b31..b449b06 100644
--- a/glom/utility_widgets/textviewglom.h
+++ b/glom/utility_widgets/textviewglom.h
@@ -35,7 +35,7 @@
namespace Glom
{
-class App_Glom;
+class Application;
class TextViewGlom
: public Gtk::ScrolledWindow,
@@ -81,7 +81,7 @@ private:
virtual bool on_button_press_event(GdkEventButton *event); //override
#endif
- virtual App_Glom* get_application();
+ virtual Application* get_application();
Glib::ustring m_old_text;
Field::glom_field_type m_glom_type; //Store the type so we can validate the text accordingly.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
