pimhwang
/
qTox
mirror of https://github.com/qTox/qTox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'pr1073'

pull/1077/head
Tux3 / Mlkj / !Lev.uXFMLA 11 years ago
parent
8ccd3bb3bf 13bd334d78
commit
efef2b2178
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
4 changed files with 94 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 25
      src/widget/form/settings/avsettings.ui
  2. 39
      src/widget/form/settings/generalsettings.ui
  3. 23
      src/widget/form/settings/identitysettings.ui
  4. 12
      src/widget/form/settings/privacysettings.ui

25
src/widget/form/settings/avsettings.ui
Unescape View File

@ -60,6 +60,10 @@ @@ -60,6 +60,10 @@
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="toolTip">
<string>Use slider to set volume of your speakers.
WARNING: slider is not supposed to work yet.</string>
</property>
</widget>
</item>
<item row="7" column="1">
@ -67,6 +71,10 @@ @@ -67,6 +71,10 @@
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="toolTip">
<string>Use slider to set volume of your microphone.
WARNING: slider is not supposed to work yet.</string>
</property>
</widget>
</item>
<item row="1" column="0">
@ -101,6 +109,9 @@ @@ -101,6 +109,9 @@
<property name="text">
<string>Filter audio</string>
</property>
<property name="toolTip">
<string>Filter sound from your microphone, so that people hearing you would get better sound.</string>
</property>
</widget>
</item>
</layout>
@ -122,6 +133,13 @@ @@ -122,6 +133,13 @@
<property name="text">
<string>Resolution</string>
</property>
<property name="toolTip">
<string>Set resolution of your camera.
The higher values, the better video quality your friends may get.
Note though that with better video quality there is needed better internet connection.
Sometimes your connection may not be good enough to handle higher video quality,
which may lead to problems with video calls.</string>
</property>
</widget>
</item>
<item row="0" column="1">
@ -132,6 +150,13 @@ @@ -132,6 +150,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Set resolution of your camera.
The higher values, the better video quality your friends may get.
Note though that with better video quality there is needed better internet connection.
Sometimes your connection may not be good enough to handle higher video quality,
which may lead to problems with video calls.</string>
</property>
</widget>
</item>
<item row="1" column="0">

39
src/widget/form/settings/generalsettings.ui
Unescape View File

@ -117,6 +117,9 @@ @@ -117,6 +117,9 @@
<property name="text">
<string>Light icon</string>
</property>
<property name="toolTip">
<string comment="toolTip for light icon setting">Enable light tray icon.</string>
</property>
</widget>
</item>
<item row="2" column="0">
@ -130,6 +133,9 @@ @@ -130,6 +133,9 @@
<property name="text">
<string>Start in tray</string>
</property>
<property name="toolTip">
<string comment="toolTip for Start in tray setting">qTox will start minimized in tray.</string>
</property>
</widget>
</item>
<item row="2" column="1">
@ -143,6 +149,10 @@ @@ -143,6 +149,10 @@
<property name="text">
<string>Close to tray</string>
</property>
<property name="toolTip">
<string comment="toolTip for close to tray setting">After pressing close (X) qTox will minimize to tray,
instead of closing itself.</string>
</property>
</widget>
</item>
<item row="2" column="2">
@ -156,6 +166,10 @@ @@ -156,6 +166,10 @@
<property name="text">
<string>Minimize to tray</string>
</property>
<property name="toolTip">
<string comment="toolTip for minimize to tray setting">After pressing minimize (_) qTox will minimize itself to tray,
instead of system taskbar.</string>
</property>
</widget>
</item>
<item row="2" column="3">
@ -191,6 +205,9 @@ @@ -191,6 +205,9 @@
<property name="text">
<string>Save to:</string>
</property>
<property name="toolTip">
<string>Set where files will be saved.</string>
</property>
</widget>
</item>
<item row="1" column="0">
@ -214,6 +231,9 @@ @@ -214,6 +231,9 @@
<property name="text">
<string>PushButton</string>
</property>
<property name="toolTip">
<string>Set where files will be saved.</string>
</property>
</widget>
</item>
<item row="0" column="2">
@ -244,7 +264,7 @@ @@ -244,7 +264,7 @@
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="autoAwayLabel">
<property name="toolTip">
<string>Provided in minutes</string>
<string>Your status is changed to Away after set time of inactivity.</string>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
@ -267,6 +287,9 @@ @@ -267,6 +287,9 @@
<layout class="QGridLayout" name="gridLayout" columnstretch="0,0,0">
<item row="3" column="0">
<widget class="QCheckBox" name="groupAlwaysNotify">
<property name="toolTip">
<string comment="toolTip for Group chat always notify">Always notify about new messages in groupchats.</string>
</property>
<property name="text">
<string>Group chats always notify</string>
</property>
@ -293,6 +316,9 @@ @@ -293,6 +316,9 @@
</property>
<item>
<widget class="QCheckBox" name="showWindow">
<property name="toolTip">
<string comment="tooltip for Show window setting">Show qTox's window when you receive new message.</string>
</property>
<property name="text">
<string>Show window</string>
</property>
@ -300,6 +326,9 @@ @@ -300,6 +326,9 @@
</item>
<item>
<widget class="QCheckBox" name="showInFront">
<property name="toolTip">
<string comment="toolTip for Show window setting">Focus qTox when you receive message.</string>
</property>
<property name="text">
<string>Focus window</string>
</property>
@ -322,6 +351,10 @@ @@ -322,6 +351,10 @@
</item>
<item row="2" column="1">
<widget class="QCheckBox" name="cbFauxOfflineMessaging">
<property name="toolTip">
<string comment="toolTip for Faux offline messaging setting">Messages you are trying to send to your friends when they are not online
will be sent to them when they will appear online to you.</string>
</property>
<property name="text">
<string>Faux offline messaging</string>
</property>
@ -329,6 +362,10 @@ @@ -329,6 +362,10 @@
</item>
<item row="3" column="1">
<widget class="QCheckBox" name="cbCompactLayout">
<property name="toolTip">
<string comment="toolTip for compact layout setting">Your contact list will be shown in compact mode.
qTox's restart needed.</string>
</property>
<property name="text">
<string>Compact contact list</string>
</property>

23
src/widget/form/settings/identitysettings.ui
Unescape View File

@ -81,6 +81,10 @@ @@ -81,6 +81,10 @@
<property name="title">
<string>Tox ID</string>
</property>
<property name="toolTip">
<string comment="Tox ID tooltip">This bunch of characters tells other Tox clients how to contact you.
Share it with your friends to communicate.</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="CroppingLabel" name="toxIdLabel">
@ -109,6 +113,9 @@ @@ -109,6 +113,9 @@
</item>
<item>
<widget class="QComboBox" name="profiles">
<property name="toolTip">
<string comment="toolTip for currently set profile">Currently selected profile.</string>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
@ -124,7 +131,7 @@ @@ -124,7 +131,7 @@
<item>
<widget class="QPushButton" name="loadButton">
<property name="toolTip">
<string comment="tooltip">Switching profiles is disabled during calls</string>
<string comment="tooltip for loading profile button">Load selected profile and switch to it.</string>
</property>
<property name="text">
<string comment="load profile button">Load</string>
@ -136,6 +143,9 @@ @@ -136,6 +143,9 @@
<property name="text">
<string comment="rename profile button">Rename</string>
</property>
<property name="toolTip">
<string comment="tooltip for renaming profile button">Rename selected profile.</string>
</property>
</widget>
</item>
<item>
@ -143,12 +153,16 @@ @@ -143,12 +153,16 @@
<property name="text">
<string comment="export profile button">Export</string>
</property>
<property name="toolTip">
<string comment="tooltip for profile exporting button">Allows you to export your Tox profile to a file.
Profile does not contain your history.</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="deleteButton">
<property name="toolTip">
<string comment="delete profile button tooltip">This is useful to remain safe on public computers</string>
<string comment="delete profile button tooltip">Delete selected profile.</string>
</property>
<property name="text">
<string comment="delete profile button">Delete</string>
@ -164,12 +178,15 @@ @@ -164,12 +178,15 @@
<property name="text">
<string comment="import profile button">Import a profile</string>
</property>
<property name="toolTip">
<string comment="tooltip for importing profile button">Import Tox profile from a .tox file.</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="newButton">
<property name="toolTip">
<string comment="tooltip">Switching profiles is disabled during calls</string>
<string comment="tooltip for creating new Tox ID button">Create new Tox ID and switch to it.</string>
</property>
<property name="text">
<string comment="new profile button">New Tox ID</string>

12
src/widget/form/settings/privacysettings.ui
Unescape View File

@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
<item>
<widget class="QCheckBox" name="cbTypingNotification">
<property name="toolTip">
<string extracomment="Your friends will be able to see when you are typing."/>
<string comment="tooltip for typing notifications setting">Your friends will be able to see when you are typing.</string>
</property>
<property name="text">
<string>Send Typing Notifications</string>
@ -59,6 +59,10 @@ @@ -59,6 +59,10 @@
<property name="text">
<string>Keep History (unstable)</string>
</property>
<property name="toolTip">
<string comment="toolTip for history setting">History is available in qTox, but we cannot promise that one day it will not dissapear without a trace :-/
We will try our best to make sure that this will not happen though!</string>
</property>
</widget>
</item>
<item alignment="Qt::AlignTop">
@ -101,6 +105,12 @@ @@ -101,6 +105,12 @@
<property name="title">
<string>Nospam</string>
</property>
<property name="toolTip">
<string comment="toolTip for nospam">Nospam is part of your Tox ID.
It is there to help you change your Tox ID when you feel like you are getting too much spam friend requests.
When you change nospam, your current contacts still can communicate with you,
but new contacts need to know your new Tox ID to be able to add you.</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">

Write Preview
Loading…
Cancel
Save