[glom] Change semi-camel-case m_* members variables to something saner.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] Change semi-camel-case m_* members variables to something saner.
- Date: Wed, 30 Mar 2016 13:17:31 +0000 (UTC)
commit 42173a529f3d954f70bf63b24385410debe46db6
Author: Murray Cumming <murrayc murrayc com>
Date: Wed Mar 30 14:03:52 2016 +0200
Change semi-camel-case m_* members variables to something saner.
glom/appwindow.cc | 320 +++++++-------
glom/appwindow.h | 22 +-
glom/filechooser_export.cc | 26 +-
glom/filechooser_export.h | 2 +-
glom/frame_glom.cc | 454 ++++++++++----------
glom/frame_glom.h | 44 +-
glom/libglom/connectionpool.cc | 42 +-
glom/libglom/connectionpool.h | 2 +-
glom/libglom/document/bakery/document.cc | 18 +-
glom/libglom/document/bakery/document.h | 2 +-
glom/libglom/document/bakery/document_xml.cc | 34 +-
glom/libglom/document/bakery/document_xml.h | 8 +-
glom/mode_data/box_data.cc | 20 +-
glom/mode_data/box_data.h | 2 +-
glom/mode_data/box_data_calendar_related.cc | 22 +-
glom/mode_data/box_data_calendar_related.h | 8 +-
glom/mode_data/box_data_list.cc | 2 +-
glom/mode_data/box_data_list_related.cc | 2 +-
glom/mode_data/box_data_manyrecords.cc | 2 +-
glom/mode_data/buttonglom.cc | 2 +-
glom/mode_data/datawidget/checkbutton.cc | 10 +-
glom/mode_data/datawidget/combo.cc | 10 +-
.../mode_data/datawidget/combo_as_radio_buttons.cc | 10 +-
glom/mode_data/datawidget/datawidget.cc | 10 +-
glom/mode_data/datawidget/dialog_choose_id.cc | 26 +-
glom/mode_data/datawidget/dialog_choose_id.h | 6 +-
glom/mode_data/datawidget/entry.cc | 10 +-
glom/mode_data/datawidget/label.cc | 4 +-
glom/mode_data/datawidget/textview.cc | 10 +-
glom/mode_data/db_adddel/db_adddel.cc | 48 +-
glom/mode_data/db_adddel/db_adddel.h | 10 +-
glom/mode_data/flowtablewithfields.cc | 2 +-
glom/mode_design/fields/box_db_table_definition.cc | 4 +-
glom/mode_design/fields/dialog_fielddefinition.cc | 186 ++++----
glom/mode_design/fields/dialog_fielddefinition.h | 48 +-
glom/navigation/box_tables.cc | 76 ++--
glom/navigation/box_tables.h | 12 +-
glom/utility_widgets/adddel/adddel.cc | 40 +-
glom/utility_widgets/adddel/adddel.h | 12 +-
glom/utility_widgets/dialog_properties.cc | 12 +-
glom/utility_widgets/dialog_properties.h | 4 +-
glom/utility_widgets/imageglom.cc | 38 +-
glom/utility_widgets/imageglom.h | 8 +-
glom/utility_widgets/layoutwidgetbase.cc | 8 +-
glom/utility_widgets/layoutwidgetbase.h | 2 +-
glom/utility_widgets/layoutwidgetmenu.cc | 66 ++--
glom/utility_widgets/layoutwidgetmenu.h | 12 +-
glom/utility_widgets/layoutwidgetutils.cc | 12 +-
glom/utility_widgets/layoutwidgetutils.h | 8 +-
glom/utility_widgets/notebooklabelglom.cc | 18 +-
glom/utility_widgets/notebooklabelglom.h | 8 +-
po/dz.po | 2 +-
po/en_CA.po | 2 +-
po/vi.po | 2 +-
54 files changed, 885 insertions(+), 885 deletions(-)
---
diff --git a/glom/appwindow.cc b/glom/appwindow.cc
index 5933698..e8c0b9b 100644
--- a/glom/appwindow.cc
+++ b/glom/appwindow.cc
@@ -86,12 +86,12 @@ AppWindow::AppWindow(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>&
: GlomBakery::AppWindow_WithDoc("Glom"),
Gtk::ApplicationWindow(cobject),
m_builder(builder),
- m_pVBox(nullptr),
- m_VBox_PlaceHolder(Gtk::ORIENTATION_VERTICAL),
- m_pBoxTop(nullptr),
- m_pFrame(nullptr),
+ m_vbox(nullptr),
+ m_vbox_placeHolder(Gtk::ORIENTATION_VERTICAL),
+ m_box_top(nullptr),
+ m_frame(nullptr),
m_about_shown(false),
- m_pAbout(nullptr),
+ m_about(nullptr),
#ifndef GLOM_ENABLE_CLIENT_ONLY
m_window_translations(nullptr),
#endif // !GLOM_ENABLE_CLIENT_ONLY
@@ -107,8 +107,8 @@ AppWindow::AppWindow(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>&
Gtk::Window::set_default_icon_name("glom");
//Load widgets from glade file:
- builder->get_widget("bakery_vbox", m_pBoxTop);
- builder->get_widget_derived("vbox_frame", m_pFrame); //This one is derived. There's a lot happening here.
+ builder->get_widget("bakery_vbox", m_box_top);
+ builder->get_widget_derived("vbox_frame", m_frame); //This one is derived. There's a lot happening here.
builder->get_widget_derived("infobar_progress", m_infobar_progress);
//Add menu bar at the top:
@@ -121,7 +121,7 @@ AppWindow::AppWindow(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>&
m_menubar = std::make_unique<Gtk::MenuBar>(gmenu);
m_menubar->show();
- m_pBoxTop->pack_start(*m_menubar, Gtk::PACK_SHRINK);
+ m_box_top->pack_start(*m_menubar, Gtk::PACK_SHRINK);
//TODO: Remove our use of add_accelerator() in application.cc,
//if there is ever an easier way to make the 'accel's from the .glade file just work.
@@ -151,7 +151,7 @@ AppWindow::~AppWindow()
#ifndef GLOM_ENABLE_CLIENT_ONLY
if(m_window_translations)
{
- m_pFrame->remove_view(m_window_translations);
+ m_frame->remove_view(m_window_translations);
delete m_window_translations;
}
@@ -160,8 +160,8 @@ AppWindow::~AppWindow()
#endif // !GLOM_ENABLE_CLIENT_ONLY
- delete m_pAbout;
- m_pAbout = nullptr;
+ delete m_about;
+ m_about = nullptr;
//This was set in the constructor:
global_appwindow = nullptr;
@@ -205,7 +205,7 @@ bool AppWindow::init_with_document(const Glib::ustring& document_uri, bool resto
{
init(); //calls init_menus()
- //m_pFrame->set_shadow_type(Gtk::SHADOW_IN);
+ //m_frame->set_shadow_type(Gtk::SHADOW_IN);
if(document_uri.empty())
{
@@ -259,42 +259,42 @@ void AppWindow::init_menus_file()
// File menu
//Build actions:
- m_refActionGroup_File = Gio::SimpleActionGroup::create();
+ m_action_group_file = Gio::SimpleActionGroup::create();
//File actions
- m_refActionGroup_File->add_action("new",
+ m_action_group_file->add_action("new",
sigc::mem_fun((AppWindow&)*this, &AppWindow::on_menu_file_new));
- m_refActionGroup_File->add_action("open",
+ m_action_group_file->add_action("open",
sigc::mem_fun((GlomBakery::AppWindow_WithDoc&)*this, &GlomBakery::AppWindow_WithDoc::on_menu_file_open));
Glib::RefPtr<Gio::SimpleAction> action;
#ifndef GLOM_ENABLE_CLIENT_ONLY
- action = m_refActionGroup_File->add_action("save-as-example",
+ action = m_action_group_file->add_action("save-as-example",
sigc::mem_fun((AppWindow&)*this, &AppWindow::on_menu_file_save_as_example));
add_developer_action(action);
- action = m_refActionGroup_File->add_action("export",
- sigc::mem_fun(*m_pFrame, &Frame_Glom::on_menu_file_export));
+ action = m_action_group_file->add_action("export",
+ sigc::mem_fun(*m_frame, &Frame_Glom::on_menu_file_export));
m_listTableSensitiveActions.emplace_back(action);
- action = m_refActionGroup_File->add_action("import",
- sigc::mem_fun(*m_pFrame, &Frame_Glom::on_menu_file_import));
+ action = m_action_group_file->add_action("import",
+ sigc::mem_fun(*m_frame, &Frame_Glom::on_menu_file_import));
m_listTableSensitiveActions.emplace_back(action);
- m_toggleaction_network_shared = m_refActionGroup_File->add_action_bool("share",
+ m_toggleaction_network_shared = m_action_group_file->add_action_bool("share",
sigc::mem_fun(*this, &AppWindow::on_menu_file_toggle_share) );
m_listTableSensitiveActions.emplace_back(m_toggleaction_network_shared);
#endif //!GLOM_ENABLE_CLIENT_ONLY
- action = m_refActionGroup_File->add_action("print",
- sigc::mem_fun(*m_pFrame, &Frame_Glom::on_menu_file_print) );
+ action = m_action_group_file->add_action("print",
+ sigc::mem_fun(*m_frame, &Frame_Glom::on_menu_file_print) );
m_listTableSensitiveActions.emplace_back(action);
#ifndef GLOM_ENABLE_CLIENT_ONLY
auto action_print_edit =
- m_refActionGroup_File->add_action("edit-print-layouts",
- sigc::mem_fun(*m_pFrame, &Frame_Glom::on_menu_file_print_edit_layouts));
+ m_action_group_file->add_action("edit-print-layouts",
+ sigc::mem_fun(*m_frame, &Frame_Glom::on_menu_file_print_edit_layouts));
m_listDeveloperActions.emplace_back(action_print_edit);
#endif // !GLOM_ENABLE_CLIENT_ONLY
@@ -302,7 +302,7 @@ void AppWindow::init_menus_file()
add_action("close",
sigc::mem_fun((GlomBakery::AppWindow_WithDoc&)*this,
&GlomBakery::AppWindow_WithDoc::on_menu_file_close));
- insert_action_group("file", m_refActionGroup_File);
+ insert_action_group("file", m_action_group_file);
}
void AppWindow::init_menus()
@@ -312,107 +312,107 @@ void AppWindow::init_menus()
//Build actions:
- m_refActionGroup_Tables = Gio::SimpleActionGroup::create();
+ m_action_group_tables = Gio::SimpleActionGroup::create();
Glib::RefPtr<Gio::SimpleAction> action;
#ifndef GLOM_ENABLE_CLIENT_ONLY
- action = m_refActionGroup_Tables->add_action("edit-tables",
- sigc::mem_fun(*m_pFrame, &Frame_Glom::on_menu_Tables_EditTables) );
+ action = m_action_group_tables->add_action("edit-tables",
+ sigc::mem_fun(*m_frame, &Frame_Glom::on_menu_Tables_EditTables) );
m_listDeveloperActions.emplace_back(action);
/* Commented out because it is useful but confusing to new users:
- action = m_refActionGroup_Tables->add_action("GlomAction_Menu_AddRelatedTable", //_("Add _Related Table"));
- sigc::mem_fun(*m_pFrame, &Frame_Glom::on_menu_Tables_AddRelatedTable) );
+ action = m_action_group_tables->add_action("GlomAction_Menu_AddRelatedTable", //_("Add _Related Table"));
+ sigc::mem_fun(*m_frame, &Frame_Glom::on_menu_Tables_AddRelatedTable) );
m_listDeveloperActions.emplace_back(action);
*/
#endif // !GLOM_ENABLE_CLIENT_ONLY
- insert_action_group("tables", m_refActionGroup_Tables);
+ insert_action_group("tables", m_action_group_tables);
//"Reports" menu:
- m_refActionGroup_Reports = Gio::SimpleActionGroup::create();
+ m_action_group_reports = Gio::SimpleActionGroup::create();
#ifndef GLOM_ENABLE_CLIENT_ONLY
- m_refActionGroup_Reports->add_action("edit-reports",
- sigc::mem_fun(*m_pFrame, &Frame_Glom::on_menu_Reports_EditReports) );
+ m_action_group_reports->add_action("edit-reports",
+ sigc::mem_fun(*m_frame, &Frame_Glom::on_menu_Reports_EditReports) );
m_listDeveloperActions.emplace_back(action);
m_listTableSensitiveActions.emplace_back(action);
#endif
- insert_action_group("reports", m_refActionGroup_Developer);
+ insert_action_group("reports", m_action_group_developer);
//Developer menu:
- m_refActionGroup_Developer = Gio::SimpleActionGroup::create();
+ m_action_group_developer = Gio::SimpleActionGroup::create();
#ifndef GLOM_ENABLE_CLIENT_ONLY
m_action_menu_developer_usermode =
- m_refActionGroup_Developer->add_action_radio_integer("usermode",
+ m_action_group_developer->add_action_radio_integer("usermode",
sigc::mem_fun(*this, &AppWindow::on_menu_developer_usermode),
Utils::to_utype(AppState::userlevels::OPERATOR) );
- action = m_refActionGroup_Developer->add_action("database-preferences",
- sigc::mem_fun(*m_pFrame, &Frame_Glom::on_menu_developer_database_preferences) );
+ action = m_action_group_developer->add_action("database-preferences",
+ sigc::mem_fun(*m_frame, &Frame_Glom::on_menu_developer_database_preferences) );
m_listDeveloperActions.emplace_back(action);
- action = m_refActionGroup_Developer->add_action("fields",
- sigc::mem_fun(*m_pFrame, &Frame_Glom::on_menu_developer_fields) );
+ action = m_action_group_developer->add_action("fields",
+ sigc::mem_fun(*m_frame, &Frame_Glom::on_menu_developer_fields) );
m_listDeveloperActions.emplace_back(action);
m_listTableSensitiveActions.emplace_back(action);
- action = m_refActionGroup_Developer->add_action("relationships-overview",
- sigc::mem_fun(*m_pFrame, &Frame_Glom::on_menu_developer_relationships_overview) );
+ action = m_action_group_developer->add_action("relationships-overview",
+ sigc::mem_fun(*m_frame, &Frame_Glom::on_menu_developer_relationships_overview) );
m_listDeveloperActions.emplace_back(action);
m_listTableSensitiveActions.emplace_back(action);
- action = m_refActionGroup_Developer->add_action("relationships",
- sigc::mem_fun(*m_pFrame, &Frame_Glom::on_menu_developer_relationships) );
+ action = m_action_group_developer->add_action("relationships",
+ sigc::mem_fun(*m_frame, &Frame_Glom::on_menu_developer_relationships) );
m_listDeveloperActions.emplace_back(action);
m_listTableSensitiveActions.emplace_back(action);
- m_action_developer_users = m_refActionGroup_Developer->add_action("users",
- sigc::mem_fun(*m_pFrame, &Frame_Glom::on_menu_developer_users));
+ m_action_developer_users = m_action_group_developer->add_action("users",
+ sigc::mem_fun(*m_frame, &Frame_Glom::on_menu_developer_users));
m_listDeveloperActions.emplace_back(m_action_developer_users);
- action = m_refActionGroup_Developer->add_action("print-layouts",
- sigc::mem_fun(*m_pFrame, &Frame_Glom::on_menu_developer_print_layouts));
+ action = m_action_group_developer->add_action("print-layouts",
+ sigc::mem_fun(*m_frame, &Frame_Glom::on_menu_developer_print_layouts));
m_listDeveloperActions.emplace_back(action);
m_listTableSensitiveActions.emplace_back(action);
- action = m_refActionGroup_Developer->add_action("reports",
- sigc::mem_fun(*m_pFrame, &Frame_Glom::on_menu_developer_reports));
+ action = m_action_group_developer->add_action("reports",
+ sigc::mem_fun(*m_frame, &Frame_Glom::on_menu_developer_reports));
m_listDeveloperActions.emplace_back(action);
m_listTableSensitiveActions.emplace_back(action);
- action = m_refActionGroup_Developer->add_action("script-library",
- sigc::mem_fun(*m_pFrame, &Frame_Glom::on_menu_developer_script_library));
+ action = m_action_group_developer->add_action("script-library",
+ sigc::mem_fun(*m_frame, &Frame_Glom::on_menu_developer_script_library));
m_listDeveloperActions.emplace_back(action);
- action = m_refActionGroup_Developer->add_action("layout",
- sigc::mem_fun(*m_pFrame, &Frame_Glom::on_menu_developer_layout));
+ action = m_action_group_developer->add_action("layout",
+ sigc::mem_fun(*m_frame, &Frame_Glom::on_menu_developer_layout));
m_listDeveloperActions.emplace_back(action);
m_listTableSensitiveActions.emplace_back(action);
- action = m_refActionGroup_Developer->add_action("change-language",
+ action = m_action_group_developer->add_action("change-language",
sigc::mem_fun(*this, &AppWindow::on_menu_developer_changelanguage));
m_listDeveloperActions.emplace_back(action);
- action = m_refActionGroup_Developer->add_action("translations",
+ action = m_action_group_developer->add_action("translations",
sigc::mem_fun(*this, &AppWindow::on_menu_developer_translations));
m_listDeveloperActions.emplace_back(action);
//"Active Platform" menu:
- m_action_menu_developer_active_platform =
m_refActionGroup_Developer->add_action_radio_string("active-platform",
+ m_action_menu_developer_active_platform =
m_action_group_developer->add_action_radio_string("active-platform",
sigc::mem_fun(*this, &AppWindow::on_menu_developer_active_platform),
"");
m_listDeveloperActions.emplace_back(m_action_menu_developer_active_platform);
- action = m_refActionGroup_Developer->add_action("export-backup",
+ action = m_action_group_developer->add_action("export-backup",
sigc::mem_fun(*this, &AppWindow::on_menu_developer_export_backup));
m_listDeveloperActions.emplace_back(action);
- action = m_refActionGroup_Developer->add_action("restore-backup",
+ action = m_action_group_developer->add_action("restore-backup",
sigc::mem_fun(*this, &AppWindow::on_menu_developer_restore_backup));
m_listDeveloperActions.emplace_back(action);
@@ -420,22 +420,22 @@ void AppWindow::init_menus()
//though it mostly only exists because it is not quite ready to be on by default:
//Note to translators: Drag and Drop is part of the name, not a verb or action:
m_action_enable_layout_drag_and_drop =
- m_refActionGroup_Developer->add_action_bool("drag-and-drop-layout",
+ m_action_group_developer->add_action_bool("drag-and-drop-layout",
sigc::mem_fun(*this, &AppWindow::on_menu_developer_enable_layout_drag_and_drop));
m_listDeveloperActions.emplace_back(m_action_enable_layout_drag_and_drop);
#endif // !GLOM_ENABLE_CLIENT_ONLY
- insert_action_group("developer", m_refActionGroup_Developer);
+ insert_action_group("developer", m_action_group_developer);
- m_refHelpActionGroup = Gio::SimpleActionGroup::create();
+ m_help_action_group = Gio::SimpleActionGroup::create();
- m_refHelpActionGroup->add_action("about",
+ m_help_action_group->add_action("about",
sigc::mem_fun(*this, &AppWindow::on_menu_help_about) );
- m_refHelpActionGroup->add_action("contents",
+ m_help_action_group->add_action("contents",
sigc::mem_fun(*this, &AppWindow::on_menu_help_contents) );
- insert_action_group("help", m_refHelpActionGroup);
+ insert_action_group("help", m_help_action_group);
update_table_sensitive_ui();
@@ -446,26 +446,26 @@ void AppWindow::init_menus()
void AppWindow::on_menu_help_about()
{
- if(m_pAbout && m_about_shown) // "About" box hasn't been closed, so just raise it
+ if(m_about && m_about_shown) // "About" box hasn't been closed, so just raise it
{
- m_pAbout->set_transient_for(*this);
+ m_about->set_transient_for(*this);
- auto about_win = m_pAbout->get_window();
+ auto about_win = m_about->get_window();
about_win->show();
about_win->raise();
}
else
{
//Re-create About box:
- delete m_pAbout;
- m_pAbout = new Gtk::AboutDialog;
+ delete m_about;
+ m_about = new Gtk::AboutDialog;
- m_pAbout->set_program_name(m_strAppName);
- m_pAbout->set_comments(_("A Database GUI"));
- m_pAbout->set_version(PACKAGE_VERSION);
- m_pAbout->set_copyright(_("© 2000-2011 Murray Cumming, Openismus GmbH"));
+ m_about->set_program_name(m_strAppName);
+ m_about->set_comments(_("A Database GUI"));
+ m_about->set_version(PACKAGE_VERSION);
+ m_about->set_copyright(_("© 2000-2011 Murray Cumming, Openismus GmbH"));
const std::vector<Glib::ustring> vecAuthors({"Murray Cumming <murrayc murrayc com>"});
- m_pAbout->set_authors(vecAuthors);
+ m_about->set_authors(vecAuthors);
//For some reason this use of the resource:// syntax does not work:
const char* about_icon_name = "48x48/glom.png";
@@ -486,15 +486,15 @@ void AppWindow::on_menu_help_about()
}
if(logo)
- m_pAbout->set_logo(logo);
+ m_about->set_logo(logo);
else
std::cout << G_STRFUNC << ": Could not load icon from resource path=" << glom_icon_path << std::endl;
- m_pAbout->signal_hide().connect( sigc::mem_fun(*this, &AppWindow::on_about_close) );
+ m_about->signal_hide().connect( sigc::mem_fun(*this, &AppWindow::on_about_close) );
m_about_shown = true;
- static_cast<Gtk::Dialog*>(m_pAbout)->run(); //show() would be better. see below:
- m_pAbout->hide();
- //m_pAbout->show(); //TODO: respond to the OK button.
+ static_cast<Gtk::Dialog*>(m_about)->run(); //show() would be better. see below:
+ m_about->hide();
+ //m_about->show(); //TODO: respond to the OK button.
}
}
@@ -505,14 +505,14 @@ void AppWindow::on_about_close()
void AppWindow::on_menu_file_toggle_share()
{
- if(!m_pFrame)
+ if(!m_frame)
return;
//The state is not changed automatically:
bool active = false;
m_toggleaction_network_shared->get_state(active);
- const auto changed = m_pFrame->attempt_toggle_shared(!active);
+ const auto changed = m_frame->attempt_toggle_shared(!active);
if(changed)
m_toggleaction_network_shared->change_state(!active);
@@ -520,22 +520,22 @@ void AppWindow::on_menu_file_toggle_share()
void AppWindow::on_menu_developer_usermode(int parameter)
{
- if(!m_pFrame)
+ if(!m_frame)
return;
const bool developer = parameter == Utils::to_utype(AppState::userlevels::DEVELOPER);
bool changed = false;
if(developer)
- changed = m_pFrame->attempt_change_usermode_to_developer();
+ changed = m_frame->attempt_change_usermode_to_developer();
else
- changed = m_pFrame->attempt_change_usermode_to_operator();
+ changed = m_frame->attempt_change_usermode_to_operator();
//Change the menu's state:
if(changed)
m_action_menu_developer_usermode->change_state(parameter);
- m_pFrame->set_enable_layout_drag_and_drop(false);
+ m_frame->set_enable_layout_drag_and_drop(false);
}
#endif // !GLOM_ENABLE_CLIENT_ONLY
@@ -781,11 +781,11 @@ void AppWindow::init_create_document()
//Tell document about view:
- m_document->set_view(m_pFrame);
+ m_document->set_view(m_frame);
//Tell view about document:
//(This calls set_document() in the child views too.)
- m_pFrame->set_document(std::static_pointer_cast<Document>(m_document));
+ m_frame->set_document(std::static_pointer_cast<Document>(m_document));
}
GlomBakery::AppWindow_WithDoc::init_create_document(); //Sets window title. Doesn't recreate doc.
@@ -853,7 +853,7 @@ bool AppWindow::on_document_load()
{
//Link to the database described in the document.
//Need to ask user for user/password:
- //m_pFrame->load_from_document();
+ //m_frame->load_from_document();
auto document = std::static_pointer_cast<Document>(get_document());
if(!document)
return false;
@@ -1010,7 +1010,7 @@ bool AppWindow::on_document_load()
if(is_example || is_backup)
{
//The user has already had the chance to specify a new filename and database name.
- test = m_pFrame->connection_request_password_and_choose_new_database_name();
+ test = m_frame->connection_request_password_and_choose_new_database_name();
}
else
#endif // !GLOM_ENABLE_CLIENT_ONLY
@@ -1031,7 +1031,7 @@ bool AppWindow::on_document_load()
}
bool database_not_found = false;
- test = m_pFrame->connection_request_password_and_attempt(database_not_found, m_temp_username,
m_temp_password);
+ test = m_frame->connection_request_password_and_attempt(database_not_found, m_temp_username,
m_temp_password);
m_temp_username = Glib::ustring();
m_temp_password = Glib::ustring();
@@ -1103,7 +1103,7 @@ bool AppWindow::on_document_load()
document_history_add(document->get_file_uri());
//Open default table, or show list of tables instead:
- m_pFrame->do_menu_Navigate_Table(true /* open the default if there is one */);
+ m_frame->do_menu_Navigate_Table(true /* open the default if there is one */);
}
}
@@ -1227,8 +1227,8 @@ void AppWindow::update_table_sensitive_ui()
bool has_table = false;
- if(m_pFrame)
- has_table = !m_pFrame->get_shown_table_name().empty();
+ if(m_frame)
+ has_table = !m_frame->get_shown_table_name().empty();
for(const auto& action : m_listTableSensitiveActions)
{
@@ -1418,7 +1418,7 @@ void AppWindow::existing_or_new_new()
if(connection_pool)
connection_pool->set_get_document_func( std::bind(&AppWindow::on_connection_pool_get_document, this) );
- const auto connected = m_pFrame->connection_request_password_and_choose_new_database_name();
+ const auto connected = m_frame->connection_request_password_and_choose_new_database_name();
if(!connected)
{
// Unset URI so that the offer_new_or_existing does not disappear
@@ -1428,13 +1428,13 @@ void AppWindow::existing_or_new_new()
}
else
{
- const auto db_created = m_pFrame->create_database(document->get_connection_database(), db_title);
+ const auto db_created = m_frame->create_database(document->get_connection_database(), db_title);
if(db_created)
{
const auto database_name_used = document->get_connection_database();
ConnectionPool::get_instance()->set_database(database_name_used);
document->set_database_title_original(db_title);
- m_pFrame->set_databases_selected(database_name_used);
+ m_frame->set_databases_selected(database_name_used);
// Add the document to recent files
document_history_add(document->get_file_uri());
@@ -1453,26 +1453,26 @@ void AppWindow::existing_or_new_new()
void AppWindow::set_mode_data()
{
- if(!m_pFrame)
+ if(!m_frame)
return;
//Update the visual feedback in the menu.
//This doesn't trigger the activate signal:
m_action_mode_find->change_state(false);
- m_pFrame->set_mode_data();
+ m_frame->set_mode_data();
}
void AppWindow::set_mode_find()
{
- if(!m_pFrame)
+ if(!m_frame)
return;
//Update the visual feedback in the menu.
//This doesn't trigger the activate signal:
m_action_mode_find->change_state(true);
- m_pFrame->set_mode_find();
+ m_frame->set_mode_find();
}
void AppWindow::on_menu_help_contents()
@@ -1540,7 +1540,7 @@ bool AppWindow::recreate_database_from_example(bool& user_cancelled)
//Create the database: (This will show a connection dialog)
connection_pool->set_database( Glib::ustring() );
- const auto db_created = m_pFrame->create_database(db_name, document->get_database_title_original());
+ const auto db_created = m_frame->create_database(db_name, document->get_database_title_original());
if(!db_created)
{
@@ -1718,7 +1718,7 @@ bool AppWindow::recreate_database_from_backup(const std::string& backup_data_fil
return false;
}
- //m_pFrame->add_standard_tables(); //Add internal, hidden, tables.
+ //m_frame->add_standard_tables(); //Add internal, hidden, tables.
//Add any extra groups from the example file.
//The backup file refers to these,
@@ -1801,16 +1801,16 @@ static Glib::ustring escape_for_action_name(const Glib::ustring& str)
void AppWindow::fill_menu_tables()
{
- m_listNavTableActions.clear();
+ m_nav_table_actions.clear();
//TODO: Clear existing items
- if(m_refNavTablesActionGroup)
+ if(m_nav_tables_action_group)
{
remove_action_group(ACTION_GROUP_NAME_TABLES);
- m_refNavTablesActionGroup.reset();
+ m_nav_tables_action_group.reset();
}
- m_refNavTablesActionGroup = Gio::SimpleActionGroup::create();
+ m_nav_tables_action_group = Gio::SimpleActionGroup::create();
auto object =
m_builder->get_object("tables-list");
@@ -1844,18 +1844,18 @@ void AppWindow::fill_menu_tables()
menu->append(title, ACTION_GROUP_NAME_TABLES + "." + action_name);
- auto action = m_refNavTablesActionGroup->add_action(action_name,
- sigc::bind( sigc::mem_fun(*m_pFrame, &Frame_Glom::on_box_tables_selected), table_info->get_name()) );
- m_listNavTableActions.emplace_back(action);
+ auto action = m_nav_tables_action_group->add_action(action_name,
+ sigc::bind( sigc::mem_fun(*m_frame, &Frame_Glom::on_box_tables_selected), table_info->get_name()) );
+ m_nav_table_actions.emplace_back(action);
}
}
- insert_action_group(ACTION_GROUP_NAME_TABLES, m_refNavTablesActionGroup);
+ insert_action_group(ACTION_GROUP_NAME_TABLES, m_nav_tables_action_group);
}
void AppWindow::fill_menu_reports(const Glib::ustring& table_name)
{
- m_listNavReportActions.clear();
+ m_nav_report_actions.clear();
//Remove existing items.
auto object =
@@ -1874,13 +1874,13 @@ void AppWindow::fill_menu_reports(const Glib::ustring& table_name)
menu->remove(0);
}
- if(m_refNavReportsActionGroup)
+ if(m_nav_reports_action_group)
{
remove_action_group(ACTION_GROUP_NAME_REPORTS);
- m_refNavReportsActionGroup.reset();
+ m_nav_reports_action_group.reset();
}
- m_refNavReportsActionGroup = Gio::SimpleActionGroup::create();
+ m_nav_reports_action_group = Gio::SimpleActionGroup::create();
const auto document = std::dynamic_pointer_cast<Document>(get_document());
if(!document)
@@ -1902,30 +1902,30 @@ void AppWindow::fill_menu_reports(const Glib::ustring& table_name)
menu->append(title, ACTION_GROUP_NAME_REPORTS + "." + report_name);
- auto action = m_refNavReportsActionGroup->add_action(action_name,
- sigc::bind( sigc::mem_fun(*m_pFrame, &Frame_Glom::on_menu_report_selected), report->get_name()) );
- m_listNavReportActions.emplace_back(action);
+ auto action = m_nav_reports_action_group->add_action(action_name,
+ sigc::bind( sigc::mem_fun(*m_frame, &Frame_Glom::on_menu_report_selected), report->get_name()) );
+ m_nav_report_actions.emplace_back(action);
}
}
}
- insert_action_group(ACTION_GROUP_NAME_REPORTS, m_refNavReportsActionGroup);
+ insert_action_group(ACTION_GROUP_NAME_REPORTS, m_nav_reports_action_group);
}
void AppWindow::enable_menu_print_layouts_details(bool enable)
{
- if(!m_refNavPrintLayoutsActionGroup)
+ if(!m_nav_print_layouts_action_group)
return;
//TODO: See https://bugzilla.gnome.org/show_bug.cgi?id=708149 about having this API in GSimpleActionGroup:
- //m_refNavPrintLayoutsActionGroup->set_enabled(enable);
+ //m_nav_print_layouts_action_group->set_enabled(enable);
//Enable/Disable each action in the group:
//TODO: Suggest a simpler get_actions() method?
- for(const auto& name : m_refNavPrintLayoutsActionGroup->list_actions())
+ for(const auto& name : m_nav_print_layouts_action_group->list_actions())
{
auto action =
- Glib::RefPtr<Gio::SimpleAction>::cast_dynamic(m_refNavPrintLayoutsActionGroup->lookup_action(name));
+ Glib::RefPtr<Gio::SimpleAction>::cast_dynamic(m_nav_print_layouts_action_group->lookup_action(name));
if(action)
action->set_enabled(enable);
}
@@ -1935,7 +1935,7 @@ void AppWindow::fill_menu_print_layouts(const Glib::ustring& table_name)
{
//TODO: This is copy/pasted from fill_menu_reports(). Can we generalize it?
- m_listNavPrintLayoutActions.clear();
+ m_nav_print_layout_actions.clear();
//Remove existing items.
auto object =
@@ -1954,13 +1954,13 @@ void AppWindow::fill_menu_print_layouts(const Glib::ustring& table_name)
menu->remove(0);
}
- if(m_refNavPrintLayoutsActionGroup)
+ if(m_nav_print_layouts_action_group)
{
remove_action_group(ACTION_GROUP_NAME_PRINT_LAYOUTS);
- m_refNavPrintLayoutsActionGroup.reset();
+ m_nav_print_layouts_action_group.reset();
}
- m_refNavPrintLayoutsActionGroup = Gio::SimpleActionGroup::create();
+ m_nav_print_layouts_action_group = Gio::SimpleActionGroup::create();
auto document = std::dynamic_pointer_cast<Document>(get_document());
if(!document)
@@ -1985,16 +1985,16 @@ void AppWindow::fill_menu_print_layouts(const Glib::ustring& table_name)
menu->append(title, ACTION_GROUP_NAME_PRINT_LAYOUTS + "." + action_name);
- auto action = m_refNavPrintLayoutsActionGroup->add_action(action_name,
- sigc::bind( sigc::mem_fun(*m_pFrame, &Frame_Glom::on_menu_print_layout_selected), name) );
+ auto action = m_nav_print_layouts_action_group->add_action(action_name,
+ sigc::bind( sigc::mem_fun(*m_frame, &Frame_Glom::on_menu_print_layout_selected), name) );
- m_listNavPrintLayoutActions.emplace_back(action);
+ m_nav_print_layout_actions.emplace_back(action);
}
}
}
#endif
- insert_action_group(ACTION_GROUP_NAME_PRINT_LAYOUTS, m_refNavPrintLayoutsActionGroup);
+ insert_action_group(ACTION_GROUP_NAME_PRINT_LAYOUTS, m_nav_print_layouts_action_group);
}
#ifndef GLOM_ENABLE_CLIENT_ONLY
@@ -2325,7 +2325,7 @@ void AppWindow::on_menu_developer_changelanguage()
int failure_code = 0;
get_document()->load(failure_code);
- m_pFrame->show_table_refresh(); //load() doesn't seem to refresh the view.
+ m_frame->show_table_refresh(); //load() doesn't seem to refresh the view.
}
delete dialog;
@@ -2338,7 +2338,7 @@ void AppWindow::on_menu_developer_translations()
Utils::get_glade_widget_derived_with_warning(m_window_translations);
if(m_window_translations)
{
- m_pFrame->add_view(m_window_translations);
+ m_frame->add_view(m_window_translations);
m_window_translations->set_transient_for(*this);
m_window_translations->set_document(std::static_pointer_cast<Document>(m_document));
m_window_translations->load_from_document();
@@ -2363,7 +2363,7 @@ void AppWindow::on_menu_developer_active_platform(const Glib::ustring& parameter
if(document)
document->set_active_layout_platform(parameter);
- m_pFrame->show_table_refresh();
+ m_frame->show_table_refresh();
}
void AppWindow::on_menu_developer_export_backup()
@@ -2441,7 +2441,7 @@ void AppWindow::on_menu_developer_restore_backup()
void AppWindow::do_print_layout(const Glib::ustring& print_layout_name, bool preview, Gtk::Window*
transient_for)
{
- m_pFrame->do_print_layout(print_layout_name, preview, transient_for);
+ m_frame->do_print_layout(print_layout_name, preview, transient_for);
}
bool AppWindow::do_restore_backup(const Glib::ustring& backup_uri)
@@ -2469,7 +2469,7 @@ void AppWindow::on_menu_developer_enable_layout_drag_and_drop()
bool state = false;
m_action_enable_layout_drag_and_drop->get_state(state);
- m_pFrame->set_enable_layout_drag_and_drop(state); //TODO: Change the menu's state.
+ m_frame->set_enable_layout_drag_and_drop(state); //TODO: Change the menu's state.
}
@@ -2477,7 +2477,7 @@ void AppWindow::on_window_translations_hide()
{
if(m_window_translations)
{
- m_pFrame->on_developer_dialog_hide();
+ m_frame->on_developer_dialog_hide();
}
}
#endif // !GLOM_ENABLE_CLIENT_ONLY
@@ -2514,12 +2514,12 @@ void AppWindow::document_history_add(const Glib::ustring& file_uri)
#ifndef GLOM_ENABLE_CLIENT_ONLY
void AppWindow::do_menu_developer_fields(Gtk::Window& parent, const Glib::ustring table_name)
{
- m_pFrame->do_menu_developer_fields(parent, table_name);
+ m_frame->do_menu_developer_fields(parent, table_name);
}
void AppWindow::do_menu_developer_relationships(Gtk::Window& parent, const Glib::ustring table_name)
{
- m_pFrame->do_menu_developer_relationships(parent, table_name);
+ m_frame->do_menu_developer_relationships(parent, table_name);
}
std::shared_ptr<Document> AppWindow::on_connection_pool_get_document()
@@ -2537,11 +2537,11 @@ void AppWindow::update_window_title()
if(!document)
return;
- if(!m_pFrame)
+ if(!m_frame)
return;
//Show the table title:
- const auto table_name = m_pFrame->get_shown_table_name();
+ const auto table_name = m_frame->get_shown_table_name();
Glib::ustring table_label = document->get_table_title(table_name, AppWindow::get_current_locale());
if(!table_label.empty())
{
@@ -2574,40 +2574,40 @@ void AppWindow::update_window_title()
void AppWindow::show_table_details(const Glib::ustring& table_name, const Gnome::Gda::Value&
primary_key_value)
{
- if(!m_pFrame)
+ if(!m_frame)
return;
- m_pFrame->show_table(table_name, primary_key_value);
+ m_frame->show_table(table_name, primary_key_value);
}
void AppWindow::show_table_list(const Glib::ustring& table_name)
{
- if(!m_pFrame)
+ if(!m_frame)
return;
- m_pFrame->show_table(table_name);
+ m_frame->show_table(table_name);
}
void AppWindow::print_report(const Glib::ustring& report_name)
{
- if(!m_pFrame)
+ if(!m_frame)
return;
- m_pFrame->on_menu_report_selected(report_name);
+ m_frame->on_menu_report_selected(report_name);
}
void AppWindow::print_layout()
{
- if(!m_pFrame)
+ if(!m_frame)
return;
- m_pFrame->on_menu_file_print();
+ m_frame->on_menu_file_print();
}
void AppWindow::start_new_record()
{
- m_pFrame->on_menu_add_record();
+ m_frame->on_menu_add_record();
}
void AppWindow::set_progress_message(const Glib::ustring& message)
@@ -2630,7 +2630,7 @@ void AppWindow::set_progress_message(const Glib::ustring& message)
if(m_menubar)
m_menubar->set_sensitive(false);
- m_pFrame->set_sensitive(false);
+ m_frame->set_sensitive(false);
}
void AppWindow::pulse_progress_message()
@@ -2646,7 +2646,7 @@ void AppWindow::clear_progress_message()
if(m_menubar)
m_menubar->set_sensitive();
- m_pFrame->set_sensitive();
+ m_frame->set_sensitive();
}
void AppWindow::set_current_locale(const Glib::ustring& locale)
@@ -2740,7 +2740,7 @@ void AppWindow::init_menus_edit()
//Edit menu
//Build actions:
- m_refActionGroup_Edit = Gio::SimpleActionGroup::create();
+ m_action_group_edit = Gio::SimpleActionGroup::create();
add_action("cut",
sigc::mem_fun((AppWindow&)*this, &AppWindow::on_menu_edit_cut_activate));
@@ -2752,17 +2752,17 @@ void AppWindow::init_menus_edit()
//TODO? sigc::mem_fun((AppWindow&)*this, &AppWindow::on_menu_edit_clear_activate));
//We remember this action, so that it can be explicitly activated later.
- m_action_mode_find = m_refActionGroup_Edit->add_action_bool("find",
+ m_action_mode_find = m_action_group_edit->add_action_bool("find",
sigc::mem_fun((AppWindow&)*this, &AppWindow::on_menu_edit_find),
false);
m_listTableSensitiveActions.emplace_back(m_action_mode_find);
- insert_action_group("edit", m_refActionGroup_Edit);
+ insert_action_group("edit", m_action_group_edit);
}
void AppWindow::add(Gtk::Widget& child)
{
- m_VBox_PlaceHolder.pack_start(child);
+ m_vbox_placeHolder.pack_start(child);
}
bool AppWindow::on_delete_event(GdkEventAny* /* event */)
@@ -2958,9 +2958,9 @@ void AppWindow::on_menu_edit_find()
m_action_mode_find->change_state(active);
if(active)
- m_pFrame->set_mode_find();
+ m_frame->set_mode_find();
else
- m_pFrame->set_mode_data();
+ m_frame->set_mode_data();
}
} //namespace Glom
diff --git a/glom/appwindow.h b/glom/appwindow.h
index e68e17c..cbbac86 100644
--- a/glom/appwindow.h
+++ b/glom/appwindow.h
@@ -210,14 +210,14 @@ protected:
//Menu Builder and Actions
Glib::RefPtr<Gtk::Builder> m_builder;
std::unique_ptr<Gtk::MenuBar> m_menubar;
- Glib::RefPtr<Gio::SimpleActionGroup> m_refActionGroup_File,
- m_refActionGroup_Edit, m_refActionGroup_Tables,
- m_refActionGroup_Developer, m_refActionGroup_Reports;
+ Glib::RefPtr<Gio::SimpleActionGroup> m_action_group_file,
+ m_action_group_edit, m_action_group_tables,
+ m_action_group_developer, m_action_group_reports;
//Member widgets:
- Gtk::Box* m_pVBox;
- Gtk::Box m_VBox_PlaceHolder;
+ Gtk::Box* m_vbox;
+ Gtk::Box m_vbox_placeHolder;
//Menu stuff:
Glib::RefPtr<Gio::SimpleAction> m_action_save, m_action_saveas;
@@ -306,11 +306,11 @@ private:
Glib::RefPtr<Gio::SimpleAction> m_toggleaction_network_shared;
sigc::connection m_connection_toggleaction_network_shared;
- Gtk::Box* m_pBoxTop;
- Frame_Glom* m_pFrame;
+ Gtk::Box* m_box_top;
+ Frame_Glom* m_frame;
bool m_about_shown;
- Gtk::AboutDialog* m_pAbout; //About box.
+ Gtk::AboutDialog* m_about; //About box.
Infobar_ProgressCreating* m_infobar_progress;
std::string m_progress_collate_key;
@@ -320,9 +320,9 @@ private:
#endif // !GLOM_ENABLE_CLIENT_ONLY
- Glib::RefPtr<Gio::SimpleActionGroup> m_refHelpActionGroup;
- Glib::RefPtr<Gio::SimpleActionGroup> m_refNavTablesActionGroup, m_refNavReportsActionGroup,
m_refNavPrintLayoutsActionGroup;
- type_listActions m_listNavTableActions, m_listNavReportActions, m_listNavPrintLayoutActions;
+ Glib::RefPtr<Gio::SimpleActionGroup> m_help_action_group;
+ Glib::RefPtr<Gio::SimpleActionGroup> m_nav_tables_action_group, m_nav_reports_action_group,
m_nav_print_layouts_action_group;
+ type_listActions m_nav_table_actions, m_nav_report_actions, m_nav_print_layout_actions;
#ifndef GLOM_ENABLE_CLIENT_ONLY
//Set these before calling offer_saveas() (which uses ui_file_select_save()), and clear it afterwards.
diff --git a/glom/filechooser_export.cc b/glom/filechooser_export.cc
index b23c258..84f6c2d 100644
--- a/glom/filechooser_export.cc
+++ b/glom/filechooser_export.cc
@@ -33,7 +33,7 @@ FileChooser_Export::FileChooser_Export()
m_extra_widget(Gtk::ORIENTATION_HORIZONTAL, Utils::to_utype(UiUtils::DefaultSpacings::SMALL)),
#ifndef GLOM_ENABLE_CLIENT_ONLY
m_button_format(_("Define Data _Format"), true /* use mnenomic */),
- m_pDialogLayout(nullptr),
+ m_dialog_layout(nullptr),
#endif //GLOM_ENABLE_CLIENT_ONLY
m_document(nullptr)
{
@@ -58,17 +58,17 @@ FileChooser_Export::FileChooser_Export()
if(!dialog)
return;
- m_pDialogLayout = dialog;
- //add_view(m_pDialogLayout); //Give it access to the document.
- m_pDialogLayout->signal_hide().connect( sigc::mem_fun(*this, &FileChooser_Export::on_dialog_layout_hide) );
+ m_dialog_layout = dialog;
+ //add_view(m_dialog_layout); //Give it access to the document.
+ m_dialog_layout->signal_hide().connect( sigc::mem_fun(*this, &FileChooser_Export::on_dialog_layout_hide) );
#endif //GLOM_ENABLE_CLIENT_ONLY
}
FileChooser_Export::~FileChooser_Export()
{
#ifndef GLOM_ENABLE_CLIENT_ONLY
- delete m_pDialogLayout;
- m_pDialogLayout = nullptr;
+ delete m_dialog_layout;
+ m_dialog_layout = nullptr;
#endif //GLOM_ENABLE_CLIENT_ONLY
}
@@ -86,20 +86,20 @@ void FileChooser_Export::set_export_layout(const Document::type_list_const_layou
#ifndef GLOM_ENABLE_CLIENT_ONLY
void FileChooser_Export::on_button_define_layout()
{
- if(!m_pDialogLayout)
+ if(!m_dialog_layout)
return;
- m_pDialogLayout->set_layout_groups(m_layout_groups, m_document, m_table_name); //TODO: Use m_TableFields?
- m_pDialogLayout->set_transient_for(*this);
+ m_dialog_layout->set_layout_groups(m_layout_groups, m_document, m_table_name); //TODO: Use m_TableFields?
+ m_dialog_layout->set_transient_for(*this);
set_modal(false);
- m_pDialogLayout->set_modal();
- m_pDialogLayout->show();
+ m_dialog_layout->set_modal();
+ m_dialog_layout->show();
}
void FileChooser_Export::on_dialog_layout_hide()
{
- if(m_pDialogLayout)
- m_pDialogLayout->get_layout_groups(m_layout_groups);
+ if(m_dialog_layout)
+ m_dialog_layout->get_layout_groups(m_layout_groups);
}
#endif //GLOM_ENABLE_CLIENT_ONLY
diff --git a/glom/filechooser_export.h b/glom/filechooser_export.h
index 7a89065..8c7d931 100644
--- a/glom/filechooser_export.h
+++ b/glom/filechooser_export.h
@@ -52,7 +52,7 @@ private:
#ifndef GLOM_ENABLE_CLIENT_ONLY
Gtk::Button m_button_format;
- Dialog_Layout_Export* m_pDialogLayout;
+ Dialog_Layout_Export* m_dialog_layout;
#endif //GLOM_ENABLE_CLIENT_ONLY
Glib::ustring m_table_name;
diff --git a/glom/frame_glom.cc b/glom/frame_glom.cc
index d0069fa..184c505 100644
--- a/glom/frame_glom.cc
+++ b/glom/frame_glom.cc
@@ -77,158 +77,158 @@ namespace Glom
Frame_Glom::Frame_Glom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: PlaceHolder(cobject, builder),
- m_pLabel_Table_DataMode(nullptr),
- m_pLabel_Table_FindMode(nullptr),
- m_Box_RecordsCount(Gtk::ORIENTATION_HORIZONTAL, Utils::to_utype(UiUtils::DefaultSpacings::SMALL)),
- m_Button_FindAll(_("Find All")),
+ m_label_table_data_mode(nullptr),
+ m_label_table_find_mode(nullptr),
+ m_box_records_count(Gtk::ORIENTATION_HORIZONTAL, Utils::to_utype(UiUtils::DefaultSpacings::SMALL)),
+ m_button_find_all(_("Find All")),
m_stack_mode(nullptr),
- m_pBox_Tables(nullptr),
- m_pDialog_Tables(nullptr),
- m_pBox_QuickFind(nullptr),
- m_pEntry_QuickFind(nullptr),
- m_pButton_QuickFind(nullptr),
+ m_box_tables(nullptr),
+ m_dialog_tables(nullptr),
+ m_box_quick_find(nullptr),
+ m_entry_quick_find(nullptr),
+ m_button_quick_find(nullptr),
#ifndef GLOM_ENABLE_CLIENT_ONLY
- m_pDialog_Reports(nullptr),
- m_pDialogLayoutReport(nullptr),
- m_pBox_Reports(nullptr),
- m_pDialogLayoutPrint(nullptr),
- m_pBox_PrintLayouts(nullptr),
- m_pDialog_Fields(nullptr),
- m_pDialog_Relationships(nullptr),
+ m_dialog_reports(nullptr),
+ m_dialog_layout_report(nullptr),
+ m_box_reports(nullptr),
+ m_dialog_layout_print(nullptr),
+ m_box_print_layouts(nullptr),
+ m_dialog_fields(nullptr),
+ m_dialog_relationships(nullptr),
m_dialog_addrelatedtable(nullptr),
m_window_relationships_overview(nullptr),
#endif // !GLOM_ENABLE_CLIENT_ONLY
- m_pDialogConnection(nullptr)
+ m_dialog_connection(nullptr)
{
- m_pLabel_Table_DataMode = Gtk::manage(new Gtk::Label(_("No Table Selected")));
- m_pLabel_Table_DataMode->show();
- m_Notebook_Data.set_action_widget(m_pLabel_Table_DataMode, Gtk::PACK_START);
+ m_label_table_data_mode = Gtk::manage(new Gtk::Label(_("No Table Selected")));
+ m_label_table_data_mode->show();
+ m_notebook_data.set_action_widget(m_label_table_data_mode, Gtk::PACK_START);
- m_pLabel_Table_FindMode = Gtk::manage(new Gtk::Label(_("No Table Selected")));
- m_pLabel_Table_FindMode->show();
- m_Notebook_Find.set_action_widget(m_pLabel_Table_FindMode, Gtk::PACK_START);
+ m_label_table_find_mode = Gtk::manage(new Gtk::Label(_("No Table Selected")));
+ m_label_table_find_mode->show();
+ m_notebook_find.set_action_widget(m_label_table_find_mode, Gtk::PACK_START);
//QuickFind widgets:
//We don't use Glade for these, so it easier to modify them for the Maemo port.
- m_pBox_QuickFind = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL,
Utils::to_utype(UiUtils::DefaultSpacings::SMALL)));
+ m_box_quick_find = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL,
Utils::to_utype(UiUtils::DefaultSpacings::SMALL)));
auto label = Gtk::manage(new Gtk::Label(_("Quick _search:"), true));
- m_pBox_QuickFind->pack_start(*label, Gtk::PACK_SHRINK);
+ m_box_quick_find->pack_start(*label, Gtk::PACK_SHRINK);
- m_pEntry_QuickFind = Gtk::manage(new Gtk::Entry());
+ m_entry_quick_find = Gtk::manage(new Gtk::Entry());
//Pressing Enter here is like pressing Find:
- m_pEntry_QuickFind->set_activates_default();
+ m_entry_quick_find->set_activates_default();
- label->set_mnemonic_widget(*m_pEntry_QuickFind);
+ label->set_mnemonic_widget(*m_entry_quick_find);
- m_pBox_QuickFind->pack_start(*m_pEntry_QuickFind, Gtk::PACK_EXPAND_WIDGET);
- m_pButton_QuickFind = Gtk::manage(new Gtk::Button(_("_Find"), true));
- m_pButton_QuickFind->signal_clicked().connect(
+ m_box_quick_find->pack_start(*m_entry_quick_find, Gtk::PACK_EXPAND_WIDGET);
+ m_button_quick_find = Gtk::manage(new Gtk::Button(_("_Find"), true));
+ m_button_quick_find->signal_clicked().connect(
sigc::mem_fun(*this, &Frame_Glom::on_button_quickfind) );
- m_pBox_QuickFind->pack_start(*m_pButton_QuickFind, Gtk::PACK_SHRINK);
+ m_box_quick_find->pack_start(*m_button_quick_find, Gtk::PACK_SHRINK);
- m_pBox_QuickFind->show_all_children();
- m_pBox_QuickFind->hide();
+ m_box_quick_find->show_all_children();
+ m_box_quick_find->hide();
PlaceHolder* placeholder_quickfind = nullptr;
builder->get_widget_derived("vbox_quickfind", placeholder_quickfind);
if(placeholder_quickfind)
- placeholder_quickfind->add(*m_pBox_QuickFind);
+ placeholder_quickfind->add(*m_box_quick_find);
//Add the Records/Found widgets at the right of the notebook tabs:
- m_Box_RecordsCount.pack_start(
+ m_box_records_count.pack_start(
*Gtk::manage(new Gtk::Label(_("Records:"))), Gtk::PACK_SHRINK);
- m_Box_RecordsCount.pack_start(m_Label_RecordsCount, Gtk::PACK_SHRINK);
- m_Box_RecordsCount.pack_start(
+ m_box_records_count.pack_start(m_label_records_count, Gtk::PACK_SHRINK);
+ m_box_records_count.pack_start(
*Gtk::manage(new Gtk::Label(_("Found:"))), Gtk::PACK_SHRINK);
- m_Box_RecordsCount.pack_start(m_Label_FoundCount, Gtk::PACK_SHRINK);
- m_Box_RecordsCount.pack_start(m_Button_FindAll, Gtk::PACK_SHRINK);
- m_Box_RecordsCount.show_all();
- m_Notebook_Data.set_action_widget(&m_Box_RecordsCount, Gtk::PACK_END);
- m_Button_FindAll.signal_clicked().connect(
+ m_box_records_count.pack_start(m_label_found_count, Gtk::PACK_SHRINK);
+ m_box_records_count.pack_start(m_button_find_all, Gtk::PACK_SHRINK);
+ m_box_records_count.show_all();
+ m_notebook_data.set_action_widget(&m_box_records_count, Gtk::PACK_END);
+ m_button_find_all.signal_clicked().connect(
sigc::mem_fun(*this, &Frame_Glom::on_button_find_all) );
builder->get_widget("stack_mode", m_stack_mode);
if(m_stack_mode)
{
- m_stack_mode->add(m_Notebook_Data, "data");
- m_stack_mode->add(m_Notebook_Find, "find");
- m_stack_mode->set_visible_child(m_Notebook_Data);
- m_Notebook_Data.set_enable_layout_drag_and_drop(false);
+ m_stack_mode->add(m_notebook_data, "data");
+ m_stack_mode->add(m_notebook_find, "find");
+ m_stack_mode->set_visible_child(m_notebook_data);
+ m_notebook_data.set_enable_layout_drag_and_drop(false);
}
m_Mode = enumModes::NONE;
m_Mode_Previous = enumModes::NONE;
- m_Notebook_Find.signal_find_criteria.connect(sigc::mem_fun(*this, &Frame_Glom::on_notebook_find_criteria));
- m_Notebook_Find.show();
- m_Notebook_Data.signal_record_details_requested().connect(sigc::mem_fun(*this,
&Frame_Glom::on_notebook_data_record_details_requested));
- m_Notebook_Data.signal_record_selection_changed().connect(sigc::mem_fun(*this,
+ m_notebook_find.signal_find_criteria.connect(sigc::mem_fun(*this, &Frame_Glom::on_notebook_find_criteria));
+ m_notebook_find.show();
+ m_notebook_data.signal_record_details_requested().connect(sigc::mem_fun(*this,
&Frame_Glom::on_notebook_data_record_details_requested));
+ m_notebook_data.signal_record_selection_changed().connect(sigc::mem_fun(*this,
&Frame_Glom::on_notebook_data_record_selection_changed));
- m_Notebook_Data.signal_switch_page().connect(sigc::mem_fun(*this,
&Frame_Glom::on_notebook_data_switch_page));
- m_Notebook_Data.show();
+ m_notebook_data.signal_switch_page().connect(sigc::mem_fun(*this,
&Frame_Glom::on_notebook_data_switch_page));
+ m_notebook_data.show();
//Fill Composite View:
//This means that set_document and load/save are delegated to these children:
- add_view(&m_Notebook_Data); //Also a composite view.
- add_view(&m_Notebook_Find); //Also a composite view.
+ add_view(&m_notebook_data); //Also a composite view.
+ add_view(&m_notebook_find); //Also a composite view.
on_userlevel_changed(AppState::userlevels::OPERATOR); //A default to show before a document is created or
loaded.
}
Frame_Glom::~Frame_Glom()
{
- if(m_pBox_Tables)
- remove_view(m_pBox_Tables);
+ if(m_box_tables)
+ remove_view(m_box_tables);
- delete m_pDialog_Tables;
- m_pDialog_Tables = nullptr;
+ delete m_dialog_tables;
+ m_dialog_tables = nullptr;
- remove_view(&m_Notebook_Data); //Also a composite view.
- remove_view(&m_Notebook_Find); //Also a composite view.
+ remove_view(&m_notebook_data); //Also a composite view.
+ remove_view(&m_notebook_find); //Also a composite view.
- if(m_pDialogConnection)
+ if(m_dialog_connection)
{
- remove_view(m_pDialogConnection);
- delete m_pDialogConnection;
- m_pDialogConnection = nullptr;
+ remove_view(m_dialog_connection);
+ delete m_dialog_connection;
+ m_dialog_connection = nullptr;
}
#ifndef GLOM_ENABLE_CLIENT_ONLY
- if(m_pBox_Reports)
- remove_view(m_pBox_Reports);
+ if(m_box_reports)
+ remove_view(m_box_reports);
- if(m_pBox_PrintLayouts)
- remove_view(m_pBox_PrintLayouts);
+ if(m_box_print_layouts)
+ remove_view(m_box_print_layouts);
- if(m_pDialog_Relationships)
+ if(m_dialog_relationships)
{
- remove_view(m_pDialog_Relationships);
- delete m_pDialog_Relationships;
- m_pDialog_Relationships = nullptr;
+ remove_view(m_dialog_relationships);
+ delete m_dialog_relationships;
+ m_dialog_relationships = nullptr;
}
- if(m_pDialogLayoutReport)
+ if(m_dialog_layout_report)
{
- remove_view(m_pDialogLayoutReport);
- delete m_pDialogLayoutReport;
- m_pDialogLayoutReport = nullptr;
+ remove_view(m_dialog_layout_report);
+ delete m_dialog_layout_report;
+ m_dialog_layout_report = nullptr;
}
- if(m_pDialogLayoutPrint)
+ if(m_dialog_layout_print)
{
- remove_view(m_pDialogLayoutPrint);
- delete m_pDialogLayoutPrint;
- m_pDialogLayoutPrint = nullptr;
+ remove_view(m_dialog_layout_print);
+ delete m_dialog_layout_print;
+ m_dialog_layout_print = nullptr;
}
- if(m_pDialog_Fields)
+ if(m_dialog_fields)
{
- remove_view(m_pDialog_Fields);
- delete m_pDialog_Fields;
- m_pDialog_Fields = nullptr;
+ remove_view(m_dialog_fields);
+ delete m_dialog_fields;
+ m_dialog_fields = nullptr;
}
if(m_dialog_addrelatedtable)
@@ -260,8 +260,8 @@ void Frame_Glom::set_databases_selected(const Glib::ustring& strName)
void Frame_Glom::on_box_tables_selected(const Glib::ustring& strName)
{
- if(m_pDialog_Tables)
- m_pDialog_Tables->hide();
+ if(m_dialog_tables)
+ m_dialog_tables->hide();
show_table(strName);
}
@@ -287,28 +287,28 @@ bool Frame_Glom::set_mode(enumModes mode)
const bool show_quickfind = (m_Mode == enumModes::FIND);
if(show_quickfind)
{
- m_pBox_QuickFind->show();
+ m_box_quick_find->show();
//Clear the quick-find entry, ready for a new Find.
if(changed)
{
- m_pEntry_QuickFind->set_text(Glib::ustring());
+ m_entry_quick_find->set_text(Glib::ustring());
//Put the cursor in the quick find entry:
- m_pEntry_QuickFind->grab_focus();
+ m_entry_quick_find->grab_focus();
}
}
else
{
- m_pBox_QuickFind->hide();
+ m_box_quick_find->hide();
}
//Show the main part of the UI:
if(m_Mode == enumModes::FIND)
- set_mode_widget(m_Notebook_Find);
+ set_mode_widget(m_notebook_find);
else
- set_mode_widget(m_Notebook_Data);
+ set_mode_widget(m_notebook_data);
return changed;
}
@@ -404,8 +404,8 @@ void Frame_Glom::show_table_allow_empty(const Glib::ustring& table_name, const G
}
//Show the wanted records in the notebook, showing details for a particular record if wanted:
- m_Notebook_Data.init_db_details(found_set, primary_key_value_for_details);
- set_mode_widget(m_Notebook_Data);
+ m_notebook_data.init_db_details(found_set, primary_key_value_for_details);
+ set_mode_widget(m_notebook_data);
//Show how many records were found:
update_records_count();
@@ -414,8 +414,8 @@ void Frame_Glom::show_table_allow_empty(const Glib::ustring& table_name, const G
}
case(enumModes::FIND):
{
- m_Notebook_Find.init_db_details(m_table_name, get_active_layout_platform(get_document()));
- set_mode_widget(m_Notebook_Find);
+ m_notebook_find.init_db_details(m_table_name, get_active_layout_platform(get_document()));
+ set_mode_widget(m_notebook_find);
break;
}
default:
@@ -578,7 +578,7 @@ void Frame_Glom::on_menu_file_export()
//const int index_primary_key = fieldsSequence.size() - 1;
- const auto found_set = m_Notebook_Data.get_found_set();
+ const auto found_set = m_notebook_data.get_found_set();
std::fstream the_stream(filepath, std::ios_base::out | std::ios_base::trunc);
if(!the_stream)
@@ -886,7 +886,7 @@ void Frame_Glom::on_menu_file_print_edit_layouts()
void Frame_Glom::set_enable_layout_drag_and_drop(bool enable)
{
- m_Notebook_Data.set_enable_layout_drag_and_drop(enable);
+ m_notebook_data.set_enable_layout_drag_and_drop(enable);
}
#endif // !GLOM_ENABLE_CLIENT_ONLY
@@ -900,13 +900,13 @@ void Frame_Glom::set_mode_find()
const bool previously_in_data_mode = (m_Mode == enumModes::DATA);
- const auto list_or_details = m_Notebook_Data.get_current_view();
+ const auto list_or_details = m_notebook_data.get_current_view();
//A workaround hack to make sure that the list view will be active when the results are shown.
//Because the list doesn't refresh properly (to give the first result) when the Details view was active
first.
//murrayc.
if(previously_in_data_mode && (list_or_details == Notebook_Data::dataview::DETAILS))
- m_Notebook_Data.set_current_view(Notebook_Data::dataview::LIST);
+ m_notebook_data.set_current_view(Notebook_Data::dataview::LIST);
if(!set_mode(enumModes::FIND))
return;
@@ -916,7 +916,7 @@ void Frame_Glom::set_mode_find()
if(previously_in_data_mode)
{
//Show the same layout in Find mode as was just being viewed in Data mode:
- m_Notebook_Find.set_current_view(list_or_details);
+ m_notebook_find.set_current_view(list_or_details);
}
}
@@ -936,7 +936,7 @@ void Frame_Glom::on_menu_add_record()
BusyCursor busy_cursor(get_app_window());
//Note: This should only be called in Data mode.
- m_Notebook_Data.do_menu_file_add_record();
+ m_notebook_data.do_menu_file_add_record();
}
@@ -1095,33 +1095,33 @@ void Frame_Glom::do_menu_Navigate_Table(bool open_default)
default_table_name = get_document()->get_default_table();
//Create the dialog, if it has not already been created:
- if(!m_pBox_Tables)
+ if(!m_box_tables)
{
const Glib::RefPtr<Gtk::Builder> builderToKeepWidgetAlive =
- Utils::get_glade_child_widget_derived_with_warning(m_pBox_Tables);
- m_pDialog_Tables = new Window_BoxHolder(m_pBox_Tables, _("Edit Tables"));
- m_pDialog_Tables->signal_hide().connect(sigc::mem_fun(*this, &Frame_Glom::on_dialog_tables_hide));
+ Utils::get_glade_child_widget_derived_with_warning(m_box_tables);
+ m_dialog_tables = new Window_BoxHolder(m_box_tables, _("Edit Tables"));
+ m_dialog_tables->signal_hide().connect(sigc::mem_fun(*this, &Frame_Glom::on_dialog_tables_hide));
auto pWindow = get_app_window();
if(pWindow)
- m_pDialog_Tables->set_transient_for(*pWindow);
+ m_dialog_tables->set_transient_for(*pWindow);
- m_pDialog_Tables->set_default_size(300, 400);
- m_pBox_Tables->show_all();
- add_view(m_pBox_Tables);
+ m_dialog_tables->set_default_size(300, 400);
+ m_box_tables->show_all();
+ add_view(m_box_tables);
//Connect signals:
- m_pBox_Tables->signal_selected.connect(sigc::mem_fun(*this, &Frame_Glom::on_box_tables_selected));
+ m_box_tables->signal_selected.connect(sigc::mem_fun(*this, &Frame_Glom::on_box_tables_selected));
}
{
BusyCursor busy_cursor(get_app_window());
- m_pBox_Tables->init_db_details();
+ m_box_tables->init_db_details();
}
//Let the user choose a table:
- //m_pDialog_Tables->set_policy(false, true, false); //TODO_port
- //m_pDialog_Tables->load_from_document(); //Refresh
+ //m_dialog_tables->set_policy(false, true, false); //TODO_port
+ //m_dialog_tables->load_from_document(); //Refresh
if(!default_table_name.empty())
{
//Show the default table, and let the user navigate to another table manually if he wants:
@@ -1129,7 +1129,7 @@ void Frame_Glom::do_menu_Navigate_Table(bool open_default)
}
else
{
- m_pDialog_Tables->show();
+ m_dialog_tables->show();
}
}
@@ -1186,7 +1186,7 @@ void Frame_Glom::on_notebook_find_criteria(const Gnome::Gda::SqlExpr& where_clau
Gnome::Gda::SqlExpr where_clause_to_use = where_clause;
//Prefer the quick find text if any was entered:
- const auto quickfind_criteria = m_pEntry_QuickFind->get_text();
+ const auto quickfind_criteria = m_entry_quick_find->get_text();
if(!quickfind_criteria.empty())
{
where_clause_to_use =
@@ -1218,9 +1218,9 @@ void Frame_Glom::on_notebook_find_criteria(const Gnome::Gda::SqlExpr& where_clau
FoundSet found_set;
found_set.m_table_name = m_table_name;
found_set.m_where_clause = where_clause_to_use;
- const auto inited = m_Notebook_Data.init_db_details(found_set);
+ const auto inited = m_notebook_data.init_db_details(found_set);
- m_Notebook_Data.select_page_for_find_results();
+ m_notebook_data.select_page_for_find_results();
//Show how many records were found:
records_found = (update_records_count() > 0);
@@ -1274,8 +1274,8 @@ void Frame_Glom::show_table_title()
//Show the table title in bold text, because it's important to the user.
const auto title = UiUtils::bold_message(table_label);
- m_pLabel_Table_DataMode->set_markup(title);
- m_pLabel_Table_FindMode->set_markup(title);
+ m_label_table_data_mode->set_markup(title);
+ m_label_table_find_mode->set_markup(title);
}
#ifndef GLOM_ENABLE_CLIENT_ONLY
@@ -1428,16 +1428,16 @@ void Frame_Glom::on_menu_developer_fields()
void Frame_Glom::do_menu_developer_fields(Gtk::Window& parent, const Glib::ustring table_name)
{
- if(!m_pDialog_Fields)
+ if(!m_dialog_fields)
{
- Utils::get_glade_widget_derived_with_warning(m_pDialog_Fields);
- if (!m_pDialog_Fields) {
- std::cerr << G_STRFUNC << ": m_pDialog_Fields is null." << std::endl;
+ Utils::get_glade_widget_derived_with_warning(m_dialog_fields);
+ if (!m_dialog_fields) {
+ std::cerr << G_STRFUNC << ": m_dialog_fields is null." << std::endl;
return;
}
- m_pDialog_Fields->signal_hide().connect( sigc::mem_fun(*this, &Frame_Glom::on_developer_dialog_hide));
- add_view(m_pDialog_Fields);
+ m_dialog_fields->signal_hide().connect( sigc::mem_fun(*this, &Frame_Glom::on_developer_dialog_hide));
+ add_view(m_dialog_fields);
}
// Some database backends (SQLite) require the table to change to no longer
@@ -1451,9 +1451,9 @@ void Frame_Glom::do_menu_developer_fields(Gtk::Window& parent, const Glib::ustri
// soon as the dialog has been closed.
m_table_name = table_name;
- m_pDialog_Fields->set_transient_for(parent);
- m_pDialog_Fields->init_db_details(table_name);
- m_pDialog_Fields->show();
+ m_dialog_fields->set_transient_for(parent);
+ m_dialog_fields->init_db_details(table_name);
+ m_dialog_fields->show();
}
void Frame_Glom::do_menu_developer_fields(Gtk::Window& parent)
@@ -1492,23 +1492,23 @@ void Frame_Glom::on_menu_developer_relationships_overview()
void Frame_Glom::do_menu_developer_relationships(Gtk::Window& parent, const Glib::ustring table_name)
{
//Create the widget if necessary:
- if(!m_pDialog_Relationships)
+ if(!m_dialog_relationships)
{
- Utils::get_glade_widget_derived_with_warning(m_pDialog_Relationships);
- if(!m_pDialog_Relationships)
+ Utils::get_glade_widget_derived_with_warning(m_dialog_relationships);
+ if(!m_dialog_relationships)
{
- std::cerr << G_STRFUNC << ": m_pDialog_Relationships is null.\n";
+ std::cerr << G_STRFUNC << ": m_dialog_relationships is null.\n";
return;
}
- m_pDialog_Relationships->set_title("Relationships");
- m_pDialog_Relationships->signal_hide().connect( sigc::mem_fun(*this,
&Frame_Glom::on_developer_dialog_hide));
- add_view(m_pDialog_Relationships); //Also a composite view.
+ m_dialog_relationships->set_title("Relationships");
+ m_dialog_relationships->signal_hide().connect( sigc::mem_fun(*this,
&Frame_Glom::on_developer_dialog_hide));
+ add_view(m_dialog_relationships); //Also a composite view.
}
- m_pDialog_Relationships->set_transient_for(parent);
- m_pDialog_Relationships->init_db_details(table_name);
- m_pDialog_Relationships->show();
+ m_dialog_relationships->set_transient_for(parent);
+ m_dialog_relationships->init_db_details(table_name);
+ m_dialog_relationships->show();
}
void Frame_Glom::on_menu_developer_relationships()
@@ -1562,40 +1562,40 @@ void Frame_Glom::on_menu_developer_reports()
return;
//Create the widget if necessary:
- if(!m_pBox_Reports)
+ if(!m_box_reports)
{
const Glib::RefPtr<Gtk::Builder> builderToKeepWidgetAlive =
- Utils::get_glade_child_widget_derived_with_warning(m_pBox_Reports);
- if(!m_pBox_Reports)
+ Utils::get_glade_child_widget_derived_with_warning(m_box_reports);
+ if(!m_box_reports)
{
- std::cerr << G_STRFUNC << ": m_pBox_Reports is null.\n";
+ std::cerr << G_STRFUNC << ": m_box_reports is null.\n";
return;
}
- m_pDialog_Reports = std::make_unique<Window_BoxHolder>(m_pBox_Reports);
- m_pDialog_Reports->set_transient_for(*(get_app_window()));
- m_pDialog_Reports->set_title(_("Reports"));
+ m_dialog_reports = std::make_unique<Window_BoxHolder>(m_box_reports);
+ m_dialog_reports->set_transient_for(*(get_app_window()));
+ m_dialog_reports->set_title(_("Reports"));
- Utils::get_glade_widget_derived_with_warning(m_pDialogLayoutReport);
- if(!m_pDialogLayoutReport)
+ Utils::get_glade_widget_derived_with_warning(m_dialog_layout_report);
+ if(!m_dialog_layout_report)
{
- std::cerr << G_STRFUNC << ": m_pDialogLayoutReport is null.\n";
+ std::cerr << G_STRFUNC << ": m_dialog_layout_report is null.\n";
return;
}
- add_view(m_pDialogLayoutReport);
- m_pDialogLayoutReport->set_transient_for(*(get_app_window()));
- m_pDialogLayoutReport->signal_hide().connect( sigc::mem_fun(*this,
&Frame_Glom::on_dialog_layout_report_hide) );
+ add_view(m_dialog_layout_report);
+ m_dialog_layout_report->set_transient_for(*(get_app_window()));
+ m_dialog_layout_report->signal_hide().connect( sigc::mem_fun(*this,
&Frame_Glom::on_dialog_layout_report_hide) );
- m_pDialog_Reports->set_default_size(300, 400);
- m_pBox_Reports->show_all();
+ m_dialog_reports->set_default_size(300, 400);
+ m_box_reports->show_all();
- m_pBox_Reports->signal_selected.connect(sigc::mem_fun(*this, &Frame_Glom::on_box_reports_selected));
- add_view(m_pBox_Reports);
+ m_box_reports->signal_selected.connect(sigc::mem_fun(*this, &Frame_Glom::on_box_reports_selected));
+ add_view(m_box_reports);
}
- m_pBox_Reports->init_db_details(m_table_name);
- m_pDialog_Reports->show();
+ m_box_reports->init_db_details(m_table_name);
+ m_dialog_reports->show();
}
void Frame_Glom::on_menu_developer_print_layouts()
@@ -1605,29 +1605,29 @@ void Frame_Glom::on_menu_developer_print_layouts()
return;
//Create the widget if necessary:
- if(!m_pBox_PrintLayouts)
+ if(!m_box_print_layouts)
{
const Glib::RefPtr<Gtk::Builder> builderToKeepWidgetAlive =
- Utils::get_glade_child_widget_derived_with_warning(m_pBox_PrintLayouts);
- if(!m_pBox_PrintLayouts)
+ Utils::get_glade_child_widget_derived_with_warning(m_box_print_layouts);
+ if(!m_box_print_layouts)
{
- std::cerr << G_STRFUNC << ": m_pBox_PrintLayouts is null.\n";
+ std::cerr << G_STRFUNC << ": m_box_print_layouts is null.\n";
return;
}
- m_pDialog_PrintLayouts = std::make_unique<Window_BoxHolder>(m_pBox_PrintLayouts);
+ m_dialog_print_layouts = std::make_unique<Window_BoxHolder>(m_box_print_layouts);
- m_pDialog_PrintLayouts->set_transient_for(*get_app_window());
- m_pDialog_PrintLayouts->set_title(_("Print Layouts"));
- m_pDialog_PrintLayouts->set_default_size(300, 400);
- m_pBox_PrintLayouts->show_all();
- add_view(m_pBox_PrintLayouts);
+ m_dialog_print_layouts->set_transient_for(*get_app_window());
+ m_dialog_print_layouts->set_title(_("Print Layouts"));
+ m_dialog_print_layouts->set_default_size(300, 400);
+ m_box_print_layouts->show_all();
+ add_view(m_box_print_layouts);
- m_pBox_PrintLayouts->signal_selected.connect(sigc::mem_fun(*this,
&Frame_Glom::on_box_print_layouts_selected));
+ m_box_print_layouts->signal_selected.connect(sigc::mem_fun(*this,
&Frame_Glom::on_box_print_layouts_selected));
}
- m_pBox_PrintLayouts->init_db_details(m_table_name);
- m_pDialog_PrintLayouts->show();
+ m_box_print_layouts->init_db_details(m_table_name);
+ m_dialog_print_layouts->show();
}
void Frame_Glom::on_menu_developer_script_library()
@@ -1648,14 +1648,14 @@ void Frame_Glom::on_menu_developer_script_library()
void Frame_Glom::on_box_reports_selected(const Glib::ustring& report_name)
{
- m_pDialog_Reports->hide();
+ m_dialog_reports->hide();
auto report = get_document()->get_report(m_table_name, report_name);
if(report)
{
- m_pDialogLayoutReport->set_transient_for(*get_app_window());
- m_pDialogLayoutReport->set_report(m_table_name, report);
- m_pDialogLayoutReport->show();
+ m_dialog_layout_report->set_transient_for(*get_app_window());
+ m_dialog_layout_report->set_report(m_table_name, report);
+ m_dialog_layout_report->show();
}
}
@@ -1694,31 +1694,31 @@ void Frame_Glom::on_box_print_layouts_selected(const Glib::ustring& print_layout
}
//Create the dialog if necessary:
- if(!m_pDialogLayoutPrint)
+ if(!m_dialog_layout_print)
{
- Utils::get_glade_widget_derived_with_warning(m_pDialogLayoutPrint);
- if(!m_pDialogLayoutPrint)
+ Utils::get_glade_widget_derived_with_warning(m_dialog_layout_print);
+ if(!m_dialog_layout_print)
{
- std::cerr << G_STRFUNC << ": m_pDialogLayoutPrint is null\n";
+ std::cerr << G_STRFUNC << ": m_dialog_layout_print is null\n";
return;
}
- add_view(m_pDialogLayoutPrint);
- m_pDialogLayoutPrint->signal_hide().connect( sigc::mem_fun(*this,
&Frame_Glom::on_dialog_layout_print_hide) );
+ add_view(m_dialog_layout_print);
+ m_dialog_layout_print->signal_hide().connect( sigc::mem_fun(*this,
&Frame_Glom::on_dialog_layout_print_hide) );
- add_window_to_app(m_pDialogLayoutPrint);
+ add_window_to_app(m_dialog_layout_print);
}
- m_pDialog_PrintLayouts->hide();
+ m_dialog_print_layouts->hide();
auto print_layout = get_document()->get_print_layout(m_table_name, print_layout_name);
if(print_layout)
{
- m_pDialogLayoutPrint->set_transient_for(*app_window);
+ m_dialog_layout_print->set_transient_for(*app_window);
- m_pDialogLayoutPrint->set_print_layout(m_table_name, print_layout);
+ m_dialog_layout_print->set_print_layout(m_table_name, print_layout);
- m_pDialogLayoutPrint->show();
+ m_dialog_layout_print->show();
}
}
@@ -1847,20 +1847,20 @@ bool Frame_Glom::connection_request_initial_password(Glib::ustring& user, Glib::
void Frame_Glom::instantiate_dialog_connection()
{
- if(m_pDialogConnection)
+ if(m_dialog_connection)
return;
- Utils::get_glade_widget_derived_with_warning(m_pDialogConnection);
- if(!m_pDialogConnection)
+ Utils::get_glade_widget_derived_with_warning(m_dialog_connection);
+ if(!m_dialog_connection)
{
- std::cerr << G_STRFUNC << ": m_pDialogConnection is null.\n";
+ std::cerr << G_STRFUNC << ": m_dialog_connection is null.\n";
}
- add_view(m_pDialogConnection); //Also a composite view.
+ add_view(m_dialog_connection); //Also a composite view.
auto window = get_app_window();
if (window)
- m_pDialogConnection->set_transient_for(*window);
+ m_dialog_connection->set_transient_for(*window);
}
bool Frame_Glom::connection_request_password_and_choose_new_database_name()
@@ -1922,11 +1922,11 @@ bool Frame_Glom::connection_request_password_and_choose_new_database_name()
instantiate_dialog_connection();
//Ask for connection details:
- m_pDialogConnection->load_from_document(); //Get good defaults.
- m_pDialogConnection->set_transient_for(*get_app_window());
+ m_dialog_connection->load_from_document(); //Get good defaults.
+ m_dialog_connection->set_transient_for(*get_app_window());
- const auto response = Glom::UiUtils::dialog_run_with_help(m_pDialogConnection);
- m_pDialogConnection->hide();
+ const auto response = Glom::UiUtils::dialog_run_with_help(m_dialog_connection);
+ m_dialog_connection->hide();
password_requested = true; //So we can ask again if it didn't work.
if(response == Gtk::RESPONSE_OK)
@@ -1938,7 +1938,7 @@ bool Frame_Glom::connection_request_password_and_choose_new_database_name()
return false;
Glib::ustring username, password;
- m_pDialogConnection->get_username_and_password(username, password);
+ m_dialog_connection->get_username_and_password(username, password);
connection_pool->set_user(username);
connection_pool->set_password(password);
@@ -1961,7 +1961,7 @@ bool Frame_Glom::connection_request_password_and_choose_new_database_name()
if(!handle_connection_initialize_errors( connection_pool->initialize(slot_ignored)) )
return false;
- //m_pDialogConnection->load_from_document(); //Get good defaults.
+ //m_dialog_connection->load_from_document(); //Get good defaults.
// No authentication required
break;
@@ -2120,27 +2120,27 @@ bool Frame_Glom::connection_request_password_and_attempt(bool& database_not_foun
|| document->get_hosting_mode() == Document::HostingMode::POSTGRES_CENTRAL)
{
//We recreate the dialog each time to make sure it is clean of any changes:
- delete m_pDialogConnection;
- m_pDialogConnection = nullptr;
+ delete m_dialog_connection;
+ m_dialog_connection = nullptr;
instantiate_dialog_connection();
- m_pDialogConnection->load_from_document(); //Get good defaults.
+ m_dialog_connection->load_from_document(); //Get good defaults.
//Show alternative text if necessary:
if(confirm_known_user)
- m_pDialogConnection->set_confirm_existing_user_note();
+ m_dialog_connection->set_confirm_existing_user_note();
if(!known_username.empty())
- m_pDialogConnection->set_username(known_username);
+ m_dialog_connection->set_username(known_username);
if(!known_password.empty())
- m_pDialogConnection->set_password(known_password);
+ m_dialog_connection->set_password(known_password);
}
else
{
- //Later, if m_pDialogConnection is null then we assume we should use the known user/password:
- delete m_pDialogConnection;
- m_pDialogConnection = nullptr;
+ //Later, if m_dialog_connection is null then we assume we should use the known user/password:
+ delete m_dialog_connection;
+ m_dialog_connection = nullptr;
}
@@ -2150,10 +2150,10 @@ bool Frame_Glom::connection_request_password_and_attempt(bool& database_not_foun
//Only show the dialog if we don't know the correct username/password yet:
int response = Gtk::RESPONSE_OK;
- if(m_pDialogConnection)
+ if(m_dialog_connection)
{
- response = Glom::UiUtils::dialog_run_with_help(m_pDialogConnection);
- m_pDialogConnection->hide();
+ response = Glom::UiUtils::dialog_run_with_help(m_dialog_connection);
+ m_dialog_connection->hide();
}
//Try to use the entered username/password:
@@ -2163,11 +2163,11 @@ bool Frame_Glom::connection_request_password_and_attempt(bool& database_not_foun
//Ask for the user/password if necessary:
//TODO: Remove any previous database setting?
- if(m_pDialogConnection)
+ if(m_dialog_connection)
{
try
{
- sharedconnection = m_pDialogConnection->connect_to_server_with_connection_settings();
+ sharedconnection = m_dialog_connection->connect_to_server_with_connection_settings();
// TODO: Save username in document?
return true; //Succeeded, because no exception was thrown.
}
@@ -2259,7 +2259,7 @@ void Frame_Glom::on_menu_report_selected(const Glib::ustring& report_name)
if(!report)
return;
- FoundSet found_set = m_Notebook_Data.get_found_set();
+ FoundSet found_set = m_notebook_data.get_found_set();
//TODO: Find a way to get a full locale name from the simplified locale name from
AppWindow::get_current_locale():
ReportBuilder report_builder(std::locale("") /* the user's current locale */);
@@ -2292,7 +2292,7 @@ void Frame_Glom::do_print_layout(const Glib::ustring& print_layout_name, bool pr
//TODO: When expanding items, avoid the page gaps that the print layout's design
//has added.
- const auto found_set = m_Notebook_Data.get_found_set_selected();
+ const auto found_set = m_notebook_data.get_found_set_selected();
//Note that found_set.m_where_clause could be empty if there are no records yet,
//and that is acceptable if this is for a print preview while designing the print layout.
@@ -2307,10 +2307,10 @@ void Frame_Glom::on_dialog_layout_report_hide()
{
auto document = get_document();
- if(document && true) //m_pDialogLayoutReport->get_modified())
+ if(document && true) //m_dialog_layout_report->get_modified())
{
- const auto original_name = m_pDialogLayoutReport->get_original_report_name();
- auto report = m_pDialogLayoutReport->get_report();
+ const auto original_name = m_dialog_layout_report->get_original_report_name();
+ auto report = m_dialog_layout_report->get_report();
if(report && (original_name != report->get_name()))
document->remove_report(m_table_name, original_name);
@@ -2327,10 +2327,10 @@ void Frame_Glom::on_dialog_layout_print_hide()
{
auto document = get_document();
- if(document && true) //m_pDialogLayoutReport->get_modified())
+ if(document && true) //m_dialog_layout_report->get_modified())
{
- const auto original_name = m_pDialogLayoutPrint->get_original_name();
- auto print_layout = m_pDialogLayoutPrint->get_print_layout();
+ const auto original_name = m_dialog_layout_print->get_original_name();
+ auto print_layout = m_dialog_layout_print->get_print_layout();
if(print_layout && (original_name != print_layout->get_name()))
document->remove_report(m_table_name, original_name);
@@ -2391,7 +2391,7 @@ void Frame_Glom::on_notebook_data_record_details_requested(const Glib::ustring&
void Frame_Glom::on_notebook_data_record_selection_changed()
{
bool something_selected = false;
- const auto found_set = m_Notebook_Data.get_found_set_selected();
+ const auto found_set = m_notebook_data.get_found_set_selected();
if(!found_set.m_where_clause.empty())
something_selected = true;
@@ -2421,7 +2421,7 @@ gulong Frame_Glom::update_records_count()
gulong count_all = 0;
gulong count_found = 0;
- m_Notebook_Data.get_record_counts(count_all, count_found);
+ m_notebook_data.get_record_counts(count_all, count_found);
//std::cout << G_STRFUNC << ": count_all=" << count_all << ", count_found=" << count_found << std::endl;
std::string str_count_all, str_count_found;
@@ -2434,17 +2434,17 @@ gulong Frame_Glom::update_records_count()
else
str_count_found = str_count_all;
- m_Button_FindAll.hide();
+ m_button_find_all.hide();
}
else
{
str_count_found = ulong_as_string(count_found);
- m_Button_FindAll.show();
+ m_button_find_all.show();
}
- m_Label_RecordsCount.set_text(str_count_all);
- m_Label_FoundCount.set_text(str_count_found);
+ m_label_records_count.set_text(str_count_all);
+ m_label_found_count.set_text(str_count_found);
return count_found;
}
diff --git a/glom/frame_glom.h b/glom/frame_glom.h
index 543ff83..5227f9d 100644
--- a/glom/frame_glom.h
+++ b/glom/frame_glom.h
@@ -255,45 +255,45 @@ private:
Glib::ustring m_table_name;
//Child widgets:
- Gtk::Label* m_pLabel_Table_DataMode;
- Gtk::Label* m_pLabel_Table_FindMode;
+ Gtk::Label* m_label_table_data_mode;
+ Gtk::Label* m_label_table_find_mode;
- Gtk::Box m_Box_RecordsCount; //Only show this when in Data mode.
- Gtk::Label m_Label_RecordsCount;
- Gtk::Label m_Label_FoundCount;
- Gtk::Button m_Button_FindAll;
+ Gtk::Box m_box_records_count; //Only show this when in Data mode.
+ Gtk::Label m_label_records_count;
+ Gtk::Label m_label_found_count;
+ Gtk::Button m_button_find_all;
Gtk::Stack* m_stack_mode; //Contains e.g. data or find mode notebook.
//Navigation:
- Box_Tables* m_pBox_Tables;
- Window_BoxHolder* m_pDialog_Tables;
+ Box_Tables* m_box_tables;
+ Window_BoxHolder* m_dialog_tables;
- Notebook_Data m_Notebook_Data;
+ Notebook_Data m_notebook_data;
- Gtk::Box* m_pBox_QuickFind; //Only show this when in Find mode.
- Gtk::Entry* m_pEntry_QuickFind;
- Gtk::Button* m_pButton_QuickFind;
- Notebook_Find m_Notebook_Find;
+ Gtk::Box* m_box_quick_find; //Only show this when in Find mode.
+ Gtk::Entry* m_entry_quick_find;
+ Gtk::Button* m_button_quick_find;
+ Notebook_Find m_notebook_find;
#ifndef GLOM_ENABLE_CLIENT_ONLY
//Developer:
- std::unique_ptr<Window_BoxHolder> m_pDialog_Reports;
- Dialog_Layout_Report* m_pDialogLayoutReport;
- Box_Reports* m_pBox_Reports;
+ std::unique_ptr<Window_BoxHolder> m_dialog_reports;
+ Dialog_Layout_Report* m_dialog_layout_report;
+ Box_Reports* m_box_reports;
- std::unique_ptr<Window_BoxHolder> m_pDialog_PrintLayouts;
- Window_PrintLayout_Edit* m_pDialogLayoutPrint;
- Box_Print_Layouts* m_pBox_PrintLayouts;
+ std::unique_ptr<Window_BoxHolder> m_dialog_print_layouts;
+ Window_PrintLayout_Edit* m_dialog_layout_print;
+ Box_Print_Layouts* m_box_print_layouts;
- Dialog_Fields* m_pDialog_Fields;
- Dialog_Relationships* m_pDialog_Relationships;
+ Dialog_Fields* m_dialog_fields;
+ Dialog_Relationships* m_dialog_relationships;
Dialog_AddRelatedTable* m_dialog_addrelatedtable;
Window_RelationshipsOverview* m_window_relationships_overview;
#endif //GLOM_ENABLE_CLIENT_ONLY
- Dialog_Connection* m_pDialogConnection;
+ Dialog_Connection* m_dialog_connection;
};
} //namespace Glom
diff --git a/glom/libglom/connectionpool.cc b/glom/libglom/connectionpool.cc
index e5e0efa..ea3d51f 100644
--- a/glom/libglom/connectionpool.cc
+++ b/glom/libglom/connectionpool.cc
@@ -289,9 +289,9 @@ std::shared_ptr<SharedConnection> ConnectionPool::connect()
return connection_cached;
}
//If the connection is already open (because it is being used by somebody):
- else if(m_refGdaConnection)
+ else if(m_gda_connection)
{
- std::shared_ptr<SharedConnection> sharedConnection( new SharedConnection(m_refGdaConnection) );
+ std::shared_ptr<SharedConnection> sharedConnection( new SharedConnection(m_gda_connection) );
//Ask for notification when the SharedConnection has been finished with:
//TODO: Note that we are overwriting the connection to a signal of a
@@ -315,7 +315,7 @@ std::shared_ptr<SharedConnection> ConnectionPool::connect()
}
else
{
- m_refGdaConnection = m_backend->connect(m_database, get_user(), get_password(), m_fake_connection);
+ m_gda_connection = m_backend->connect(m_database, get_user(), get_password(), m_fake_connection);
{
//Allow get_meta_store_data() to succeed:
@@ -323,7 +323,7 @@ std::shared_ptr<SharedConnection> ConnectionPool::connect()
//std::cout << "DEBUG: Calling update_meta_store_data_types() ...\n";
try
{
- m_refGdaConnection->update_meta_store_data_types();
+ m_gda_connection->update_meta_store_data_types();
}
catch(const Glib::Error& ex)
{
@@ -347,7 +347,7 @@ std::shared_ptr<SharedConnection> ConnectionPool::connect()
// Connection succeeded
// Create the fieldtypes member if it has not already been done:
if(!m_field_types)
- m_field_types = std::make_shared<FieldTypes>(m_refGdaConnection);
+ m_field_types = std::make_shared<FieldTypes>(m_gda_connection);
#ifndef G_OS_WIN32
//Let other clients discover this server via avahi:
@@ -360,7 +360,7 @@ std::shared_ptr<SharedConnection> ConnectionPool::connect()
avahi_start_publishing(); //Stopped in the signal_finished handler.
#endif // !G_OS_WIN32
- return connect(); //Call this method recursively. This time m_refGdaConnection exists.
+ return connect(); //Call this method recursively. This time m_gda_connection exists.
}
}
}
@@ -431,7 +431,7 @@ bool ConnectionPool::convert_backup(const SlotProgress& slot_progress, const std
{
//update_meta_store_table_names() has been known to throw an exception.
//Glom is mostly unusable when it fails, but that's still better than a crash.
- m_refGdaConnection->update_meta_store_table_names(m_backend->get_public_schema_name());
+ m_gda_connection->update_meta_store_table_names(m_backend->get_public_schema_name());
}
catch(const Glib::Error& ex)
{
@@ -500,10 +500,10 @@ void ConnectionPool::invalidate_connection()
connection_cached_timeout_connection.disconnect();
connection_cached_finished_connection.disconnect();
- if(m_refGdaConnection)
- m_refGdaConnection->close();
+ if(m_gda_connection)
+ m_gda_connection->close();
- m_refGdaConnection.reset();
+ m_gda_connection.reset();
m_sharedconnection_refcount = 0;
m_field_types.reset();
@@ -522,9 +522,9 @@ void ConnectionPool::on_sharedconnection_finished()
//There should be no copies of the m_refConnection, so the Gnome::Gda::Connection destructor should
//run when we clear this last RefPtr of it, but we will explicitly close it just in case.
//std::cerr << G_STRFUNC << ": closing GdaConnection\n";
- m_refGdaConnection->close();
+ m_gda_connection->close();
- m_refGdaConnection.reset();
+ m_gda_connection.reset();
#ifndef G_OS_WIN32
//TODO: this should only even be started if we are the first to open the .glom file:
@@ -667,7 +667,7 @@ bool ConnectionPool::set_network_shared(const SlotProgress& slot_progress, bool
bool ConnectionPool::connect_nothrow()
{
- if(!m_refGdaConnection)
+ if(!m_gda_connection)
{
try
{
@@ -680,7 +680,7 @@ bool ConnectionPool::connect_nothrow()
}
}
- return (m_refGdaConnection != 0);
+ return (m_gda_connection != 0);
}
//TODO: Why do we use noexcept here and on change_columns()?
@@ -691,8 +691,8 @@ bool ConnectionPool::add_column(const Glib::ustring& table_name, const std::shar
try
{
- const auto result = m_backend->add_column(m_refGdaConnection, table_name, field);
- m_refGdaConnection->update_meta_store_table(table_name, m_backend->get_public_schema_name());
+ const auto result = m_backend->add_column(m_gda_connection, table_name, field);
+ m_gda_connection->update_meta_store_table(table_name, m_backend->get_public_schema_name());
return result;
}
catch(const Glib::Error& ex)
@@ -710,8 +710,8 @@ bool ConnectionPool::drop_column(const Glib::ustring& table_name, const Glib::us
try
{
- const auto result = m_backend->drop_column(m_refGdaConnection, table_name, field_name);
- m_refGdaConnection->update_meta_store_table(table_name, m_backend->get_public_schema_name());
+ const auto result = m_backend->drop_column(m_gda_connection, table_name, field_name);
+ m_gda_connection->update_meta_store_table(table_name, m_backend->get_public_schema_name());
return result;
}
catch(const Glib::Error& ex)
@@ -735,11 +735,11 @@ bool ConnectionPool::change_columns(const Glib::ustring& table_name, const type_
if(!connect_nothrow())
return false;
- const auto result = m_backend->change_columns(m_refGdaConnection, table_name, old_fields, new_fields);
+ const auto result = m_backend->change_columns(m_gda_connection, table_name, old_fields, new_fields);
try
{
- m_refGdaConnection->update_meta_store_table(table_name, m_backend->get_public_schema_name());
+ m_gda_connection->update_meta_store_table(table_name, m_backend->get_public_schema_name());
}
catch(const Glib::Error& ex)
{
@@ -996,7 +996,7 @@ bool ConnectionPool::update_meta_store_for_table_names()
//update_meta_store_table_names() has been known to throw an exception.
//Glom is mostly unusable when it fails, but that's still better than a crash.
//std::cout << G_STRFUNC << ": Before update_meta_store_table_name()\n";
- const auto test = m_refGdaConnection->update_meta_store_table_names(m_backend->get_public_schema_name());
+ const auto test = m_gda_connection->update_meta_store_table_names(m_backend->get_public_schema_name());
if(!test && !m_fake_connection)
{
std::cerr << G_STRFUNC << ": update_meta_store_table_names() failed without an exception.\n";
diff --git a/glom/libglom/connectionpool.h b/glom/libglom/connectionpool.h
index 9d02170..b266472 100644
--- a/glom/libglom/connectionpool.h
+++ b/glom/libglom/connectionpool.h
@@ -339,7 +339,7 @@ private:
Gtk::Dialog* m_dialog_epc_progress; //For progress while generating certificates.
std::shared_ptr<Backend> m_backend;
- Glib::RefPtr<Gnome::Gda::Connection> m_refGdaConnection;
+ Glib::RefPtr<Gnome::Gda::Connection> m_gda_connection;
guint m_sharedconnection_refcount;
bool m_ready_to_connect;
Glib::ustring m_user, m_password, m_database;
diff --git a/glom/libglom/document/bakery/document.cc b/glom/libglom/document/bakery/document.cc
index 94674e9..e3f345a 100644
--- a/glom/libglom/document/bakery/document.cc
+++ b/glom/libglom/document/bakery/document.cc
@@ -33,7 +33,7 @@ Document::Document()
m_is_new = true;
m_modified = false;
m_read_only = false;
- m_pView = nullptr;
+ m_view = nullptr;
}
Document::~Document()
@@ -123,8 +123,8 @@ bool Document::load(int& failure_code)
if(bTest)
{
//Tell the View to show the new data:
- if(m_pView)
- m_pView->load_from_document();
+ if(m_view)
+ m_view->load_from_document();
}
}
@@ -157,8 +157,8 @@ bool Document::load_from_data(const guchar* data, std::size_t length, int& failu
if(bTest)
{
//Tell the View to show the new data:
- if(m_pView)
- m_pView->load_from_document();
+ if(m_view)
+ m_view->load_from_document();
}
set_is_new(false);
@@ -181,8 +181,8 @@ bool Document::load_after(int& failure_code)
bool Document::save()
{
//Tell the view to update the data in this document.
- if(m_pView)
- m_pView->save_to_document();
+ if(m_view)
+ m_view->save_to_document();
const auto bTest = save_before(); //This could be overridden.
if(bTest)
@@ -427,12 +427,12 @@ Glib::ustring Document::util_file_uri_get_name(const Glib::ustring& file_uri, co
void Document::set_view(ViewBase* pView)
{
- m_pView = pView;
+ m_view = pView;
}
ViewBase* Document::get_view()
{
- return m_pView;
+ return m_view;
}
bool Document::get_read_only() const
diff --git a/glom/libglom/document/bakery/document.h b/glom/libglom/document/bakery/document.h
index f5b379d..95d152b 100644
--- a/glom/libglom/document/bakery/document.h
+++ b/glom/libglom/document/bakery/document.h
@@ -129,7 +129,7 @@ protected:
Glib::ustring m_file_uri;
Glib::ustring m_file_extension;
- ViewBase* m_pView;
+ ViewBase* m_view;
type_signal_modified signal_modified_;
diff --git a/glom/libglom/document/bakery/document_xml.cc b/glom/libglom/document/bakery/document_xml.cc
index b589451..ec627c6 100644
--- a/glom/libglom/document/bakery/document_xml.cc
+++ b/glom/libglom/document/bakery/document_xml.cc
@@ -25,14 +25,14 @@ namespace GlomBakery
Document_XML::Document_XML()
-: m_pDOM_Document(nullptr),
+: m_dom_document(nullptr),
m_write_formatted(false)
{
}
Document_XML::~Document_XML()
{
- //m_pDOM_Document is owned by m_DOM_Document;
+ //m_dom_document is owned by m_DOM_Document;
}
bool Document_XML::load_after(int& failure_code)
@@ -47,14 +47,14 @@ bool Document_XML::load_after(int& failure_code)
try
{
//Link the parser to the XML text that was loaded:
- //m_DOM_Parser.setDoValidation(true);
+ //m_dom_parser.setDoValidation(true);
if(m_strContents.empty())
std::cerr << G_STRFUNC << ": parsing empty document.\n";
- m_DOM_Parser.parse_memory(m_strContents);
- m_pDOM_Document = m_DOM_Parser.get_document();
- if(!m_pDOM_Document) return false;
+ m_dom_parser.parse_memory(m_strContents);
+ m_dom_document = m_dom_parser.get_document();
+ if(!m_dom_document) return false;
return true; //Success.
}
@@ -98,9 +98,9 @@ void Document_XML::Util_DOM_Write(Glib::ustring& refstrXML) const
try
{
if(m_write_formatted)
- refstrXML = m_pDOM_Document->write_to_string_formatted();
+ refstrXML = m_dom_document->write_to_string_formatted();
else
- refstrXML = m_pDOM_Document->write_to_string();
+ refstrXML = m_dom_document->write_to_string();
}
catch(xmlpp::exception& ex)
{
@@ -110,23 +110,23 @@ void Document_XML::Util_DOM_Write(Glib::ustring& refstrXML) const
void Document_XML::set_dtd_name(const std::string& strVal)
{
- m_strDTD_Name = strVal;
+ m_dtd_name = strVal;
}
std::string Document_XML::get_dtd_name() const
{
- return m_strDTD_Name;
+ return m_dtd_name;
}
void Document_XML::set_dtd_root_node_name(const Glib::ustring& strVal, const Glib::ustring& xmlns)
{
- m_strRootNodeName = strVal;
+ m_root_node_name = strVal;
m_root_xmlns = xmlns;
}
Glib::ustring Document_XML::get_dtd_root_node_name() const
{
- return m_strRootNodeName;
+ return m_root_node_name;
}
@@ -138,21 +138,21 @@ const xmlpp::Element* Document_XML::get_node_document() const
xmlpp::Element* Document_XML::get_node_document()
{
- if(!m_pDOM_Document)
- m_pDOM_Document = m_DOM_Parser.get_document();
+ if(!m_dom_document)
+ m_dom_document = m_dom_parser.get_document();
//Make sure that it has the DTD declaration:
//TODO: Put this in a better place, where it's more guaranteed to always be set?
//TODO: Add API to specify the PUBLIC URI, if the document should write this:
//SYSTEM (local) DTDs do not seem very useful.
//- means non-registered, which is commonly used.
- //m_pDOM_Document->set_internal_subset(m_strRootNodeName, "-//glom/" + m_strDTD_Name, m_strDTD_Name);
+ //m_dom_document->set_internal_subset(m_root_node_name, "-//glom/" + m_dtd_name, m_dtd_name);
- auto nodeRoot = m_pDOM_Document->get_root_node();
+ auto nodeRoot = m_dom_document->get_root_node();
if(!nodeRoot)
{
//Add it if it isn't there already:
- nodeRoot = m_pDOM_Document->create_root_node(m_strRootNodeName, m_root_xmlns);
+ nodeRoot = m_dom_document->create_root_node(m_root_node_name, m_root_xmlns);
}
//Make sure that it has the root name name and xmlns:
diff --git a/glom/libglom/document/bakery/document_xml.h b/glom/libglom/document/bakery/document_xml.h
index 6fe7a9a..593a78d 100644
--- a/glom/libglom/document/bakery/document_xml.h
+++ b/glom/libglom/document/bakery/document_xml.h
@@ -70,11 +70,11 @@ protected:
typedef GlomBakery::Document type_base;
//XML Parsing bits:
- xmlpp::DomParser m_DOM_Parser; //Could be mutable to allow us to guarantee a root node.
- xmlpp::Document* m_pDOM_Document; //1-to-1 with the m_DOM_Parser.
+ xmlpp::DomParser m_dom_parser; //Could be mutable to allow us to guarantee a root node.
+ xmlpp::Document* m_dom_document; //1-to-1 with the m_dom_parser.
- std::string m_strDTD_Name;
- Glib::ustring m_strRootNodeName, m_root_xmlns;
+ std::string m_dtd_name;
+ Glib::ustring m_root_node_name, m_root_xmlns;
bool m_write_formatted;
};
diff --git a/glom/mode_data/box_data.cc b/glom/mode_data/box_data.cc
index a853a04..38366b4 100644
--- a/glom/mode_data/box_data.cc
+++ b/glom/mode_data/box_data.cc
@@ -41,7 +41,7 @@ namespace Glom
Box_Data::Box_Data()
: m_Button_Find(_("_Find"), true)
#ifndef GLOM_ENABLE_CLIENT_ONLY
- ,m_pDialogLayout(nullptr)
+ ,m_dialog_layout(nullptr)
#endif // !GLOM_ENABLE_CLIENT_ONLY
{
m_bUnstoredData = false;
@@ -53,10 +53,10 @@ Box_Data::Box_Data()
Box_Data::~Box_Data()
{
#ifndef GLOM_ENABLE_CLIENT_ONLY
- if(m_pDialogLayout)
+ if(m_dialog_layout)
{
- remove_view(m_pDialogLayout);
- delete m_pDialogLayout;
+ remove_view(m_dialog_layout);
+ delete m_dialog_layout;
}
#endif // !GLOM_ENABLE_CLIENT_ONLY
}
@@ -204,15 +204,15 @@ bool Box_Data::confirm_discard_unstored_data() const
#ifndef GLOM_ENABLE_CLIENT_ONLY
void Box_Data::show_layout_dialog()
{
- if(!m_pDialogLayout)
+ if(!m_dialog_layout)
{
- m_pDialogLayout = create_layout_dialog();
- add_view(m_pDialogLayout); //Give it access to the document.
- m_pDialogLayout->signal_hide().connect( sigc::mem_fun(*this, &Box_Data::on_dialog_layout_hide) );
+ m_dialog_layout = create_layout_dialog();
+ add_view(m_dialog_layout); //Give it access to the document.
+ m_dialog_layout->signal_hide().connect( sigc::mem_fun(*this, &Box_Data::on_dialog_layout_hide) );
}
- prepare_layout_dialog(m_pDialogLayout);
- m_pDialogLayout->show();
+ prepare_layout_dialog(m_dialog_layout);
+ m_dialog_layout->show();
}
#endif // !GLOM_ENABLE_CLIENT_ONLY
diff --git a/glom/mode_data/box_data.h b/glom/mode_data/box_data.h
index 7faa2ad..bd9e343 100644
--- a/glom/mode_data/box_data.h
+++ b/glom/mode_data/box_data.h
@@ -129,7 +129,7 @@ protected:
bool m_bUnstoredData;
#ifndef GLOM_ENABLE_CLIENT_ONLY
- Dialog_Layout* m_pDialogLayout;
+ Dialog_Layout* m_dialog_layout;
#endif // !GLOM_ENABLE_CLIENT_ONLY
/// "details" or "list", as specified in the Document's XML.
diff --git a/glom/mode_data/box_data_calendar_related.cc b/glom/mode_data/box_data_calendar_related.cc
index ce5288c..181c15b 100644
--- a/glom/mode_data/box_data_calendar_related.cc
+++ b/glom/mode_data/box_data_calendar_related.cc
@@ -316,7 +316,7 @@ Box_Data_Calendar_Related::type_vecConstLayoutFields Box_Data_Calendar_Related::
#ifndef GLOM_ENABLE_CLIENT_ONLY
void Box_Data_Calendar_Related::on_dialog_layout_hide()
{
- auto dialog_related = dynamic_cast<Dialog_Layout_Calendar_Related*>(m_pDialogLayout);
+ auto dialog_related = dynamic_cast<Dialog_Layout_Calendar_Related*>(m_dialog_layout);
g_assert(dialog_related);
const auto portal = dialog_related->get_portal_layout();
set_layout_item(portal, "" /* TODO */);
@@ -466,27 +466,27 @@ Glib::ustring Box_Data_Calendar_Related::on_calendar_details(guint year, guint m
void Box_Data_Calendar_Related::setup_menu(Gtk::Widget* /* this */)
{
- m_refActionGroup = Gio::SimpleActionGroup::create();
+ m_action_group = Gio::SimpleActionGroup::create();
- m_refContextEdit = m_refActionGroup->add_action("edit",
+ m_context_edit = m_action_group->add_action("edit",
sigc::mem_fun(*this, &Box_Data_Calendar_Related::on_MenuPopup_activate_Edit) );
#ifndef GLOM_ENABLE_CLIENT_ONLY
// Don't add ContextLayout in client only mode because it would never
// be sensitive anyway
- m_refContextLayout = m_refActionGroup->add_action("layout",
+ m_context_layout = m_action_group->add_action("layout",
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:
auto pApp = get_appwindow();
if(pApp)
{
- pApp->add_developer_action(m_refContextLayout); //So that it can be disabled when not in developer mode.
+ pApp->add_developer_action(m_context_layout); //So that it can be disabled when not in developer mode.
pApp->update_userlevel_ui(); //Update our action's sensitivity.
}
#endif // !GLOM_ENABLE_CLIENT_ONLY
- insert_action_group("context", m_refActionGroup);
+ insert_action_group("context", m_action_group);
//TODO: add_accel_group(m_refUIManager->get_accel_group());
@@ -494,12 +494,12 @@ void Box_Data_Calendar_Related::setup_menu(Gtk::Widget* /* this */)
menu->append(_("_Edit"), "context.edit");
menu->append(_("_Layout"), "context.layout");
- m_pMenuPopup = std::make_unique<Gtk::Menu>(menu);
- m_pMenuPopup->attach_to_widget(*this);
+ m_menu_popup = std::make_unique<Gtk::Menu>(menu);
+ m_menu_popup->attach_to_widget(*this);
#ifndef GLOM_ENABLE_CLIENT_ONLY
if(pApp)
- m_refContextLayout->set_enabled(pApp->get_userlevel() == AppState::userlevels::DEVELOPER);
+ m_context_layout->set_enabled(pApp->get_userlevel() == AppState::userlevels::DEVELOPER);
#endif // !GLOM_ENABLE_CLIENT_ONLY
}
@@ -511,7 +511,7 @@ void Box_Data_Calendar_Related::on_calendar_button_press_event(GdkEventButton *b
auto pApp = get_appwindow();
if(pApp)
{
- pApp->add_developer_action(m_refContextLayout); //So that it can be disabled when not in developer mode.
+ pApp->add_developer_action(m_context_layout); //So that it can be disabled when not in developer mode.
pApp->update_userlevel_ui(); //Update our action's sensitivity.
}
#endif
@@ -521,7 +521,7 @@ void Box_Data_Calendar_Related::on_calendar_button_press_event(GdkEventButton *b
if(mods & GDK_BUTTON3_MASK)
{
//Give user choices of actions on this item:
- m_pMenuPopup->popup(button_event->button, button_event->time);
+ m_menu_popup->popup(button_event->button, button_event->time);
return; //handled.
}
else
diff --git a/glom/mode_data/box_data_calendar_related.h b/glom/mode_data/box_data_calendar_related.h
index 992122e..aeac0fd 100644
--- a/glom/mode_data/box_data_calendar_related.h
+++ b/glom/mode_data/box_data_calendar_related.h
@@ -86,12 +86,12 @@ private:
Gtk::Calendar m_calendar;
//TODO: Avoid repeating these in so many widgets:
- std::unique_ptr<Gtk::Menu> m_pMenuPopup;
- Glib::RefPtr<Gio::SimpleActionGroup> m_refActionGroup;
- Glib::RefPtr<Gio::SimpleAction> m_refContextEdit, m_refContextAdd, m_refContextDelete;
+ std::unique_ptr<Gtk::Menu> m_menu_popup;
+ Glib::RefPtr<Gio::SimpleActionGroup> m_action_group;
+ Glib::RefPtr<Gio::SimpleAction> m_context_edit, m_context_add, m_context_delete;
#ifndef GLOM_ENABLE_CLIENT_ONLY
- Glib::RefPtr<Gio::SimpleAction> m_refContextLayout;
+ Glib::RefPtr<Gio::SimpleAction> m_context_layout;
#endif
//The cached data for the month:
diff --git a/glom/mode_data/box_data_list.cc b/glom/mode_data/box_data_list.cc
index dd94ac1..f15ac7c 100644
--- a/glom/mode_data/box_data_list.cc
+++ b/glom/mode_data/box_data_list.cc
@@ -53,7 +53,7 @@ Box_Data_List::Box_Data_List()
//Groups are not very helpful for a list view:
- //m_pDialogLayout->set_show_groups(false);
+ //m_dialog_layout->set_show_groups(false);
m_AddDel.show();
}
diff --git a/glom/mode_data/box_data_list_related.cc b/glom/mode_data/box_data_list_related.cc
index 6c62b2f..31b3c1a 100644
--- a/glom/mode_data/box_data_list_related.cc
+++ b/glom/mode_data/box_data_list_related.cc
@@ -324,7 +324,7 @@ void Box_Data_List_Related::on_adddel_record_added(const Gtk::TreeModel::iterato
#ifndef GLOM_ENABLE_CLIENT_ONLY
void Box_Data_List_Related::on_dialog_layout_hide()
{
- auto dialog_related = dynamic_cast<Dialog_Layout_List_Related*>(m_pDialogLayout);
+ auto dialog_related = dynamic_cast<Dialog_Layout_List_Related*>(m_dialog_layout);
g_assert(dialog_related);
const auto portal = dialog_related->get_portal_layout();
diff --git a/glom/mode_data/box_data_manyrecords.cc b/glom/mode_data/box_data_manyrecords.cc
index 320c2fc..e3df142 100644
--- a/glom/mode_data/box_data_manyrecords.cc
+++ b/glom/mode_data/box_data_manyrecords.cc
@@ -39,7 +39,7 @@ Box_Data_ManyRecords::Box_Data_ManyRecords()
m_layout_name = "manyrecords"; //Set by derived classes.
//Groups are not very helpful for a list view:
- //m_pDialogLayout->set_show_groups(false);
+ //m_dialog_layout->set_show_groups(false);
}
diff --git a/glom/mode_data/buttonglom.cc b/glom/mode_data/buttonglom.cc
index 06cf806..07a9978 100644
--- a/glom/mode_data/buttonglom.cc
+++ b/glom/mode_data/buttonglom.cc
@@ -87,7 +87,7 @@ bool ButtonGlom::on_button_press_event(GdkEventButton *button_event)
if(mods & GDK_BUTTON3_MASK)
{
//Give user choices of actions on this item:
- m_pPopupMenuUtils->popup(button_event->button, button_event->time);
+ m_popup_menu_utils->popup(button_event->button, button_event->time);
return true; //We handled this event.
}
}
diff --git a/glom/mode_data/datawidget/checkbutton.cc b/glom/mode_data/datawidget/checkbutton.cc
index efd6ddf..dd77343 100644
--- a/glom/mode_data/datawidget/checkbutton.cc
+++ b/glom/mode_data/datawidget/checkbutton.cc
@@ -45,10 +45,10 @@ bool CheckButton::on_button_press_event(GdkEventButton *button_event)
auto pApp = get_appwindow();
if(pApp)
{
- pApp->add_developer_action(m_refContextLayout); //So that it can be disabled when not in developer mode.
- pApp->add_developer_action(m_refContextAddField);
- pApp->add_developer_action(m_refContextAddRelatedRecords);
- pApp->add_developer_action(m_refContextAddGroup);
+ pApp->add_developer_action(m_context_layout); //So that it can be disabled when not in developer mode.
+ pApp->add_developer_action(m_context_add_field);
+ pApp->add_developer_action(m_context_add_related_records);
+ pApp->add_developer_action(m_context_add_group);
pApp->update_userlevel_ui(); //Update our action's sensitivity.
@@ -61,7 +61,7 @@ bool CheckButton::on_button_press_event(GdkEventButton *button_event)
if(mods & GDK_BUTTON3_MASK)
{
//Give user choices of actions on this item:
- m_pMenuPopup->popup(button_event->button, button_event->time);
+ m_menu_popup->popup(button_event->button, button_event->time);
return true; //We handled this event.
}
}
diff --git a/glom/mode_data/datawidget/combo.cc b/glom/mode_data/datawidget/combo.cc
index f21c787..fd23a13 100644
--- a/glom/mode_data/datawidget/combo.cc
+++ b/glom/mode_data/datawidget/combo.cc
@@ -308,10 +308,10 @@ g_warning("ComboGlom::on_button_press_event()");
auto pApp = get_appwindow();
if(pApp)
{
- pApp->add_developer_action(m_refContextLayout); //So that it can be disabled when not in developer mode.
- pApp->add_developer_action(m_refContextAddField);
- pApp->add_developer_action(m_refContextAddRelatedRecords);
- pApp->add_developer_action(m_refContextAddGroup);
+ pApp->add_developer_action(m_context_layout); //So that it can be disabled when not in developer mode.
+ pApp->add_developer_action(m_context_add_field);
+ pApp->add_developer_action(m_context_add_related_records);
+ pApp->add_developer_action(m_context_add_group);
pApp->update_userlevel_ui(); //Update our action's sensitivity.
@@ -324,7 +324,7 @@ g_warning("ComboGlom::on_button_press_event()");
if(mods & GDK_BUTTON3_MASK)
{
//Give user choices of actions on this item:
- m_pMenuPopup->popup(button_event->button, button_event->time);
+ m_menu_popup->popup(button_event->button, button_event->time);
return true; //We handled this event.
}
}
diff --git a/glom/mode_data/datawidget/combo_as_radio_buttons.cc
b/glom/mode_data/datawidget/combo_as_radio_buttons.cc
index e84b601..d007781 100644
--- a/glom/mode_data/datawidget/combo_as_radio_buttons.cc
+++ b/glom/mode_data/datawidget/combo_as_radio_buttons.cc
@@ -256,10 +256,10 @@ void ComboAsRadioButtons::show_context_menu(GdkEventButton *button_event)
{
//Enable/Disable items.
//We did this earlier, but get_appwindow is more likely to work now:
- pApp->add_developer_action(m_refContextLayout); //So that it can be disabled when not in developer mode.
- pApp->add_developer_action(m_refContextAddField);
- pApp->add_developer_action(m_refContextAddRelatedRecords);
- pApp->add_developer_action(m_refContextAddGroup);
+ pApp->add_developer_action(m_context_layout); //So that it can be disabled when not in developer mode.
+ pApp->add_developer_action(m_context_add_field);
+ pApp->add_developer_action(m_context_add_related_records);
+ pApp->add_developer_action(m_context_add_group);
pApp->update_userlevel_ui(); //Update our action's sensitivity.
@@ -272,7 +272,7 @@ void ComboAsRadioButtons::show_context_menu(GdkEventButton *button_event)
if(mods & GDK_BUTTON3_MASK)
{
//Give user choices of actions on this item:
- m_pMenuPopup->popup(button_event->button, button_event->time);
+ m_menu_popup->popup(button_event->button, button_event->time);
}
}
}
diff --git a/glom/mode_data/datawidget/datawidget.cc b/glom/mode_data/datawidget/datawidget.cc
index 1caaef7..8b42498 100644
--- a/glom/mode_data/datawidget/datawidget.cc
+++ b/glom/mode_data/datawidget/datawidget.cc
@@ -427,10 +427,10 @@ bool DataWidget::on_button_press_event(GdkEventButton *button_event)
if(pApp)
{
//TODO: Avoid doing this multiple times:
- pApp->add_developer_action(m_refContextLayout); //So that it can be disabled when not in developer mode.
- pApp->add_developer_action(m_refContextAddField);
- pApp->add_developer_action(m_refContextAddRelatedRecords);
- pApp->add_developer_action(m_refContextAddGroup);
+ pApp->add_developer_action(m_context_layout); //So that it can be disabled when not in developer mode.
+ pApp->add_developer_action(m_context_add_field);
+ pApp->add_developer_action(m_context_add_related_records);
+ pApp->add_developer_action(m_context_add_group);
pApp->update_userlevel_ui(); //Update our action's sensitivity.
@@ -443,7 +443,7 @@ bool DataWidget::on_button_press_event(GdkEventButton *button_event)
if(mods & GDK_BUTTON3_MASK)
{
//Give user choices of actions on this item:
- m_pMenuPopup->popup(button_event->button, button_event->time);
+ m_menu_popup->popup(button_event->button, button_event->time);
return true; //We handled this event.
}
}
diff --git a/glom/mode_data/datawidget/dialog_choose_id.cc b/glom/mode_data/datawidget/dialog_choose_id.cc
index 7c8df8f..e6e973f 100644
--- a/glom/mode_data/datawidget/dialog_choose_id.cc
+++ b/glom/mode_data/datawidget/dialog_choose_id.cc
@@ -36,9 +36,9 @@ const bool Dialog_ChooseID::glade_developer(false);
Dialog_ChooseID::Dialog_ChooseID()
: m_label_table_name(nullptr),
- m_pBox_QuickFind(nullptr),
- m_pEntry_QuickFind(nullptr),
- m_pButton_QuickFind(nullptr),
+ m_box_quick_find(nullptr),
+ m_entry_quick_find(nullptr),
+ m_button_quick_find(nullptr),
m_vbox_parent(nullptr),
m_document(nullptr),
m_stage(enumStage::INVALID)
@@ -48,9 +48,9 @@ Dialog_ChooseID::Dialog_ChooseID()
Dialog_ChooseID::Dialog_ChooseID(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Dialog(cobject),
m_label_table_name(nullptr),
- m_pBox_QuickFind(nullptr),
- m_pEntry_QuickFind(nullptr),
- m_pButton_QuickFind(nullptr),
+ m_box_quick_find(nullptr),
+ m_entry_quick_find(nullptr),
+ m_button_quick_find(nullptr),
m_vbox_parent(nullptr),
m_document(nullptr),
m_stage(enumStage::INVALID)
@@ -58,11 +58,11 @@ Dialog_ChooseID::Dialog_ChooseID(BaseObjectType* cobject, const Glib::RefPtr<Gtk
builder->get_widget("label_table_name", m_label_table_name);
builder->get_widget("vbox_parent", m_vbox_parent);
- builder->get_widget("hbox_quickfind", m_pBox_QuickFind);
- builder->get_widget("entry_quickfind", m_pEntry_QuickFind);
- builder->get_widget("button_quickfind", m_pButton_QuickFind);
+ builder->get_widget("hbox_quickfind", m_box_quick_find);
+ builder->get_widget("entry_quickfind", m_entry_quick_find);
+ builder->get_widget("button_quickfind", m_button_quick_find);
- m_pButton_QuickFind->signal_clicked().connect(
+ m_button_quick_find->signal_clicked().connect(
sigc::mem_fun(*this, &Dialog_ChooseID::on_button_quickfind) );
setup();
@@ -98,7 +98,7 @@ bool Dialog_ChooseID::get_id_chosen(Gnome::Gda::Value& chosen_id) const
void Dialog_ChooseID::on_button_quickfind()
{
- const auto criteria = m_pEntry_QuickFind->get_text();
+ const auto criteria = m_entry_quick_find->get_text();
if(criteria.empty())
{
Glib::ustring message = _("You have not entered any quick find criteria.");
@@ -153,14 +153,14 @@ void Dialog_ChooseID::update_ui_for_stage()
if(m_stage == enumStage::FIND)
{
- m_pBox_QuickFind->show();
+ m_box_quick_find->show();
m_box_find.show();
m_vbox_parent->pack_start(m_box_find);
}
else if(m_stage == enumStage::SELECT)
{
- m_pBox_QuickFind->hide();
+ m_box_quick_find->hide();
m_box_select.show();
m_vbox_parent->pack_start(m_box_select);
diff --git a/glom/mode_data/datawidget/dialog_choose_id.h b/glom/mode_data/datawidget/dialog_choose_id.h
index 6337c21..21a885b 100644
--- a/glom/mode_data/datawidget/dialog_choose_id.h
+++ b/glom/mode_data/datawidget/dialog_choose_id.h
@@ -66,9 +66,9 @@ private:
void on_box_select_selected(const Gnome::Gda::Value& primary_key);
Gtk::Label* m_label_table_name;
- Gtk::Box* m_pBox_QuickFind; //Only show this when in Find mode.
- Gtk::Entry* m_pEntry_QuickFind;
- Gtk::Button* m_pButton_QuickFind;
+ Gtk::Box* m_box_quick_find; //Only show this when in Find mode.
+ Gtk::Entry* m_entry_quick_find;
+ Gtk::Button* m_button_quick_find;
Gtk::Box* m_vbox_parent;
Glib::ustring m_table_name;
diff --git a/glom/mode_data/datawidget/entry.cc b/glom/mode_data/datawidget/entry.cc
index 1aee6a6..5eb87d7 100644
--- a/glom/mode_data/datawidget/entry.cc
+++ b/glom/mode_data/datawidget/entry.cc
@@ -185,10 +185,10 @@ bool Entry::on_button_press_event(GdkEventButton *button_event)
auto pApp = get_appwindow();
if(pApp)
{
- pApp->add_developer_action(m_refContextLayout); //So that it can be disabled when not in developer mode.
- pApp->add_developer_action(m_refContextAddField);
- pApp->add_developer_action(m_refContextAddRelatedRecords);
- pApp->add_developer_action(m_refContextAddGroup);
+ pApp->add_developer_action(m_context_layout); //So that it can be disabled when not in developer mode.
+ pApp->add_developer_action(m_context_add_field);
+ pApp->add_developer_action(m_context_add_related_records);
+ pApp->add_developer_action(m_context_add_group);
pApp->update_userlevel_ui(); //Update our action's sensitivity.
@@ -201,7 +201,7 @@ bool Entry::on_button_press_event(GdkEventButton *button_event)
if(mods & GDK_BUTTON3_MASK)
{
//Give user choices of actions on this item:
- m_pMenuPopup->popup(button_event->button, button_event->time);
+ m_menu_popup->popup(button_event->button, button_event->time);
return true; //We handled this event.
}
}
diff --git a/glom/mode_data/datawidget/label.cc b/glom/mode_data/datawidget/label.cc
index 4879489..b0c9ac0 100644
--- a/glom/mode_data/datawidget/label.cc
+++ b/glom/mode_data/datawidget/label.cc
@@ -72,7 +72,7 @@ AppWindow* Label::get_appwindow() const
#ifndef GLOM_ENABLE_CLIENT_ONLY
void Label::on_menu_properties_activate()
{
- auto textobject = std::dynamic_pointer_cast<LayoutItem_Text>(m_pLayoutItem);
+ auto textobject = std::dynamic_pointer_cast<LayoutItem_Text>(m_layout_item);
if(!textobject)
return;
@@ -105,7 +105,7 @@ bool Label::on_button_press_event(GdkEventButton *button_event)
if(mods & GDK_BUTTON3_MASK)
{
//Give user choices of actions on this item:
- m_pPopupMenuUtils->popup(button_event->button, button_event->time);
+ m_popup_menu_utils->popup(button_event->button, button_event->time);
return true; //We handled this event.
}
}
diff --git a/glom/mode_data/datawidget/textview.cc b/glom/mode_data/datawidget/textview.cc
index bfb4415..47bc47b 100644
--- a/glom/mode_data/datawidget/textview.cc
+++ b/glom/mode_data/datawidget/textview.cc
@@ -144,10 +144,10 @@ bool TextView::on_button_press_event(GdkEventButton *button_event)
auto pApp = get_appwindow();
if(pApp)
{
- pApp->add_developer_action(m_refContextLayout); //So that it can be disabled when not in developer mode.
- pApp->add_developer_action(m_refContextAddField);
- pApp->add_developer_action(m_refContextAddRelatedRecords);
- pApp->add_developer_action(m_refContextAddGroup);
+ pApp->add_developer_action(m_context_layout); //So that it can be disabled when not in developer mode.
+ pApp->add_developer_action(m_context_add_field);
+ pApp->add_developer_action(m_context_add_related_records);
+ pApp->add_developer_action(m_context_add_group);
pApp->update_userlevel_ui(); //Update our action's sensitivity.
@@ -160,7 +160,7 @@ bool TextView::on_button_press_event(GdkEventButton *button_event)
if(mods & GDK_BUTTON3_MASK)
{
//Give user choices of actions on this item:
- m_pMenuPopup->popup(button_event->button, button_event->time);
+ m_menu_popup->popup(button_event->button, button_event->time);
return true; //We handled this event.
}
}
diff --git a/glom/mode_data/db_adddel/db_adddel.cc b/glom/mode_data/db_adddel/db_adddel.cc
index 072fc1d..ba79cee 100644
--- a/glom/mode_data/db_adddel/db_adddel.cc
+++ b/glom/mode_data/db_adddel/db_adddel.cc
@@ -125,7 +125,7 @@ DbAddDel::~DbAddDel()
auto pApp = get_appwindow();
if(pApp)
{
- pApp->remove_developer_action(m_refContextLayout);
+ pApp->remove_developer_action(m_context_layout);
}
#endif // !GLOM_ENABLE_CLIENT_ONLY
}
@@ -218,37 +218,37 @@ void DbAddDel::on_MenuPopup_activate_layout()
void DbAddDel::setup_menu(Gtk::Widget* /* widget */)
{
- m_refActionGroup = Gio::SimpleActionGroup::create();
+ m_action_group = Gio::SimpleActionGroup::create();
const Glib::ustring edit_title =
(m_open_button_title.empty() ? _("_Edit") : m_open_button_title); //TODO: Use this?
- m_refContextEdit = m_refActionGroup->add_action("edit",
+ m_context_edit = m_action_group->add_action("edit",
sigc::mem_fun(*this, &DbAddDel::on_MenuPopup_activate_Edit) );
- m_refContextDelete = m_refActionGroup->add_action("delete",
+ m_context_delete = m_action_group->add_action("delete",
sigc::mem_fun(*this, &DbAddDel::on_MenuPopup_activate_Delete) );
- m_refContextAdd = m_refActionGroup->add_action("add",
+ m_context_add = m_action_group->add_action("add",
sigc::mem_fun(*this, &DbAddDel::on_MenuPopup_activate_Add) );
- m_refContextAdd->set_enabled(m_allow_add);
+ m_context_add->set_enabled(m_allow_add);
#ifndef GLOM_ENABLE_CLIENT_ONLY
// Don't add ContextLayout in client only mode because it would never
// be sensitive anyway
- m_refContextLayout = m_refActionGroup->add_action("layout",
+ m_context_layout = m_action_group->add_action("layout",
sigc::mem_fun(*this, &DbAddDel::on_MenuPopup_activate_layout) );
//TODO: This does not work until this widget is in a container in the window:
auto pApp = get_appwindow();
if(pApp)
{
- pApp->add_developer_action(m_refContextLayout); //So that it can be disabled when not in developer mode.
+ pApp->add_developer_action(m_context_layout); //So that it can be disabled when not in developer mode.
pApp->update_userlevel_ui(); //Update our action's sensitivity.
}
#endif // !GLOM_ENABLE_CLIENT_ONLY
- insert_action_group("context", m_refActionGroup);
+ insert_action_group("context", m_action_group);
//TODO: add_accel_group(builder->get_accel_group());
@@ -260,23 +260,23 @@ void DbAddDel::setup_menu(Gtk::Widget* /* widget */)
menu->append(_("_Layout"), "context.layout");
#endif
- m_pMenuPopup = std::make_unique<Gtk::Menu>(menu);
- m_pMenuPopup->attach_to_widget(*this);
+ m_menu_popup = std::make_unique<Gtk::Menu>(menu);
+ m_menu_popup->attach_to_widget(*this);
if(get_allow_user_actions())
{
- m_refContextEdit->set_enabled();
- m_refContextDelete->set_enabled();
+ m_context_edit->set_enabled();
+ m_context_delete->set_enabled();
}
else
{
- m_refContextEdit->set_enabled(false);
- m_refContextDelete->set_enabled(false);
+ m_context_edit->set_enabled(false);
+ m_context_delete->set_enabled(false);
}
#ifndef GLOM_ENABLE_CLIENT_ONLY
if(pApp)
- m_refContextLayout->set_enabled(pApp->get_userlevel() == AppState::userlevels::DEVELOPER);
+ m_context_layout->set_enabled(pApp->get_userlevel() == AppState::userlevels::DEVELOPER);
#endif // !GLOM_ENABLE_CLIENT_ONLY
}
@@ -288,7 +288,7 @@ bool DbAddDel::on_button_press_event_Popup(GdkEventButton *button_event)
auto pApp = get_appwindow();
if(pApp)
{
- pApp->add_developer_action(m_refContextLayout); //So that it can be disabled when not in developer mode.
+ pApp->add_developer_action(m_context_layout); //So that it can be disabled when not in developer mode.
pApp->update_userlevel_ui(); //Update our action's sensitivity.
}
#endif
@@ -298,7 +298,7 @@ bool DbAddDel::on_button_press_event_Popup(GdkEventButton *button_event)
if(mods & GDK_BUTTON3_MASK)
{
//Give user choices of actions on this item:
- m_pMenuPopup->popup(button_event->button, button_event->time);
+ m_menu_popup->popup(button_event->button, button_event->time);
return true; //handled.
}
else
@@ -1094,7 +1094,7 @@ void DbAddDel::set_allow_add(bool val)
{
m_allow_add = val;
- m_refContextAdd->set_enabled(val);
+ m_context_add->set_enabled(val);
}
void DbAddDel::set_allow_delete(bool val)
@@ -1606,8 +1606,8 @@ void DbAddDel::on_treeview_columns_changed()
{
if(!m_ignore_tree_view_signals)
{
- //Get the new column order, and save it in m_vecColumnIDs:
- m_vecColumnIDs.clear();
+ //Get the new column order, and save it in m_column_ids:
+ m_column_ids.clear();
for(const auto& vecViewColumn : m_TreeView.get_columns())
{
@@ -1616,7 +1616,7 @@ void DbAddDel::on_treeview_columns_changed()
continue;
const auto column_id = view_column->get_column_id();
- m_vecColumnIDs.emplace_back(column_id);
+ m_column_ids.emplace_back(column_id);
}
//Tell other code that something has changed, so the new column order can be serialized.
@@ -2403,8 +2403,8 @@ void DbAddDel::on_treeview_selection_changed()
void DbAddDel::on_selection_changed(bool selection)
{
- m_refContextDelete->set_enabled(selection);
- m_refContextAdd->set_enabled(selection);
+ m_context_delete->set_enabled(selection);
+ m_context_add->set_enabled(selection);
m_signal_record_selection_changed.emit();
}
diff --git a/glom/mode_data/db_adddel/db_adddel.h b/glom/mode_data/db_adddel/db_adddel.h
index c87c620..fcd433b 100644
--- a/glom/mode_data/db_adddel/db_adddel.h
+++ b/glom/mode_data/db_adddel/db_adddel.h
@@ -400,12 +400,12 @@ protected:
private:
//TODO: Avoid repeating these in so many widgets:
- std::unique_ptr<Gtk::Menu> m_pMenuPopup;
- Glib::RefPtr<Gio::SimpleActionGroup> m_refActionGroup;
- Glib::RefPtr<Gio::SimpleAction> m_refContextEdit, m_refContextAdd, m_refContextDelete;
+ std::unique_ptr<Gtk::Menu> m_menu_popup;
+ Glib::RefPtr<Gio::SimpleActionGroup> m_action_group;
+ Glib::RefPtr<Gio::SimpleAction> m_context_edit, m_context_add, m_context_delete;
#ifndef GLOM_ENABLE_CLIENT_ONLY
- Glib::RefPtr<Gio::SimpleAction> m_refContextLayout;
+ Glib::RefPtr<Gio::SimpleAction> m_context_layout;
#endif
bool m_allow_user_actions;
@@ -413,7 +413,7 @@ private:
bool m_prevent_user_signals;
bool m_ignore_tree_view_signals;
- type_vec_strings m_vecColumnIDs; //We give each ViewColumn a special ID, so we know where they are after a
reorder.
+ type_vec_strings m_column_ids; //We give each ViewColumn a special ID, so we know where they are after a
reorder.
protected:
bool m_allow_add;
diff --git a/glom/mode_data/flowtablewithfields.cc b/glom/mode_data/flowtablewithfields.cc
index 656baf6..f5466de 100644
--- a/glom/mode_data/flowtablewithfields.cc
+++ b/glom/mode_data/flowtablewithfields.cc
@@ -1313,7 +1313,7 @@ bool FlowTableWithFields::on_button_press_event(GdkEventButton *button_event)
if(mods & GDK_BUTTON3_MASK)
{
//Give user choices of actions on this item:
- m_pPopupMenuUtils->popup(button_event->button, button_event->time);
+ m_popup_menu_utils->popup(button_event->button, button_event->time);
return true; //We handled this event.
}
}
diff --git a/glom/mode_design/fields/box_db_table_definition.cc
b/glom/mode_design/fields/box_db_table_definition.cc
index 2c36519..a264b51 100644
--- a/glom/mode_design/fields/box_db_table_definition.cc
+++ b/glom/mode_design/fields/box_db_table_definition.cc
@@ -208,7 +208,7 @@ void Box_DB_Table_Definition::on_adddel_add(const Gtk::TreeModel::iterator& row)
if(bTest)
{
//Store the generated title in the document:
- //on_adddel_changed(row, m_colTitle);
+ //on_adddel_changed(row, m_col_title);
// Don't call on_adddel_changed for this, since this does a lot of
// unnecessary extra stuff just to get the field added into the
@@ -238,7 +238,7 @@ void Box_DB_Table_Definition::on_adddel_add(const Gtk::TreeModel::iterator& row)
m_AddDel.select_item(field->get_name(), m_colName, false);
- //m_AddDel.select_item(row, m_colTitle, true); //Start editing the title
+ //m_AddDel.select_item(row, m_col_title, true); //Start editing the title
}
}
}
diff --git a/glom/mode_design/fields/dialog_fielddefinition.cc
b/glom/mode_design/fields/dialog_fielddefinition.cc
index ade7a7f..0d97c17 100644
--- a/glom/mode_design/fields/dialog_fielddefinition.cc
+++ b/glom/mode_design/fields/dialog_fielddefinition.cc
@@ -36,52 +36,52 @@ const bool Dialog_FieldDefinition::glade_developer(true);
Dialog_FieldDefinition::Dialog_FieldDefinition(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>&
builder)
: Dialog_Properties(cobject, builder),
- m_pDataWidget_DefaultValueSimple(nullptr)
+ m_data_idget_default_value_simple(nullptr)
{
- builder->get_widget_derived("combobox_type", m_pCombo_Type);
+ builder->get_widget_derived("combobox_type", m_combo_type);
- builder->get_widget("entry_name", m_pEntry_Name);
- builder->get_widget("entry_title", m_pEntry_Title);
+ builder->get_widget("entry_name", m_entry_name);
+ builder->get_widget("entry_title", m_entry_title);
- builder->get_widget("checkbutton_unique", m_pCheck_Unique);
- builder->get_widget("checkbutton_primarykey", m_pCheck_PrimaryKey);
- builder->get_widget("checkbutton_autoincrement", m_pCheck_AutoIncrement);
+ builder->get_widget("checkbutton_unique", m_check_unique);
+ builder->get_widget("checkbutton_primarykey", m_check_primary_key);
+ builder->get_widget("checkbutton_autoincrement", m_check_auto_increment);
- builder->get_widget("hbox_default_value_simple", m_pBox_DefaultValueSimple);
+ builder->get_widget("hbox_default_value_simple", m_box_default_value_simple);
- builder->get_widget("box_default_value", m_pBox_ValueTab);
+ builder->get_widget("box_default_value", m_box_value_tab);
- builder->get_widget("radiobutton_userentry", m_pRadio_UserEntry);
- builder->get_widget("alignment_userentry", m_pAlignment_UserEntry);
+ builder->get_widget("radiobutton_userentry", m_radio_user_entry);
+ builder->get_widget("alignment_userentry", m_alignment_user_entry);
- builder->get_widget("checkbutton_lookup", m_pCheck_Lookup);
- builder->get_widget("table_lookup", m_pTable_Lookup);
- builder->get_widget_derived("combobox_lookup_relationship", m_pCombo_LookupRelationship);
- builder->get_widget("combobox_lookup_field", m_pCombo_LookupField);
+ builder->get_widget("checkbutton_lookup", m_check_lookup);
+ builder->get_widget("table_lookup", m_table_lookup);
+ builder->get_widget_derived("combobox_lookup_relationship", m_combo_lookup_relationship);
+ builder->get_widget("combobox_lookup_field", m_combo_lookup_field);
- builder->get_widget("radiobutton_calculate", m_pRadio_Calculate);
- builder->get_widget("alignment_calculate", m_pAlignment_Calculate);
- builder->get_widget("textview_calculate", m_pTextView_Calculation);
- builder->get_widget("button_edit_calculation", m_pButton_EditCalculation);
+ builder->get_widget("radiobutton_calculate", m_radio_calculate);
+ builder->get_widget("alignment_calculate", m_alignment_calculate);
+ builder->get_widget("textview_calculate", m_textView_calculation);
+ builder->get_widget("button_edit_calculation", m_button_edit_calculation);
//Connect signals:
- if(m_pCombo_Type)
- m_pCombo_Type->signal_changed().connect( sigc::mem_fun(*this,
&Dialog_FieldDefinition::on_combo_type_changed) );
+ if(m_combo_type)
+ m_combo_type->signal_changed().connect( sigc::mem_fun(*this,
&Dialog_FieldDefinition::on_combo_type_changed) );
- if(m_pCombo_LookupRelationship)
- m_pCombo_LookupRelationship->signal_changed().connect( sigc::mem_fun(*this,
&Dialog_FieldDefinition::on_combo_lookup_relationship_changed) );
+ if(m_combo_lookup_relationship)
+ m_combo_lookup_relationship->signal_changed().connect( sigc::mem_fun(*this,
&Dialog_FieldDefinition::on_combo_lookup_relationship_changed) );
- if(m_pCheck_Lookup)
- m_pCheck_Lookup->signal_toggled().connect( sigc::mem_fun(*this,
&Dialog_FieldDefinition::on_check_lookup_toggled) );
+ if(m_check_lookup)
+ m_check_lookup->signal_toggled().connect( sigc::mem_fun(*this,
&Dialog_FieldDefinition::on_check_lookup_toggled) );
- if(m_pRadio_Calculate)
- m_pRadio_Calculate->signal_toggled().connect( sigc::mem_fun(*this,
&Dialog_FieldDefinition::on_radio_calculate_toggled) );
+ if(m_radio_calculate)
+ m_radio_calculate->signal_toggled().connect( sigc::mem_fun(*this,
&Dialog_FieldDefinition::on_radio_calculate_toggled) );
- if(m_pRadio_UserEntry)
- m_pRadio_UserEntry->signal_toggled().connect( sigc::mem_fun(*this,
&Dialog_FieldDefinition::on_radio_userentry_toggled) );
+ if(m_radio_user_entry)
+ m_radio_user_entry->signal_toggled().connect( sigc::mem_fun(*this,
&Dialog_FieldDefinition::on_radio_userentry_toggled) );
- if(m_pButton_EditCalculation)
- m_pButton_EditCalculation->signal_clicked().connect( sigc::mem_fun(*this,
&Dialog_FieldDefinition::on_button_edit_calculation) );
+ if(m_button_edit_calculation)
+ m_button_edit_calculation->signal_clicked().connect( sigc::mem_fun(*this,
&Dialog_FieldDefinition::on_button_edit_calculation) );
//TODO:
//Connect every widget to on_anything_changed():
@@ -94,8 +94,8 @@ Dialog_FieldDefinition::Dialog_FieldDefinition(BaseObjectType* cobject, const Gl
connect_each_widget(this);
- connect_each_widget(m_pBox_DefaultValueSimple);
- connect_each_widget(m_pBox_ValueTab);
+ connect_each_widget(m_box_default_value_simple);
+ connect_each_widget(m_box_value_tab);
Dialog_Properties::set_modified(false);
@@ -115,12 +115,12 @@ void Dialog_FieldDefinition::set_field(const std::shared_ptr<const Field>& field
//Set the Widgets from the field info:
//const Glib::RefPtr<Gnome::Gda::Column>& fieldInfo = field->get_field_info();
- m_pEntry_Name->set_text(field->get_name());
- m_pCombo_Type->set_field_type( field->get_glom_type() );
+ m_entry_name->set_text(field->get_name());
+ m_combo_type->set_field_type( field->get_glom_type() );
- m_pCheck_Unique->set_active(field->get_unique_key());
- m_pCheck_PrimaryKey->set_active(field->get_primary_key());
- m_pCheck_AutoIncrement->set_active(field->get_auto_increment());
+ m_check_unique->set_active(field->get_unique_key());
+ m_check_primary_key->set_active(field->get_primary_key());
+ m_check_auto_increment->set_active(field->get_auto_increment());
//Glom-specific details:
@@ -135,8 +135,8 @@ void Dialog_FieldDefinition::set_field(const std::shared_ptr<const Field>& field
default_value = m_Field->get_default_value();
//Create an appropriate DataWidget for the default value:
- delete m_pDataWidget_DefaultValueSimple;
- m_pDataWidget_DefaultValueSimple = nullptr;
+ delete m_data_idget_default_value_simple;
+ m_data_idget_default_value_simple = nullptr;
//We use a regular DataWidget for the default value, so we can reuse its functionality,
//but it's not a real field - hence the special title.
@@ -145,26 +145,26 @@ void Dialog_FieldDefinition::set_field(const std::shared_ptr<const Field>& field
field_default_value->set_name("glom_temp_default_value");
field_default_value->set_title_original(_("Default Value"));
layout_item->set_full_field_details(field_default_value);
- m_pDataWidget_DefaultValueSimple = Gtk::manage( new DataWidget(layout_item, "", get_document()) );
- if(!m_pDataWidget_DefaultValueSimple->get_data_child_widget())
+ m_data_idget_default_value_simple = Gtk::manage( new DataWidget(layout_item, "", get_document()) );
+ if(!m_data_idget_default_value_simple->get_data_child_widget())
std::cerr << G_STRFUNC << ": The DataWidget did not create a child widget.\n";
- connect_each_widget(m_pDataWidget_DefaultValueSimple);
+ connect_each_widget(m_data_idget_default_value_simple);
- auto pLabel = m_pDataWidget_DefaultValueSimple->get_label();
+ auto pLabel = m_data_idget_default_value_simple->get_label();
if(!pLabel->get_text().empty())
{
pLabel->set_valign(Gtk::ALIGN_START); //Because the widget might be multiline.
- m_pBox_DefaultValueSimple->pack_start(*pLabel, Gtk::PACK_SHRINK);
+ m_box_default_value_simple->pack_start(*pLabel, Gtk::PACK_SHRINK);
}
- m_pBox_DefaultValueSimple->pack_end(*m_pDataWidget_DefaultValueSimple, Gtk::PACK_EXPAND_WIDGET);
- m_pDataWidget_DefaultValueSimple->set_value(default_value);
- m_pDataWidget_DefaultValueSimple->show();
+ m_box_default_value_simple->pack_end(*m_data_idget_default_value_simple, Gtk::PACK_EXPAND_WIDGET);
+ m_data_idget_default_value_simple->set_value(default_value);
+ m_data_idget_default_value_simple->show();
//Default value: lookup:
- m_pCheck_Lookup->set_active(m_Field->get_is_lookup());
+ m_check_lookup->set_active(m_Field->get_is_lookup());
on_check_lookup_toggled();
//Fill the lookup relationships combo:
@@ -174,36 +174,36 @@ void Dialog_FieldDefinition::set_field(const std::shared_ptr<const Field>& field
//Get the relationships used by this table, excluding relationships triggered
//by this field itself (to avoid circular self-lookups):
const auto vecRelationships = document->get_relationships(table_name);
- m_pCombo_LookupRelationship->set_relationships_excluding_triggered_by(vecRelationships,
m_Field->get_name());
+ m_combo_lookup_relationship->set_relationships_excluding_triggered_by(vecRelationships,
m_Field->get_name());
}
std::shared_ptr<Relationship> lookup_relationship;
if(!disable_default_value)
lookup_relationship = m_Field->get_lookup_relationship();
- m_pCombo_LookupRelationship->set_selected_relationship(lookup_relationship);
+ m_combo_lookup_relationship->set_selected_relationship(lookup_relationship);
on_combo_lookup_relationship_changed(); //Put the correct list of fields in the fields combo.
Glib::ustring lookup_field_name;
if(!disable_default_value)
lookup_field_name = m_Field->get_lookup_field();
- m_pCombo_LookupField->set_active_text(lookup_field_name);
+ m_combo_lookup_field->set_active_text(lookup_field_name);
//Calculation:
const auto calculation = field->get_calculation();
if(calculation.empty())
- m_pRadio_UserEntry->set_active();
+ m_radio_user_entry->set_active();
else
- m_pRadio_Calculate->set_active();
+ m_radio_calculate->set_active();
on_check_lookup_toggled();
- //std::cout << "debug: dialog_fielddefinition.c:: m_pTextView_Calculation.gobj() gtype = " <<
G_OBJECT_TYPE_NAME(m_pTextView_Calculation->gobj()) << std::endl;
- m_pTextView_Calculation->get_buffer()->set_text(calculation);
+ //std::cout << "debug: dialog_fielddefinition.c:: m_textView_calculation.gobj() gtype = " <<
G_OBJECT_TYPE_NAME(m_textView_calculation->gobj()) << std::endl;
+ m_textView_calculation->get_buffer()->set_text(calculation);
//std::cout << " debug: dialog_fielddefinition.c:: after get_buffer()\n";
- m_pEntry_Title->set_text(item_get_title(field));
+ m_entry_title->set_text(item_get_title(field));
set_blocked(false);
@@ -228,34 +228,34 @@ std::shared_ptr<Field> Dialog_FieldDefinition::get_field() const
auto fieldInfo = field->get_field_info(); //Preserve previous information.
- fieldInfo->set_name(m_pEntry_Name->get_text());
+ fieldInfo->set_name(m_entry_name->get_text());
- fieldInfo->set_g_type( Field::get_gda_type_for_glom_type( m_pCombo_Type->get_field_type() ) );
+ fieldInfo->set_g_type( Field::get_gda_type_for_glom_type( m_combo_type->get_field_type() ) );
- fieldInfo->set_auto_increment(m_pCheck_AutoIncrement->get_active());
+ fieldInfo->set_auto_increment(m_check_auto_increment->get_active());
if(!fieldInfo->get_auto_increment()) //Ignore default_values for auto_increment fields - it's just some
obscure postgres code.
{
//Simple default value:
- fieldInfo->set_default_value( m_pDataWidget_DefaultValueSimple->get_value() );
+ fieldInfo->set_default_value( m_data_idget_default_value_simple->get_value() );
}
//Lookup:
- const auto is_lookup = m_pCheck_Lookup->get_active();
+ const auto is_lookup = m_check_lookup->get_active();
std::shared_ptr<Relationship> relationship;
if(is_lookup)
- relationship = m_pCombo_LookupRelationship->get_selected_relationship();
+ relationship = m_combo_lookup_relationship->get_selected_relationship();
field->set_lookup_relationship(relationship);
Glib::ustring lookup_field;
if(is_lookup)
- lookup_field = m_pCombo_LookupField->get_active_text();
+ lookup_field = m_combo_lookup_field->get_active_text();
field->set_lookup_field(lookup_field);
//Calculation:
- if(m_pRadio_Calculate)
- field->set_calculation(m_pTextView_Calculation->get_buffer()->get_text());
+ if(m_radio_calculate)
+ field->set_calculation(m_textView_calculation->get_buffer()->get_text());
auto field_info_copy = fieldInfo;
@@ -263,10 +263,10 @@ std::shared_ptr<Field> Dialog_FieldDefinition::get_field() const
//Glom-specific details:
- field->set_unique_key(m_pCheck_Unique->get_active());
- field->set_primary_key(m_pCheck_PrimaryKey->get_active());
+ field->set_unique_key(m_check_unique->get_active());
+ field->set_primary_key(m_check_primary_key->get_active());
- field->set_title(m_pEntry_Title->get_text(), AppWindow::get_current_locale());
+ field->set_title(m_entry_title->get_text(), AppWindow::get_current_locale());
return field;
}
@@ -279,41 +279,41 @@ void Dialog_FieldDefinition::on_combo_type_changed()
//m_Frame_TypeDetails.remove();
//Use FieldType static method to categorise field type:
- // glom_field_type fieldType = m_pCombo_Type->get_field_type();
+ // glom_field_type fieldType = m_combo_type->get_field_type();
}
void Dialog_FieldDefinition::enforce_constraints()
{
- if(m_pCheck_PrimaryKey->get_active())
+ if(m_check_primary_key->get_active())
{
- m_pCheck_Unique->set_active(true); //Primary keys must be unique.
- m_pCheck_Unique->set_sensitive(false); //Stop the user from disagreeing with that.
+ m_check_unique->set_active(true); //Primary keys must be unique.
+ m_check_unique->set_sensitive(false); //Stop the user from disagreeing with that.
}
else
- m_pCheck_Unique->set_sensitive(true);
+ m_check_unique->set_sensitive(true);
- if(m_pCheck_Unique->get_active() || m_pCheck_AutoIncrement->get_active())
+ if(m_check_unique->get_active() || m_check_auto_increment->get_active())
{
- m_pBox_ValueTab->set_sensitive(false); //Disable all controls on the Notebook page.
- m_pDataWidget_DefaultValueSimple->set_value( Gnome::Gda::Value() ); //Unique fields cannot have default
values. //TODO: People will be surprised when they lose information here. We should probably read the text as
"" if the widget is disabled.
+ m_box_value_tab->set_sensitive(false); //Disable all controls on the Notebook page.
+ m_data_idget_default_value_simple->set_value( Gnome::Gda::Value() ); //Unique fields cannot have default
values. //TODO: People will be surprised when they lose information here. We should probably read the text as
"" if the widget is disabled.
}
else
{
- m_pBox_ValueTab->set_sensitive(true);
+ m_box_value_tab->set_sensitive(true);
}
- const auto enable_calc = m_pRadio_Calculate->get_active();
- m_pAlignment_Calculate->set_sensitive(enable_calc);
+ const auto enable_calc = m_radio_calculate->get_active();
+ m_alignment_calculate->set_sensitive(enable_calc);
- const auto enable_userentry = m_pRadio_UserEntry->get_active();
- m_pAlignment_UserEntry->set_sensitive(enable_userentry);
+ const auto enable_userentry = m_radio_user_entry->get_active();
+ m_alignment_user_entry->set_sensitive(enable_userentry);
}
void Dialog_FieldDefinition::on_check_lookup_toggled()
{
- bool enable = m_pCheck_Lookup->get_active();
- m_pTable_Lookup->set_sensitive(enable);
+ bool enable = m_check_lookup->get_active();
+ m_table_lookup->set_sensitive(enable);
//re-disable it if it was not meant to be enabled:
enforce_constraints();
@@ -321,8 +321,8 @@ void Dialog_FieldDefinition::on_check_lookup_toggled()
void Dialog_FieldDefinition::on_radio_calculate_toggled()
{
- bool enable = m_pRadio_Calculate->get_active();
- m_pAlignment_Calculate->set_sensitive(enable);
+ bool enable = m_radio_calculate->get_active();
+ m_alignment_calculate->set_sensitive(enable);
//re-disable it if it was not meant to be enabled:
enforce_constraints();
@@ -330,8 +330,8 @@ void Dialog_FieldDefinition::on_radio_calculate_toggled()
void Dialog_FieldDefinition::on_radio_userentry_toggled()
{
- bool enable = m_pRadio_UserEntry->get_active();
- m_pAlignment_UserEntry->set_sensitive(enable);
+ bool enable = m_radio_user_entry->get_active();
+ m_alignment_user_entry->set_sensitive(enable);
//re-disable it if it was not meant to be enabled:
enforce_constraints();
@@ -342,10 +342,10 @@ void Dialog_FieldDefinition::on_combo_lookup_relationship_changed()
{
//Get the fields that are avaiable from the new relationship:
- m_pCombo_LookupField->remove_all();
+ m_combo_lookup_field->remove_all();
//Get the relationship name:
- auto relationship = m_pCombo_LookupRelationship->get_selected_relationship();
+ auto relationship = m_combo_lookup_relationship->get_selected_relationship();
if(relationship)
{
//Get the relationship details:
@@ -359,7 +359,7 @@ void Dialog_FieldDefinition::on_combo_lookup_relationship_changed()
const auto fields_in_to_table = DbUtils::get_fields_for_table(document, to_table);
for(const auto& field : fields_in_to_table)
{
- m_pCombo_LookupField->append(field->get_name());
+ m_combo_lookup_field->append(field->get_name());
}
}
}
@@ -377,13 +377,13 @@ void Dialog_FieldDefinition::on_button_edit_calculation()
add_view(dialog); //Give it access to the document.
- m_Field->set_calculation( m_pTextView_Calculation->get_buffer()->get_text() );
+ m_Field->set_calculation( m_textView_calculation->get_buffer()->get_text() );
dialog->set_field(m_Field, m_table_name);
//TODO: dialog.set_transient_for(*get_app_window());
const auto response = Glom::UiUtils::dialog_run_with_help(dialog);
if(response == Gtk::RESPONSE_OK)
{
- m_pTextView_Calculation->get_buffer()->set_text( dialog->get_field()->get_calculation() );
+ m_textView_calculation->get_buffer()->set_text( dialog->get_field()->get_calculation() );
}
remove_view(dialog);
diff --git a/glom/mode_design/fields/dialog_fielddefinition.h
b/glom/mode_design/fields/dialog_fielddefinition.h
index 5ac5ef8..3a7ebc3 100644
--- a/glom/mode_design/fields/dialog_fielddefinition.h
+++ b/glom/mode_design/fields/dialog_fielddefinition.h
@@ -67,30 +67,30 @@ private:
//Disable/enable other controls when a control is selected.
void enforce_constraints() override;
- Gtk::Entry* m_pEntry_Name;
- Combo_FieldType* m_pCombo_Type;
- Gtk::CheckButton* m_pCheck_Unique;
- Gtk::Box* m_pBox_DefaultValueSimple;
- Gtk::CheckButton* m_pCheck_PrimaryKey;
- Gtk::CheckButton* m_pCheck_AutoIncrement;
-
- Gtk::Box* m_pBox_ValueTab;
-
- Gtk::RadioButton* m_pRadio_UserEntry;
- Gtk::Box* m_pAlignment_UserEntry;
- Gtk::CheckButton* m_pCheck_Lookup;
- Gtk::Widget* m_pTable_Lookup; //So we can make it insensitive.
- ComboBox_Relationship* m_pCombo_LookupRelationship;
- Gtk::ComboBoxText* m_pCombo_LookupField;
-
- Gtk::RadioButton* m_pRadio_Calculate;
- Gtk::Box* m_pAlignment_Calculate;
- Gsv::View* m_pTextView_Calculation;
- Gtk::Button* m_pButton_EditCalculation;
-
- Gtk::Entry* m_pEntry_Title;
-
- DataWidget* m_pDataWidget_DefaultValueSimple;
+ Gtk::Entry* m_entry_name;
+ Combo_FieldType* m_combo_type;
+ Gtk::CheckButton* m_check_unique;
+ Gtk::Box* m_box_default_value_simple;
+ Gtk::CheckButton* m_check_primary_key;
+ Gtk::CheckButton* m_check_auto_increment;
+
+ Gtk::Box* m_box_value_tab;
+
+ Gtk::RadioButton* m_radio_user_entry;
+ Gtk::Box* m_alignment_user_entry;
+ Gtk::CheckButton* m_check_lookup;
+ Gtk::Widget* m_table_lookup; //So we can make it insensitive.
+ ComboBox_Relationship* m_combo_lookup_relationship;
+ Gtk::ComboBoxText* m_combo_lookup_field;
+
+ Gtk::RadioButton* m_radio_calculate;
+ Gtk::Box* m_alignment_calculate;
+ Gsv::View* m_textView_calculation;
+ Gtk::Button* m_button_edit_calculation;
+
+ Gtk::Entry* m_entry_title;
+
+ DataWidget* m_data_idget_default_value_simple;
std::shared_ptr<Field> m_Field;
Glib::ustring m_table_name;
diff --git a/glom/navigation/box_tables.cc b/glom/navigation/box_tables.cc
index d97410e..447c203 100644
--- a/glom/navigation/box_tables.cc
+++ b/glom/navigation/box_tables.cc
@@ -34,12 +34,12 @@ const bool Box_Tables::glade_developer(false);
Box_Tables::Box_Tables(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Box_WithButtons(cobject, builder),
- m_pCheckButtonShowHidden(nullptr),
- m_colTableName(0),
- m_colHidden(0),
- m_colTitle(0),
- m_colDefault(0),
- m_colTitleSingular(0)
+ m_check_button_show_hidden(nullptr),
+ m_col_table_name(0),
+ m_col_hidden(0),
+ m_col_title(0),
+ m_col_default(0),
+ m_col_title_singular(0)
{
//Get the Glade-instantiated widgets, and connect signal handlers:
Gtk::Button* pButtonCancel = nullptr;
@@ -53,8 +53,8 @@ Box_Tables::Box_Tables(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>
builder->get_widget("vbox_adddel_parent", pAddDelParent);
pAddDelParent->pack_start(m_AddDel);
- builder->get_widget("checkbutton_show_hidden", m_pCheckButtonShowHidden);
- m_pCheckButtonShowHidden->signal_toggled().connect(sigc::mem_fun(*this,
&Box_Tables::on_show_hidden_toggled));
+ builder->get_widget("checkbutton_show_hidden", m_check_button_show_hidden);
+ m_check_button_show_hidden->signal_toggled().connect(sigc::mem_fun(*this,
&Box_Tables::on_show_hidden_toggled));
#ifndef GLOM_ENABLE_CLIENT_ONLY
m_AddDel.signal_user_added().connect(sigc::mem_fun(*this, &Box_Tables::on_adddel_Add));
@@ -79,22 +79,22 @@ void Box_Tables::fill_table_row(const Gtk::TreeModel::iterator& iter, const std:
const auto developer_mode = (get_userlevel() == AppState::userlevels::DEVELOPER);
m_AddDel.set_value_key(iter, table_info->get_name());
- m_AddDel.set_value(iter, m_colTableName, table_info->get_name());
- m_AddDel.set_value(iter, m_colHidden, table_info->get_hidden());
+ m_AddDel.set_value(iter, m_col_table_name, table_info->get_name());
+ m_AddDel.set_value(iter, m_col_hidden, table_info->get_hidden());
if(developer_mode)
{
//std::cout << "debug: " << G_STRFUNC << ": dev title=" <<
table_info->get_title(AppWindow::get_current_locale()) << std::endl;
- m_AddDel.set_value(iter, m_colTitle, item_get_title(table_info));
- m_AddDel.set_value(iter, m_colTitleSingular,
table_info->get_title_singular(AppWindow::get_current_locale()));
+ m_AddDel.set_value(iter, m_col_title, item_get_title(table_info));
+ m_AddDel.set_value(iter, m_col_title_singular,
table_info->get_title_singular(AppWindow::get_current_locale()));
}
else
{
//std::cout << "debug: " << G_STRFUNC << ": op get_title_or_name=" <<
table_info->get_title_or_name(AppWindow::get_current_locale()) << std::endl;
- m_AddDel.set_value(iter, m_colTitle, item_get_title_or_name(table_info));
+ m_AddDel.set_value(iter, m_col_title, item_get_title_or_name(table_info));
}
- m_AddDel.set_value(iter, m_colDefault, table_info->get_default());
+ m_AddDel.set_value(iter, m_col_default, table_info->get_default());
}
}
@@ -113,9 +113,9 @@ bool Box_Tables::fill_from_database()
else
set_size_request(-1, -1);
- m_pCheckButtonShowHidden->set_sensitive(developer_mode); //Operators have no choice - they can't see
hidden tables ever.
+ m_check_button_show_hidden->set_sensitive(developer_mode); //Operators have no choice - they can't see
hidden tables ever.
if(!developer_mode)
- m_pCheckButtonShowHidden->set_active(false); //Operators have no choice - they can't see hidden tables
ever.
+ m_check_button_show_hidden->set_active(false); //Operators have no choice - they can't see hidden tables
ever.
m_AddDel.remove_all();
@@ -124,18 +124,18 @@ bool Box_Tables::fill_from_database()
const bool editable = developer_mode;
const bool visible_extras = developer_mode;
- m_colTableName = m_AddDel.add_column(_("Table"), AddDelColumnInfo::enumStyles::Text, editable,
visible_extras);
- m_AddDel.prevent_duplicates(m_colTableName); //Prevent two tables with the same name from being added.
+ m_col_table_name = m_AddDel.add_column(_("Table"), AddDelColumnInfo::enumStyles::Text, editable,
visible_extras);
+ m_AddDel.prevent_duplicates(m_col_table_name); //Prevent two tables with the same name from being added.
m_AddDel.set_prevent_duplicates_warning(_("This table already exists. Please choose a different table
name"));
- m_colHidden = m_AddDel.add_column(_("Hidden"), AddDelColumnInfo::enumStyles::Boolean, editable,
visible_extras);
- m_colTitle = m_AddDel.add_column(_("Title"), AddDelColumnInfo::enumStyles::Text, editable, true);
+ m_col_hidden = m_AddDel.add_column(_("Hidden"), AddDelColumnInfo::enumStyles::Boolean, editable,
visible_extras);
+ m_col_title = m_AddDel.add_column(_("Title"), AddDelColumnInfo::enumStyles::Text, editable, true);
//TODO: This should really be a radio, but the use of AddDel makes it awkward to change that CellRenderer
property.
- m_colDefault = m_AddDel.add_column(_("Default"), AddDelColumnInfo::enumStyles::Boolean, editable,
visible_extras);
+ m_col_default = m_AddDel.add_column(_("Default"), AddDelColumnInfo::enumStyles::Boolean, editable,
visible_extras);
if(developer_mode)
- m_colTitleSingular = m_AddDel.add_column(_("Title (Singular Form)"), AddDelColumnInfo::enumStyles::Text,
editable, true);
+ m_col_title_singular = m_AddDel.add_column(_("Title (Singular Form)"),
AddDelColumnInfo::enumStyles::Text, editable, true);
//Get the list of hidden tables:
@@ -185,7 +185,7 @@ bool Box_Tables::fill_from_database()
if(hidden && !developer_mode) //Don't add hidden tables unless we are in developer mode:
bAddIt = false;
- if(hidden && !m_pCheckButtonShowHidden->get_active()) //Don't add hidden tables if that checkbox is
unset.
+ if(hidden && !m_check_button_show_hidden->get_active()) //Don't add hidden tables if that checkbox is
unset.
{
bAddIt = false;
}
@@ -215,7 +215,7 @@ void Box_Tables::on_adddel_Add(const Gtk::TreeModel::iterator& row)
{
//TODO: Handle cell renderer changes to prevent illegal table names (e.g. starting with numbers.).
- const auto table_name = m_AddDel.get_value(row, m_colTableName);
+ const auto table_name = m_AddDel.get_value(row, m_col_table_name);
if(table_name.empty())
return;
@@ -356,39 +356,39 @@ void Box_Tables::on_adddel_changed(const Gtk::TreeModel::iterator& row, guint co
{
if(get_userlevel() == AppState::userlevels::DEVELOPER)
{
- if(column == m_colHidden)
+ if(column == m_col_hidden)
{
save_to_document();
//TODO: This causes a crash. fill_from_database(); //Hide/show the table.
}
- else if(column == m_colTitle)
+ else if(column == m_col_title)
{
save_to_document();
}
- else if(column == m_colTitleSingular)
+ else if(column == m_col_title_singular)
{
save_to_document();
}
- else if(column == m_colDefault)
+ else if(column == m_col_default)
{
//Only one table can be the default, so ensure that:
- const auto is_default = m_AddDel.get_value_as_bool(row, m_colDefault);
+ const auto is_default = m_AddDel.get_value_as_bool(row, m_col_default);
if(is_default)
{
//Set all the other rows to false:
auto model = m_AddDel.get_model();
for(const auto& child_row : model->children())
{
- m_AddDel.set_value(child_row, m_colDefault, false);
+ m_AddDel.set_value(child_row, m_col_default, false);
}
}
save_to_document();
}
- else if(column == m_colTableName)
+ else if(column == m_col_table_name)
{
Glib::ustring table_name = m_AddDel.get_value_key(row);
- Glib::ustring table_name_new = m_AddDel.get_value(row, m_colTableName);
+ Glib::ustring table_name_new = m_AddDel.get_value(row, m_col_table_name);
if(!table_name.empty() && !table_name_new.empty())
{
Glib::ustring strMsg = _("Are you sure that you want to rename this table?"); //TODO: Show old and
new names?
@@ -463,19 +463,19 @@ void Box_Tables::save_to_document()
for(const auto& row : m_AddDel.get_model()->children())
{
- const auto table_name = m_AddDel.get_value(row, m_colTableName); //The name has already been changed
in the document.
+ const auto table_name = m_AddDel.get_value(row, m_col_table_name); //The name has already been changed
in the document.
auto table_info = document->get_table(table_name); //Start with the existing table_info, to preserve
extra information, such as translations.
if(table_info)
{
- table_info->set_name( m_AddDel.get_value(row, m_colTableName) );
+ table_info->set_name( m_AddDel.get_value(row, m_col_table_name) );
if(!table_info->get_name().empty())
{
- table_info->set_hidden( m_AddDel.get_value_as_bool(row, m_colHidden) );
- table_info->set_title( m_AddDel.get_value(row, m_colTitle) , AppWindow::get_current_locale());
//TODO_Translations: Store the TableInfo in the TreeView.
- table_info->set_title_singular( m_AddDel.get_value(row, m_colTitleSingular),
AppWindow::get_current_locale()); //TODO_Translations: Store the TableInfo in the TreeView.
+ table_info->set_hidden( m_AddDel.get_value_as_bool(row, m_col_hidden) );
+ table_info->set_title( m_AddDel.get_value(row, m_col_title) , AppWindow::get_current_locale());
//TODO_Translations: Store the TableInfo in the TreeView.
+ table_info->set_title_singular( m_AddDel.get_value(row, m_col_title_singular),
AppWindow::get_current_locale()); //TODO_Translations: Store the TableInfo in the TreeView.
//std::cout << "debug: " << G_STRFUNC << ": title=" << item_get_title(table_info) << std::endl;
- table_info->set_default( m_AddDel.get_value_as_bool(row, m_colDefault) );
+ table_info->set_default( m_AddDel.get_value_as_bool(row, m_col_default) );
listTables.emplace_back(table_info);
}
diff --git a/glom/navigation/box_tables.h b/glom/navigation/box_tables.h
index bd5f982..c85eb82 100644
--- a/glom/navigation/box_tables.h
+++ b/glom/navigation/box_tables.h
@@ -63,12 +63,12 @@ private:
void on_userlevel_changed(AppState::userlevels userlevel) override;
- Gtk::CheckButton* m_pCheckButtonShowHidden;
- guint m_colTableName;
- guint m_colHidden;
- guint m_colTitle;
- guint m_colDefault;
- guint m_colTitleSingular;
+ Gtk::CheckButton* m_check_button_show_hidden;
+ guint m_col_table_name;
+ guint m_col_hidden;
+ guint m_col_title;
+ guint m_col_default;
+ guint m_col_title_singular;
mutable AddDel_WithButtons m_AddDel; //mutable because its get_ methods aren't const.
};
diff --git a/glom/utility_widgets/adddel/adddel.cc b/glom/utility_widgets/adddel/adddel.cc
index af09eea..f7477dc 100644
--- a/glom/utility_widgets/adddel/adddel.cc
+++ b/glom/utility_widgets/adddel/adddel.cc
@@ -219,18 +219,18 @@ void AddDel::on_MenuPopup_activate_Delete()
void AddDel::setup_menu(Gtk::Widget* /* widget */)
{
- m_refActionGroup = Gio::SimpleActionGroup::create();
+ m_action_Group = Gio::SimpleActionGroup::create();
- m_refContextEdit = m_refActionGroup->add_action("edit",
+ m_context_edit = m_action_Group->add_action("edit",
sigc::mem_fun(*this, &AddDel::on_MenuPopup_activate_Edit) );
if(get_allow_user_actions())
{
- m_refContextDelete = m_refActionGroup->add_action("delete",
+ m_context_delete = m_action_Group->add_action("delete",
sigc::mem_fun(*this, &AddDel::on_MenuPopup_activate_Delete) );
}
- insert_action_group("context", m_refActionGroup);
+ insert_action_group("context", m_action_Group);
//TODO: add_accel_group(builder->get_accel_group());
@@ -239,8 +239,8 @@ void AddDel::setup_menu(Gtk::Widget* /* widget */)
menu->append(_("_Edit"), "context.edit");
menu->append(_("_Delete"), "context.delete");
- m_pMenuPopup = std::make_unique<Gtk::Menu>(menu);
- m_pMenuPopup->attach_to_widget(*this);
+ m_menu_popup = std::make_unique<Gtk::Menu>(menu);
+ m_menu_popup->attach_to_widget(*this);
}
bool AddDel::on_button_press_event_Popup(GdkEventButton *button_event)
@@ -250,7 +250,7 @@ bool AddDel::on_button_press_event_Popup(GdkEventButton *button_event)
if(mods & GDK_BUTTON3_MASK)
{
//Give user choices of actions on this item:
- m_pMenuPopup->popup(button_event->button, button_event->time);
+ m_menu_popup->popup(button_event->button, button_event->time);
}
else
{
@@ -1011,17 +1011,17 @@ void AddDel::remove_item_by_key(const Glib::ustring& strKey)
}
AddDel::InnerIgnore::InnerIgnore(AddDel* pOuter)
-: m_pOuter(pOuter),
+: m_outer(pOuter),
m_bPreventUserSignals(false),
m_bIgnoreSheetSignals(false)
{
- if(m_pOuter)
+ if(m_outer)
{
- m_bPreventUserSignals = m_pOuter->get_prevent_user_signals();
- m_pOuter->set_prevent_user_signals();
+ m_bPreventUserSignals = m_outer->get_prevent_user_signals();
+ m_outer->set_prevent_user_signals();
- m_bIgnoreSheetSignals = m_pOuter->get_ignore_treeview_signals();
- m_pOuter->set_ignore_treeview_signals();
+ m_bIgnoreSheetSignals = m_outer->get_ignore_treeview_signals();
+ m_outer->set_ignore_treeview_signals();
}
}
@@ -1029,13 +1029,13 @@ AddDel::InnerIgnore::InnerIgnore(AddDel* pOuter)
AddDel::InnerIgnore::~InnerIgnore()
{
//Restore values:
- if(m_pOuter)
+ if(m_outer)
{
- m_pOuter->set_prevent_user_signals(m_bPreventUserSignals);
- m_pOuter->set_ignore_treeview_signals(m_bIgnoreSheetSignals);
+ m_outer->set_prevent_user_signals(m_bPreventUserSignals);
+ m_outer->set_ignore_treeview_signals(m_bIgnoreSheetSignals);
}
- m_pOuter = 0;
+ m_outer = 0;
}
Glib::ustring AddDel::treeview_get_key(const Gtk::TreeModel::iterator& row)
@@ -1324,8 +1324,8 @@ void AddDel::on_treeview_columns_changed()
{
if(!get_ignore_treeview_signals())
{
- //Get the new column order, and save it in m_vecColumnIDs:
- m_vecColumnIDs.clear();
+ //Get the new column order, and save it in m_column_ids:
+ m_column_ids.clear();
for(const auto& item : m_TreeView.get_columns())
{
@@ -1333,7 +1333,7 @@ void AddDel::on_treeview_columns_changed()
if(pViewColumn)
{
const auto column_id = pViewColumn->get_column_id();
- m_vecColumnIDs.emplace_back(column_id);
+ m_column_ids.emplace_back(column_id);
}
}
diff --git a/glom/utility_widgets/adddel/adddel.h b/glom/utility_widgets/adddel/adddel.h
index 474b6da..739932c 100644
--- a/glom/utility_widgets/adddel/adddel.h
+++ b/glom/utility_widgets/adddel/adddel.h
@@ -296,12 +296,12 @@ private:
bool m_prevent_user_signals;
bool m_ignore_sheet_signals;
- type_vec_strings m_vecColumnIDs; //We give each ViewColumn a special ID, so we know where they are after a
reorder.
+ type_vec_strings m_column_ids; //We give each ViewColumn a special ID, so we know where they are after a
reorder.
- Glib::ustring m_strTextActiveCell; //value before the change
- std::unique_ptr<Gtk::Menu> m_pMenuPopup;
- Glib::RefPtr<Gio::SimpleActionGroup> m_refActionGroup;
- Glib::RefPtr<Gio::SimpleAction> m_refContextEdit, m_refContextDelete;
+ Glib::ustring m_text_active_cell; //value before the change
+ std::unique_ptr<Gtk::Menu> m_menu_popup;
+ Glib::RefPtr<Gio::SimpleActionGroup> m_action_Group;
+ Glib::RefPtr<Gio::SimpleAction> m_context_edit, m_context_delete;
protected:
bool m_auto_add;
@@ -329,7 +329,7 @@ private:
~InnerIgnore();
protected:
- AddDel* m_pOuter;
+ AddDel* m_outer;
bool m_bPreventUserSignals, m_bIgnoreSheetSignals;
};
diff --git a/glom/utility_widgets/dialog_properties.cc b/glom/utility_widgets/dialog_properties.cc
index b571e22..841be9d 100644
--- a/glom/utility_widgets/dialog_properties.cc
+++ b/glom/utility_widgets/dialog_properties.cc
@@ -32,16 +32,16 @@ Dialog_Properties::Dialog_Properties(BaseObjectType* cobject, const Glib::RefPtr
m_block(false),
m_modified(false)
{
- builder->get_widget("button_cancel", m_pButton_Cancel);
- builder->get_widget("button_save", m_pButton_Save);
+ builder->get_widget("button_cancel", m_button_cancel);
+ builder->get_widget("button_save", m_button_save);
//In general, we don't want to allow changes to windows underneath while editing properties.
//Also, if we don't set this then seconday windows (from a modal dialog) will be on top but unusable.
set_modal();
//Connect signal handlers:
- m_pButton_Cancel->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Properties::on_button_cancel) );
- m_pButton_Save->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Properties::on_button_save) );
+ m_button_cancel->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Properties::on_button_cancel) );
+ m_button_save->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Properties::on_button_save) );
show_all_children();
}
@@ -164,8 +164,8 @@ void Dialog_Properties::set_modified(bool modified)
{
m_modified = true;
- m_pButton_Save->set_sensitive(modified);
- m_pButton_Cancel->set_sensitive(true);
+ m_button_save->set_sensitive(modified);
+ m_button_cancel->set_sensitive(true);
}
void Dialog_Properties::enforce_constraints()
diff --git a/glom/utility_widgets/dialog_properties.h b/glom/utility_widgets/dialog_properties.h
index c2397af..683f995 100644
--- a/glom/utility_widgets/dialog_properties.h
+++ b/glom/utility_widgets/dialog_properties.h
@@ -72,8 +72,8 @@ protected:
//Child widgets:
//PlaceHolder m_Frame; //For the top-half. See add().
- Gtk::Button* m_pButton_Save;
- Gtk::Button* m_pButton_Cancel;
+ Gtk::Button* m_button_save;
+ Gtk::Button* m_button_cancel;
bool m_block;
diff --git a/glom/utility_widgets/imageglom.cc b/glom/utility_widgets/imageglom.cc
index 4e2e1f0..71c7ec1 100644
--- a/glom/utility_widgets/imageglom.cc
+++ b/glom/utility_widgets/imageglom.cc
@@ -167,10 +167,10 @@ bool ImageGlom::on_button_press_event(GdkEventButton *button_event)
if(pApp)
{
#ifndef GLOM_ENABLE_CLIENT_ONLY
- pApp->add_developer_action(m_refContextLayout); //So that it can be disabled when not in developer mode.
- pApp->add_developer_action(m_refContextAddField);
- pApp->add_developer_action(m_refContextAddRelatedRecords);
- pApp->add_developer_action(m_refContextAddGroup);
+ pApp->add_developer_action(m_context_layout); //So that it can be disabled when not in developer mode.
+ pApp->add_developer_action(m_context_add_field);
+ pApp->add_developer_action(m_context_add_related_records);
+ pApp->add_developer_action(m_context_add_group);
pApp->update_userlevel_ui(); //Update our action's sensitivity.
#endif // !GLOM_ENABLE_CLIENT_ONLY
@@ -941,30 +941,30 @@ void ImageGlom::on_menupopup_activate_clear()
void ImageGlom::setup_menu_usermode()
{
//Create the Gio::ActionGroup and associate it with this widget:
- m_refActionGroup_UserModePopup = Gio::SimpleActionGroup::create();
+ m_action_group_user_mode_popup = Gio::SimpleActionGroup::create();
- m_refActionOpenFile = m_refActionGroup_UserModePopup->add_action("open-file",
+ m_action_open_file = m_action_group_user_mode_popup->add_action("open-file",
sigc::mem_fun(*this, &ImageGlom::on_menupopup_activate_open_file) );
- m_refActionOpenFileWith = m_refActionGroup_UserModePopup->add_action("open-fil-ewith",
+ m_action_open_file_with = m_action_group_user_mode_popup->add_action("open-fil-ewith",
sigc::mem_fun(*this, &ImageGlom::on_menupopup_activate_open_file_with) );
- m_refActionSaveFile = m_refActionGroup_UserModePopup->add_action("save-file",
+ m_action_save_file = m_action_group_user_mode_popup->add_action("save-file",
sigc::mem_fun(*this, &ImageGlom::on_menupopup_activate_save_file) );
- m_refActionSelectFile = m_refActionGroup_UserModePopup->add_action("select-file",
+ m_action_select_file = m_action_group_user_mode_popup->add_action("select-file",
sigc::mem_fun(*this, &ImageGlom::on_menupopup_activate_select_file) );
- m_refActionCopy = m_refActionGroup_UserModePopup->add_action("copy",
+ m_action_copy = m_action_group_user_mode_popup->add_action("copy",
sigc::mem_fun(*this, &ImageGlom::on_menupopup_activate_copy) );
- m_refActionPaste = m_refActionGroup_UserModePopup->add_action("paste",
+ m_action_paste = m_action_group_user_mode_popup->add_action("paste",
sigc::mem_fun(*this, &ImageGlom::on_menupopup_activate_paste) );
- m_refActionClear = m_refActionGroup_UserModePopup->add_action("clear",
+ m_action_clear = m_action_group_user_mode_popup->add_action("clear",
sigc::mem_fun(*this, &ImageGlom::on_menupopup_activate_clear) );
- insert_action_group("imagecontext", m_refActionGroup_UserModePopup);
+ insert_action_group("imagecontext", m_action_group_user_mode_popup);
//Create the UI for the menu whose items will activate the actions,
@@ -978,8 +978,8 @@ void ImageGlom::setup_menu_usermode()
menu->append(_("_Paste"), "context.paste");
menu->append(_("_Clear"), "context.clear");
- m_pMenuPopup_UserMode = std::make_unique<Gtk::Menu>(menu);
- m_pMenuPopup_UserMode->attach_to_widget(*this);
+ m_menu_popup_user_mode = std::make_unique<Gtk::Menu>(menu);
+ m_menu_popup_user_mode->attach_to_widget(*this);
}
void ImageGlom::do_choose_image()
@@ -994,15 +994,15 @@ void ImageGlom::set_read_only(bool read_only)
void ImageGlom::popup_menu(guint button, guint32 activate_time)
{
- if(!m_pMenuPopup_UserMode)
+ if(!m_menu_popup_user_mode)
{
- std::cerr << G_STRFUNC << ": m_pMenuPopup_UserMode is null\n";
+ std::cerr << G_STRFUNC << ": m_menu_popup_user_mode is null\n";
return;
}
- m_pMenuPopup_UserMode->popup(button, activate_time);
+ m_menu_popup_user_mode->popup(button, activate_time);
- m_refActionSelectFile->set_enabled();
+ m_action_select_file->set_enabled();
}
diff --git a/glom/utility_widgets/imageglom.h b/glom/utility_widgets/imageglom.h
index 97f7b38..55260e3 100644
--- a/glom/utility_widgets/imageglom.h
+++ b/glom/utility_widgets/imageglom.h
@@ -122,15 +122,15 @@ private:
Glib::RefPtr<Gdk::Pixbuf> m_pixbuf_clipboard; //When copy is used, store it here until it is pasted.
- std::unique_ptr<Gtk::Menu> m_pMenuPopup_UserMode;
+ std::unique_ptr<Gtk::Menu> m_menu_popup_user_mode;
//TODO: Use just the Gio::ActionGroup type when it derives from Gio::ActionMap.
- Glib::RefPtr<Gio::SimpleActionGroup> m_refActionGroup_UserModePopup;
+ Glib::RefPtr<Gio::SimpleActionGroup> m_action_group_user_mode_popup;
//We use Gio::SimpleAction rather than Gio::Action
//because Gio::Action has no way to enable/disable it.
- Glib::RefPtr<Gio::SimpleAction> m_refActionOpenFile, m_refActionOpenFileWith,
- m_refActionSaveFile, m_refActionSelectFile, m_refActionCopy, m_refActionPaste, m_refActionClear;
+ Glib::RefPtr<Gio::SimpleAction> m_action_open_file, m_action_open_file_with,
+ m_action_save_file, m_action_select_file, m_action_copy, m_action_paste, m_action_clear;
bool m_read_only;
diff --git a/glom/utility_widgets/layoutwidgetbase.cc b/glom/utility_widgets/layoutwidgetbase.cc
index 4ff5513..da6ca45 100644
--- a/glom/utility_widgets/layoutwidgetbase.cc
+++ b/glom/utility_widgets/layoutwidgetbase.cc
@@ -29,24 +29,24 @@ namespace Glom
{
LayoutWidgetBase::LayoutWidgetBase()
-: m_pLayoutItem(nullptr)
+: m_layout_item(nullptr)
{
}
void LayoutWidgetBase::set_layout_item(const std::shared_ptr<LayoutItem>& layout_item, const Glib::ustring&
table_name)
{
- m_pLayoutItem = layout_item;
+ m_layout_item = layout_item;
m_table_name = table_name;
}
std::shared_ptr<const LayoutItem> LayoutWidgetBase::get_layout_item() const
{
- return m_pLayoutItem;
+ return m_layout_item;
}
std::shared_ptr<LayoutItem> LayoutWidgetBase::get_layout_item()
{
- return m_pLayoutItem;
+ return m_layout_item;
}
AppWindow* LayoutWidgetBase::get_appwindow() const
diff --git a/glom/utility_widgets/layoutwidgetbase.h b/glom/utility_widgets/layoutwidgetbase.h
index 1e54086..8ba0859 100644
--- a/glom/utility_widgets/layoutwidgetbase.h
+++ b/glom/utility_widgets/layoutwidgetbase.h
@@ -84,7 +84,7 @@ protected:
static void apply_formatting(Gtk::Widget& widget, const std::shared_ptr<const LayoutItem_WithFormatting>&
layout_item);
protected: //TODO: Add accessor?
- std::shared_ptr<LayoutItem> m_pLayoutItem;
+ std::shared_ptr<LayoutItem> m_layout_item;
protected: //TODO: Add accessor?
Glib::ustring m_table_name;
diff --git a/glom/utility_widgets/layoutwidgetmenu.cc b/glom/utility_widgets/layoutwidgetmenu.cc
index fe7cb82..295c39d 100644
--- a/glom/utility_widgets/layoutwidgetmenu.cc
+++ b/glom/utility_widgets/layoutwidgetmenu.cc
@@ -31,17 +31,17 @@ namespace Glom
LayoutWidgetMenu::LayoutWidgetMenu()
{
#ifndef GLOM_ENABLE_CLIENT_ONLY
- m_refActionGroup = Gio::SimpleActionGroup::create();
-
- m_refContextLayout = Gio::SimpleAction::create("choose-field");
- m_refContextLayoutProperties = Gio::SimpleAction::create("field-layout-properties");
- m_refContextAddField = Gio::SimpleAction::create("add-field");
- m_refContextAddRelatedRecords = Gio::SimpleAction::create("add-related-records");
- m_refContextAddNotebook = Gio::SimpleAction::create("add-notebook");
- m_refContextAddGroup = Gio::SimpleAction::create("add-group");
- m_refContextAddButton = Gio::SimpleAction::create("add-button");
- m_refContextAddText = Gio::SimpleAction::create("add-text");
- m_refContextDelete = Gio::SimpleAction::create("delete");
+ m_action_group = Gio::SimpleActionGroup::create();
+
+ m_context_layout = Gio::SimpleAction::create("choose-field");
+ m_context_layout_properties = Gio::SimpleAction::create("field-layout-properties");
+ m_context_add_field = Gio::SimpleAction::create("add-field");
+ m_context_add_related_records = Gio::SimpleAction::create("add-related-records");
+ m_context_add_notebook = Gio::SimpleAction::create("add-notebook");
+ m_context_add_group = Gio::SimpleAction::create("add-group");
+ m_context_add_button = Gio::SimpleAction::create("add-button");
+ m_context_add_text = Gio::SimpleAction::create("add-text");
+ m_context_delete = Gio::SimpleAction::create("delete");
#endif // !GLOM_ENABLE_CLIENT_ONLY
}
@@ -52,7 +52,7 @@ void LayoutWidgetMenu::add_action(const Glib::RefPtr<Gio::SimpleAction>& action,
if(!action)
return;
- m_refActionGroup->add_action(m_refContextLayout);
+ m_action_group->add_action(m_context_layout);
action->signal_activate().connect(
sigc::hide(slot));
}
@@ -65,45 +65,45 @@ void LayoutWidgetMenu::setup_menu(Gtk::Widget* widget)
return;
}
- add_action(m_refContextLayout,
+ add_action(m_context_layout,
sigc::mem_fun(*this, &LayoutWidgetMenu::on_menupopup_activate_layout) );
- add_action(m_refContextLayoutProperties,
+ add_action(m_context_layout_properties,
sigc::mem_fun(*this, &LayoutWidgetMenu::on_menupopup_activate_layout_properties) );
- add_action(m_refContextAddField,
+ add_action(m_context_add_field,
sigc::bind( sigc::mem_fun(*this, &LayoutWidgetMenu::on_menupopup_add_item), enumType::FIELD ) );
- add_action(m_refContextAddRelatedRecords,
+ add_action(m_context_add_related_records,
sigc::bind( sigc::mem_fun(*this, &LayoutWidgetMenu::on_menupopup_add_item), enumType::PORTAL ) );
- add_action(m_refContextAddGroup,
+ add_action(m_context_add_group,
sigc::bind( sigc::mem_fun(*this, &LayoutWidgetMenu::on_menupopup_add_item), enumType::GROUP ) );
- add_action(m_refContextAddNotebook,
+ add_action(m_context_add_notebook,
sigc::bind( sigc::mem_fun(*this, &LayoutWidgetMenu::on_menupopup_add_item), enumType::NOTEBOOK ) );
- add_action(m_refContextAddButton,
+ add_action(m_context_add_button,
sigc::bind( sigc::mem_fun(*this, &LayoutWidgetMenu::on_menupopup_add_item), enumType::BUTTON ) );
- add_action(m_refContextAddText,
+ add_action(m_context_add_text,
sigc::bind( sigc::mem_fun(*this, &LayoutWidgetMenu::on_menupopup_add_item), enumType::TEXT ) );
- add_action(m_refContextDelete,
+ add_action(m_context_delete,
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
auto pApp = get_appwindow();
if(pApp)
{
- pApp->add_developer_action(m_refContextLayout); //So that it can be disabled when not in developer mode.
- pApp->add_developer_action(m_refContextLayoutProperties); //So that it can be disabled when not in
developer mode.
- pApp->add_developer_action(m_refContextAddField);
- pApp->add_developer_action(m_refContextAddRelatedRecords);
- pApp->add_developer_action(m_refContextAddNotebook);
- pApp->add_developer_action(m_refContextAddGroup);
- pApp->add_developer_action(m_refContextAddButton);
- pApp->add_developer_action(m_refContextAddText);
+ pApp->add_developer_action(m_context_layout); //So that it can be disabled when not in developer mode.
+ pApp->add_developer_action(m_context_layout_properties); //So that it can be disabled when not in
developer mode.
+ pApp->add_developer_action(m_context_add_field);
+ pApp->add_developer_action(m_context_add_related_records);
+ pApp->add_developer_action(m_context_add_notebook);
+ pApp->add_developer_action(m_context_add_group);
+ pApp->add_developer_action(m_context_add_button);
+ pApp->add_developer_action(m_context_add_text);
pApp->update_userlevel_ui(); //Update our action's sensitivity.
}
@@ -119,14 +119,14 @@ void LayoutWidgetMenu::setup_menu(Gtk::Widget* widget)
menu->append(_("Delete"), "context.delete");
- m_pMenuPopup = std::make_unique<Gtk::Menu>(menu);
- m_pMenuPopup->attach_to_widget(*widget);
+ m_menu_popup = std::make_unique<Gtk::Menu>(menu);
+ m_menu_popup->attach_to_widget(*widget);
if(pApp)
- m_refContextLayout->set_enabled(pApp->get_userlevel() == AppState::userlevels::DEVELOPER);
+ m_context_layout->set_enabled(pApp->get_userlevel() == AppState::userlevels::DEVELOPER);
//Make our popup menu work:
- widget->insert_action_group("context", m_refActionGroup);
+ widget->insert_action_group("context", m_action_group);
}
void LayoutWidgetMenu::on_menupopup_add_item(enumType item)
diff --git a/glom/utility_widgets/layoutwidgetmenu.h b/glom/utility_widgets/layoutwidgetmenu.h
index d94495d..2657ef0 100644
--- a/glom/utility_widgets/layoutwidgetmenu.h
+++ b/glom/utility_widgets/layoutwidgetmenu.h
@@ -49,15 +49,15 @@ public:
protected:
#ifndef GLOM_ENABLE_CLIENT_ONLY
- std::unique_ptr<Gtk::Menu> m_pMenuPopup;
+ std::unique_ptr<Gtk::Menu> m_menu_popup;
//TODO_Performance: //Presumably we waste lots of memory by having this in each layout widget. Maybe we
can use one shared menu.
- Glib::RefPtr<Gio::SimpleActionGroup> m_refActionGroup;
+ Glib::RefPtr<Gio::SimpleActionGroup> m_action_group;
- Glib::RefPtr<Gio::SimpleAction> m_refContextLayout, m_refContextLayoutProperties;
- Glib::RefPtr<Gio::SimpleAction> m_refContextAddField, m_refContextAddRelatedRecords,
- m_refContextAddGroup, m_refContextAddNotebook, m_refContextAddButton, m_refContextAddText;
- Glib::RefPtr<Gio::SimpleAction> m_refContextDelete;
+ Glib::RefPtr<Gio::SimpleAction> m_context_layout, m_context_layout_properties;
+ Glib::RefPtr<Gio::SimpleAction> m_context_add_field, m_context_add_related_records,
+ m_context_add_group, m_context_add_notebook, m_context_add_button, m_context_add_text;
+ Glib::RefPtr<Gio::SimpleAction> m_context_delete;
#endif // GLOM_ENABLE_CLIENT_ONLY
private:
diff --git a/glom/utility_widgets/layoutwidgetutils.cc b/glom/utility_widgets/layoutwidgetutils.cc
index 79f50d3..730d866 100644
--- a/glom/utility_widgets/layoutwidgetutils.cc
+++ b/glom/utility_widgets/layoutwidgetutils.cc
@@ -39,21 +39,21 @@ LayoutWidgetUtils::LayoutWidgetUtils()
void LayoutWidgetUtils::setup_util_menu(Gtk::Widget* widget)
{
#ifndef GLOM_ENABLE_CLIENT_ONLY
- m_refActionGroup = Gio::SimpleActionGroup::create();
+ m_action_group = Gio::SimpleActionGroup::create();
- m_refUtilProperties = m_refActionGroup->add_action("properties",
+ m_util_properties = m_action_group->add_action("properties",
sigc::mem_fun(*this, &LayoutWidgetUtils::on_menu_properties_activate) );
- m_refUtilDelete = m_refActionGroup->add_action("delete",
+ m_util_delete = m_action_group->add_action("delete",
sigc::mem_fun(*this, &LayoutWidgetUtils::on_menu_delete_activate) );
- widget->insert_action_group("utility", m_refActionGroup);
+ widget->insert_action_group("utility", m_action_group);
auto menu = Gio::Menu::create();
menu->append(_("Properties"), "context.properties");
menu->append(_("_Delete"), "context.delete");
- m_pPopupMenuUtils = std::make_unique<Gtk::Menu>(menu);
- m_pPopupMenuUtils->attach_to_widget(*widget);
+ m_popup_menu_utils = std::make_unique<Gtk::Menu>(menu);
+ m_popup_menu_utils->attach_to_widget(*widget);
#endif
}
diff --git a/glom/utility_widgets/layoutwidgetutils.h b/glom/utility_widgets/layoutwidgetutils.h
index 04247f8..82946c7 100644
--- a/glom/utility_widgets/layoutwidgetutils.h
+++ b/glom/utility_widgets/layoutwidgetutils.h
@@ -39,7 +39,7 @@ public:
protected:
void setup_util_menu(Gtk::Widget* widget);
- std::unique_ptr<Gtk::Menu> m_pPopupMenuUtils;
+ std::unique_ptr<Gtk::Menu> m_popup_menu_utils;
#ifndef GLOM_ENABLE_CLIENT_ONLY
virtual void on_menu_properties_activate();
@@ -48,9 +48,9 @@ protected:
#endif // !GLOM_ENABLE_CLIENT_ONLY
private:
- Glib::RefPtr<Gio::SimpleAction> m_refUtilProperties;
- Glib::RefPtr<Gio::SimpleAction> m_refUtilDelete;
- Glib::RefPtr<Gio::SimpleActionGroup> m_refActionGroup;
+ Glib::RefPtr<Gio::SimpleAction> m_util_properties;
+ Glib::RefPtr<Gio::SimpleAction> m_util_delete;
+ Glib::RefPtr<Gio::SimpleActionGroup> m_action_group;
};
} // namespace Glom
diff --git a/glom/utility_widgets/notebooklabelglom.cc b/glom/utility_widgets/notebooklabelglom.cc
index aedae7a..fdde786 100644
--- a/glom/utility_widgets/notebooklabelglom.cc
+++ b/glom/utility_widgets/notebooklabelglom.cc
@@ -29,7 +29,7 @@ namespace Glom
NotebookLabel::NotebookLabel(NotebookGlom* notebook)
: m_notebook(notebook),
- m_pPopupMenu(nullptr)
+ m_popup_menu(nullptr)
{
init();
}
@@ -37,7 +37,7 @@ NotebookLabel::NotebookLabel(NotebookGlom* notebook)
NotebookLabel::NotebookLabel(const Glib::ustring& label, NotebookGlom* notebook)
: m_label(label),
m_notebook (notebook),
- m_pPopupMenu(nullptr)
+ m_popup_menu(nullptr)
{
init();
}
@@ -104,21 +104,21 @@ void NotebookLabel::on_menu_delete_activate()
void NotebookLabel::setup_menu(Gtk::Widget* /* widget */)
{
- m_refActionGroup = Gio::SimpleActionGroup::create();
+ m_action_group = Gio::SimpleActionGroup::create();
- m_refNewGroup = m_refActionGroup->add_action("new-group",
+ m_new_group = m_action_group->add_action("new-group",
sigc::mem_fun(*this, &NotebookLabel::on_menu_new_group_activate) );
- m_refDelete = m_refActionGroup->add_action("delete",
+ m_deelete = m_action_group->add_action("delete",
sigc::mem_fun(*this, &NotebookLabel::on_menu_delete_activate) );
- insert_action_group("context", m_refActionGroup);
+ insert_action_group("context", m_action_group);
auto menu = Gio::Menu::create();
menu->append(_("New Group"), "context.new-group");
menu->append(_("_Delete"), "context.delete");
- m_pPopupMenu = std::make_unique<Gtk::Menu>(menu);
- m_pPopupMenu->attach_to_widget(*this);
+ m_popup_menu = std::make_unique<Gtk::Menu>(menu);
+ m_popup_menu->attach_to_widget(*this);
}
bool NotebookLabel::on_button_press_event(GdkEventButton *button_event)
@@ -131,7 +131,7 @@ bool NotebookLabel::on_button_press_event(GdkEventButton *button_event)
if(mods & GDK_BUTTON3_MASK)
{
//Give user choices of actions on this item:
- m_pPopupMenu->popup(button_event->button, button_event->time);
+ m_popup_menu->popup(button_event->button, button_event->time);
return true; //We handled this event.
}
}
diff --git a/glom/utility_widgets/notebooklabelglom.h b/glom/utility_widgets/notebooklabelglom.h
index 680c82d..9dee57b 100644
--- a/glom/utility_widgets/notebooklabelglom.h
+++ b/glom/utility_widgets/notebooklabelglom.h
@@ -50,16 +50,16 @@ private:
NotebookGlom* m_notebook;
void setup_menu(Gtk::Widget* widget);
- std::unique_ptr<Gtk::Menu> m_pPopupMenu;
+ std::unique_ptr<Gtk::Menu> m_popup_menu;
void on_menu_new_group_activate();
void on_menu_delete_activate();
bool on_button_press_event(GdkEventButton *event) override;
- Glib::RefPtr<Gio::SimpleAction> m_refNewGroup;
- Glib::RefPtr<Gio::SimpleAction> m_refDelete;
- Glib::RefPtr<Gio::SimpleActionGroup> m_refActionGroup;
+ Glib::RefPtr<Gio::SimpleAction> m_new_group;
+ Glib::RefPtr<Gio::SimpleAction> m_deelete;
+ Glib::RefPtr<Gio::SimpleActionGroup> m_action_group;
};
} //namespace Glom
diff --git a/po/dz.po b/po/dz.po
index b66fa93..bd1b402 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -1047,7 +1047,7 @@ msgstr "ཐིག་ཁྲམ་ཚུ། (_T)"
#. Glib::RefPtr<Gtk::Action> action = Gtk::Action::create("GlomAction_Menu_Navigate_Database",
_("_Database"));
#. m_listDeveloperActions.push_back(action);
#. m_refActionGroup_Others->add(action,
-#. sigc::mem_fun(*m_pFrame, &Frame_Glom::on_menu_Navigate_Database) );
+#. sigc::mem_fun(*m_frame, &Frame_Glom::on_menu_Navigate_Database) );
#: ../glom/application.cc:255
msgid "_Edit Tables"
msgstr "ཐིག་ཁྲམ་ཚུ་ཞུན་དག་འབད། (_E)"
diff --git a/po/en_CA.po b/po/en_CA.po
index 4d5403f..a4740e1 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -764,7 +764,7 @@ msgstr "_Tables"
#. Glib::RefPtr<Gtk::Action> action = Gtk::Action::create("GlomAction_Menu_Navigate_Database",
_("_Database"));
#. m_listDeveloperActions.push_back(action);
#. m_refActionGroup_Others->add(action,
-#. sigc::mem_fun(*m_pFrame, &Frame_Glom::on_menu_Navigate_Database) );
+#. sigc::mem_fun(*m_frame, &Frame_Glom::on_menu_Navigate_Database) );
#: ../glom/application.cc:222
msgid "_Edit Tables"
msgstr "_Edit Tables"
diff --git a/po/vi.po b/po/vi.po
index 5a37594..57f2e93 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1050,7 +1050,7 @@ msgstr "_Bảng"
#.Glib::RefPtr<Gtk::Action> action = Gtk::Action::create("GlomAction_Menu_Navigate_Database",
_("_Database"));
#.m_listDeveloperActions.push_back(action);
#.m_refActionGroup_Others->add(action,
-#.sigc::mem_fun(*m_pFrame, &Frame_Glom::on_menu_Navigate_Database) );
+#.sigc::mem_fun(*m_frame, &Frame_Glom::on_menu_Navigate_Database) );
#: ../glom/application.cc:238
msgid "_Edit Tables"
msgstr "_Sửa bảng"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
