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

Merge branch 'pr565'

pull/568/head
Tux3 / Mlkj / !Lev.uXFMLA 11 years ago
parent
f19007ad9e 36d4998eb8
commit
c15e303d31
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
3 changed files with 110 additions and 77 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. 19
      src/widget/form/settings/generalsettings.ui
  2. 24
      src/widget/form/settings/identitysettings.ui
  3. 144
      src/widget/form/settings/privacysettings.ui

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

@ -15,13 +15,16 @@ @@ -15,13 +15,16 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="leftMargin">
<number>6</number>
<number>9</number>
</property>
<property name="topMargin">
<number>6</number>
<number>9</number>
</property>
<property name="rightMargin">
<number>6</number>
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
<item>
<widget class="QScrollArea" name="scrollArea">
@ -36,8 +39,8 @@ @@ -36,8 +39,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>531</width>
<height>627</height>
<width>525</width>
<height>624</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4" stretch="0,0,1">
@ -249,7 +252,7 @@ @@ -249,7 +252,7 @@
</item>
<item>
<layout class="QHBoxLayout" name="styleHLayout">
<item alignment="Qt::AlignTop">
<item>
<widget class="QLabel" name="styleLabel">
<property name="text">
<string>Style:</string>
@ -281,7 +284,7 @@ @@ -281,7 +284,7 @@
</property>
<layout class="QVBoxLayout" name="verticalLayoutProxy">
<property name="topMargin">
<number>0</number>
<number>9</number>
</property>
<item>
<widget class="QCheckBox" name="cbEnableIPv6">
@ -310,7 +313,7 @@ @@ -310,7 +313,7 @@
<item>
<layout class="QHBoxLayout" name="proxyLayout">
<property name="spacing">
<number>0</number>
<number>6</number>
</property>
<item>
<widget class="QLabel" name="proxyAddrLabel">

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

@ -14,6 +14,18 @@ @@ -14,6 +14,18 @@
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin">
<number>9</number>
</property>
<property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
<item>
<widget class="QScrollArea" name="scrollArea">
<property name="widgetResizable">
@ -111,12 +123,12 @@ @@ -111,12 +123,12 @@
<layout class="QHBoxLayout" name="profilesButtonsLayout">
<item>
<widget class="QPushButton" name="loadButton">
<property name="text">
<string comment="load profile button">Load</string>
</property>
<property name="toolTip">
<string comment="tooltip">Switching profiles is disabled during calls</string>
</property>
<property name="text">
<string comment="load profile button">Load</string>
</property>
</widget>
</item>
<item>
@ -156,12 +168,12 @@ @@ -156,12 +168,12 @@
</item>
<item>
<widget class="QPushButton" name="newButton">
<property name="text">
<string comment="new profile button">New Tox ID</string>
</property>
<property name="toolTip">
<string comment="tooltip">Switching profiles is disabled during calls</string>
</property>
<property name="text">
<string comment="new profile button">New Tox ID</string>
</property>
</widget>
</item>
</layout>

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

@ -14,74 +14,92 @@ @@ -14,74 +14,92 @@
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin">
<number>9</number>
</property>
<property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
<item>
<widget class="QCheckBox" name="cbTypingNotification">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Typing Notification</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cbKeepHistory">
<property name="toolTip">
<string extracomment="History keeping still under developing. Log format changin is possible."/>
</property>
<property name="text">
<string>Keep History (unstable)</string>
</property>
</widget>
</item>
<item>
<widget class="QGroupBox" name="encryptionGroup">
<property name="enabled">
<widget class="QScrollArea" name="scrollArea">
<property name="widgetResizable">
<bool>true</bool>
</property>
<property name="title">
<string>Encryption</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QCheckBox" name="cbEncryptTox">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Encrypt Tox datafile</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cbEncryptHistory">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Encrypt History</string>
</property>
<property name="checkable">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>380</width>
<height>280</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QCheckBox" name="cbTypingNotification">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Typing Notification</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cbKeepHistory">
<property name="toolTip">
<string extracomment="History keeping still under developing. Log format changin is possible."/>
</property>
<property name="text">
<string>Keep History (unstable)</string>
</property>
</widget>
</item>
<item alignment="Qt::AlignTop">
<widget class="QGroupBox" name="encryptionGroup">
<property name="enabled">
<bool>true</bool>
</property>
<property name="title">
<string>Encryption</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QCheckBox" name="cbEncryptTox">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Encrypt Tox datafile</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cbEncryptHistory">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Encrypt History</string>
</property>
<property name="checkable">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<resources/>

Write Preview
Loading…
Cancel
Save