[Xfce4-commits] [panel-plugins/xfce4-whiskermenu-plugin] 205/473: Rename Menu class to Window.
noreply at xfce.org
noreply at xfce.org
Mon Feb 16 23:56:15 CET 2015
This is an automated email from the git hooks/post-receive script.
gottcode pushed a commit to branch master
in repository panel-plugins/xfce4-whiskermenu-plugin.
commit c66e5e9fdbf1689872d32cc650100a6d38dd454d
Author: Graeme Gott <graeme at gottcode.org>
Date: Thu Oct 31 11:19:37 2013 -0400
Rename Menu class to Window.
---
src/CMakeLists.txt | 4 +-
src/applications_page.cpp | 12 ++---
src/applications_page.hpp | 3 +-
src/configuration_dialog.cpp | 26 +++++-----
src/favorites_page.cpp | 8 ++--
src/favorites_page.hpp | 2 +-
src/list_page.cpp | 10 ++--
src/list_page.hpp | 2 +-
src/page.cpp | 22 ++++-----
src/page.hpp | 10 ++--
src/panel_plugin.cpp | 56 +++++++++++-----------
src/panel_plugin.hpp | 8 ++--
src/recent_page.cpp | 8 ++--
src/recent_page.hpp | 2 +-
src/search_page.cpp | 10 ++--
src/search_page.hpp | 2 +-
src/section_button.cpp | 9 +++-
src/section_button.hpp | 3 +-
src/{menu.cpp => window.cpp} | 108 +++++++++++++++++++++---------------------
src/{menu.hpp => window.hpp} | 40 ++++++++--------
20 files changed, 174 insertions(+), 171 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0f4c9f8..6e361c9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -69,7 +69,6 @@ add_library(whiskermenu MODULE
launcher_model.cpp
launcher_view.cpp
list_page.cpp
- menu.cpp
page.cpp
panel_plugin.cpp
query.cpp
@@ -77,7 +76,8 @@ add_library(whiskermenu MODULE
register_plugin.c
resizer_widget.cpp
search_page.cpp
- section_button.cpp)
+ section_button.cpp
+ window.cpp)
target_link_libraries(whiskermenu
${exo_LIBRARIES}
diff --git a/src/applications_page.cpp b/src/applications_page.cpp
index 7431ac0..77a3219 100644
--- a/src/applications_page.cpp
+++ b/src/applications_page.cpp
@@ -20,8 +20,8 @@
#include "launcher.hpp"
#include "launcher_model.hpp"
#include "launcher_view.hpp"
-#include "menu.hpp"
#include "section_button.hpp"
+#include "window.hpp"
#include <algorithm>
@@ -38,8 +38,8 @@ static bool f_load_hierarchy = false;
//-----------------------------------------------------------------------------
-ApplicationsPage::ApplicationsPage(Menu* menu) :
- Page(menu),
+ApplicationsPage::ApplicationsPage(Window* window) :
+ Page(window),
m_garcon_menu(NULL),
m_all_button(NULL),
m_model(NULL),
@@ -174,7 +174,7 @@ void ApplicationsPage::load_applications()
load_categories();
// Update menu items of other panels
- get_menu()->set_items();
+ get_window()->set_items();
m_loaded = true;
}
@@ -194,7 +194,7 @@ void ApplicationsPage::clear_applications()
m_categories.clear();
// Free menu items
- get_menu()->unset_items();
+ get_window()->unset_items();
unset_model();
for (std::map<std::string, Launcher*>::iterator i = m_items.begin(), end = m_items.end(); i != end; ++i)
@@ -322,7 +322,7 @@ void ApplicationsPage::load_categories()
}
// Add category buttons to window
- get_menu()->set_categories(category_buttons);
+ get_window()->set_categories(category_buttons);
}
//-----------------------------------------------------------------------------
diff --git a/src/applications_page.hpp b/src/applications_page.hpp
index 00a010c..5bd4982 100644
--- a/src/applications_page.hpp
+++ b/src/applications_page.hpp
@@ -34,14 +34,13 @@ namespace WhiskerMenu
class Category;
class Launcher;
class LauncherView;
-class Menu;
class SectionButton;
class ApplicationsPage : public Page
{
public:
- explicit ApplicationsPage(Menu* menu);
+ explicit ApplicationsPage(Window* window);
~ApplicationsPage();
Launcher* get_application(const std::string& desktop_id) const;
diff --git a/src/configuration_dialog.cpp b/src/configuration_dialog.cpp
index 7438994..229e7d0 100644
--- a/src/configuration_dialog.cpp
+++ b/src/configuration_dialog.cpp
@@ -21,9 +21,9 @@
#include "icon_size.hpp"
#include "launcher.hpp"
#include "launcher_view.hpp"
-#include "menu.hpp"
#include "panel_plugin.hpp"
#include "section_button.hpp"
+#include "window.hpp"
extern "C"
{
@@ -173,7 +173,7 @@ void ConfigurationDialog::toggle_show_description(GtkToggleButton* button)
void ConfigurationDialog::toggle_position_search_alternate(GtkToggleButton* button)
{
bool active = gtk_toggle_button_get_active(button);
- Menu::set_position_search_alternate(gtk_toggle_button_get_active(button));
+ Window::set_position_search_alternate(gtk_toggle_button_get_active(button));
gtk_widget_set_sensitive(GTK_WIDGET(m_position_commands_alternate), active);
m_plugin->reload();
}
@@ -182,7 +182,7 @@ void ConfigurationDialog::toggle_position_search_alternate(GtkToggleButton* butt
void ConfigurationDialog::toggle_position_commands_alternate(GtkToggleButton* button)
{
- Menu::set_position_commands_alternate(gtk_toggle_button_get_active(button));
+ Window::set_position_commands_alternate(gtk_toggle_button_get_active(button));
m_plugin->reload();
}
@@ -205,7 +205,7 @@ void ConfigurationDialog::toggle_remember_favorites(GtkToggleButton* button)
void ConfigurationDialog::toggle_display_recent(GtkToggleButton* button)
{
- Menu::set_display_recent(gtk_toggle_button_get_active(button));
+ Window::set_display_recent(gtk_toggle_button_get_active(button));
m_plugin->reload();
}
@@ -214,7 +214,7 @@ void ConfigurationDialog::toggle_display_recent(GtkToggleButton* button)
void ConfigurationDialog::settings_command_changed()
{
const gchar* text = gtk_entry_get_text(GTK_ENTRY(m_settings_command));
- m_plugin->get_menu()->set_settings_command(text ? text : "");
+ m_plugin->get_window()->set_settings_command(text ? text : "");
}
//-----------------------------------------------------------------------------
@@ -222,7 +222,7 @@ void ConfigurationDialog::settings_command_changed()
void ConfigurationDialog::lockscreen_command_changed()
{
const gchar* text = gtk_entry_get_text(GTK_ENTRY(m_lockscreen_command));
- m_plugin->get_menu()->set_lockscreen_command(text ? text : "");
+ m_plugin->get_window()->set_lockscreen_command(text ? text : "");
}
//-----------------------------------------------------------------------------
@@ -230,7 +230,7 @@ void ConfigurationDialog::lockscreen_command_changed()
void ConfigurationDialog::logout_command_changed()
{
const gchar* text = gtk_entry_get_text(GTK_ENTRY(m_logout_command));
- m_plugin->get_menu()->set_logout_command(text ? text : "");
+ m_plugin->get_window()->set_logout_command(text ? text : "");
}
//-----------------------------------------------------------------------------
@@ -276,13 +276,13 @@ GtkWidget* ConfigurationDialog::init_appearance_tab()
// Add option to use alternate search entry position
m_position_search_alternate = gtk_check_button_new_with_mnemonic(_("Position _search entry next to panel button"));
gtk_box_pack_start(appearance_vbox, m_position_search_alternate, true, true, 0);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_position_search_alternate), Menu::get_position_search_alternate());
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_position_search_alternate), Window::get_position_search_alternate());
g_signal_connect(m_position_search_alternate, "toggled", G_CALLBACK(ConfigurationDialog::toggle_position_search_alternate_slot), this);
// Add option to use alternate commands position
m_position_commands_alternate = gtk_check_button_new_with_mnemonic(_("Position commands next to search _entry"));
gtk_box_pack_start(appearance_vbox, m_position_commands_alternate, true, true, 0);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_position_commands_alternate), Menu::get_position_commands_alternate());
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_position_commands_alternate), Window::get_position_commands_alternate());
gtk_widget_set_sensitive(GTK_WIDGET(m_position_commands_alternate), gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_position_search_alternate)));
g_signal_connect(m_position_commands_alternate, "toggled", G_CALLBACK(ConfigurationDialog::toggle_position_commands_alternate_slot), this);
@@ -426,7 +426,7 @@ GtkWidget* ConfigurationDialog::init_behavior_tab()
// Add option to display recently used
m_display_recent = gtk_check_button_new_with_mnemonic(_("Display recently _used by default"));
gtk_box_pack_start(behavior_vbox, m_display_recent, true, true, 0);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_display_recent), Menu::get_display_recent());
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_display_recent), Window::get_display_recent());
g_signal_connect(m_display_recent, "toggled", G_CALLBACK(ConfigurationDialog::toggle_display_recent_slot), this);
return page;
@@ -455,7 +455,7 @@ GtkWidget* ConfigurationDialog::init_commands_tab()
gtk_size_group_add_widget(label_size_group, label);
m_settings_command = gtk_entry_new();
- gtk_entry_set_text(GTK_ENTRY(m_settings_command), m_plugin->get_menu()->get_settings_command().c_str());
+ gtk_entry_set_text(GTK_ENTRY(m_settings_command), m_plugin->get_window()->get_settings_command().c_str());
gtk_box_pack_start(hbox, m_settings_command, true, true, 0);
gtk_label_set_mnemonic_widget(GTK_LABEL(label), m_settings_command);
g_signal_connect(m_settings_command, "changed", G_CALLBACK(ConfigurationDialog::settings_command_changed_slot), this);
@@ -470,7 +470,7 @@ GtkWidget* ConfigurationDialog::init_commands_tab()
gtk_size_group_add_widget(label_size_group, label);
m_lockscreen_command = gtk_entry_new();
- gtk_entry_set_text(GTK_ENTRY(m_lockscreen_command), m_plugin->get_menu()->get_lockscreen_command().c_str());
+ gtk_entry_set_text(GTK_ENTRY(m_lockscreen_command), m_plugin->get_window()->get_lockscreen_command().c_str());
gtk_box_pack_start(hbox, m_lockscreen_command, true, true, 0);
gtk_label_set_mnemonic_widget(GTK_LABEL(label), m_lockscreen_command);
g_signal_connect(m_lockscreen_command, "changed", G_CALLBACK(ConfigurationDialog::lockscreen_command_changed_slot), this);
@@ -485,7 +485,7 @@ GtkWidget* ConfigurationDialog::init_commands_tab()
gtk_size_group_add_widget(label_size_group, label);
m_logout_command = gtk_entry_new();
- gtk_entry_set_text(GTK_ENTRY(m_logout_command), m_plugin->get_menu()->get_logout_command().c_str());
+ gtk_entry_set_text(GTK_ENTRY(m_logout_command), m_plugin->get_window()->get_logout_command().c_str());
gtk_box_pack_start(hbox, m_logout_command, true, true, 0);
gtk_label_set_mnemonic_widget(GTK_LABEL(label), m_logout_command);
g_signal_connect(m_logout_command, "changed", G_CALLBACK(ConfigurationDialog::logout_command_changed_slot), this);
diff --git a/src/favorites_page.cpp b/src/favorites_page.cpp
index 43ddc75..a36ea44 100644
--- a/src/favorites_page.cpp
+++ b/src/favorites_page.cpp
@@ -20,7 +20,7 @@
#include "launcher.hpp"
#include "launcher_model.hpp"
#include "launcher_view.hpp"
-#include "menu.hpp"
+#include "window.hpp"
#include <algorithm>
@@ -40,10 +40,10 @@ static const std::string default_favorites[4] =
//-----------------------------------------------------------------------------
-FavoritesPage::FavoritesPage(XfceRc* settings, Menu* menu) :
+FavoritesPage::FavoritesPage(XfceRc* settings, Window* window) :
ListPage(settings, "favorites",
std::vector<std::string>(default_favorites, default_favorites + 4),
- menu)
+ window)
{
get_view()->set_reorderable(true);
}
@@ -113,7 +113,7 @@ void FavoritesPage::sort(std::vector<Launcher*>& items) const
const std::vector<std::string>& desktop_ids = get_desktop_ids();
for (std::vector<std::string>::const_iterator i = desktop_ids.begin(), end = desktop_ids.end(); i != end; ++i)
{
- Launcher* launcher = get_menu()->get_applications()->get_application(*i);
+ Launcher* launcher = get_window()->get_applications()->get_application(*i);
if (!launcher)
{
continue;
diff --git a/src/favorites_page.hpp b/src/favorites_page.hpp
index 6122b6e..82337d8 100644
--- a/src/favorites_page.hpp
+++ b/src/favorites_page.hpp
@@ -27,7 +27,7 @@ class Launcher;
class FavoritesPage : public ListPage
{
public:
- FavoritesPage(XfceRc* settings, Menu* menu);
+ FavoritesPage(XfceRc* settings, Window* window);
void add(Launcher* launcher);
diff --git a/src/list_page.cpp b/src/list_page.cpp
index 8ca1633..9fcc3d7 100644
--- a/src/list_page.cpp
+++ b/src/list_page.cpp
@@ -20,7 +20,7 @@
#include "launcher.hpp"
#include "launcher_model.hpp"
#include "launcher_view.hpp"
-#include "menu.hpp"
+#include "window.hpp"
#include <algorithm>
@@ -28,8 +28,8 @@ using namespace WhiskerMenu;
//-----------------------------------------------------------------------------
-ListPage::ListPage(XfceRc* rc, const gchar* key, const std::vector<std::string>& default_desktop_ids, Menu* menu) :
- Page(menu),
+ListPage::ListPage(XfceRc* rc, const gchar* key, const std::vector<std::string>& default_desktop_ids, Window* window) :
+ Page(window),
m_key(key)
{
if (!rc || !xfce_rc_has_entry(rc, key))
@@ -110,7 +110,7 @@ void ListPage::set_menu_items()
continue;
}
- Launcher* launcher = get_menu()->get_applications()->get_application(*i);
+ Launcher* launcher = get_window()->get_applications()->get_application(*i);
if (launcher)
{
model.append_item(launcher);
@@ -163,7 +163,7 @@ void ListPage::on_row_changed(GtkTreeModel* model, GtkTreePath* path, GtkTreeIte
if (launcher)
{
m_desktop_ids[pos] = launcher->get_desktop_id();
- get_menu()->set_modified(); // Handle favorites being rearranged
+ get_window()->set_modified(); // Handle favorites being rearranged
}
}
diff --git a/src/list_page.hpp b/src/list_page.hpp
index bb329a8..5894944 100644
--- a/src/list_page.hpp
+++ b/src/list_page.hpp
@@ -37,7 +37,7 @@ class LauncherView;
class ListPage : public Page
{
public:
- ListPage(XfceRc* settings, const gchar* key, const std::vector<std::string>& default_desktop_ids, Menu* menu);
+ ListPage(XfceRc* settings, const gchar* key, const std::vector<std::string>& default_desktop_ids, Window* window);
~ListPage();
bool contains(Launcher* launcher) const;
diff --git a/src/page.cpp b/src/page.cpp
index ad423fe..b776eb0 100644
--- a/src/page.cpp
+++ b/src/page.cpp
@@ -20,8 +20,8 @@
#include "launcher.hpp"
#include "launcher_model.hpp"
#include "launcher_view.hpp"
-#include "menu.hpp"
#include "recent_page.hpp"
+#include "window.hpp"
extern "C"
{
@@ -32,8 +32,8 @@ using namespace WhiskerMenu;
//-----------------------------------------------------------------------------
-Page::Page(Menu* menu) :
- m_menu(menu),
+Page::Page(Window* window) :
+ m_window(window),
m_selected_path(NULL)
{
// Create view
@@ -41,7 +41,7 @@ Page::Page(Menu* menu) :
g_signal_connect(m_view->get_widget(), "button-press-event", G_CALLBACK(Page::view_button_press_event_slot), this);
g_signal_connect(m_view->get_widget(), "popup-menu", G_CALLBACK(Page::view_popup_menu_event_slot), this);
g_signal_connect(m_view->get_widget(), "row-activated", G_CALLBACK(Page::launcher_activated_slot), this);
- g_signal_connect_swapped(m_view->get_widget(), "start-interactive-search", G_CALLBACK(gtk_widget_grab_focus), m_menu->get_search_entry());
+ g_signal_connect_swapped(m_view->get_widget(), "start-interactive-search", G_CALLBACK(gtk_widget_grab_focus), m_window->get_search_entry());
// Add scrolling to view
m_widget = gtk_scrolled_window_new(NULL, NULL);
@@ -124,11 +124,11 @@ void Page::launcher_activated(GtkTreeView* view, GtkTreePath* path)
// Add to recent
if (remember_launcher(launcher))
{
- m_menu->get_recent()->add(launcher);
+ m_window->get_recent()->add(launcher);
}
// Hide window
- m_menu->hide();
+ m_window->hide();
// Execute app
launcher->run(gtk_widget_get_screen(GTK_WIDGET(view)));
@@ -189,7 +189,7 @@ void Page::create_context_menu(GtkTreeIter* iter, GdkEventButton* event)
menuitem = gtk_separator_menu_item_new();
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
- if (!m_menu->get_favorites()->contains(launcher))
+ if (!m_window->get_favorites()->contains(launcher))
{
menuitem = gtk_image_menu_item_new_with_label(_("Add to Favorites"));
GtkWidget* image = gtk_image_new_from_icon_name("stock_add-bookmark", GTK_ICON_SIZE_MENU);
@@ -359,8 +359,8 @@ void Page::add_selected_to_favorites()
{
Launcher* launcher = get_selected_launcher();
g_assert(launcher != NULL);
- m_menu->get_favorites()->add(launcher);
- m_menu->set_modified();
+ m_window->get_favorites()->add(launcher);
+ m_window->set_modified();
}
//-----------------------------------------------------------------------------
@@ -369,8 +369,8 @@ void Page::remove_selected_from_favorites()
{
Launcher* launcher = get_selected_launcher();
g_assert(launcher != NULL);
- m_menu->get_favorites()->remove(launcher);
- m_menu->set_modified();
+ m_window->get_favorites()->remove(launcher);
+ m_window->set_modified();
}
//-----------------------------------------------------------------------------
diff --git a/src/page.hpp b/src/page.hpp
index cb04fc1..5eb89b4 100644
--- a/src/page.hpp
+++ b/src/page.hpp
@@ -28,12 +28,12 @@ namespace WhiskerMenu
class FavoritesPage;
class Launcher;
class LauncherView;
-class Menu;
+class Window;
class Page
{
public:
- explicit Page(Menu* menu);
+ explicit Page(WhiskerMenu::Window *window);
virtual ~Page();
GtkWidget* get_widget() const
@@ -49,9 +49,9 @@ public:
void reset_selection();
protected:
- Menu* get_menu() const
+ Window* get_window() const
{
- return m_menu;
+ return m_window;
}
private:
@@ -71,7 +71,7 @@ private:
static void position_context_menu(GtkMenu*, gint* x, gint* y, gboolean* push_in, Page* page);
private:
- Menu* m_menu;
+ Window* m_window;
GtkWidget* m_widget;
LauncherView* m_view;
GtkTreePath* m_selected_path;
diff --git a/src/panel_plugin.cpp b/src/panel_plugin.cpp
index fbe12c1..c3a5ccc 100644
--- a/src/panel_plugin.cpp
+++ b/src/panel_plugin.cpp
@@ -22,8 +22,8 @@
#include "icon_size.hpp"
#include "launcher.hpp"
#include "launcher_view.hpp"
-#include "menu.hpp"
#include "section_button.hpp"
+#include "window.hpp"
using namespace WhiskerMenu;
@@ -45,7 +45,7 @@ static void whiskermenu_free(XfcePanelPlugin*, PanelPlugin* whiskermenu)
PanelPlugin::PanelPlugin(XfcePanelPlugin* plugin) :
m_plugin(plugin),
- m_menu(NULL),
+ m_window(NULL),
m_button_title(get_button_title_default()),
m_button_icon_name("xfce4-whiskermenu"),
m_button_title_visible(false),
@@ -69,22 +69,22 @@ PanelPlugin::PanelPlugin(XfcePanelPlugin* plugin) :
LauncherView::set_icon_size(xfce_rc_read_int_entry(settings, "item-icon-size", LauncherView::get_icon_size()));
ApplicationsPage::set_load_hierarchy(xfce_rc_read_bool_entry(settings, "load-hierarchy", ApplicationsPage::get_load_hierarchy()));
FavoritesPage::set_remember_favorites(xfce_rc_read_bool_entry(settings, "favorites-in-recent", FavoritesPage::get_remember_favorites()));
- Menu::set_display_recent(xfce_rc_read_bool_entry(settings, "display-recent-default", Menu::get_display_recent()));
- Menu::set_position_search_alternate(xfce_rc_read_bool_entry(settings, "position-search-alternate", Menu::get_position_search_alternate()));
- Menu::set_position_commands_alternate(xfce_rc_read_bool_entry(settings, "position-commands-alternate", Menu::get_position_commands_alternate()));
+ Window::set_display_recent(xfce_rc_read_bool_entry(settings, "display-recent-default", Window::get_display_recent()));
+ Window::set_position_search_alternate(xfce_rc_read_bool_entry(settings, "position-search-alternate", Window::get_position_search_alternate()));
+ Window::set_position_commands_alternate(xfce_rc_read_bool_entry(settings, "position-commands-alternate", Window::get_position_commands_alternate()));
- m_menu = new Menu(settings);
- m_menu->set_settings_command(xfce_rc_read_entry(settings, "command-settings", m_menu->get_settings_command().c_str()));
- m_menu->set_lockscreen_command(xfce_rc_read_entry(settings, "command-lockscreen", m_menu->get_lockscreen_command().c_str()));
- m_menu->set_logout_command(xfce_rc_read_entry(settings, "command-logout", m_menu->get_logout_command().c_str()));
+ m_window = new Window(settings);
+ m_window->set_settings_command(xfce_rc_read_entry(settings, "command-settings", m_window->get_settings_command().c_str()));
+ m_window->set_lockscreen_command(xfce_rc_read_entry(settings, "command-lockscreen", m_window->get_lockscreen_command().c_str()));
+ m_window->set_logout_command(xfce_rc_read_entry(settings, "command-logout", m_window->get_logout_command().c_str()));
xfce_rc_close(settings);
}
else
{
- m_menu = new Menu(NULL);
+ m_window = new Window(NULL);
}
- g_signal_connect(m_menu->get_widget(), "unmap", G_CALLBACK(PanelPlugin::menu_hidden_slot), this);
+ g_signal_connect(m_window->get_widget(), "unmap", G_CALLBACK(PanelPlugin::menu_hidden_slot), this);
// Prevent empty panel button
if (!m_button_icon_visible)
@@ -148,8 +148,8 @@ PanelPlugin::~PanelPlugin()
{
save();
- delete m_menu;
- m_menu = NULL;
+ delete m_window;
+ m_window = NULL;
gtk_widget_destroy(m_button);
}
@@ -165,8 +165,8 @@ std::string PanelPlugin::get_button_title_default()
void PanelPlugin::reload()
{
- m_menu->hide();
- m_menu->get_applications()->invalidate_applications();
+ m_window->hide();
+ m_window->get_applications()->invalidate_applications();
}
//-----------------------------------------------------------------------------
@@ -239,7 +239,7 @@ bool PanelPlugin::button_clicked(GdkEventButton* event)
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_button)) == true)
{
- m_menu->hide();
+ m_window->hide();
}
else
{
@@ -255,7 +255,7 @@ void PanelPlugin::menu_hidden()
{
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_button), false);
xfce_panel_plugin_block_autohide(m_plugin, false);
- if (m_menu->get_modified())
+ if (m_window->get_modified())
{
save();
}
@@ -287,9 +287,9 @@ bool PanelPlugin::remote_event(gchar* name, GValue* value)
return false;
}
- if (gtk_widget_get_visible(m_menu->get_widget()))
+ if (gtk_widget_get_visible(m_window->get_widget()))
{
- m_menu->hide();
+ m_window->hide();
}
else
{
@@ -322,13 +322,13 @@ void PanelPlugin::save()
xfce_rc_write_int_entry(settings, "item-icon-size", LauncherView::get_icon_size());
xfce_rc_write_bool_entry(settings, "load-hierarchy", ApplicationsPage::get_load_hierarchy());
xfce_rc_write_bool_entry(settings, "favorites-in-recent", FavoritesPage::get_remember_favorites());
- xfce_rc_write_bool_entry(settings, "display-recent-default", Menu::get_display_recent());
- xfce_rc_write_bool_entry(settings, "position-search-alternate", Menu::get_position_search_alternate());
- xfce_rc_write_bool_entry(settings, "position-commands-alternate", Menu::get_position_commands_alternate());
- xfce_rc_write_entry(settings, "command-settings", m_menu->get_settings_command().c_str());
- xfce_rc_write_entry(settings, "command-lockscreen", m_menu->get_lockscreen_command().c_str());
- xfce_rc_write_entry(settings, "command-logout", m_menu->get_logout_command().c_str());
- m_menu->save(settings);
+ xfce_rc_write_bool_entry(settings, "display-recent-default", Window::get_display_recent());
+ xfce_rc_write_bool_entry(settings, "position-search-alternate", Window::get_position_search_alternate());
+ xfce_rc_write_bool_entry(settings, "position-commands-alternate", Window::get_position_commands_alternate());
+ xfce_rc_write_entry(settings, "command-settings", m_window->get_settings_command().c_str());
+ xfce_rc_write_entry(settings, "command-lockscreen", m_window->get_lockscreen_command().c_str());
+ xfce_rc_write_entry(settings, "command-logout", m_window->get_logout_command().c_str());
+ m_window->save(settings);
xfce_rc_close(settings);
}
@@ -397,11 +397,11 @@ void PanelPlugin::popup_menu(bool at_cursor)
{
xfce_panel_plugin_block_autohide(m_plugin, true);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_button), true);
- m_menu->show(m_button, xfce_panel_plugin_get_orientation(m_plugin) == GTK_ORIENTATION_HORIZONTAL);
+ m_window->show(m_button, xfce_panel_plugin_get_orientation(m_plugin) == GTK_ORIENTATION_HORIZONTAL);
}
else
{
- m_menu->show(NULL, true);
+ m_window->show(NULL, true);
}
}
diff --git a/src/panel_plugin.hpp b/src/panel_plugin.hpp
index f9f571d..88b71d9 100644
--- a/src/panel_plugin.hpp
+++ b/src/panel_plugin.hpp
@@ -28,7 +28,7 @@ extern "C"
namespace WhiskerMenu
{
-class Menu;
+class Window;
class PanelPlugin
{
@@ -48,9 +48,9 @@ public:
ShowIconAndText = ShowIcon | ShowText
};
- Menu* get_menu() const
+ Window* get_window() const
{
- return m_menu;
+ return m_window;
}
ButtonStyle get_button_style() const
@@ -88,7 +88,7 @@ private:
private:
XfcePanelPlugin* m_plugin;
- Menu* m_menu;
+ Window* m_window;
std::string m_button_title;
std::string m_button_icon_name;
diff --git a/src/recent_page.cpp b/src/recent_page.cpp
index 2004791..ab45d1b 100644
--- a/src/recent_page.cpp
+++ b/src/recent_page.cpp
@@ -19,14 +19,14 @@
#include "launcher.hpp"
#include "launcher_model.hpp"
#include "launcher_view.hpp"
-#include "menu.hpp"
+#include "window.hpp"
using namespace WhiskerMenu;
//-----------------------------------------------------------------------------
-RecentPage::RecentPage(XfceRc* settings, Menu* menu) :
- ListPage(settings, "recent", std::vector<std::string>(), menu),
+RecentPage::RecentPage(XfceRc* settings, Window* window) :
+ ListPage(settings, "recent", std::vector<std::string>(), window),
m_max_items(10)
{
// Prevent going over max
@@ -84,7 +84,7 @@ void RecentPage::clear_menu()
{
model.remove_first_item();
}
- get_menu()->set_modified();
+ get_window()->set_modified();
}
//-----------------------------------------------------------------------------
diff --git a/src/recent_page.hpp b/src/recent_page.hpp
index 1ec588a..0d575f8 100644
--- a/src/recent_page.hpp
+++ b/src/recent_page.hpp
@@ -28,7 +28,7 @@ class LauncherView;
class RecentPage : public ListPage
{
public:
- RecentPage(XfceRc* settings, Menu* menu);
+ RecentPage(XfceRc* settings, Window* window);
void add(Launcher* launcher);
diff --git a/src/search_page.cpp b/src/search_page.cpp
index 79b1025..c91989d 100644
--- a/src/search_page.cpp
+++ b/src/search_page.cpp
@@ -19,7 +19,7 @@
#include "launcher.hpp"
#include "launcher_model.hpp"
#include "launcher_view.hpp"
-#include "menu.hpp"
+#include "window.hpp"
extern "C"
{
@@ -30,16 +30,16 @@ using namespace WhiskerMenu;
//-----------------------------------------------------------------------------
-SearchPage::SearchPage(Menu* menu) :
- Page(menu),
+SearchPage::SearchPage(Window* window) :
+ Page(window),
m_filter_model(NULL),
m_sort_model(NULL),
m_current_results(NULL)
{
get_view()->set_selection_mode(GTK_SELECTION_BROWSE);
- g_signal_connect(menu->get_search_entry(), "icon-release", G_CALLBACK(SearchPage::clear_search_slot), this);
- g_signal_connect(menu->get_search_entry(), "key-press-event", G_CALLBACK(SearchPage::search_entry_key_press_slot), this);
+ g_signal_connect(window->get_search_entry(), "icon-release", G_CALLBACK(SearchPage::clear_search_slot), this);
+ g_signal_connect(window->get_search_entry(), "key-press-event", G_CALLBACK(SearchPage::search_entry_key_press_slot), this);
}
//-----------------------------------------------------------------------------
diff --git a/src/search_page.hpp b/src/search_page.hpp
index 8439de4..765b870 100644
--- a/src/search_page.hpp
+++ b/src/search_page.hpp
@@ -32,7 +32,7 @@ class LauncherView;
class SearchPage : public Page
{
public:
- explicit SearchPage(Menu* menu);
+ explicit SearchPage(Window* window);
~SearchPage();
void set_filter(const gchar* filter);
diff --git a/src/section_button.cpp b/src/section_button.cpp
index 844f9fc..d6fbf1d 100644
--- a/src/section_button.cpp
+++ b/src/section_button.cpp
@@ -18,6 +18,11 @@
#include "icon_size.hpp"
+extern "C"
+{
+#include <libxfce4panel/libxfce4panel.h>
+}
+
using namespace WhiskerMenu;
//-----------------------------------------------------------------------------
@@ -56,7 +61,7 @@ SectionButton::SectionButton(const gchar* icon, const gchar* text)
GtkBox* box = GTK_BOX(gtk_hbox_new(false, 4));
gtk_container_add(GTK_CONTAINER(m_button), GTK_WIDGET(box));
- m_icon = XFCE_PANEL_IMAGE(xfce_panel_image_new_from_source(icon));
+ m_icon = xfce_panel_image_new_from_source(icon);
reload_icon_size();
gtk_box_pack_start(box, GTK_WIDGET(m_icon), false, false, 0);
@@ -75,7 +80,7 @@ SectionButton::~SectionButton()
void SectionButton::reload_icon_size()
{
- xfce_panel_image_set_size(m_icon, f_icon_size.get_size());
+ xfce_panel_image_set_size(XFCE_PANEL_IMAGE(m_icon), f_icon_size.get_size());
}
//-----------------------------------------------------------------------------
diff --git a/src/section_button.hpp b/src/section_button.hpp
index daa06c3..e77c512 100644
--- a/src/section_button.hpp
+++ b/src/section_button.hpp
@@ -20,7 +20,6 @@
extern "C"
{
#include <gtk/gtk.h>
-#include <libxfce4panel/libxfce4panel.h>
}
namespace WhiskerMenu
@@ -66,7 +65,7 @@ public:
private:
GtkRadioButton* m_button;
- XfcePanelImage* m_icon;
+ GtkWidget* m_icon;
};
}
diff --git a/src/menu.cpp b/src/window.cpp
similarity index 90%
rename from src/menu.cpp
rename to src/window.cpp
index e3ed2d0..5599e5c 100644
--- a/src/menu.cpp
+++ b/src/window.cpp
@@ -14,7 +14,7 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#include "menu.hpp"
+#include "window.hpp"
#include "applications_page.hpp"
#include "command_button.hpp"
@@ -38,13 +38,13 @@ using namespace WhiskerMenu;
//-----------------------------------------------------------------------------
-bool Menu::m_display_recent = false;
-bool Menu::m_position_search_alternate = false;
-bool Menu::m_position_commands_alternate = false;
+bool Window::m_display_recent = false;
+bool Window::m_position_search_alternate = false;
+bool Window::m_position_commands_alternate = false;
//-----------------------------------------------------------------------------
-Menu::Menu(XfceRc* settings) :
+Window::Window(XfceRc* settings) :
m_window(NULL),
m_layout_left(true),
m_layout_bottom(true),
@@ -66,14 +66,14 @@ Menu::Menu(XfceRc* settings) :
gtk_window_set_skip_pager_hint(m_window, true);
gtk_window_stick(m_window);
gtk_widget_add_events(GTK_WIDGET(m_window), GDK_BUTTON_PRESS_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_STRUCTURE_MASK);
- g_signal_connect(m_window, "enter-notify-event", G_CALLBACK(Menu::on_enter_notify_event_slot), this);
- g_signal_connect(m_window, "leave-notify-event", G_CALLBACK(Menu::on_leave_notify_event_slot), this);
+ g_signal_connect(m_window, "enter-notify-event", G_CALLBACK(Window::on_enter_notify_event_slot), this);
+ g_signal_connect(m_window, "leave-notify-event", G_CALLBACK(Window::on_leave_notify_event_slot), this);
g_signal_connect(m_window, "focus-in-event", G_CALLBACK(on_focus_in_event_slot), this);
- g_signal_connect(m_window, "button-press-event", G_CALLBACK(Menu::on_button_press_event_slot), this);
- g_signal_connect(m_window, "key-press-event", G_CALLBACK(Menu::on_key_press_event_slot), this);
- g_signal_connect_after(m_window, "key-press-event", G_CALLBACK(Menu::on_key_press_event_after_slot), this);
- g_signal_connect(m_window, "map-event", G_CALLBACK(Menu::on_map_event_slot), this);
- g_signal_connect(m_window, "configure-event", G_CALLBACK(Menu::on_configure_event_slot), this);
+ g_signal_connect(m_window, "button-press-event", G_CALLBACK(Window::on_button_press_event_slot), this);
+ g_signal_connect(m_window, "key-press-event", G_CALLBACK(Window::on_key_press_event_slot), this);
+ g_signal_connect_after(m_window, "key-press-event", G_CALLBACK(Window::on_key_press_event_after_slot), this);
+ g_signal_connect(m_window, "map-event", G_CALLBACK(Window::on_map_event_slot), this);
+ g_signal_connect(m_window, "configure-event", G_CALLBACK(Window::on_configure_event_slot), this);
// Create the border of the window
GtkWidget* frame = gtk_frame_new(NULL);
@@ -94,13 +94,13 @@ Menu::Menu(XfceRc* settings) :
// Create action buttons
m_settings_button = new CommandButton("preferences-desktop", _("All Settings"), "xfce4-settings-manager", _("Failed to open settings manager."));
- g_signal_connect_swapped(m_settings_button->get_widget(), "clicked", G_CALLBACK(Menu::hide_slot), this);
+ g_signal_connect_swapped(m_settings_button->get_widget(), "clicked", G_CALLBACK(Window::hide_slot), this);
m_lockscreen_button = new CommandButton("system-lock-screen", _("Lock Screen"), "xflock4", _("Failed to lock screen."));
- g_signal_connect_swapped(m_lockscreen_button->get_widget(), "clicked", G_CALLBACK(Menu::hide_slot), this);
+ g_signal_connect_swapped(m_lockscreen_button->get_widget(), "clicked", G_CALLBACK(Window::hide_slot), this);
m_logout_button = new CommandButton("system-log-out", _("Log Out"), "xfce4-session-logout", _("Failed to log out."));
- g_signal_connect_swapped(m_logout_button->get_widget(), "clicked", G_CALLBACK(Menu::hide_slot), this);
+ g_signal_connect_swapped(m_logout_button->get_widget(), "clicked", G_CALLBACK(Window::hide_slot), this);
m_resizer = new ResizerWidget(m_window);
@@ -108,20 +108,20 @@ Menu::Menu(XfceRc* settings) :
m_search_entry = GTK_ENTRY(gtk_entry_new());
gtk_entry_set_icon_from_stock(m_search_entry, GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_FIND);
gtk_entry_set_icon_activatable(m_search_entry, GTK_ENTRY_ICON_SECONDARY, false);
- g_signal_connect(m_search_entry, "changed", G_CALLBACK(Menu::search_slot), this);
+ g_signal_connect(m_search_entry, "changed", G_CALLBACK(Window::search_slot), this);
// Create favorites
m_favorites = new FavoritesPage(settings, this);
m_favorites_button = new SectionButton("user-bookmarks", _("Favorites"));
- g_signal_connect(m_favorites_button->get_button(), "toggled", G_CALLBACK(Menu::favorites_toggled_slot), this);
+ g_signal_connect(m_favorites_button->get_button(), "toggled", G_CALLBACK(Window::favorites_toggled_slot), this);
// Create recent
m_recent = new RecentPage(settings, this);
m_recent_button = new SectionButton("document-open-recent", _("Recently Used"));
m_recent_button->set_group(m_favorites_button->get_group());
- g_signal_connect(m_recent_button->get_button(), "toggled", G_CALLBACK(Menu::recent_toggled_slot), this);
+ g_signal_connect(m_recent_button->get_button(), "toggled", G_CALLBACK(Window::recent_toggled_slot), this);
// Create applications
m_applications = new ApplicationsPage(this);
@@ -224,7 +224,7 @@ Menu::Menu(XfceRc* settings) :
//-----------------------------------------------------------------------------
-Menu::~Menu()
+Window::~Window()
{
delete m_applications;
delete m_search_results;
@@ -241,7 +241,7 @@ Menu::~Menu()
//-----------------------------------------------------------------------------
-void Menu::hide()
+void Window::hide()
{
gdk_pointer_ungrab(gtk_get_current_event_time());
@@ -269,7 +269,7 @@ void Menu::hide()
//-----------------------------------------------------------------------------
-void Menu::show(GtkWidget* parent, bool horizontal)
+void Window::show(GtkWidget* parent, bool horizontal)
{
// Make sure icon sizes are correct
m_favorites_button->reload_icon_size();
@@ -539,7 +539,7 @@ void Menu::show(GtkWidget* parent, bool horizontal)
//-----------------------------------------------------------------------------
-void Menu::save(XfceRc* settings)
+void Window::save(XfceRc* settings)
{
if (settings)
{
@@ -553,13 +553,13 @@ void Menu::save(XfceRc* settings)
//-----------------------------------------------------------------------------
-void Menu::set_categories(const std::vector<SectionButton*>& categories)
+void Window::set_categories(const std::vector<SectionButton*>& categories)
{
for (std::vector<SectionButton*>::const_iterator i = categories.begin(), end = categories.end(); i != end; ++i)
{
(*i)->set_group(m_recent_button->get_group());
gtk_box_pack_start(m_sidebar_box, GTK_WIDGET((*i)->get_button()), false, false, 0);
- g_signal_connect((*i)->get_button(), "toggled", G_CALLBACK(Menu::category_toggled_slot), this);
+ g_signal_connect((*i)->get_button(), "toggled", G_CALLBACK(Window::category_toggled_slot), this);
}
gtk_widget_show_all(GTK_WIDGET(m_sidebar_box));
@@ -568,7 +568,7 @@ void Menu::set_categories(const std::vector<SectionButton*>& categories)
//-----------------------------------------------------------------------------
-void Menu::set_items()
+void Window::set_items()
{
m_search_results->set_menu_items(m_applications->get_model());
m_favorites->set_menu_items();
@@ -576,19 +576,19 @@ void Menu::set_items()
// Handle switching to favorites are added
GtkTreeModel* favorites_model = m_favorites->get_view()->get_model();
- g_signal_connect(favorites_model, "row-inserted", G_CALLBACK(Menu::show_favorites_slot), this);
+ g_signal_connect(favorites_model, "row-inserted", G_CALLBACK(Window::show_favorites_slot), this);
}
//-----------------------------------------------------------------------------
-void Menu::set_modified()
+void Window::set_modified()
{
m_modified = true;
}
//-----------------------------------------------------------------------------
-void Menu::unset_items()
+void Window::unset_items()
{
m_search_results->unset_menu_items();
m_favorites->unset_menu_items();
@@ -597,7 +597,7 @@ void Menu::unset_items()
//-----------------------------------------------------------------------------
-bool Menu::on_enter_notify_event(GdkEventCrossing* event)
+bool Window::on_enter_notify_event(GdkEventCrossing* event)
{
if ( (event->detail == GDK_NOTIFY_INFERIOR)
|| (event->mode == GDK_CROSSING_GRAB)
@@ -621,77 +621,77 @@ bool Menu::on_enter_notify_event(GdkEventCrossing* event)
//-----------------------------------------------------------------------------
-std::string Menu::get_settings_command()
+std::string Window::get_settings_command()
{
return m_settings_button->get_command();
}
//-----------------------------------------------------------------------------
-std::string Menu::get_lockscreen_command()
+std::string Window::get_lockscreen_command()
{
return m_lockscreen_button->get_command();
}
//-----------------------------------------------------------------------------
-std::string Menu::get_logout_command()
+std::string Window::get_logout_command()
{
return m_logout_button->get_command();
}
//-----------------------------------------------------------------------------
-void Menu::set_settings_command(const std::string& command)
+void Window::set_settings_command(const std::string& command)
{
m_settings_button->set_command(command);
}
//-----------------------------------------------------------------------------
-void Menu::set_lockscreen_command(const std::string& command)
+void Window::set_lockscreen_command(const std::string& command)
{
m_lockscreen_button->set_command(command);
}
//-----------------------------------------------------------------------------
-void Menu::set_logout_command(const std::string& command)
+void Window::set_logout_command(const std::string& command)
{
m_logout_button->set_command(command);
}
//-----------------------------------------------------------------------------
-bool Menu::get_display_recent()
+bool Window::get_display_recent()
{
return m_display_recent;
}
//-----------------------------------------------------------------------------
-bool Menu::get_position_search_alternate()
+bool Window::get_position_search_alternate()
{
return m_position_search_alternate;
}
//-----------------------------------------------------------------------------
-bool Menu::get_position_commands_alternate()
+bool Window::get_position_commands_alternate()
{
return m_position_commands_alternate;
}
//-----------------------------------------------------------------------------
-void Menu::set_display_recent(bool display)
+void Window::set_display_recent(bool display)
{
m_display_recent = display;
}
//-----------------------------------------------------------------------------
-void Menu::set_position_search_alternate(bool alternate)
+void Window::set_position_search_alternate(bool alternate)
{
m_position_search_alternate = alternate;
if (!alternate)
@@ -702,14 +702,14 @@ void Menu::set_position_search_alternate(bool alternate)
//-----------------------------------------------------------------------------
-void Menu::set_position_commands_alternate(bool alternate)
+void Window::set_position_commands_alternate(bool alternate)
{
m_position_commands_alternate = alternate && m_position_search_alternate;
}
//-----------------------------------------------------------------------------
-bool Menu::on_leave_notify_event(GdkEventCrossing* event)
+bool Window::on_leave_notify_event(GdkEventCrossing* event)
{
if ( (event->detail == GDK_NOTIFY_INFERIOR)
|| (event->mode != GDK_CROSSING_NORMAL) )
@@ -734,7 +734,7 @@ bool Menu::on_leave_notify_event(GdkEventCrossing* event)
//-----------------------------------------------------------------------------
-bool Menu::on_focus_in_event()
+bool Window::on_focus_in_event()
{
gdk_pointer_grab(gtk_widget_get_window(GTK_WIDGET(m_window)), true,
GdkEventMask(
@@ -747,7 +747,7 @@ bool Menu::on_focus_in_event()
//-----------------------------------------------------------------------------
-bool Menu::on_button_press_event(GdkEventButton* event)
+bool Window::on_button_press_event(GdkEventButton* event)
{
// Hide menu if user clicks outside
if ((event->x_root <= m_geometry.x) || (event->x_root >= m_geometry.x + m_geometry.width)
@@ -760,7 +760,7 @@ bool Menu::on_button_press_event(GdkEventButton* event)
//-----------------------------------------------------------------------------
-bool Menu::on_key_press_event(GtkWidget* widget, GdkEventKey* event)
+bool Window::on_key_press_event(GtkWidget* widget, GdkEventKey* event)
{
// Hide if escape is pressed and there is no text in search entry
if ( (event->keyval == GDK_Escape) && exo_str_is_empty(gtk_entry_get_text(m_search_entry)) )
@@ -801,7 +801,7 @@ bool Menu::on_key_press_event(GtkWidget* widget, GdkEventKey* event)
//-----------------------------------------------------------------------------
-bool Menu::on_key_press_event_after(GtkWidget* widget, GdkEventKey* event)
+bool Window::on_key_press_event_after(GtkWidget* widget, GdkEventKey* event)
{
// Pass unhandled key presses to search entry
GtkWidget* search_entry = GTK_WIDGET(m_search_entry);
@@ -816,7 +816,7 @@ bool Menu::on_key_press_event_after(GtkWidget* widget, GdkEventKey* event)
//-----------------------------------------------------------------------------
-bool Menu::on_map_event()
+bool Window::on_map_event()
{
m_favorites->reset_selection();
@@ -838,7 +838,7 @@ bool Menu::on_map_event()
//-----------------------------------------------------------------------------
-bool Menu::on_configure_event(GdkEventConfigure* event)
+bool Window::on_configure_event(GdkEventConfigure* event)
{
if (event->width && event->height)
{
@@ -852,7 +852,7 @@ bool Menu::on_configure_event(GdkEventConfigure* event)
//-----------------------------------------------------------------------------
-void Menu::favorites_toggled()
+void Window::favorites_toggled()
{
m_favorites->reset_selection();
gtk_widget_hide(m_recent->get_widget());
@@ -863,7 +863,7 @@ void Menu::favorites_toggled()
//-----------------------------------------------------------------------------
-void Menu::recent_toggled()
+void Window::recent_toggled()
{
m_recent->reset_selection();
gtk_widget_hide(m_favorites->get_widget());
@@ -874,7 +874,7 @@ void Menu::recent_toggled()
//-----------------------------------------------------------------------------
-void Menu::category_toggled()
+void Window::category_toggled()
{
m_applications->reset_selection();
gtk_widget_hide(m_favorites->get_widget());
@@ -885,7 +885,7 @@ void Menu::category_toggled()
//-----------------------------------------------------------------------------
-void Menu::show_favorites()
+void Window::show_favorites()
{
// Switch to favorites panel
m_favorites_button->set_active(true);
@@ -897,7 +897,7 @@ void Menu::show_favorites()
//-----------------------------------------------------------------------------
-void Menu::show_default_page()
+void Window::show_default_page()
{
// Switch to favorites panel
m_default_button->set_active(true);
@@ -909,7 +909,7 @@ void Menu::show_default_page()
//-----------------------------------------------------------------------------
-void Menu::search()
+void Window::search()
{
// Fetch search string
gchar* filter_string = NULL;
diff --git a/src/menu.hpp b/src/window.hpp
similarity index 86%
rename from src/menu.hpp
rename to src/window.hpp
index 86b16df..5a23107 100644
--- a/src/menu.hpp
+++ b/src/window.hpp
@@ -14,8 +14,8 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#ifndef WHISKERMENU_MENU_HPP
-#define WHISKERMENU_MENU_HPP
+#ifndef WHISKERMENU_WINDOW_HPP
+#define WHISKERMENU_WINDOW_HPP
#include <map>
#include <string>
@@ -40,11 +40,11 @@ class RecentPage;
class SearchPage;
class SectionButton;
-class Menu
+class Window
{
public:
- explicit Menu(XfceRc* settings);
- ~Menu();
+ explicit Window(XfceRc* settings);
+ ~Window();
GtkWidget* get_widget() const
{
@@ -159,72 +159,72 @@ private:
private:
- static gboolean on_enter_notify_event_slot(GtkWidget*, GdkEventCrossing* event, Menu* obj)
+ static gboolean on_enter_notify_event_slot(GtkWidget*, GdkEventCrossing* event, Window* obj)
{
return obj->on_enter_notify_event(event);
}
- static gboolean on_leave_notify_event_slot(GtkWidget*, GdkEventCrossing* event, Menu* obj)
+ static gboolean on_leave_notify_event_slot(GtkWidget*, GdkEventCrossing* event, Window* obj)
{
return obj->on_leave_notify_event(event);
}
- static gboolean on_focus_in_event_slot(GtkWidget*, GdkEventFocus*, Menu* obj)
+ static gboolean on_focus_in_event_slot(GtkWidget*, GdkEventFocus*, Window* obj)
{
return obj->on_focus_in_event();
}
- static gboolean on_button_press_event_slot(GtkWidget*, GdkEventButton* event, Menu* obj)
+ static gboolean on_button_press_event_slot(GtkWidget*, GdkEventButton* event, Window* obj)
{
return obj->on_button_press_event(event);
}
- static gboolean on_key_press_event_slot(GtkWidget* widget, GdkEventKey* event, Menu* obj)
+ static gboolean on_key_press_event_slot(GtkWidget* widget, GdkEventKey* event, Window* obj)
{
return obj->on_key_press_event(widget, event);
}
- static gboolean on_key_press_event_after_slot(GtkWidget* widget, GdkEventKey* event, Menu* obj)
+ static gboolean on_key_press_event_after_slot(GtkWidget* widget, GdkEventKey* event, Window* obj)
{
return obj->on_key_press_event_after(widget, event);
}
- static gboolean on_map_event_slot(GtkWidget*, GdkEventAny*, Menu* obj)
+ static gboolean on_map_event_slot(GtkWidget*, GdkEventAny*, Window* obj)
{
return obj->on_map_event();
}
- static gboolean on_configure_event_slot(GtkWidget*, GdkEventConfigure* event, Menu* obj)
+ static gboolean on_configure_event_slot(GtkWidget*, GdkEventConfigure* event, Window* obj)
{
return obj->on_configure_event(event);
}
- static void favorites_toggled_slot(GtkToggleButton*, Menu* obj)
+ static void favorites_toggled_slot(GtkToggleButton*, Window* obj)
{
obj->favorites_toggled();
}
- static void recent_toggled_slot(GtkToggleButton*, Menu* obj)
+ static void recent_toggled_slot(GtkToggleButton*, Window* obj)
{
obj->recent_toggled();
}
- static void category_toggled_slot(GtkToggleButton*, Menu* obj)
+ static void category_toggled_slot(GtkToggleButton*, Window* obj)
{
obj->category_toggled();
}
- static void show_favorites_slot(GtkTreeModel*, GtkTreePath*, GtkTreeIter*, Menu* obj)
+ static void show_favorites_slot(GtkTreeModel*, GtkTreePath*, GtkTreeIter*, Window* obj)
{
obj->show_favorites();
}
- static void search_slot(GtkEditable*, Menu* obj)
+ static void search_slot(GtkEditable*, Window* obj)
{
obj->search();
}
- static void hide_slot(Menu* obj)
+ static void hide_slot(Window* obj)
{
obj->hide();
}
@@ -232,4 +232,4 @@ private:
}
-#endif // WHISKERMENU_MENU_HPP
+#endif // WHISKERMENU_WINDOW_HPP
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list