StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

fix(widget): rename "Activate" to "Show"

Browse Source
This commit is contained in:
sudden6 2016-06-13 16:46:42 +02:00
parent a851a5b18d
commit 6173199a5b
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/widget/widget.cpp
View File

@ -125,8 +125,8 @@ void Widget::init()
icon_size = 15; icon_size = 15;
actionActivate = new QAction(this); actionShow = new QAction(this);
connect(actionActivate, &QAction::triggered, this, &Widget::forceShow); connect(actionShow, &QAction::triggered, this, &Widget::forceShow);
statusOnline = new QAction(this); statusOnline = new QAction(this);
statusOnline->setIcon(prepareIcon(getStatusIconPath(Status::Online), icon_size, icon_size)); statusOnline->setIcon(prepareIcon(getStatusIconPath(Status::Online), icon_size, icon_size));
@ -1791,7 +1791,7 @@ void Widget::onTryCreateTrayIcon()
trayMenu = new QMenu(this); trayMenu = new QMenu(this);
// adding activate to the top, avoids accidentally clicking quit // adding activate to the top, avoids accidentally clicking quit
trayMenu->addAction(actionActivate); trayMenu->addAction(actionShow);
trayMenu->addSeparator(); trayMenu->addSeparator();
trayMenu->addAction(statusOnline); trayMenu->addAction(statusOnline);
trayMenu->addAction(statusAway); trayMenu->addAction(statusAway);
@ -2253,7 +2253,7 @@ void Widget::retranslateUi()
statusBusy->setText(tr("Busy", "Button to set your status to 'Busy'")); statusBusy->setText(tr("Busy", "Button to set your status to 'Busy'"));
actionLogout->setText(tr("Logout", "Tray action menu to logout user")); actionLogout->setText(tr("Logout", "Tray action menu to logout user"));
actionQuit->setText(tr("Exit", "Tray action menu to exit tox")); actionQuit->setText(tr("Exit", "Tray action menu to exit tox"));
actionActivate->setText(tr("Activate", "Tray action menu to reactivate qTox window")); actionShow->setText(tr("Show", "Tray action menu to show qTox window"));
if (!Settings::getInstance().getSeparateWindow()) if (!Settings::getInstance().getSeparateWindow())
setWindowTitle(fromDialogType(AddDialog)); setWindowTitle(fromDialogType(AddDialog));

2
src/widget/widget.h
View File

@ -241,7 +241,7 @@ private:
QAction *statusBusy; QAction *statusBusy;
QAction *actionLogout; QAction *actionLogout;
QAction *actionQuit; QAction *actionQuit;
QAction *actionActivate; QAction *actionShow;
QMenu* filterMenu; QMenu* filterMenu;