From 89ecd9601ff3717c5b0e8e603d56f5bd656743ed Mon Sep 17 00:00:00 2001 From: Pavol Babincak 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 - Edit &Profile - Editar &Perfil + Edit &Profile… + Editar &Perfil… - Enter &Room - Entrar a &Sala + Enter &Room… + Entrar a &Sala… - &Add Contact - &Afegir Contacte + &Add Contact… + &Afegir Contacte… - &Edit Selected Contact - &Editar Contacte Sel·leccionat + &Edit Selected Contact… + &Editar Contacte Sel·leccionat… - Start &Chat + Start &Chat… Començar &Conversa 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 @@ - Edit &Profile - &Profil editieren + Edit &Profile… + &Profil editieren… - Enter &Room - Chat&raum betreten + Enter &Room… + Chat&raum betreten… - &Add Contact - Kont&akt hinzufügen + &Add Contact… + Kont&akt hinzufügen… - &Edit Selected Contact - Ausgewählten Kontakt &editieren + &Edit Selected Contact… + Ausgewählten Kontakt &editieren… - Start &Chat + Start &Chat… Gesprä&ch beginnen 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 - Edit &Profile - Editar &Perfil + Edit &Profile… + Editar &Perfil… - Enter &Room - Entrar a &Sala + Enter &Room… + Entrar a &Sala… - &Add Contact - &Añadir Contacto + &Add Contact… + &Añadir Contacto… - &Edit Selected Contact - &Editar Contacto Seleccionado + &Edit Selected Contact… + &Editar Contacto Seleccionado… - Start &Chat + Start &Chat… Comenzar &Conversación 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 @@ - Edit &Profile - Editer le &Profil + Edit &Profile… + Editer le &Profil… - Enter &Room - Joindre un &Salon + Enter &Room… + Joindre un &Salon… - &Add Contact - &Ajouter un Contact + &Add Contact… + &Ajouter un Contact… - &Edit Selected Contact - &Editer le Contact Sélectionné + &Edit Selected Contact… + &Editer le Contact Sélectionné… - Start &Chat + Start &Chat… Démarrer une &Discussion 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 @@ - Edit &Profile - Editar &perfil + Edit &Profile… + Editar &perfil… - Enter &Room - Entrar á &sala + Enter &Room… + Entrar á &sala… - &Add Contact - &Engadir contacto + &Add Contact… + &Engadir contacto… - &Edit Selected Contact - &Editar contacto seleccionado + &Edit Selected Contact… + &Editar contacto seleccionado… - Start &Chat + Start &Chat… Comezar &conversa 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 @@ &Műveletek - Edit &Profile - &Profil szerkesztése + Edit &Profile… + &Profil szerkesztése… - Enter &Room - Belépés &szobába + Enter &Room… + Belépés &szobába… - &Add Contact - &Partner felvétele + &Add Contact… + &Partner felvétele… - &Edit Selected Contact - &Kiválasztott partner szerkesztése + &Edit Selected Contact… + &Kiválasztott partner szerkesztése… - Start &Chat + Start &Chat… Bes&zélgetés kezdeményezése 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 &Toon offline contacten - &Add Contact - Contact &toevoegen + &Add Contact… + Contact &toevoegen… - &Edit Selected Contact - Geselecteerde contact &bewerken + &Edit Selected Contact… + Geselecteerde contact &bewerken… - Start &Chat + Start &Chat… &Conversatie starten @@ -1205,12 +1205,12 @@ afbeelding &Afmelden - Edit &Profile - Bewerk &profiel + Edit &Profile… + Bewerk &profiel… - Enter &Room - &Kamer betreden + Enter &Room… + &Kamer betreden… Run Server Command 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 @@ - Edit &Profile - Edytuj &profil + Edit &Profile… + Edytuj &profil… - Enter &Room - &Wejdź do pokoju + Enter &Room… + &Wejdź do pokoju… - &Add Contact - &Dodaj kontakt + &Add Contact… + &Dodaj kontakt… - &Edit Selected Contact - &Edytuj wybrany kontakt + &Edit Selected Contact… + &Edytuj wybrany kontakt… - Start &Chat + Start &Chat… &Rozpocznij rozmowę 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 @@ - Edit &Profile - Редактировать &профиль + Edit &Profile… + Редактировать &профиль… - Enter &Room - &Войти в комнату + Enter &Room… + &Войти в комнату… - &Add Contact - &Добавить контакт + &Add Contact… + &Добавить контакт… - &Edit Selected Contact - &Редактировать выделенный контакт + &Edit Selected Contact… + &Редактировать выделенный контакт… - Start &Chat + Start &Chat… Начать &чат 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 @@ - Edit &Profile - Upraviť &profil + Edit &Profile… + Upraviť &profil… - Enter &Room - Vstúpiť do &miestnosti + Enter &Room… + Vstúpiť do &miestnosti… - &Add Contact - Pridať &kontakt + &Add Contact… + Pridať &kontakt… - &Edit Selected Contact - &Upraviť vybraný kontakt + &Edit Selected Contact… + &Upraviť vybraný kontakt… - Start &Chat - Začať &rozhovor + Start &Chat… + Začať &rozhovor… 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 @@ - Edit &Profile - &Redigera profil + Edit &Profile… + &Redigera profil… - Enter &Room - &Anslut till rum + Enter &Room… + &Anslut till rum… - &Add Contact - &Lägg till kontakt + &Add Contact… + &Lägg till kontakt… - &Edit Selected Contact - &Redigera markerad kontakt + &Edit Selected Contact… + &Redigera markerad kontakt… - Start &Chat + Start &Chat… Starta &chat -- cgit v0.10.2-6-g49f6