Commit 1f33e34d authored by Fabio Bas's avatar Fabio Bas
Browse files

Add tooltips to tabs

parent 31635d2a
...@@ -126,7 +126,10 @@ void TabSupervisor::retranslateUi() ...@@ -126,7 +126,10 @@ void TabSupervisor::retranslateUi()
for (int i = 0; i < tabs.size(); ++i) for (int i = 0; i < tabs.size(); ++i)
if (tabs[i]) { if (tabs[i]) {
setTabText(indexOf(tabs[i]), sanitizeTabName(tabs[i]->getTabText())); int idx = indexOf(tabs[i]);
QString tabText = tabs[i]->getTabText();
setTabText(idx, sanitizeTabName(tabText));
setTabToolTip(idx, sanitizeHtml(tabText));
tabs[i]->retranslateUi(); tabs[i]->retranslateUi();
} }
} }
...@@ -158,11 +161,25 @@ QString TabSupervisor::sanitizeTabName(QString dirty) const ...@@ -158,11 +161,25 @@ QString TabSupervisor::sanitizeTabName(QString dirty) const
return dirty.replace("&", "&&"); return dirty.replace("&", "&&");
} }
QString TabSupervisor::sanitizeHtml(QString dirty) const
{
return dirty
.replace("&", "&amp;")
.replace("<", "&lt;")
.replace(">", "&gt;")
.replace("\"", "&quot;");
}
int TabSupervisor::myAddTab(Tab *tab) int TabSupervisor::myAddTab(Tab *tab)
{ {
connect(tab, SIGNAL(userEvent(bool)), this, SLOT(tabUserEvent(bool))); connect(tab, SIGNAL(userEvent(bool)), this, SLOT(tabUserEvent(bool)));
connect(tab, SIGNAL(tabTextChanged(Tab *, QString)), this, SLOT(updateTabText(Tab *, QString))); connect(tab, SIGNAL(tabTextChanged(Tab *, QString)), this, SLOT(updateTabText(Tab *, QString)));
return addTab(tab, sanitizeTabName(tab->getTabText()));
QString tabText = tab->getTabText();
int idx = addTab(tab, sanitizeTabName(tabText));
setTabToolTip(idx, sanitizeHtml(tabText));
return idx;
} }
void TabSupervisor::start(const ServerInfo_User &_userInfo) void TabSupervisor::start(const ServerInfo_User &_userInfo)
...@@ -457,7 +474,9 @@ void TabSupervisor::tabUserEvent(bool globalEvent) ...@@ -457,7 +474,9 @@ void TabSupervisor::tabUserEvent(bool globalEvent)
void TabSupervisor::updateTabText(Tab *tab, const QString &newTabText) void TabSupervisor::updateTabText(Tab *tab, const QString &newTabText)
{ {
setTabText(indexOf(tab), newTabText); int idx = indexOf(tab);
setTabText(idx, sanitizeTabName(newTabText));
setTabToolTip(idx, sanitizeHtml(newTabText));
} }
void TabSupervisor::processRoomEvent(const RoomEvent &event) void TabSupervisor::processRoomEvent(const RoomEvent &event)
......
...@@ -59,6 +59,7 @@ private: ...@@ -59,6 +59,7 @@ private:
int myAddTab(Tab *tab); int myAddTab(Tab *tab);
void addCloseButtonToTab(Tab *tab, int tabIndex); void addCloseButtonToTab(Tab *tab, int tabIndex);
QString sanitizeTabName(QString dirty) const; QString sanitizeTabName(QString dirty) const;
QString sanitizeHtml(QString dirty) const;
public: public:
TabSupervisor(AbstractClient *_client, QWidget *parent = 0); TabSupervisor(AbstractClient *_client, QWidget *parent = 0);
~TabSupervisor(); ~TabSupervisor();
......
This diff is collapsed.
Supports Markdown
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