1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge branch 'pr475'

This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2014-10-23 18:35:14 +02:00
commit 5d69887b6d
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
8 changed files with 672 additions and 560 deletions

View File

@ -20,7 +20,7 @@
<string>qTox</string> <string>qTox</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="res.qrc"> <iconset resource="../res.qrc">
<normaloff>:/img/icon.png</normaloff>:/img/icon.png</iconset> <normaloff>:/img/icon.png</normaloff>:/img/icon.png</iconset>
</property> </property>
<widget class="QWidget" name="centralwidget"> <widget class="QWidget" name="centralwidget">
@ -1033,8 +1033,8 @@ QSplitter:handle{
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>288</width> <width>260</width>
<height>400</height> <height>399</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_5"/> <layout class="QVBoxLayout" name="verticalLayout_5"/>
@ -1092,7 +1092,7 @@ QSplitter:handle{
<string/> <string/>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="res.qrc"> <iconset resource="../res.qrc">
<normaloff>:/img/add.png</normaloff>:/img/add.png</iconset> <normaloff>:/img/add.png</normaloff>:/img/add.png</iconset>
</property> </property>
<property name="flat"> <property name="flat">
@ -1118,7 +1118,7 @@ QSplitter:handle{
<string/> <string/>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="res.qrc"> <iconset resource="../res.qrc">
<normaloff>:/img/group_2x.png</normaloff>:/img/group_2x.png</iconset> <normaloff>:/img/group_2x.png</normaloff>:/img/group_2x.png</iconset>
</property> </property>
<property name="flat"> <property name="flat">
@ -1150,7 +1150,7 @@ QSplitter:handle{
<string/> <string/>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="res.qrc"> <iconset resource="../res.qrc">
<normaloff>:/img/transfer.png</normaloff>:/img/transfer.png</iconset> <normaloff>:/img/transfer.png</normaloff>:/img/transfer.png</iconset>
</property> </property>
<property name="flat"> <property name="flat">
@ -1182,7 +1182,7 @@ QSplitter:handle{
<string/> <string/>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="res.qrc"> <iconset resource="../res.qrc">
<normaloff>:/img/settings.png</normaloff>:/img/settings.png</iconset> <normaloff>:/img/settings.png</normaloff>:/img/settings.png</iconset>
</property> </property>
<property name="flat"> <property name="flat">
@ -1751,7 +1751,7 @@ QSplitter:handle{
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>710</width> <width>710</width>
<height>25</height> <height>21</height>
</rect> </rect>
</property> </property>
</widget> </widget>
@ -1779,7 +1779,7 @@ QSplitter:handle{
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="res.qrc"/> <include location="../res.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

View File

@ -16,6 +16,9 @@
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<widget class="QScrollArea" name="scrollArea"> <widget class="QScrollArea" name="scrollArea">
<property name="autoFillBackground">
<bool>true</bool>
</property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::NoFrame</enum> <enum>QFrame::NoFrame</enum>
</property> </property>
@ -171,7 +174,14 @@
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="0" column="0">
<widget class="VideoSurface" name="CamVideoSurface" native="true"/> <widget class="VideoSurface" name="CamVideoSurface" native="true">
<property name="minimumSize">
<size>
<width>160</width>
<height>120</height>
</size>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>

View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>527</width> <width>545</width>
<height>525</height> <height>644</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -24,303 +24,330 @@
<number>6</number> <number>6</number>
</property> </property>
<item> <item>
<widget class="QGroupBox" name="generalGroup"> <widget class="QScrollArea" name="scrollArea">
<property name="title"> <property name="widgetResizable">
<string>General Settings</string> <bool>true</bool>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_3"> <property name="alignment">
<item> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
<layout class="QHBoxLayout" name="transLayout"> </property>
<item> <widget class="QWidget" name="scrollAreaWidgetContents_2">
<widget class="QLabel" name="transLabel"> <property name="geometry">
<property name="toolTip"> <rect>
<string>The translation may not load until qTox restarts.</string> <x>0</x>
</property> <y>0</y>
<property name="text"> <width>531</width>
<string>Translation:</string> <height>627</height>
</property> </rect>
</widget> </property>
</item> <layout class="QVBoxLayout" name="verticalLayout_4" stretch="0,0,1">
<item> <property name="spacing">
<widget class="QComboBox" name="transComboBox"> <number>9</number>
<property name="sizePolicy"> </property>
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <property name="topMargin">
<horstretch>0</horstretch> <number>9</number>
<verstretch>0</verstretch> </property>
</sizepolicy> <item alignment="Qt::AlignTop">
</property> <widget class="QGroupBox" name="generalGroup">
<property name="toolTip"> <property name="title">
<string>The translation may not load until qTox restarts.</string> <string>General Settings</string>
</property> </property>
</widget> <layout class="QVBoxLayout" name="verticalLayout_3">
</item> <item>
</layout> <layout class="QHBoxLayout" name="transLayout">
</item> <item>
<item> <widget class="QLabel" name="transLabel">
<widget class="QCheckBox" name="cbMakeToxPortable"> <property name="toolTip">
<property name="toolTip"> <string>The translation may not load until qTox restarts.</string>
<string extracomment="describes makeToxPortable checkbox">Save settings to the working directory instead of the usual conf dir</string> </property>
</property> <property name="text">
<property name="text"> <string>Translation:</string>
<string>Make Tox portable</string> </property>
</property> </widget>
</widget> </item>
</item> <item>
<item> <widget class="QComboBox" name="transComboBox">
<widget class="QCheckBox" name="startInTray"> <property name="sizePolicy">
<property name="text"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<string>Start in tray</string> <horstretch>0</horstretch>
</property> <verstretch>0</verstretch>
</widget> </sizepolicy>
</item> </property>
<item> <property name="toolTip">
<widget class="QCheckBox" name="closeToTray"> <string>The translation may not load until qTox restarts.</string>
<property name="text"> </property>
<string>Close to tray</string> </widget>
</property> </item>
</widget> </layout>
</item> </item>
<item> <item>
<widget class="QCheckBox" name="minimizeToTray"> <widget class="QCheckBox" name="cbMakeToxPortable">
<property name="text"> <property name="toolTip">
<string>Minimize to tray</string> <string extracomment="describes makeToxPortable checkbox">Save settings to the working directory instead of the usual conf dir</string>
</property> </property>
</widget> <property name="text">
</item> <string>Make Tox portable</string>
<item> </property>
<widget class="QCheckBox" name="statusChanges"> </widget>
<property name="text"> </item>
<string>Show contacts' status changes</string> <item>
</property> <widget class="QCheckBox" name="startInTray">
</widget> <property name="text">
</item> <string>Start in tray</string>
<item> </property>
<layout class="QHBoxLayout" name="horizontalLayout_2"> </widget>
<item alignment="Qt::AlignLeft"> </item>
<widget class="QLabel" name="autoAwayLabel"> <item>
<property name="toolTip"> <widget class="QCheckBox" name="closeToTray">
<string>Provided in minutes</string> <property name="text">
</property> <string>Close to tray</string>
<property name="layoutDirection"> </property>
<enum>Qt::LeftToRight</enum> </widget>
</property> </item>
<property name="text"> <item>
<string>Auto away after (0 to disable):</string> <widget class="QCheckBox" name="minimizeToTray">
</property> <property name="text">
</widget> <string>Minimize to tray</string>
</item> </property>
<item> </widget>
<widget class="QSpinBox" name="autoAwaySpinBox"> </item>
<property name="sizePolicy"> <item>
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <widget class="QCheckBox" name="statusChanges">
<horstretch>0</horstretch> <property name="text">
<verstretch>0</verstretch> <string>Show contacts' status changes</string>
</sizepolicy> </property>
</property> </widget>
<property name="toolTip"> </item>
<string>Set to 0 to disable</string> <item>
</property> <layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="showGroupSeparator" stdset="0"> <item alignment="Qt::AlignLeft">
<bool>true</bool> <widget class="QLabel" name="autoAwayLabel">
</property> <property name="toolTip">
<property name="suffix"> <string>Provided in minutes</string>
<string> minutes</string> </property>
</property> <property name="layoutDirection">
<property name="minimum"> <enum>Qt::LeftToRight</enum>
</property>
<property name="text">
<string>Auto away after (0 to disable):</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="autoAwaySpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Set to 0 to disable</string>
</property>
<property name="showGroupSeparator" stdset="0">
<bool>true</bool>
</property>
<property name="suffix">
<string> minutes</string>
</property>
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>2147483647</number>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item alignment="Qt::AlignTop">
<widget class="QGroupBox" name="themeGroup">
<property name="title">
<string>Theme</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="smileyHLayout">
<item>
<widget class="QLabel" name="smileyPackLabel">
<property name="text">
<string extracomment="Text on smiley pack label">Smiley Pack:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="smileyPackBrowser">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,0,0,0">
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
</property>
<item alignment="Qt::AlignTop">
<widget class="QLabel" name="smile1">
<property name="toolTip">
<string>:)</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item alignment="Qt::AlignTop">
<widget class="QLabel" name="smile2">
<property name="toolTip">
<string>;)</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item alignment="Qt::AlignTop">
<widget class="QLabel" name="smile3">
<property name="toolTip">
<string>:p</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item alignment="Qt::AlignTop">
<widget class="QLabel" name="smile4">
<property name="toolTip">
<string>:O</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item alignment="Qt::AlignTop">
<widget class="QLabel" name="smile5">
<property name="toolTip">
<string>:'(</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="styleHLayout">
<item alignment="Qt::AlignTop">
<widget class="QLabel" name="styleLabel">
<property name="text">
<string>Style:</string>
</property>
</widget>
</item>
<item alignment="Qt::AlignTop">
<widget class="QComboBox" name="styleBrowser">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item alignment="Qt::AlignTop">
<widget class="QGroupBox" name="connectionGroup">
<property name="title">
<string>Connection Settings</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<layout class="QVBoxLayout" name="verticalLayoutProxy">
<property name="topMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="maximum"> <item>
<number>2147483647</number> <widget class="QCheckBox" name="cbEnableIPv6">
</property> <property name="text">
</widget> <string extracomment="Text on a checkbox to enable IPv6">Enable IPv6 (recommended)</string>
</item> </property>
</layout> </widget>
</item> </item>
</layout> <item>
<widget class="QCheckBox" name="cbUDPDisabled">
<property name="toolTip">
<string extracomment="force tcp checkbox tooltip">This allows, e.g., toxing over Tor. It adds load to the Tox network however, so use only when necessary.</string>
</property>
<property name="text">
<string extracomment="Text on checkbox to disable UDP">Disable UDP (not recommended)</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cbUseProxy">
<property name="text">
<string>Use proxy (SOCKS5)</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="proxyLayout">
<property name="spacing">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="proxyAddrLabel">
<property name="text">
<string extracomment="Text on proxy addr label">Address</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="proxyAddr"/>
</item>
<item>
<widget class="QLabel" name="proxyPortLabel">
<property name="text">
<string extracomment="Text on proxy port label">Port</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="proxyPort">
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>65535</number>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</widget> </widget>
</item> </item>
<item>
<widget class="QGroupBox" name="themeGroup">
<property name="title">
<string>Theme</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="smileyHLayout">
<item>
<widget class="QLabel" name="smileyPackLabel">
<property name="text">
<string extracomment="Text on smiley pack label">Smiley Pack:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="smileyPackBrowser">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="smile1">
<property name="toolTip">
<string>:)</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="smile2">
<property name="toolTip">
<string>;)</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="smile3">
<property name="toolTip">
<string>:p</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="smile4">
<property name="toolTip">
<string>:O</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="smile5">
<property name="toolTip">
<string>:'(</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="styleHLayout">
<item>
<widget class="QLabel" name="styleLabel">
<property name="text">
<string>Style:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="styleBrowser">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="connectionGroup">
<property name="title">
<string>Connection Settings</string>
</property>
<layout class="QVBoxLayout" name="verticalLayoutProxy">
<item>
<widget class="QCheckBox" name="cbEnableIPv6">
<property name="text">
<string extracomment="Text on a checkbox to enable IPv6">Enable IPv6 (recommended)</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cbUDPDisabled">
<property name="toolTip">
<string extracomment="force tcp checkbox tooltip">This allows, e.g., toxing over Tor. It adds load to the Tox network however, so use only when necessary.</string>
</property>
<property name="text">
<string extracomment="Text on checkbox to disable UDP">Disable UDP (not recommended)</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cbUseProxy">
<property name="text">
<string>Use proxy (SOCKS5)</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="proxyLayout">
<item>
<widget class="QLabel" name="proxyAddrLabel">
<property name="text">
<string extracomment="Text on proxy addr label">Address</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="proxyAddr"/>
</item>
<item>
<widget class="QLabel" name="proxyPortLabel">
<property name="text">
<string extracomment="Text on proxy port label">Port</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="proxyPort">
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>65535</number>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</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> </layout>
</widget> </widget>
<resources/> <resources/>

View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>400</width> <width>439</width>
<height>300</height> <height>472</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -15,146 +15,158 @@
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QGroupBox" name="publicGroup"> <widget class="QScrollArea" name="scrollArea">
<property name="title"> <property name="widgetResizable">
<string>Public Information</string> <bool>true</bool>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <property name="alignment">
<item> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
<widget class="QLabel" name="userNameLabel"> </property>
<property name="text"> <widget class="QWidget" name="scrollAreaWidgetContents">
<string>Name</string> <property name="geometry">
</property> <rect>
</widget> <x>0</x>
</item> <y>0</y>
<item> <width>419</width>
<widget class="QLineEdit" name="userName"/> <height>452</height>
</item> </rect>
<item> </property>
<widget class="QLabel" name="statusMessageLabel"> <layout class="QVBoxLayout" name="verticalLayout_4" stretch="0,0,1">
<property name="text"> <property name="spacing">
<string>Status</string> <number>9</number>
</property> </property>
</widget> <item alignment="Qt::AlignTop">
</item> <widget class="QGroupBox" name="publicGroup">
<item> <property name="title">
<widget class="QLineEdit" name="statusMessage"/> <string>Public Information</string>
</item> </property>
</layout> <layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="userNameLabel">
<property name="text">
<string>Name</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="userName"/>
</item>
<item>
<widget class="QLabel" name="statusMessageLabel">
<property name="text">
<string>Status</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="statusMessage"/>
</item>
</layout>
</widget>
</item>
<item alignment="Qt::AlignTop">
<widget class="QGroupBox" name="toxGroup">
<property name="title">
<string>Tox ID</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="CroppingLabel" name="toxIdLabel">
<property name="text">
<string>Your Tox ID (click to copy)</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item alignment="Qt::AlignTop">
<widget class="QGroupBox" name="profilesGroup">
<property name="title">
<string>Profiles</string>
</property>
<layout class="QVBoxLayout" name="profilesVLayout">
<item>
<layout class="QHBoxLayout" name="profilesComboLayout">
<item>
<widget class="QLabel" name="profilesLabel">
<property name="text">
<string>Available profiles:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="profiles">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="profilesButtonsLayout">
<item>
<widget class="QPushButton" name="loadButton">
<property name="text">
<string comment="load profile button">Load</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="renameButton">
<property name="text">
<string comment="rename profile button">Rename</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="exportButton">
<property name="text">
<string comment="export profile button">Export</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>
</property>
<property name="text">
<string comment="delete profile button">Delete</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="profilesButtonsLayout2">
<item>
<widget class="QPushButton" name="importButton">
<property name="text">
<string comment="import profile button">Import a profile</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="newButton">
<property name="text">
<string comment="new profile button">New Tox ID</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</widget> </widget>
</item> </item>
<item>
<widget class="QGroupBox" name="toxGroup">
<property name="title">
<string>Tox ID</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="CroppingLabel" name="toxIdLabel">
<property name="text">
<string>Your Tox ID (click to copy)</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="profilesGroup">
<property name="title">
<string>Profiles</string>
</property>
<layout class="QVBoxLayout" name="profilesVLayout">
<item>
<layout class="QHBoxLayout" name="profilesComboLayout">
<item>
<widget class="QLabel" name="profilesLabel">
<property name="text">
<string>Available profiles:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="profiles">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="profilesButtonsLayout">
<item>
<widget class="QPushButton" name="loadButton">
<property name="text">
<string comment="load profile button">Load</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="renameButton">
<property name="text">
<string comment="rename profile button">Rename</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="exportButton">
<property name="text">
<string comment="export profile button">Export</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="deleteButton">
<property name="text">
<string comment="delete profile button">Delete</string>
</property>
<property name="toolTip">
<string comment="delete profile button tooltip">This is useful to remain safe on public computers</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="profilesButtonsLayout2">
<item>
<widget class="QPushButton" name="importButton">
<property name="text">
<string comment="import profile button">Import a profile</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="newButton">
<property name="text">
<string comment="new profile button">New Tox ID</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</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> </layout>
</widget> </widget>
<customwidgets> <customwidgets>

View File

@ -69,8 +69,6 @@ void Widget::init()
icon = new QSystemTrayIcon(this); icon = new QSystemTrayIcon(this);
icon->setIcon(this->windowIcon()); icon->setIcon(this->windowIcon());
trayMenu = new QMenu; trayMenu = new QMenu;
trayMenu->setStyleSheet("QMenu {background: white; color: black; border: 1px solid black;}"
"QMenu::item:selected { background: #414141}");
statusOnline = new QAction(tr("online"), this); statusOnline = new QAction(tr("online"), this);
statusOnline->setIcon(QIcon(":ui/statusButton/dot_online.png")); statusOnline->setIcon(QIcon(":ui/statusButton/dot_online.png"));

View File

@ -1,111 +1,5 @@
QScrollArea { QTextEdit
{
background: white; background: white;
border: 0 0 0 0 ; color: back;
} }
QScrollArea > QWidget > QWidget {
background: white;
}
QScrollBar:vertical {
background: transparent;
width: 12px;
margin-top: 2px;
margin-bottom: 2px;
}
QScrollBar::handle:vertical {
background: #d1d1d1;
min-height: 20px;
border-radius: 3px;
margin-left: 2px;
}
QScrollBar::handle:vertical:hover {
background: #e3e3e3;
}
QScrollBar::handle:vertical:pressed {
background: #b1b1b1;
}
QScrollBar::add-line:vertical {
background: url(":ui/chatArea/scrollBarDownArrow.png") center;
height: 0px;
subcontrol-position: bottom;
subcontrol-origin: margin;
}
QScrollBar::sub-line:vertical {
background: url(":ui/chatArea/scrollBarUpArrow.png") center;
height: 0px;
subcontrol-position: top;
subcontrol-origin: margin;
}
QScrollBar:QScrollBar::down-arrow:vertical {
width: 10;
height: 10px;
background: white;
}
QScrollBar:QScrollBar::up-arrow:vertical {
width: 10px;
height: 10px;
background: white;
}
QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
background: none;
}
QScrollBar:horizontal {
background: white;
height: 10px;
margin: 0 2px 0 2px;
}
QScrollBar::handle:horizontal {
background: #d1d1d1;
min-width: 20px;
border-radius: 2px;
}
QScrollBar::handle:horizontal:hover {
background: #e3e3e3;
}
QScrollBar::handle:horizontal:pressed {
background: #b1b1b1;
}
QScrollBar::add-line:horizontal {
background: url(":ui/chatArea/scrollBarRightArrow.png") center;
width: 0px;
subcontrol-position: right;
subcontrol-origin: margin;
}
QScrollBar::sub-line:horizontal {
background: url(":ui/chatArea/scrollBarLeftArrow.png") center;
width: 0px;
subcontrol-position: left;
subcontrol-origin: margin;
}
QScrollBar:QScrollBar::down-arrow:horizontal {
width: 10;
height: 10px;
background: white;
}
QScrollBar:QScrollBar::up-arrow:horizontal {
width: 10px;
height: 10px;
background: white;
}
QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal {
background: none;
}

View File

@ -2,6 +2,7 @@ QTextEdit {
border-color: @lightGrey; border-color: @lightGrey;
border-style: solid; border-style: solid;
border-width: 1px 0 1px 1px; border-width: 1px 0 1px 1px;
background: white;
} }
QTextEdit:hover { QTextEdit:hover {
@ -23,4 +24,4 @@ QTextEdit#group:hover {
QTextEdit#group:pressed { QTextEdit#group:pressed {
border-color: #4ea6ea; border-color: #4ea6ea;
} }

View File

@ -4,14 +4,66 @@ QWidget
font: @big; font: @big;
} }
QCheckBox QTextEdit
{ {
color: black; border-color: @lightGrey;
border-style: solid;
border-width: 1px 0 1px 1px;
background: white;
border: 1px solid #c4c1bd;
}
QListWidget
{
background: white;
}
QScrollArea
{
background: white;
} }
QGroupBox QGroupBox
{ {
background-color: white; background: white;
}
QMessageBox
{
background: white;
}
QCheckBox
{
background: white;
color: black;
}
QSpinBox
{
background: white;
}
QSlider::groove:horizontal
{
border: 1px solid #999999;
height: 8px; /* the groove expands to the size of the slider by default. by giving it a height, it has a fixed size */
background: white;
margin: 2px 0;
}
QSlider::handle:horizontal
{
background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #b4b4b4, stop:1 #8f8f8f);
border: 1px solid #5c5c5c;
width: 18px;
margin: -2px 0; /* handle is placed by default on the contents rect of the groove. Expand outside the groove */
border-radius: 3px;
}
QPushButton
{
background: white;
} }
QGroupBox QGroupBox
@ -23,7 +75,12 @@ QGroupBox
QComboBox QComboBox
{ {
background-color: white; color: black;
background: white;
}
QComboBox QAbstractItemView {
background: white;
} }
QLineEdit QLineEdit
@ -44,4 +101,117 @@ QTabBar
QScrollArea QScrollArea
{ {
background-color: white; background-color: white;
} }
QScrollArea
{
background: transparent;
}
QScrollArea > QWidget > QWidget
{
background: transparent;
}
QScrollBar:vertical {
background: transparent;
width: 12px;
margin-top: 2px;
margin-bottom: 2px;
}
QScrollBar::handle:vertical {
background: #d1d1d1;
min-height: 20px;
border-radius: 3px;
margin-left: 2px;
}
QScrollBar::handle:vertical:hover {
background: #e3e3e3;
}
QScrollBar::handle:vertical:pressed {
background: #b1b1b1;
}
QScrollBar::add-line:vertical {
background: url(":ui/chatArea/scrollBarDownArrow.png") center;
height: 0px;
subcontrol-position: bottom;
subcontrol-origin: margin;
}
QScrollBar::sub-line:vertical {
background: url(":ui/chatArea/scrollBarUpArrow.png") center;
height: 0px;
subcontrol-position: top;
subcontrol-origin: margin;
}
QScrollBar:QScrollBar::down-arrow:vertical {
width: 10;
height: 10px;
background: white;
}
QScrollBar:QScrollBar::up-arrow:vertical {
width: 10px;
height: 10px;
background: white;
}
QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
background: none;
}
QScrollBar:horizontal {
background: white;
height: 10px;
margin: 0 2px 0 2px;
}
QScrollBar::handle:horizontal {
background: #d1d1d1;
min-width: 20px;
border-radius: 2px;
}
QScrollBar::handle:horizontal:hover {
background: #e3e3e3;
}
QScrollBar::handle:horizontal:pressed {
background: #b1b1b1;
}
QScrollBar::add-line:horizontal {
background: url(":ui/chatArea/scrollBarRightArrow.png") center;
width: 0px;
subcontrol-position: right;
subcontrol-origin: margin;
}
QScrollBar::sub-line:horizontal {
background: url(":ui/chatArea/scrollBarLeftArrow.png") center;
width: 0px;
subcontrol-position: left;
subcontrol-origin: margin;
}
QScrollBar:QScrollBar::down-arrow:horizontal {
width: 10;
height: 10px;
background: white;
}
QScrollBar:QScrollBar::up-arrow:horizontal {
width: 10px;
height: 10px;
background: white;
}
QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal {
background: none;
}