[glom/gmenu] More adapting to my API changes in Gio::Action
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom/gmenu] More adapting to my API changes in Gio::Action
- Date: Wed, 7 Aug 2013 20:28:32 +0000 (UTC)
commit a2eda4544168094d6c94d6772ff5c8b26b5f96ac
Author: Murray Cumming <murrayc murrayc com>
Date: Wed Aug 7 22:13:08 2013 +0200
More adapting to my API changes in Gio::Action
.../print_layouts/window_print_layout_edit.cc | 73 +++++++++----------
.../print_layouts/window_print_layout_edit.h | 56 ++++++++--------
.../dialog_relationships_overview.cc | 6 +-
.../dialog_relationships_overview.h | 8 +-
glom/utility_widgets/imageglom.cc | 20 +++---
glom/utility_widgets/imageglom.h | 14 ++--
6 files changed, 86 insertions(+), 91 deletions(-)
---
diff --git a/glom/mode_design/print_layouts/window_print_layout_edit.cc
b/glom/mode_design/print_layouts/window_print_layout_edit.cc
index 020a695..d577847 100644
--- a/glom/mode_design/print_layouts/window_print_layout_edit.cc
+++ b/glom/mode_design/print_layouts/window_print_layout_edit.cc
@@ -840,14 +840,14 @@ sharedptr<PrintLayout> Window_PrintLayout_Edit::get_print_layout()
return m_print_layout;
}
-void Window_PrintLayout_Edit::on_context_menu_insert_field(const Glib::VariantBase& parameter)
+void Window_PrintLayout_Edit::on_context_menu_insert_field()
{
- on_menu_insert_field(parameter);
+ on_menu_insert_field();
}
-void Window_PrintLayout_Edit::on_context_menu_insert_text(const Glib::VariantBase& parameter)
+void Window_PrintLayout_Edit::on_context_menu_insert_text()
{
- on_menu_insert_text(parameter);
+ on_menu_insert_text();
}
void Window_PrintLayout_Edit::setup_context_menu()
@@ -963,7 +963,7 @@ void Window_PrintLayout_Edit::set_default_position(const sharedptr<LayoutItem>&
item->set_print_layout_position(item_x, item_y, old_width, old_height);
}
-void Window_PrintLayout_Edit::on_menu_insert_field(const Glib::VariantBase& /* parameter */)
+void Window_PrintLayout_Edit::on_menu_insert_field()
{
sharedptr<LayoutItem> layout_item = create_empty_item(PrintLayoutToolbarButton::ITEM_FIELD);
@@ -973,7 +973,7 @@ void Window_PrintLayout_Edit::on_menu_insert_field(const Glib::VariantBase& /* p
create_canvas_layout_item_and_add(layout_item);
}
-void Window_PrintLayout_Edit::on_menu_insert_text(const Glib::VariantBase& /* parameter */)
+void Window_PrintLayout_Edit::on_menu_insert_text()
{
sharedptr<LayoutItem> layout_item = create_empty_item(PrintLayoutToolbarButton::ITEM_TEXT);
set_default_position(layout_item);
@@ -981,7 +981,7 @@ void Window_PrintLayout_Edit::on_menu_insert_text(const Glib::VariantBase& /* pa
create_canvas_layout_item_and_add(layout_item);
}
-void Window_PrintLayout_Edit::on_menu_insert_image(const Glib::VariantBase& /* parameter */)
+void Window_PrintLayout_Edit::on_menu_insert_image()
{
sharedptr<LayoutItem> layout_item = create_empty_item(PrintLayoutToolbarButton::ITEM_IMAGE);
// Note to translators: This is the default contents of a text item on a print layout:
@@ -991,7 +991,7 @@ void Window_PrintLayout_Edit::on_menu_insert_image(const Glib::VariantBase& /* p
create_canvas_layout_item_and_add(layout_item);
}
-void Window_PrintLayout_Edit::on_menu_insert_relatedrecords(const Glib::VariantBase& /* parameter */)
+void Window_PrintLayout_Edit::on_menu_insert_relatedrecords()
{
sharedptr<LayoutItem> layout_item = create_empty_item(PrintLayoutToolbarButton::ITEM_PORTAL);
set_default_position(layout_item);
@@ -999,7 +999,7 @@ void Window_PrintLayout_Edit::on_menu_insert_relatedrecords(const Glib::VariantB
create_canvas_layout_item_and_add(layout_item);
}
-void Window_PrintLayout_Edit::on_menu_insert_line_horizontal(const Glib::VariantBase& /* parameter */)
+void Window_PrintLayout_Edit::on_menu_insert_line_horizontal()
{
sharedptr<LayoutItem> layout_item = create_empty_item(PrintLayoutToolbarButton::ITEM_LINE_HORIZONTAL);
@@ -1016,14 +1016,14 @@ void Window_PrintLayout_Edit::on_menu_insert_line_horizontal(const Glib::Variant
create_canvas_layout_item_and_add(layout_item);
}
-void Window_PrintLayout_Edit::on_menu_insert_line_vertical(const Glib::VariantBase& /* parameter */)
+void Window_PrintLayout_Edit::on_menu_insert_line_vertical()
{
sharedptr<LayoutItem> layout_item = create_empty_item(PrintLayoutToolbarButton::ITEM_LINE_VERTICAL);
create_canvas_layout_item_and_add(layout_item);
}
-void Window_PrintLayout_Edit::on_menu_insert_create_standard(const Glib::VariantBase& /* parameter */)
+void Window_PrintLayout_Edit::on_menu_insert_create_standard()
{
//Ask for confirmation:
Gtk::MessageDialog dialog(Utils::bold_message(_("Create Standard Layout")), true, Gtk::MESSAGE_QUESTION,
Gtk::BUTTONS_NONE);
@@ -1056,14 +1056,14 @@ void Window_PrintLayout_Edit::on_menu_insert_create_standard(const Glib::Variant
}
-void Window_PrintLayout_Edit::on_menu_insert_add_page(const Glib::VariantBase& /* parameter */)
+void Window_PrintLayout_Edit::on_menu_insert_add_page()
{
m_canvas.set_page_count(
m_canvas.get_page_count() + 1);
}
//TODO: Disable this menu item when there is only one page:
-void Window_PrintLayout_Edit::on_menu_insert_delete_page(const Glib::VariantBase& /* parameter */)
+void Window_PrintLayout_Edit::on_menu_insert_delete_page()
{
const guint page_count = m_canvas.get_page_count();
if(page_count <= 1)
@@ -1086,7 +1086,7 @@ void Window_PrintLayout_Edit::on_button_close()
hide();
}
-void Window_PrintLayout_Edit::on_menu_view_show_grid(const Glib::VariantBase& /* parameter */)
+void Window_PrintLayout_Edit::on_menu_view_show_grid()
{
//The state is not changed automatically:
bool active = false;
@@ -1110,7 +1110,7 @@ void Window_PrintLayout_Edit::do_menu_view_show_grid(bool active)
}
}
-void Window_PrintLayout_Edit::on_menu_view_show_rules(const Glib::VariantBase& parameter)
+void Window_PrintLayout_Edit::on_menu_view_show_rules()
{
//The state is not changed automatically:
bool active = false;
@@ -1142,7 +1142,7 @@ void Window_PrintLayout_Edit::do_menu_view_show_rules(bool active)
}
-void Window_PrintLayout_Edit::on_menu_view_show_outlines(const Glib::VariantBase& parameter)
+void Window_PrintLayout_Edit::on_menu_view_show_outlines()
{
//The state is not changed automatically:
bool active = false;
@@ -1159,15 +1159,12 @@ void Window_PrintLayout_Edit::do_menu_view_show_outlines(bool active)
m_canvas.set_outlines_visibility(active);
}
-void Window_PrintLayout_Edit::on_menu_view_zoom(const Glib::VariantBase& parameter)
+void Window_PrintLayout_Edit::on_menu_view_zoom(int parameter)
{
- const Glib::Variant<int> variantInt = parameter.cast_dynamic< Glib::Variant<int> >(parameter);
- const int percent = variantInt.get();
-
//The state is not changed automatically:
- m_action_zoom->change_state(variantInt); //Change to change_state(percent) if we ever make that templated
in glibmm.
+ m_action_zoom->change_state(Glib::Variant<int>::create(parameter)); //Change to change_state(percent) if
we ever make that templated in glibmm.
- if(percent == 0) //For us, this means Fit Page Width.
+ if(parameter == 0) //For us, this means Fit Page Width.
{
//Get the canvas size:
Goocanvas::Bounds bounds;
@@ -1194,11 +1191,11 @@ void Window_PrintLayout_Edit::on_menu_view_zoom(const Glib::VariantBase& paramet
}
else
{
- m_canvas.set_zoom_percent(percent);
+ m_canvas.set_zoom_percent(parameter);
}
}
-void Window_PrintLayout_Edit::on_menu_file_page_setup(const Glib::VariantBase& /* parameter */)
+void Window_PrintLayout_Edit::on_menu_file_page_setup()
{
Glib::RefPtr<Gtk::PageSetup> page_setup = m_canvas.get_page_setup();
@@ -1213,7 +1210,7 @@ void Window_PrintLayout_Edit::on_menu_file_page_setup(const Glib::VariantBase& /
set_ruler_sizes();
}
-void Window_PrintLayout_Edit::on_menu_file_print_preview(const Glib::VariantBase& /* parameter */)
+void Window_PrintLayout_Edit::on_menu_file_print_preview()
{
//Save any recent changes in the document,
//so that the preview will show them:
@@ -1234,13 +1231,13 @@ void Window_PrintLayout_Edit::on_menu_file_print_preview(const Glib::VariantBase
app->do_print_layout(m_print_layout->get_name(), true /* preview */, this);
}
-void Window_PrintLayout_Edit::on_menu_edit_cut(const Glib::VariantBase& parameter)
+void Window_PrintLayout_Edit::on_menu_edit_cut()
{
- on_menu_edit_copy(parameter);
- on_menu_edit_delete(parameter);
+ on_menu_edit_copy();
+ on_menu_edit_delete();
}
-void Window_PrintLayout_Edit::on_menu_edit_copy(const Glib::VariantBase& /* parameter */)
+void Window_PrintLayout_Edit::on_menu_edit_copy()
{
if(m_layout_items_selected.empty())
return;
@@ -1263,7 +1260,7 @@ void Window_PrintLayout_Edit::on_menu_edit_copy(const Glib::VariantBase& /* para
m_action_edit_paste->set_enabled();
}
-void Window_PrintLayout_Edit::on_menu_edit_paste(const Glib::VariantBase& /* parameter */)
+void Window_PrintLayout_Edit::on_menu_edit_paste()
{
if(m_layout_items_to_paste.empty())
return;
@@ -1304,7 +1301,7 @@ Glib::RefPtr<CanvasLayoutItem> Window_PrintLayout_Edit::create_canvas_layout_ite
return canvas_item;
}
-void Window_PrintLayout_Edit::on_menu_edit_delete(const Glib::VariantBase& /* parameter */)
+void Window_PrintLayout_Edit::on_menu_edit_delete()
{
while(!m_layout_items_selected.empty())
{
@@ -1316,17 +1313,17 @@ void Window_PrintLayout_Edit::on_menu_edit_delete(const Glib::VariantBase& /* pa
m_layout_items_selected.clear();
}
-void Window_PrintLayout_Edit::on_menu_edit_selectall(const Glib::VariantBase& /* parameter */)
+void Window_PrintLayout_Edit::on_menu_edit_selectall()
{
m_canvas.select_all();
}
-void Window_PrintLayout_Edit::on_menu_edit_unselectall(const Glib::VariantBase& /* parameter */)
+void Window_PrintLayout_Edit::on_menu_edit_unselectall()
{
m_canvas.select_all(false);
}
-void Window_PrintLayout_Edit::on_menu_align_top(const Glib::VariantBase& /* parameter */)
+void Window_PrintLayout_Edit::on_menu_align_top()
{
//Get the top-most position:
double top = 0;
@@ -1362,7 +1359,7 @@ void Window_PrintLayout_Edit::on_menu_align_top(const Glib::VariantBase& /* para
}
}
-void Window_PrintLayout_Edit::on_menu_align_bottom(const Glib::VariantBase& /* parameter */)
+void Window_PrintLayout_Edit::on_menu_align_bottom()
{
//Get the bottom-most position:
double bottom = 0;
@@ -1410,7 +1407,7 @@ void Window_PrintLayout_Edit::on_menu_align_bottom(const Glib::VariantBase& /* p
}
}
-void Window_PrintLayout_Edit::on_menu_align_left(const Glib::VariantBase& /* parameter */)
+void Window_PrintLayout_Edit::on_menu_align_left()
{
//Get the left-most position:
double left = 0;
@@ -1446,7 +1443,7 @@ void Window_PrintLayout_Edit::on_menu_align_left(const Glib::VariantBase& /* par
}
}
-void Window_PrintLayout_Edit::on_menu_align_right(const Glib::VariantBase& /* parameter */)
+void Window_PrintLayout_Edit::on_menu_align_right()
{
//Get the right-most position:
double right = 0;
@@ -1549,7 +1546,7 @@ bool Window_PrintLayout_Edit::on_configure_event(GdkEventConfigure* event)
if(percent == 0) //Fit Page Width
{
- on_menu_view_zoom( Glib::Variant<int>::create(percent) );
+ on_menu_view_zoom(percent);
}
return result;
diff --git a/glom/mode_design/print_layouts/window_print_layout_edit.h
b/glom/mode_design/print_layouts/window_print_layout_edit.h
index 1a4e467..3e87184 100644
--- a/glom/mode_design/print_layouts/window_print_layout_edit.h
+++ b/glom/mode_design/print_layouts/window_print_layout_edit.h
@@ -63,39 +63,39 @@ private:
sharedptr<LayoutItem> create_empty_item(PrintLayoutToolbarButton::enumItems item_type);
- void on_menu_file_page_setup(const Glib::VariantBase& parameter);
- void on_menu_file_print_preview(const Glib::VariantBase& parameter);
- void on_menu_insert_field(const Glib::VariantBase& parameter);
- void on_menu_insert_text(const Glib::VariantBase& parameter);
- void on_menu_insert_image(const Glib::VariantBase& parameter);
- void on_menu_insert_relatedrecords(const Glib::VariantBase& parameter);
- void on_menu_insert_line_horizontal(const Glib::VariantBase& parameter);
- void on_menu_insert_line_vertical(const Glib::VariantBase& parameter);
- void on_menu_insert_create_standard(const Glib::VariantBase& parameter);
- void on_menu_insert_add_page(const Glib::VariantBase& parameter);
- void on_menu_insert_delete_page(const Glib::VariantBase& parameter);
+ void on_menu_file_page_setup();
+ void on_menu_file_print_preview();
+ void on_menu_insert_field();
+ void on_menu_insert_text();
+ void on_menu_insert_image();
+ void on_menu_insert_relatedrecords();
+ void on_menu_insert_line_horizontal();
+ void on_menu_insert_line_vertical();
+ void on_menu_insert_create_standard();
+ void on_menu_insert_add_page();
+ void on_menu_insert_delete_page();
- void on_menu_view_show_grid(const Glib::VariantBase& parameter);
- void on_menu_view_show_rules(const Glib::VariantBase& parameter);
- void on_menu_view_show_outlines(const Glib::VariantBase& parameter);
- void on_menu_view_zoom(const Glib::VariantBase& parameter);
-
- void on_menu_edit_cut(const Glib::VariantBase& parameter);
- void on_menu_edit_copy(const Glib::VariantBase& parameter);
- void on_menu_edit_paste(const Glib::VariantBase& parameter);
- void on_menu_edit_delete(const Glib::VariantBase& parameter);
- void on_menu_edit_selectall(const Glib::VariantBase& parameter);
- void on_menu_edit_unselectall(const Glib::VariantBase& parameter);
+ void on_menu_view_show_grid();
+ void on_menu_view_show_rules();
+ void on_menu_view_show_outlines();
+ void on_menu_view_zoom(int parameter);
+
+ void on_menu_edit_cut();
+ void on_menu_edit_copy();
+ void on_menu_edit_paste();
+ void on_menu_edit_delete();
+ void on_menu_edit_selectall();
+ void on_menu_edit_unselectall();
- void on_menu_align_top(const Glib::VariantBase& parameter);
- void on_menu_align_bottom(const Glib::VariantBase& parameter);
- void on_menu_align_left(const Glib::VariantBase& parameter);
- void on_menu_align_right(const Glib::VariantBase& parameter);
+ void on_menu_align_top();
+ void on_menu_align_bottom();
+ void on_menu_align_left();
+ void on_menu_align_right();
bool on_canvas_motion_notify_event(GdkEventMotion* event);
void on_canvas_show_context_menu(guint button, guint32 activate_time);
- void on_context_menu_insert_field(const Glib::VariantBase& parameter);
- void on_context_menu_insert_text(const Glib::VariantBase& parameter);
+ void on_context_menu_insert_field();
+ void on_context_menu_insert_text();
void on_scroll_value_changed();
void on_button_close();
diff --git a/glom/mode_design/relationships_overview/dialog_relationships_overview.cc
b/glom/mode_design/relationships_overview/dialog_relationships_overview.cc
index fc1345d..9bac130 100644
--- a/glom/mode_design/relationships_overview/dialog_relationships_overview.cc
+++ b/glom/mode_design/relationships_overview/dialog_relationships_overview.cc
@@ -368,12 +368,12 @@ void Dialog_RelationshipsOverview::on_response(int /* id */)
hide();
}
-void Dialog_RelationshipsOverview::on_menu_file_print(const Glib::VariantBase& /* parameter */)
+void Dialog_RelationshipsOverview::on_menu_file_print()
{
print_or_preview(Gtk::PRINT_OPERATION_ACTION_PRINT_DIALOG);
}
-void Dialog_RelationshipsOverview::on_menu_file_page_setup(const Glib::VariantBase& /* parameter */)
+void Dialog_RelationshipsOverview::on_menu_file_page_setup()
{
//Show the page setup dialog, asking it to start with the existing settings:
Glib::RefPtr<Gtk::PageSetup> new_page_setup =
@@ -399,7 +399,7 @@ void Dialog_RelationshipsOverview::on_menu_view_showgrid(const Glib::VariantBase
}
//TODO: Is this used?
-void Dialog_RelationshipsOverview::on_menu_file_save(const Glib::VariantBase& parameter)
+void Dialog_RelationshipsOverview::on_menu_file_save()
{
}
diff --git a/glom/mode_design/relationships_overview/dialog_relationships_overview.h
b/glom/mode_design/relationships_overview/dialog_relationships_overview.h
index 89aabb3..62cebd7 100644
--- a/glom/mode_design/relationships_overview/dialog_relationships_overview.h
+++ b/glom/mode_design/relationships_overview/dialog_relationships_overview.h
@@ -63,10 +63,10 @@ private:
void print_or_preview(Gtk::PrintOperationAction print_action);
void on_response(int id);
- void on_menu_file_print(const Glib::VariantBase& parameter);
- void on_menu_file_page_setup(const Glib::VariantBase& parameter);
- void on_menu_file_save(const Glib::VariantBase& parameter);
- void on_menu_view_showgrid(const Glib::VariantBase& parameter);
+ void on_menu_file_print();
+ void on_menu_file_page_setup();
+ void on_menu_file_save();
+ void on_menu_view_showgrid(const Glib::VariantBase& /* parameter */);
void on_table_moved(const Glib::RefPtr<CanvasItemMovable>& item, double x_offset, double y_offset);
void on_table_show_context(guint button, guint32 activate_time, Glib::RefPtr<CanvasGroupDbTable> table);
diff --git a/glom/utility_widgets/imageglom.cc b/glom/utility_widgets/imageglom.cc
index 086e367..a4d4973 100644
--- a/glom/utility_widgets/imageglom.cc
+++ b/glom/utility_widgets/imageglom.cc
@@ -155,8 +155,7 @@ bool ImageGlom::on_button_press_event(GdkEventButton *event)
//Single-click to select file:
if(mods & GDK_BUTTON1_MASK)
{
- Glib::VariantBase parameter;
- on_menupopup_activate_select_file(parameter);
+ on_menupopup_activate_select_file();
return true; //We handled this event.
}
@@ -499,12 +498,12 @@ Glib::RefPtr<Gdk::Pixbuf> ImageGlom::get_scaled_image()
return pixbuf;
}
-void ImageGlom::on_menupopup_activate_open_file(const Glib::VariantBase& /* parameter */)
+void ImageGlom::on_menupopup_activate_open_file()
{
open_with();
}
-void ImageGlom::on_menupopup_activate_open_file_with(const Glib::VariantBase& /* parameter */)
+void ImageGlom::on_menupopup_activate_open_file_with()
{
AppWindow* pApp = get_appwindow();
@@ -675,7 +674,7 @@ static void set_file_filter_images(Gtk::FileChooser& file_chooser)
*/
}
-void ImageGlom::on_menupopup_activate_save_file(const Glib::VariantBase& /* parameter */)
+void ImageGlom::on_menupopup_activate_save_file()
{
AppWindow* pApp = get_appwindow();
@@ -759,7 +758,7 @@ bool ImageGlom::save_file(const Glib::ustring& uri)
return true;
}
-void ImageGlom::on_menupopup_activate_select_file(const Glib::VariantBase& /* parameter */)
+void ImageGlom::on_menupopup_activate_select_file()
{
if(m_read_only)
return;
@@ -856,7 +855,7 @@ void ImageGlom::on_clipboard_clear()
m_pixbuf_clipboard.reset();
}
-void ImageGlom::on_menupopup_activate_copy(const Glib::VariantBase& /* parameter */)
+void ImageGlom::on_menupopup_activate_copy()
{
if(m_pixbuf_original)
{
@@ -899,7 +898,7 @@ void ImageGlom::on_clipboard_received_image(const Glib::RefPtr<Gdk::Pixbuf>& pix
}
-void ImageGlom::on_menupopup_activate_paste(const Glib::VariantBase& /* parameter */)
+void ImageGlom::on_menupopup_activate_paste()
{
if(m_read_only)
return;
@@ -911,7 +910,7 @@ void ImageGlom::on_menupopup_activate_paste(const Glib::VariantBase& /* paramete
refClipboard->request_image( sigc::mem_fun(*this, &ImageGlom::on_clipboard_received_image) );
}
-void ImageGlom::on_menupopup_activate_clear(const Glib::VariantBase& /* parameter */)
+void ImageGlom::on_menupopup_activate_clear()
{
if(m_read_only)
return;
@@ -1008,8 +1007,7 @@ void ImageGlom::setup_menu_usermode()
void ImageGlom::do_choose_image()
{
- Glib::VariantBase parameter;
- on_menupopup_activate_select_file(parameter);
+ on_menupopup_activate_select_file();
}
void ImageGlom::set_read_only(bool read_only)
diff --git a/glom/utility_widgets/imageglom.h b/glom/utility_widgets/imageglom.h
index ee5dc90..a0926b4 100644
--- a/glom/utility_widgets/imageglom.h
+++ b/glom/utility_widgets/imageglom.h
@@ -70,13 +70,13 @@ private:
virtual bool on_button_press_event(GdkEventButton *event);
- void on_menupopup_activate_open_file(const Glib::VariantBase& parameter);
- void on_menupopup_activate_open_file_with(const Glib::VariantBase& parameter);
- void on_menupopup_activate_save_file(const Glib::VariantBase& parameter);
- void on_menupopup_activate_select_file(const Glib::VariantBase& parameter);
- void on_menupopup_activate_copy(const Glib::VariantBase& parameter);
- void on_menupopup_activate_paste(const Glib::VariantBase& parameter);
- void on_menupopup_activate_clear(const Glib::VariantBase& parameter);
+ void on_menupopup_activate_open_file();
+ void on_menupopup_activate_open_file_with();
+ void on_menupopup_activate_save_file();
+ void on_menupopup_activate_select_file();
+ void on_menupopup_activate_copy();
+ void on_menupopup_activate_paste();
+ void on_menupopup_activate_clear();
void on_clipboard_get(Gtk::SelectionData& selection_data, guint /* info */);
void on_clipboard_clear();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]