Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-27 08:29:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing People Margins

Browse Source 
Update emotes file
This commit is contained in:
defnax 2016-01-07 19:25:52 +01:00
parent 3d6fa0cf8d
commit 81e2a597e9
3 changed files with 180 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

300
retroshare-gui/src/gui/Identity/IdDialog.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>745</width> <width>745</width>
<height>668</height> <height>500</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -19,8 +19,23 @@
<property name="windowTitle"> <property name="windowTitle">
<string/> <string/>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QGridLayout" name="gridLayout_5">
<item> <property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<property name="horizontalSpacing">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QFrame" name="titleBarFrame"> <widget class="QFrame" name="titleBarFrame">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum"> <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
@ -35,6 +50,18 @@
<enum>QFrame::Sunken</enum> <enum>QFrame::Sunken</enum>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin">
<number>2</number>
</property>
<property name="topMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>2</number>
</property>
<property name="bottomMargin">
<number>2</number>
</property>
<item> <item>
<widget class="QLabel" name="titleBarPixmap"> <widget class="QLabel" name="titleBarPixmap">
<property name="minimumSize"> <property name="minimumSize">
@ -107,130 +134,135 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_3"> <widget class="QSplitter" name="splitter">
<item> <property name="orientation">
<widget class="QSplitter" name="splitter"> <enum>Qt::Horizontal</enum>
<property name="orientation"> </property>
<enum>Qt::Horizontal</enum> <widget class="QWidget" name="layoutWidget">
</property> <layout class="QVBoxLayout" name="verticalLayout_5">
<widget class="QWidget" name="layoutWidget"> <item>
<layout class="QVBoxLayout" name="verticalLayout_5"> <widget class="QFrame" name="toolBarFrame">
<item> <property name="frameShape">
<widget class="QFrame" name="toolBarFrame"> <enum>QFrame::Box</enum>
<property name="frameShape"> </property>
<enum>QFrame::Box</enum> <property name="frameShadow">
</property> <enum>QFrame::Sunken</enum>
<property name="frameShadow"> </property>
<enum>QFrame::Sunken</enum> <layout class="QHBoxLayout" name="horizontalLayout_2">
</property> <property name="leftMargin">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <number>2</number>
<property name="margin"> </property>
<number>2</number> <property name="topMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>2</number>
</property>
<property name="bottomMargin">
<number>2</number>
</property>
<item>
<widget class="LineEditClear" name="filterLineEdit"/>
</item>
<item>
<widget class="QComboBox" name="filterComboBox"/>
</item>
<item>
<widget class="QToolButton" name="toolButton_NewId">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Create new Identity</string>
</property> </property>
<item>
<widget class="LineEditClear" name="filterLineEdit"/>
</item>
<item>
<widget class="QComboBox" name="filterComboBox"/>
</item>
<item>
<widget class="QToolButton" name="toolButton_NewId">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Create new Identity</string>
</property>
<property name="text">
<string>New ID</string>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/identity/identity_create_32.png</normaloff>:/images/identity/identity_create_32.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="filterLayout"/>
</item>
<item>
<widget class="RSTreeWidget" name="idTreeWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::ExtendedSelection</enum>
</property>
<property name="iconSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="indentation">
<number>24</number>
</property>
<property name="sortingEnabled">
<bool>true</bool>
</property>
<attribute name="headerStretchLastSection">
<bool>false</bool>
</attribute>
<column>
<property name="text"> <property name="text">
<string>Persons</string> <string>New ID</string>
</property> </property>
</column> <property name="icon">
<column> <iconset resource="../images.qrc">
<property name="text"> <normaloff>:/images/identity/identity_create_32.png</normaloff>:/images/identity/identity_create_32.png</iconset>
<string>Identity ID</string>
</property> </property>
</column> <property name="iconSize">
<column> <size>
<property name="text"> <width>24</width>
<string>Owned by</string> <height>24</height>
</size>
</property> </property>
</column> <property name="autoRaise">
<column> <bool>true</bool>
<property name="text">
<string>Reputation</string>
</property> </property>
<property name="textAlignment"> </widget>
<set>AlignLeft|AlignVCenter</set> </item>
</property> </layout>
</column> </widget>
</widget> </item>
</item> <item>
</layout> <layout class="QHBoxLayout" name="filterLayout"/>
</widget> </item>
</widget> <item>
</item> <widget class="RSTreeWidget" name="idTreeWidget">
<item> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::ExtendedSelection</enum>
</property>
<property name="iconSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="indentation">
<number>24</number>
</property>
<property name="sortingEnabled">
<bool>true</bool>
</property>
<attribute name="headerStretchLastSection">
<bool>false</bool>
</attribute>
<column>
<property name="text">
<string>Persons</string>
</property>
</column>
<column>
<property name="text">
<string>Identity ID</string>
</property>
</column>
<column>
<property name="text">
<string>Owned by</string>
</property>
</column>
<column>
<property name="text">
<string>Reputation</string>
</property>
<property name="textAlignment">
<set>AlignLeading|AlignVCenter</set>
</property>
</column>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="layoutWidget">
<layout class="QVBoxLayout" name="verticalLayout_4"> <layout class="QVBoxLayout" name="verticalLayout_4">
<item> <item>
<widget class="QFrame" name="headerFrame"> <widget class="QFrame" name="headerFrame">
@ -287,7 +319,16 @@
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0"> <item row="0" column="0">
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="margin"> <property name="leftMargin">
<number>6</number>
</property>
<property name="topMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<number>6</number> <number>6</number>
</property> </property>
<property name="spacing"> <property name="spacing">
@ -461,7 +502,16 @@
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<property name="margin"> <property name="leftMargin">
<number>6</number>
</property>
<property name="topMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<number>6</number> <number>6</number>
</property> </property>
<item row="2" column="1"> <item row="2" column="1">
@ -582,8 +632,8 @@ p, li { white-space: pre-wrap; }
</spacer> </spacer>
</item> </item>
</layout> </layout>
</item> </widget>
</layout> </widget>
</item> </item>
</layout> </layout>
<action name="editIdentity"> <action name="editIdentity">

1
retroshare-gui/src/gui/emojione.qrc
View File

@ -390,6 +390,7 @@
<file>emojione/1F597.png</file> <file>emojione/1F597.png</file>
<file>emojione/1F598.png</file> <file>emojione/1F598.png</file>
<file>emojione/1F599.png</file> <file>emojione/1F599.png</file>
<file>emojione/1F59E.png</file>
<file>emojione/1F600.png</file> <file>emojione/1F600.png</file>
<file>emojione/1F601.png</file> <file>emojione/1F601.png</file>
<file>emojione/1F602.png</file> <file>emojione/1F602.png</file>

4
retroshare-gui/src/gui/emojione/emotes.acs
View File

@ -130,6 +130,10 @@
":thumbsdown:|:-1:|(N)|(n)":"emojione/1F44E.png"; ":thumbsdown:|:-1:|(N)|(n)":"emojione/1F44E.png";
":muscle:":"emojione/1F4AA.png"; ":muscle:":"emojione/1F4AA.png";
":middle_finger:|":"emojione/1F595.png"; ":middle_finger:|":"emojione/1F595.png";
":finger_pointing_down:":"emojione/1F597.png";
":finger_pointing_left:":"emojione/1F598.png";
":finger_pointing_right:":"emojione/1F599.png";
":finger_pointing_up:":"emojione/1F59E.png";
":coffee:|(C)|(c)":"emojione/2615.png"; ":coffee:|(C)|(c)":"emojione/2615.png";
":sake:":"emojione/1F376.png"; ":sake:":"emojione/1F376.png";
":tea:":"emojione/1F375.png"; ":tea:":"emojione/1F375.png";