[glom/gmenu] Remove use of Gtk::RecentAction.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom/gmenu] Remove use of Gtk::RecentAction.
- Date: Fri, 13 Sep 2013 21:05:20 +0000 (UTC)
commit 373deb1eca46ec1d662b0c4d4924093968bb002d
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Sep 12 12:57:28 2013 +0200
Remove use of Gtk::RecentAction.
* glom/appwindow.cc:
* glom/bakery/appwindow_withdoc_gtk.[h|cc]:
Remove use of GtkRecentAction, and therefore remove the
recent files menu. GtkRecentAction has been deprecated
without a replacement, and their has been some suggestion
that this is a good thing:
TODO: Link to gtk-devel-list mail.
This does not remove the custom recent files list in our
initial dialog.
glom/appwindow.cc | 6 ----
glom/bakery/appwindow_withdoc_gtk.cc | 44 ----------------------------------
glom/bakery/appwindow_withdoc_gtk.h | 1 -
3 files changed, 0 insertions(+), 51 deletions(-)
---
diff --git a/glom/appwindow.cc b/glom/appwindow.cc
index 4b00799..5c6b3e6 100644
--- a/glom/appwindow.cc
+++ b/glom/appwindow.cc
@@ -263,7 +263,6 @@ void AppWindow::init_menus_file()
m_refFileActionGroup = Gtk::ActionGroup::create("BakeryFileActions");
m_refFileActionGroup->add(Gtk::Action::create("BakeryAction_Menu_File", _("_File")));
- m_refFileActionGroup->add(Gtk::Action::create("BakeryAction_Menu_File_RecentFiles", _("_Recent Files")));
//File actions
m_refFileActionGroup->add(Gtk::Action::create("BakeryAction_File_New", _("_New")),
@@ -323,8 +322,6 @@ void AppWindow::init_menus_file()
" <menu action='BakeryAction_Menu_File'>"
" <menuitem action='BakeryAction_File_New' />"
" <menuitem action='BakeryAction_File_Open' />"
- " <menu action='BakeryAction_Menu_File_RecentFiles'>"
- " </menu>"
#ifndef GLOM_ENABLE_CLIENT_ONLY
" <menuitem action='BakeryAction_File_SaveAsExample' />"
" <separator/>"
@@ -349,9 +346,6 @@ void AppWindow::init_menus_file()
//Add menu:
add_ui_from_string(ui_description);
-
- //Add recent-files submenu:
-
init_menus_file_recentfiles("/Bakery_MainMenu/Bakery_MenuPH_File/BakeryAction_Menu_File/BakeryAction_Menu_File_RecentFiles");
}
void AppWindow::init_menus()
diff --git a/glom/bakery/appwindow_withdoc_gtk.cc b/glom/bakery/appwindow_withdoc_gtk.cc
index 2943966..ca42b0e 100644
--- a/glom/bakery/appwindow_withdoc_gtk.cc
+++ b/glom/bakery/appwindow_withdoc_gtk.cc
@@ -179,44 +179,6 @@ void AppWindow_WithDoc_Gtk::init_menus()
init_menus_edit();
}
-void AppWindow_WithDoc_Gtk::init_menus_file_recentfiles(const Glib::ustring& path)
-{
- if(!m_mime_types.empty()) //"Recent-files" is useless unless it knows what documents (which MIME-types) to
show.
- {
- //Add recent-files submenu:
- Gtk::MenuItem* pMenuItem = dynamic_cast<Gtk::MenuItem*>(m_refUIManager->get_widget(path));
- if(pMenuItem)
- {
- Glib::RefPtr<Gtk::RecentFilter> filter = Gtk::RecentFilter::create();
-
- //Add the mime-types, so that it only shows those documents:
- for(type_list_strings::iterator iter = m_mime_types.begin(); iter != m_mime_types.end(); ++iter)
- {
- const Glib::ustring mime_type = *iter;
-
- //TODO: Find a gio equivalent for gnome_vfs_mime_type_is_known(). murrayc.
- filter->add_mime_type(mime_type);
- }
-
- Gtk::RecentChooserMenu* menu = Gtk::manage(new Gtk::RecentChooserMenu);
- menu->set_filter(filter);
- menu->set_show_numbers(false);
- menu->set_sort_type(Gtk::RECENT_SORT_MRU);
- menu->signal_item_activated().connect(sigc::bind(sigc::mem_fun(*this,
static_cast<void(AppWindow_WithDoc_Gtk::*)(Gtk::RecentChooser&)>(&AppWindow_WithDoc_Gtk::on_recent_files_activate)),
sigc::ref(*menu)));
-
- pMenuItem->set_submenu(*menu);
- }
- else
- {
- std::cout << "debug: recent files menu not found" << std::endl;
- }
- }
- else
- {
- //std::cout << "debug: " << G_STRFUNC << ": No recent files sub-menu added, because no MIME types are
specified." << std::endl;
- }
-}
-
void AppWindow_WithDoc_Gtk::init_menus_file()
{
// File menu
@@ -225,7 +187,6 @@ void AppWindow_WithDoc_Gtk::init_menus_file()
m_refFileActionGroup = Gtk::ActionGroup::create("BakeryFileActions");
m_refFileActionGroup->add(Gtk::Action::create("BakeryAction_Menu_File", _("_File")));
- m_refFileActionGroup->add(Gtk::Action::create("BakeryAction_Menu_File_RecentFiles", _("_Recent Files")));
//File actions
m_refFileActionGroup->add(Gtk::Action::create("BakeryAction_File_New", _("_New")),
@@ -255,8 +216,6 @@ void AppWindow_WithDoc_Gtk::init_menus_file()
" <menu action='BakeryAction_Menu_File'>"
" <menuitem action='BakeryAction_File_New' />"
" <menuitem action='BakeryAction_File_Open' />"
- " <menu action='BakeryAction_Menu_File_RecentFiles'>"
- " </menu>"
" <menuitem action='BakeryAction_File_Save' />"
" <menuitem action='BakeryAction_File_SaveAs' />"
" <separator/>"
@@ -268,9 +227,6 @@ void AppWindow_WithDoc_Gtk::init_menus_file()
//Add menu:
add_ui_from_string(ui_description);
-
- //Add recent-files submenu:
-
init_menus_file_recentfiles("/Bakery_MainMenu/Bakery_MenuPH_File/BakeryAction_Menu_File/BakeryAction_Menu_File_RecentFiles");
}
void AppWindow_WithDoc_Gtk::init_menus_edit()
diff --git a/glom/bakery/appwindow_withdoc_gtk.h b/glom/bakery/appwindow_withdoc_gtk.h
index f3d3a3b..7793324 100644
--- a/glom/bakery/appwindow_withdoc_gtk.h
+++ b/glom/bakery/appwindow_withdoc_gtk.h
@@ -72,7 +72,6 @@ public:
protected:
virtual void init_layout(); //Arranges the menu, toolbar, etc.
- void init_menus_file_recentfiles(const Glib::ustring& path); // call this in init_menus_file()
virtual void init_ui_manager(); //Override this to add more UI placeholders
virtual void init_menus(); //Override this to add more or different menus.
virtual void init_menus_file(); //Call this from init_menus() to add the standard file menu.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]