Commit 86b6bff6 authored by Graeme Gott's avatar Graeme Gott

Fix saving plugin title with overridden default text.

parent 77cc5128
......@@ -102,6 +102,7 @@ Plugin::Plugin(XfcePanelPlugin* plugin) :
wm_settings->command[i]->set_shown(false);
}
wm_settings->load(xfce_resource_lookup(XFCE_RESOURCE_CONFIG, "xfce4/whiskermenu/defaults.rc"));
wm_settings->m_button_title_default = wm_settings->button_title;
wm_settings->load(xfce_panel_plugin_lookup_rc_file(m_plugin));
m_opacity = wm_settings->menu_opacity;
......@@ -210,7 +211,7 @@ std::string Plugin::get_button_title() const
std::string Plugin::get_button_title_default()
{
return _("Applications");
return wm_settings->m_button_title_default;
}
//-----------------------------------------------------------------------------
......
......@@ -87,6 +87,7 @@ static void write_vector_entry(XfceRc* rc, const gchar* key, const std::vector<s
//-----------------------------------------------------------------------------
Settings::Settings() :
m_button_title_default(_("Applications")),
m_modified(false),
favorites {
......@@ -96,7 +97,7 @@ Settings::Settings() :
"exo-terminal-emulator.desktop"
},
button_title(Plugin::get_button_title_default()),
button_title(m_button_title_default),
button_icon_name("xfce4-whiskermenu"),
button_title_visible(false),
button_icon_visible(true),
......
......@@ -45,6 +45,7 @@ class Settings
void load(gchar* file);
void save(gchar* file);
std::string m_button_title_default;
bool m_modified;
public:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment