From 89ecd9601ff3717c5b0e8e603d56f5bd656743ed Mon Sep 17 00:00:00 2001
From: Pavol Babincak <scroolik@gmail.com>
Date: Fri, 27 Apr 2012 18:33:09 +0200
Subject: Added ellipsis to menu items which needs further input to complete
action
This is recommended in HIGs for Gnome, OS X, Windows:
- http://developer.gnome.org/hig-book/3.0/menus-design.html.en
- https://developer.apple.com/library/mac/#documentation/UserExperience/Conceptual/AppleHIGuidelines/TextStyle/TextStyle.html#//apple_ref/doc/uid/TP30000365-TPXREF126
- http://msdn.microsoft.com/en-us/library/aa511502.aspx#ellipses
Resolves: #1114
License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
diff --git a/Swift/QtUI/QtMainWindow.cpp b/Swift/QtUI/QtMainWindow.cpp
index 05c78b3..9a3ce6b 100644
--- a/Swift/QtUI/QtMainWindow.cpp
+++ b/Swift/QtUI/QtMainWindow.cpp
@@ -99,20 +99,20 @@ QtMainWindow::QtMainWindow(SettingsProvider* settings, UIEventStream* uiEventStr
QMenu* actionsMenu = new QMenu(tr("&Actions"), this);
menus_.push_back(actionsMenu);
- QAction* editProfileAction = new QAction(tr("Edit &Profile"), this);
+ QAction* editProfileAction = new QAction(tr("Edit &Profile…"), this);
connect(editProfileAction, SIGNAL(triggered()), SLOT(handleEditProfileAction()));
actionsMenu->addAction(editProfileAction);
- QAction* joinMUCAction = new QAction(tr("Enter &Room"), this);
+ QAction* joinMUCAction = new QAction(tr("Enter &Room…"), this);
connect(joinMUCAction, SIGNAL(triggered()), SLOT(handleJoinMUCAction()));
actionsMenu->addAction(joinMUCAction);
- addUserAction_ = new QAction(tr("&Add Contact"), this);
+ addUserAction_ = new QAction(tr("&Add Contact…"), this);
connect(addUserAction_, SIGNAL(triggered(bool)), this, SLOT(handleAddUserActionTriggered(bool)));
actionsMenu->addAction(addUserAction_);
- editUserAction_ = new QAction(tr("&Edit Selected Contact"), this);
+ editUserAction_ = new QAction(tr("&Edit Selected Contact…"), this);
connect(editUserAction_, SIGNAL(triggered(bool)), treeWidget_, SLOT(handleEditUserActionTriggered(bool)));
actionsMenu->addAction(editUserAction_);
editUserAction_->setEnabled(false);
- chatUserAction_ = new QAction(tr("Start &Chat"), this);
+ chatUserAction_ = new QAction(tr("Start &Chat…"), this);
connect(chatUserAction_, SIGNAL(triggered(bool)), this, SLOT(handleChatUserActionTriggered(bool)));
actionsMenu->addAction(chatUserAction_);
serverAdHocMenu_ = new QMenu(tr("Run Server Command"), this);
diff --git a/Swift/Translations/swift_ca.ts b/Swift/Translations/swift_ca.ts
index 85d2c0c..8f29a30 100644
--- a/Swift/Translations/swift_ca.ts
+++ b/Swift/Translations/swift_ca.ts
@@ -1595,27 +1595,27 @@ Si esculls ajornar aquesta elecció, se't preguntarà de nou la propera veg
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="86"/>
- <source>Edit &Profile</source>
- <translation>Editar &Perfil</translation>
+ <source>Edit &Profile…</source>
+ <translation>Editar &Perfil…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="89"/>
- <source>Enter &Room</source>
- <translation>Entrar a &Sala</translation>
+ <source>Enter &Room…</source>
+ <translation>Entrar a &Sala…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="92"/>
- <source>&Add Contact</source>
- <translation>&Afegir Contacte</translation>
+ <source>&Add Contact…</source>
+ <translation>&Afegir Contacte…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="95"/>
- <source>&Edit Selected Contact</source>
- <translation>&Editar Contacte Sel·leccionat</translation>
+ <source>&Edit Selected Contact…</source>
+ <translation>&Editar Contacte Sel·leccionat…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="99"/>
- <source>Start &Chat</source>
+ <source>Start &Chat…</source>
<translation>Començar &Conversa</translation>
</message>
<message>
diff --git a/Swift/Translations/swift_de.ts b/Swift/Translations/swift_de.ts
index 6183099..0fee815 100644
--- a/Swift/Translations/swift_de.ts
+++ b/Swift/Translations/swift_de.ts
@@ -1532,27 +1532,27 @@
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="95"/>
- <source>Edit &Profile</source>
- <translation>&Profil editieren</translation>
+ <source>Edit &Profile…</source>
+ <translation>&Profil editieren…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="98"/>
- <source>Enter &Room</source>
- <translation>Chat&raum betreten</translation>
+ <source>Enter &Room…</source>
+ <translation>Chat&raum betreten…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="101"/>
- <source>&Add Contact</source>
- <translation>Kont&akt hinzufügen</translation>
+ <source>&Add Contact…</source>
+ <translation>Kont&akt hinzufügen…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="104"/>
- <source>&Edit Selected Contact</source>
- <translation>Ausgewählten Kontakt &editieren</translation>
+ <source>&Edit Selected Contact…</source>
+ <translation>Ausgewählten Kontakt &editieren…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="108"/>
- <source>Start &Chat</source>
+ <source>Start &Chat…</source>
<translation>Gesprä&ch beginnen</translation>
</message>
<message>
diff --git a/Swift/Translations/swift_es.ts b/Swift/Translations/swift_es.ts
index 2231ecf..8d7805f 100644
--- a/Swift/Translations/swift_es.ts
+++ b/Swift/Translations/swift_es.ts
@@ -1595,27 +1595,27 @@ Si escoges posponer esta elección, se te preguntará de nuevo la próxima vez q
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="86"/>
- <source>Edit &Profile</source>
- <translation>Editar &Perfil</translation>
+ <source>Edit &Profile…</source>
+ <translation>Editar &Perfil…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="89"/>
- <source>Enter &Room</source>
- <translation>Entrar a &Sala</translation>
+ <source>Enter &Room…</source>
+ <translation>Entrar a &Sala…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="92"/>
- <source>&Add Contact</source>
- <translation>&Añadir Contacto</translation>
+ <source>&Add Contact…</source>
+ <translation>&Añadir Contacto…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="95"/>
- <source>&Edit Selected Contact</source>
- <translation>&Editar Contacto Seleccionado</translation>
+ <source>&Edit Selected Contact…</source>
+ <translation>&Editar Contacto Seleccionado…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="99"/>
- <source>Start &Chat</source>
+ <source>Start &Chat…</source>
<translation>Comenzar &Conversación</translation>
</message>
<message>
diff --git a/Swift/Translations/swift_fr.ts b/Swift/Translations/swift_fr.ts
index 44bb980..b95c0d1 100644
--- a/Swift/Translations/swift_fr.ts
+++ b/Swift/Translations/swift_fr.ts
@@ -1437,27 +1437,27 @@
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="86"/>
- <source>Edit &Profile</source>
- <translation>Editer le &Profil</translation>
+ <source>Edit &Profile…</source>
+ <translation>Editer le &Profil…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="89"/>
- <source>Enter &Room</source>
- <translation>Joindre un &Salon</translation>
+ <source>Enter &Room…</source>
+ <translation>Joindre un &Salon…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="92"/>
- <source>&Add Contact</source>
- <translation>&Ajouter un Contact</translation>
+ <source>&Add Contact…</source>
+ <translation>&Ajouter un Contact…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="95"/>
- <source>&Edit Selected Contact</source>
- <translation>&Editer le Contact Sélectionné</translation>
+ <source>&Edit Selected Contact…</source>
+ <translation>&Editer le Contact Sélectionné…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="99"/>
- <source>Start &Chat</source>
+ <source>Start &Chat…</source>
<translation>Démarrer une &Discussion</translation>
</message>
<message>
diff --git a/Swift/Translations/swift_gl.ts b/Swift/Translations/swift_gl.ts
index 00540a3..c189a1d 100644
--- a/Swift/Translations/swift_gl.ts
+++ b/Swift/Translations/swift_gl.ts
@@ -1441,27 +1441,27 @@
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="86"/>
- <source>Edit &Profile</source>
- <translation>Editar &perfil</translation>
+ <source>Edit &Profile…</source>
+ <translation>Editar &perfil…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="89"/>
- <source>Enter &Room</source>
- <translation>Entrar á &sala</translation>
+ <source>Enter &Room…</source>
+ <translation>Entrar á &sala…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="92"/>
- <source>&Add Contact</source>
- <translation>&Engadir contacto</translation>
+ <source>&Add Contact…</source>
+ <translation>&Engadir contacto…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="95"/>
- <source>&Edit Selected Contact</source>
- <translation>&Editar contacto seleccionado</translation>
+ <source>&Edit Selected Contact…</source>
+ <translation>&Editar contacto seleccionado…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="99"/>
- <source>Start &Chat</source>
+ <source>Start &Chat…</source>
<translation>Comezar &conversa</translation>
</message>
<message>
diff --git a/Swift/Translations/swift_hu.ts b/Swift/Translations/swift_hu.ts
index 30f98ec..54167e2 100644
--- a/Swift/Translations/swift_hu.ts
+++ b/Swift/Translations/swift_hu.ts
@@ -1136,23 +1136,23 @@
<translation>&Műveletek</translation>
</message>
<message>
- <source>Edit &Profile</source>
- <translation>&Profil szerkesztése</translation>
+ <source>Edit &Profile…</source>
+ <translation>&Profil szerkesztése…</translation>
</message>
<message>
- <source>Enter &Room</source>
- <translation>Belépés &szobába</translation>
+ <source>Enter &Room…</source>
+ <translation>Belépés &szobába…</translation>
</message>
<message>
- <source>&Add Contact</source>
- <translation>&Partner felvétele</translation>
+ <source>&Add Contact…</source>
+ <translation>&Partner felvétele…</translation>
</message>
<message>
- <source>&Edit Selected Contact</source>
- <translation>&Kiválasztott partner szerkesztése</translation>
+ <source>&Edit Selected Contact…</source>
+ <translation>&Kiválasztott partner szerkesztése…</translation>
</message>
<message>
- <source>Start &Chat</source>
+ <source>Start &Chat…</source>
<translation>Bes&zélgetés kezdeményezése</translation>
</message>
<message>
diff --git a/Swift/Translations/swift_nl.ts b/Swift/Translations/swift_nl.ts
index 7e8bfbd..706fe41 100644
--- a/Swift/Translations/swift_nl.ts
+++ b/Swift/Translations/swift_nl.ts
@@ -1189,15 +1189,15 @@ afbeelding</translation>
<translation>&Toon offline contacten</translation>
</message>
<message>
- <source>&Add Contact</source>
- <translation>Contact &toevoegen</translation>
+ <source>&Add Contact…</source>
+ <translation>Contact &toevoegen…</translation>
</message>
<message>
- <source>&Edit Selected Contact</source>
- <translation>Geselecteerde contact &bewerken</translation>
+ <source>&Edit Selected Contact…</source>
+ <translation>Geselecteerde contact &bewerken…</translation>
</message>
<message>
- <source>Start &Chat</source>
+ <source>Start &Chat…</source>
<translation>&Conversatie starten</translation>
</message>
<message>
@@ -1205,12 +1205,12 @@ afbeelding</translation>
<translation>&Afmelden</translation>
</message>
<message>
- <source>Edit &Profile</source>
- <translation>Bewerk &profiel</translation>
+ <source>Edit &Profile…</source>
+ <translation>Bewerk &profiel…</translation>
</message>
<message>
- <source>Enter &Room</source>
- <translation>&Kamer betreden</translation>
+ <source>Enter &Room…</source>
+ <translation>&Kamer betreden…</translation>
</message>
<message>
<source>Run Server Command</source>
diff --git a/Swift/Translations/swift_pl.ts b/Swift/Translations/swift_pl.ts
index f471f4a..cc461a1 100644
--- a/Swift/Translations/swift_pl.ts
+++ b/Swift/Translations/swift_pl.ts
@@ -1437,27 +1437,27 @@
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="86"/>
- <source>Edit &Profile</source>
- <translation>Edytuj &profil</translation>
+ <source>Edit &Profile…</source>
+ <translation>Edytuj &profil…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="89"/>
- <source>Enter &Room</source>
- <translation>&Wejdź do pokoju</translation>
+ <source>Enter &Room…</source>
+ <translation>&Wejdź do pokoju…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="92"/>
- <source>&Add Contact</source>
- <translation>&Dodaj kontakt</translation>
+ <source>&Add Contact…</source>
+ <translation>&Dodaj kontakt…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="95"/>
- <source>&Edit Selected Contact</source>
- <translation>&Edytuj wybrany kontakt</translation>
+ <source>&Edit Selected Contact…</source>
+ <translation>&Edytuj wybrany kontakt…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="99"/>
- <source>Start &Chat</source>
+ <source>Start &Chat…</source>
<translation>&Rozpocznij rozmowę</translation>
</message>
<message>
diff --git a/Swift/Translations/swift_ru.ts b/Swift/Translations/swift_ru.ts
index c1a9a6c..059bb69 100644
--- a/Swift/Translations/swift_ru.ts
+++ b/Swift/Translations/swift_ru.ts
@@ -1504,27 +1504,27 @@
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="86"/>
- <source>Edit &Profile</source>
- <translation>Редактировать &профиль</translation>
+ <source>Edit &Profile…</source>
+ <translation>Редактировать &профиль…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="89"/>
- <source>Enter &Room</source>
- <translation>&Войти в комнату</translation>
+ <source>Enter &Room…</source>
+ <translation>&Войти в комнату…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="92"/>
- <source>&Add Contact</source>
- <translation>&Добавить контакт</translation>
+ <source>&Add Contact…</source>
+ <translation>&Добавить контакт…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="95"/>
- <source>&Edit Selected Contact</source>
- <translation>&Редактировать выделенный контакт</translation>
+ <source>&Edit Selected Contact…</source>
+ <translation>&Редактировать выделенный контакт…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="99"/>
- <source>Start &Chat</source>
+ <source>Start &Chat…</source>
<translation>Начать &чат</translation>
</message>
<message>
diff --git a/Swift/Translations/swift_sk.ts b/Swift/Translations/swift_sk.ts
index 18c78e7..03f1e2c 100644
--- a/Swift/Translations/swift_sk.ts
+++ b/Swift/Translations/swift_sk.ts
@@ -2043,28 +2043,28 @@
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="102"/>
- <source>Edit &Profile</source>
- <translation>Upraviť &profil</translation>
+ <source>Edit &Profile…</source>
+ <translation>Upraviť &profil…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="105"/>
- <source>Enter &Room</source>
- <translation>Vstúpiť do &miestnosti</translation>
+ <source>Enter &Room…</source>
+ <translation>Vstúpiť do &miestnosti…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="108"/>
- <source>&Add Contact</source>
- <translation>Pridať &kontakt</translation>
+ <source>&Add Contact…</source>
+ <translation>Pridať &kontakt…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="111"/>
- <source>&Edit Selected Contact</source>
- <translation>&Upraviť vybraný kontakt</translation>
+ <source>&Edit Selected Contact…</source>
+ <translation>&Upraviť vybraný kontakt…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="115"/>
- <source>Start &Chat</source>
- <translation>Začať &rozhovor</translation>
+ <source>Start &Chat…</source>
+ <translation>Začať &rozhovor…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="121"/>
diff --git a/Swift/Translations/swift_sv.ts b/Swift/Translations/swift_sv.ts
index fdd0c98..b979dab 100644
--- a/Swift/Translations/swift_sv.ts
+++ b/Swift/Translations/swift_sv.ts
@@ -1445,27 +1445,27 @@
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="86"/>
- <source>Edit &Profile</source>
- <translation>&Redigera profil</translation>
+ <source>Edit &Profile…</source>
+ <translation>&Redigera profil…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="89"/>
- <source>Enter &Room</source>
- <translation>&Anslut till rum</translation>
+ <source>Enter &Room…</source>
+ <translation>&Anslut till rum…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="92"/>
- <source>&Add Contact</source>
- <translation>&Lägg till kontakt</translation>
+ <source>&Add Contact…</source>
+ <translation>&Lägg till kontakt…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="95"/>
- <source>&Edit Selected Contact</source>
- <translation>&Redigera markerad kontakt</translation>
+ <source>&Edit Selected Contact…</source>
+ <translation>&Redigera markerad kontakt…</translation>
</message>
<message>
<location filename="../QtUI/QtMainWindow.cpp" line="99"/>
- <source>Start &Chat</source>
+ <source>Start &Chat…</source>
<translation>Starta &chat</translation>
</message>
<message>
--
cgit v0.10.2-6-g49f6