Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

more cleanup

Browse Source
This commit is contained in:
defnax 2020-02-22 13:24:30 +01:00
parent 089aedfc3b
commit e19f97f820
46 changed files with 170 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
retroshare-gui/src/gui/FileTransfer/SharedFilesDialog.cpp
View File

@ -60,9 +60,8 @@
#define IMAGE_HASH_BUSY ":/images/settings.png" #define IMAGE_HASH_BUSY ":/images/settings.png"
#define IMAGE_HASH_DONE ":/images/accepted16.png" #define IMAGE_HASH_DONE ":/images/accepted16.png"
#define IMAGE_MSG ":/images/message-mail.png" #define IMAGE_MSG ":/images/message-mail.png"
#define IMAGE_ATTACHMENT ":/images/attachment.png" #define IMAGE_ATTACHMENT ":/icons/png/attachements.png"
#define IMAGE_FRIEND ":/images/peers_16x16.png" #define IMAGE_FRIEND ":/images/peers_16x16.png"
#define IMAGE_PROGRESS ":/images/browse-looking.gif"
#define IMAGE_COPYLINK ":/images/copyrslink.png" #define IMAGE_COPYLINK ":/images/copyrslink.png"
#define IMAGE_OPENFOLDER ":/images/folderopen.png" #define IMAGE_OPENFOLDER ":/images/folderopen.png"
#define IMAGE_OPENFILE ":/images/fileopen.png" #define IMAGE_OPENFILE ":/images/fileopen.png"

2
retroshare-gui/src/gui/Identity/IdDialog.cpp
View File

@ -1162,7 +1162,7 @@ void IdDialog::CircleListCustomPopupMenu( QPoint )
static const int CANCEL = 3 ; // Admin list: no Subscription request: yes static const int CANCEL = 3 ; // Admin list: no Subscription request: yes
const QString menu_titles[4] = { tr("Request subscription"), tr("Accept circle invitation"), tr("Quit this circle"),tr("Cancel subscribe request")} ; const QString menu_titles[4] = { tr("Request subscription"), tr("Accept circle invitation"), tr("Quit this circle"),tr("Cancel subscribe request")} ;
const QString image_names[4] = { ":/images/edit_add24.png",":/images/accepted16.png",":/images/door_in.png",":/images/cancel.png" } ; const QString image_names[4] = { ":/images/edit_add24.png",":/images/accepted16.png",":/icons/png/enter.png",":/images/cancel.png" } ;
std::vector< std::vector<RsGxsId> > ids(4) ; std::vector< std::vector<RsGxsId> > ids(4) ;

7
retroshare-gui/src/gui/Posted/PostedCreatePostDialog.ui
View File

@ -279,13 +279,6 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="1" column="0">
<widget class="QCheckBox" name="shareimagecheckBox">
<property name="text">
<string>Share Orginal Image</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="3"> <item row="0" column="0" colspan="3">
<widget class="QLabel" name="imageLabel"> <widget class="QLabel" name="imageLabel">
<property name="maximumSize"> <property name="maximumSize">

140
retroshare-gui/src/gui/connect/PGPKeyDialog.ui
View File

@ -13,8 +13,8 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Dialog</string> <string>Dialog</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QGridLayout" name="gridLayout_3">
<item> <item row="0" column="0">
<widget class="HeaderFrame" name="headerFrame"> <widget class="HeaderFrame" name="headerFrame">
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::NoFrame</enum> <enum>QFrame::NoFrame</enum>
@ -24,7 +24,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="1" column="0">
<widget class="QTabWidget" name="stabWidget"> <widget class="QTabWidget" name="stabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>0</number>
@ -33,18 +33,11 @@
<attribute name="title"> <attribute name="title">
<string>Profile info</string> <string>Profile info</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item> <item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label_name">
<property name="text">
<string>Name :</string>
</property>
</widget>
</item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLineEdit" name="name"> <widget class="QLineEdit" name="name">
<property name="readOnly"> <property name="readOnly">
@ -52,13 +45,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0">
<widget class="QLabel" name="pgpfingerprint_label">
<property name="text">
<string>Fingerprint :</string>
</property>
</widget>
</item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QLineEdit" name="pgpfingerprint"> <widget class="QLineEdit" name="pgpfingerprint">
<property name="toolTip"> <property name="toolTip">
@ -69,13 +55,17 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="1" column="0">
<widget class="QLabel" name="web_of_trust_label"> <widget class="QLabel" name="pgpfingerprint_label">
<property name="text"> <property name="text">
<string>Trust level:</string> <string>Fingerprint :</string>
</property> </property>
<property name="wordWrap"> </widget>
<bool>true</bool> </item>
<item row="0" column="0">
<widget class="QLabel" name="label_name">
<property name="text">
<string>Name :</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -140,11 +130,65 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="2" column="0">
<widget class="QLabel" name="web_of_trust_label">
<property name="text">
<string>Trust level:</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Keysigning:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QToolButton" name="signKeyButton">
<property name="toolTip">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend's key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Sign this key</string>
</property>
<property name="iconSize">
<size>
<width>48</width>
<height>48</height>
</size>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextUnderIcon</enum>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="signGPGKeyCheckBox">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend's key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Sign PGP key</string>
</property>
</widget>
</item>
</layout>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>
</item> </item>
<item> <item row="1" column="0">
<widget class="QLabel" name="is_signing_me"> <widget class="QLabel" name="is_signing_me">
<property name="font"> <property name="font">
<font> <font>
@ -157,7 +201,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="2" column="0">
<widget class="QGroupBox" name="signersBox"> <widget class="QGroupBox" name="signersBox">
<property name="title"> <property name="title">
<string>Key signatures :</string> <string>Key signatures :</string>
@ -173,7 +217,7 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item row="3" column="0">
<layout class="QHBoxLayout" name="friendAndSignLayout"> <layout class="QHBoxLayout" name="friendAndSignLayout">
<property name="leftMargin"> <property name="leftMargin">
<number>6</number> <number>6</number>
@ -187,43 +231,6 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>6</number> <number>6</number>
</property> </property>
<item>
<widget class="QToolButton" name="signKeyButton">
<property name="toolTip">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend's key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Sign this key</string>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/view-certificate-sign-48.png</normaloff>:/images/view-certificate-sign-48.png</iconset>
</property>
<property name="iconSize">
<size>
<width>48</width>
<height>48</height>
</size>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextUnderIcon</enum>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="signGPGKeyCheckBox">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Signing a friend's key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Sign PGP key</string>
</property>
</widget>
</item>
<item> <item>
<spacer name="horizontalSpacer"> <spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">
@ -451,7 +458,7 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
</widget> </widget>
</item> </item>
<item> <item row="2" column="0">
<widget class="QDialogButtonBox" name="buttonBox"> <widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -462,9 +469,6 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
</item> </item>
</layout> </layout>
<zorder>stabWidget</zorder>
<zorder>headerFrame</zorder>
<zorder>buttonBox</zorder>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>

2
retroshare-gui/src/gui/gxs/GxsIdDetails.cpp
View File

@ -36,7 +36,7 @@
/* Images for tag icons */ /* Images for tag icons */
#define IMAGE_LOADING ":/images/folder-draft.png" #define IMAGE_LOADING ":/images/folder-draft.png"
#define IMAGE_PGPKNOWN ":/images/contact.png" #define IMAGE_PGPKNOWN ":/images/contact22.png"
#define IMAGE_PGPUNKNOWN ":/images/tags/pgp-unknown.png" #define IMAGE_PGPUNKNOWN ":/images/tags/pgp-unknown.png"
#define IMAGE_ANON ":/images/tags/anon.png" #define IMAGE_ANON ":/images/tags/anon.png"
#define IMAGE_BANNED ":/icons/biohazard_red.png" #define IMAGE_BANNED ":/icons/biohazard_red.png"

80
retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui
View File

@ -285,48 +285,6 @@ p, li { white-space: pre-wrap; }
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="attachmentsPixLabel">
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../images.qrc">:/images/attachment.png</pixmap>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="attachmentsLabel">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>26</height>
</size>
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Attachments</string>
</property>
</widget>
</item>
<item row="0" column="2">
<spacer name="attachmentsHSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>334</width>
<height>26</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="3">
<widget class="QPushButton" name="addFileButton"> <widget class="QPushButton" name="addFileButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@ -340,6 +298,9 @@ p, li { white-space: pre-wrap; }
<height>34</height> <height>34</height>
</size> </size>
</property> </property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Add File&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
@ -355,16 +316,6 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="4">
<widget class="QCheckBox" name="thumbNailCb">
<property name="toolTip">
<string>Allow channels to get frame for message thumbnail from movie media attachments or not</string>
</property>
<property name="text">
<string>Auto Thumbnail</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="5"> <item row="1" column="0" colspan="5">
<widget class="QScrollArea" name="attachmentsScrollArea"> <widget class="QScrollArea" name="attachmentsScrollArea">
<property name="verticalScrollBarPolicy"> <property name="verticalScrollBarPolicy">
@ -378,7 +329,7 @@ p, li { white-space: pre-wrap; }
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>81</width> <width>632</width>
<height>24</height> <height>24</height>
</rect> </rect>
</property> </property>
@ -425,6 +376,29 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
</widget> </widget>
</item> </item>
<item row="0" column="2">
<spacer name="attachmentsHSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>334</width>
<height>26</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="thumbNailCb">
<property name="toolTip">
<string>Allow channels to get frame for message thumbnail from movie media attachments or not</string>
</property>
<property name="text">
<string>Auto Thumbnail</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</widget> </widget>

BIN
retroshare-gui/src/gui/icons/png/attachements.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

65
retroshare-gui/src/gui/icons/svg/attachments.svg Normal file
View File

@ -0,0 +1,65 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
height="128"
version="1.0"
viewBox="0 0 176 176"
width="128"
xml:space="preserve"
id="svg2"
inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="attachments.svg"
inkscape:export-filename="C:\Users\ProBook\Documents\GitHub\RetroShare\retroshare-gui\src\gui\icons\png\attachments.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96"><metadata
id="metadata20"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs18" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1366"
inkscape:window-height="705"
id="namedview16"
showgrid="false"
inkscape:zoom="3.0341309"
inkscape:cx="77.428349"
inkscape:cy="56.305717"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="layer1"
inkscape:snap-grids="true"
inkscape:snap-text-baseline="false" /><g
id="Artboard"
transform="translate(0,66)" /><g
inkscape:groupmode="layer"
id="layer1"
inkscape:label="Layer 1"
style="display:inline"
transform="translate(0,66)"><path
style="fill:#000000;fill-opacity:0.15686275;stroke-width:2.0708437"
sodipodi:nodetypes="ccccccccccsasccsccccccccccccccsasccccccccccc"
id="use4188"
d="M 44.090446,93.263012 C 36.60259,93.26473 29.049256,90.31345 23.296365,84.559964 17.540579,78.805052 14.586684,71.248839 14.588708,63.762419 14.578631,56.714431 17.235414,49.610791 22.586516,44.268625 l 1.228456,-1.229034 73.807296,-73.810749 c 7.023462,-7.033281 16.348102,-10.522805 25.643592,-10.510118 9.88016,-0.0041 19.86818,3.891902 27.49306,11.514173 7.61737,7.621106 11.51185,17.603953 11.50984,27.4835423 0.009,9.2986616 -3.47829,18.6209827 -10.51011,25.6482117 -22.19267,22.190182 -42.74228,42.759514 -62.090436,61.547843 -2.356316,2.288138 -6.947381,2.559968 -9.094662,0.41551 -2.211303,-2.208399 -2.355168,-6.664588 0.415584,-9.366387 C 100.49719,56.939042 142.5393,14.141181 142.5393,14.141181 c 4.45924,-4.4687669 6.67705,-10.3154133 6.68745,-16.4251041 -0.001,-6.4740034 -2.54289,-13.1109589 -7.69179,-18.2615999 -5.15065,-5.152375 -11.79106,-7.691786 -18.2688,-7.696403 -6.10712,0.01204 -11.9526,2.22848 -16.41878,6.689751 l -73.812767,73.813052 -1.227304,1.228169 c -2.782271,2.788629 -4.164763,6.41717 -4.176873,10.272442 0.0041,4.083986 1.60198,8.29087 4.888447,11.578776 3.283004,3.279826 7.486989,4.876057 11.571857,4.88065 3.854685,-0.01203 7.482949,-1.393715 10.27359,-4.176 l 52.2275,-52.224822 4.37386,-4.373591 c 1.0479,-1.055682 1.56941,-2.39779 1.57949,-3.93459 0,-1.620148 -0.63109,-3.323089 -1.98706,-4.679333 -1.35881,-1.3594062 -3.06204,-1.9881997 -4.68075,-1.9928177 -1.53623,0.013254 -2.87633,0.5356379 -3.93345,1.5852657 0,0 -36.737225,36.900144 -43.141031,43.526168 -2.533705,2.621625 -7.447295,2.364616 -9.606654,7e-6 -2.146619,-2.350651 -1.908387,-6.726026 0.864761,-9.510726 6.658412,-6.686146 42.656956,-43.2330758 42.656956,-43.2330758 3.613556,-3.6253763 8.433938,-5.4183106 13.158838,-5.4067739 5.02371,-0.00415 10.07311,1.9809959 13.90618,5.8123196 3.82209,3.8281512 5.80569,8.8732211 5.80569,13.8992641 0.0103,4.722021 -1.78082,9.541535 -5.40217,13.156813 l -4.37531,4.373593 -52.227216,52.226921 c -5.335236,5.339266 -12.419565,7.99521 -19.452563,7.993769 l -0.0409,-2.93e-4 v 0 z"
inkscape:connector-curvature="0" /><g
id="g16"
transform="matrix(1.2942773,0,0,1.2942773,-23.539199,-4.5703125)"><g
id="g12"><path
inkscape:connector-curvature="0"
d="m 52.721094,72.291436 c -5.785112,0.05327 -11.641306,-2.174445 -16.125925,-6.579667 -4.486865,-4.406304 -6.821488,-10.223738 -6.871883,-16.007767 -0.05672,-5.44521 1.946631,-10.951928 6.04382,-15.11643 l 0.940577,-0.958077 56.511309,-57.538488 c 5.377523,-5.482663 12.557528,-8.243386 19.739318,-8.298095 7.63339,-0.07177 15.37719,2.868994 21.32107,8.705045 5.93808,5.835208 9.01624,13.5209371 9.08326,21.1539263 0.0715,7.184092 -2.55809,14.4107297 -7.94212,19.8887737 -16.99206,17.298173 -32.72596,33.332678 -47.54396,47.982837 -1.804612,1.78417 -5.349786,2.02605 -7.02366,0.384141 -1.723781,-1.690862 -1.865859,-5.132718 0.256076,-7.239362 14.939916,-14.832244 47.124654,-48.189692 47.124654,-48.189692 3.4142,-3.4835213 5.0871,-8.0160384 5.05273,-12.7364609 -0.0457,-5.0018134 -2.05563,-10.1118911 -6.06942,-14.0555431 -4.01515,-3.944983 -9.16317,-5.860847 -14.16791,-5.819458 -4.71827,0.05169 -9.21912,1.804681 -12.63873,5.282459 l -56.515517,57.540301 -0.939692,0.957403 c -2.130231,2.173807 -3.173162,4.986819 -3.155762,7.965487 0.03154,3.155262 1.295232,6.394415 3.857178,8.911842 2.559215,2.511214 5.818295,3.715285 8.974299,3.690485 2.978049,-0.03605 5.77166,-1.128717 7.908402,-3.297683 L 100.52776,18.206 l 3.3489,-3.409396 c 0.80228,-0.822895 1.19588,-1.863425 1.19301,-3.05083 -0.0112,-1.251726 -0.51065,-2.563041 -1.56768,-3.6014632 -1.05926,-1.0408503 -2.37954,-1.5148338 -3.630189,-1.5071657 -1.186801,0.020901 -2.218534,0.4337938 -3.027982,1.2520738 0,0 -28.127115,28.7640491 -33.028714,33.9277661 -1.939347,2.043052 -5.737375,1.878588 -7.422109,0.06668 -1.674793,-1.801218 -1.521101,-5.18329 0.602108,-7.353998 5.097891,-5.211934 32.656749,-33.69796164 32.656749,-33.69796164 2.766676,-2.82604606 6.478461,-4.24472176 10.129002,-4.26860216 3.881295,-0.038066 7.796245,1.4606072 10.784265,4.39409167 2.97952,2.93110473 4.54706,6.81516313 4.58195,10.69828813 0.0408,3.648164 -1.30965,7.384155 -4.08241,10.202455 l -3.35001,3.409408 -39.988325,40.713033 c -4.084951,4.162151 -9.539876,6.263301 -14.973587,6.310999 l -0.0316,5.9e-5 v 0 z"
id="path3"
sodipodi:nodetypes="ccccccccccsasccsccccccccccccccsasccccccccccc"
style="fill:#039bd5;fill-opacity:1;stroke-width:1.60000002" /></g></g></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 6.4 KiB

26
retroshare-gui/src/gui/images.qrc
View File

@ -30,7 +30,6 @@
<file>images/browsable_128_blue.png</file> <file>images/browsable_128_blue.png</file>
<file>images/blank_128_green.png</file> <file>images/blank_128_green.png</file>
<file>images/blank_128_blue.png</file> <file>images/blank_128_blue.png</file>
<file>images/door_in.png</file>
<file>images/tor-logo.png</file> <file>images/tor-logo.png</file>
<file>images/help/addafriend.png</file> <file>images/help/addafriend.png</file>
<file>images/help/addfriendkey.png</file> <file>images/help/addfriendkey.png</file>
@ -38,7 +37,6 @@
<file>icons/help_64.png</file> <file>icons/help_64.png</file>
<file>images/help/natgreen.png</file> <file>images/help/natgreen.png</file>
<file>images/help/natred.png</file> <file>images/help/natred.png</file>
<file>images/attach.png</file>
<file>images/pgp.png</file> <file>images/pgp.png</file>
<file>images/rs_wizard.png</file> <file>images/rs_wizard.png</file>
<file>images/avatar_request.png</file> <file>images/avatar_request.png</file>
@ -83,14 +81,12 @@
<file>images/avatarstatus-bg-away-70.png</file> <file>images/avatarstatus-bg-away-70.png</file>
<file>images/avatarstatus-bg-busy-70.png</file> <file>images/avatarstatus-bg-busy-70.png</file>
<file>images/avatarstatus-bg-offline-70.png</file> <file>images/avatarstatus-bg-offline-70.png</file>
<file>images/browse-looking.gif</file>
<file>images/back.png</file> <file>images/back.png</file>
<file>images/configure.png</file> <file>images/configure.png</file>
<file>images/copyrslink.png</file> <file>images/copyrslink.png</file>
<file>images/contacts24.png</file> <file>images/contacts24.png</file>
<file>images/contactsclosed24.png</file> <file>images/contactsclosed24.png</file>
<file>images/connection.png</file> <file>images/connection.png</file>
<file>images/contact.png</file>
<file>images/contact22.png</file> <file>images/contact22.png</file>
<file>images/Client0.png</file> <file>images/Client0.png</file>
<file>images/Client1.png</file> <file>images/Client1.png</file>
@ -111,7 +107,6 @@
<file>images/FileTypeProgram.png</file> <file>images/FileTypeProgram.png</file>
<file>images/FileTypeVideo.png</file> <file>images/FileTypeVideo.png</file>
<file>images/fonts.png</file> <file>images/fonts.png</file>
<file>images/folder16.png</file>
<file>images/foldermail.png</file> <file>images/foldermail.png</file>
<file>images/folderopen.png</file> <file>images/folderopen.png</file>
<file>images/fileopen.png</file> <file>images/fileopen.png</file>
@ -121,7 +116,6 @@
<file>images/graph-checking.png</file> <file>images/graph-checking.png</file>
<file>images/graph-blue.png</file> <file>images/graph-blue.png</file>
<file>images/add-share24.png</file> <file>images/add-share24.png</file>
<file>images/attachment.png</file>
<file>images/avatar_background.png</file> <file>images/avatar_background.png</file>
<file>images/button_cancel.png</file> <file>images/button_cancel.png</file>
<file>images/calendar.png</file> <file>images/calendar.png</file>
@ -204,14 +198,6 @@
<file>images/folder-outbox.png</file> <file>images/folder-outbox.png</file>
<file>images/folder-sent.png</file> <file>images/folder-sent.png</file>
<file>images/folder-trash.png</file> <file>images/folder-trash.png</file>
<file>images/folder_doments.png</file>
<file>images/folder_green.png</file>
<file>images/folder_red.png</file>
<file>images/folder_grey.png</file>
<file>images/folder_yellow.png</file>
<file>images/folder_open.png</file>
<file>images/folder_video.png</file>
<file>images/folder_blueshared.png</file>
<file>images/forward.png</file> <file>images/forward.png</file>
<file>images/kgames.png</file> <file>images/kgames.png</file>
<file>images/go-down.png</file> <file>images/go-down.png</file>
@ -220,7 +206,6 @@
<file>images/go-bottom.png</file> <file>images/go-bottom.png</file>
<file>images/graph-area.png</file> <file>images/graph-area.png</file>
<file>images/graph-line.png</file> <file>images/graph-line.png</file>
<file>images/groupchat.png</file>
<file>images/gohome.png</file> <file>images/gohome.png</file>
<file>images/gpgp_key_generate.png</file> <file>images/gpgp_key_generate.png</file>
<file>images/hide_toolbox_frame.png</file> <file>images/hide_toolbox_frame.png</file>
@ -232,7 +217,6 @@
<file>images/hot_3.png</file> <file>images/hot_3.png</file>
<file>images/hot_4.png</file> <file>images/hot_4.png</file>
<file>images/hot_5.png</file> <file>images/hot_5.png</file>
<file>images/image16.png</file>
<file>images/imageblocked_24.png</file> <file>images/imageblocked_24.png</file>
<file>images/info16.png</file> <file>images/info16.png</file>
<file>images/im-user.png</file> <file>images/im-user.png</file>
@ -245,16 +229,11 @@
<file>images/kalarm.png</file> <file>images/kalarm.png</file>
<file>images/kbackgammon.png</file> <file>images/kbackgammon.png</file>
<file>images/kcmsystem24.png</file> <file>images/kcmsystem24.png</file>
<file>images/kdmconfig.png</file>
<file>images/konsole.png</file>
<file>images/library.png</file> <file>images/library.png</file>
<file>images/ledoff1.png</file> <file>images/ledoff1.png</file>
<file>images/ledon1.png</file> <file>images/ledon1.png</file>
<file>images/locale.png</file> <file>images/locale.png</file>
<file>images/looknfeel.png</file> <file>images/looknfeel.png</file>
<file>images/lphoto.png</file>
<file>images/lphoto16.png</file>
<file>images/lphoto24.png</file>
<file>images/logo/logo_16.png</file> <file>images/logo/logo_16.png</file>
<file>images/logo/logo_24.png</file> <file>images/logo/logo_24.png</file>
<file>images/logo/logo_24_0.png</file> <file>images/logo/logo_24_0.png</file>
@ -296,7 +275,6 @@
<file>images/message-state-new.png</file> <file>images/message-state-new.png</file>
<file>images/message-news.png</file> <file>images/message-news.png</file>
<file>images/message.png</file> <file>images/message.png</file>
<file>images/messenger.png</file>
<file>images/mute-off-16.png</file> <file>images/mute-off-16.png</file>
<file>images/mute-on-16.png</file> <file>images/mute-on-16.png</file>
<file>images/new-mail-alert.png</file> <file>images/new-mail-alert.png</file>
@ -375,8 +353,6 @@
<file>images/mimetypes/source_c.png</file> <file>images/mimetypes/source_c.png</file>
<file>images/mimetypes/source_cpp.png</file> <file>images/mimetypes/source_cpp.png</file>
<file>images/mimetypes/source_h.png</file> <file>images/mimetypes/source_h.png</file>
<file>images/view-certificate-copy-32.png</file>
<file>images/view-certificate-export-32.png</file>
<file>images/textedit/textbold.png</file> <file>images/textedit/textbold.png</file>
<file>images/textedit/textitalic.png</file> <file>images/textedit/textitalic.png</file>
<file>images/textedit/textunder.png</file> <file>images/textedit/textunder.png</file>
@ -455,7 +431,6 @@
<file>images/up1down0.png</file> <file>images/up1down0.png</file>
<file>images/underconstruction.png</file> <file>images/underconstruction.png</file>
<file>images/user.png</file> <file>images/user.png</file>
<file>images/view-certificate-sign-32.png</file>
<file>images/view_calendar_day.png</file> <file>images/view_calendar_day.png</file>
<file>images/view_calendar_week.png</file> <file>images/view_calendar_week.png</file>
<file>images/view_calendar_month.png</file> <file>images/view_calendar_month.png</file>
@ -530,7 +505,6 @@
<file>images/tags/dev-patcher.png</file> <file>images/tags/dev-patcher.png</file>
<file>images/tags/developer.png</file> <file>images/tags/developer.png</file>
<file>images/share-icon-16.png</file> <file>images/share-icon-16.png</file>
<file>images/view-certificate-sign-48.png</file>
<file>images/toasterEnable.png</file> <file>images/toasterEnable.png</file>
<file>images/toasterDisable.png</file> <file>images/toasterDisable.png</file>
<file>images/library_edit.png</file> <file>images/library_edit.png</file>

BIN
retroshare-gui/src/gui/images/Eterm.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.0 KiB

BIN
retroshare-gui/src/gui/images/Login Manager.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.3 KiB

BIN
retroshare-gui/src/gui/images/attach.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
retroshare-gui/src/gui/images/attachment.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 636 B

BIN
retroshare-gui/src/gui/images/browse-looking.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.3 KiB

BIN
retroshare-gui/src/gui/images/contact.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 681 B

BIN
retroshare-gui/src/gui/images/door_in.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
retroshare-gui/src/gui/images/folder.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 611 B

BIN
retroshare-gui/src/gui/images/folder_blueshared.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 861 B

BIN
retroshare-gui/src/gui/images/folder_doments.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.5 KiB

BIN
retroshare-gui/src/gui/images/folder_green.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 643 B

BIN
retroshare-gui/src/gui/images/folder_grey.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 579 B

BIN
retroshare-gui/src/gui/images/folder_music.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 736 B

BIN
retroshare-gui/src/gui/images/folder_open.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 527 B

BIN
retroshare-gui/src/gui/images/folder_red.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 628 B

BIN
retroshare-gui/src/gui/images/folder_video.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 715 B

BIN
retroshare-gui/src/gui/images/folder_yellow.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 618 B

BIN
retroshare-gui/src/gui/images/groupchat.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.1 KiB

BIN
retroshare-gui/src/gui/images/im-ban-kick-user.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
retroshare-gui/src/gui/images/im-ban-user.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
retroshare-gui/src/gui/images/im-invisible-user.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
retroshare-gui/src/gui/images/im-kick-user.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
retroshare-gui/src/gui/images/image16.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 474 B

BIN
retroshare-gui/src/gui/images/irkickflash.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.2 KiB

BIN
retroshare-gui/src/gui/images/kdmconfig.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.2 KiB

BIN
retroshare-gui/src/gui/images/konsole.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.5 KiB

BIN
retroshare-gui/src/gui/images/lphoto.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.2 KiB

BIN
retroshare-gui/src/gui/images/lphoto16.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
retroshare-gui/src/gui/images/lphoto24.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.8 KiB

BIN
retroshare-gui/src/gui/images/messenger.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.1 KiB

BIN
retroshare-gui/src/gui/images/view-certificate-copy-32.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.1 KiB

BIN
retroshare-gui/src/gui/images/view-certificate-export-32.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.2 KiB

BIN
retroshare-gui/src/gui/images/view-certificate-sign-32.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.2 KiB

BIN
retroshare-gui/src/gui/images/view-certificate-sign-48.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.7 KiB

2
retroshare-gui/src/gui/msgs/MessageModel.cpp
View File

@ -173,7 +173,7 @@ QVariant RsMessageModel::headerData(int section, Qt::Orientation orientation, in
{ {
case COLUMN_THREAD_STAR: return QIcon(IMAGE_STAR_ON); case COLUMN_THREAD_STAR: return QIcon(IMAGE_STAR_ON);
case COLUMN_THREAD_READ: return QIcon(":/images/message-state-header.png"); case COLUMN_THREAD_READ: return QIcon(":/images/message-state-header.png");
case COLUMN_THREAD_ATTACHMENT: return QIcon(":/images/attachment.png"); case COLUMN_THREAD_ATTACHMENT: return QIcon(":/icons/png/attachements.png");
default: default:
return QVariant(); return QVariant();
} }

3
retroshare-gui/src/gui/unfinished/LibraryDialog.cpp
View File

@ -46,9 +46,8 @@
#define IMAGE_PLAY ":/images/start.png" #define IMAGE_PLAY ":/images/start.png"
#define IMAGE_HASH_BUSY ":/images/settings.png" #define IMAGE_HASH_BUSY ":/images/settings.png"
#define IMAGE_MSG ":/images/message-mail.png" #define IMAGE_MSG ":/images/message-mail.png"
#define IMAGE_ATTACHMENT ":/images/attachment.png" #define IMAGE_ATTACHMENT ":/icons/png/attachements.png"
#define IMAGE_FRIEND ":/images/peers_16x16.png" #define IMAGE_FRIEND ":/images/peers_16x16.png"
#define IMAGE_PROGRESS ":/images/browse-looking.gif"
#define IMAGE_LIBRARY ":/images/library.png" #define IMAGE_LIBRARY ":/images/library.png"

2
retroshare-gui/src/gui/unfinished/PhotoDialog.cpp
View File

@ -46,7 +46,7 @@
#define IMAGE_CHAT ":/images/chat.png" #define IMAGE_CHAT ":/images/chat.png"
/* Images for Status icons */ /* Images for Status icons */
#define IMAGE_PEER ":/images/user/identity16.png" #define IMAGE_PEER ":/images/user/identity16.png"
#define IMAGE_PHOTOS ":/images/image16.png" #define IMAGE_PHOTOS ":/icons/png/photo.png"
#define PHOTO_ICON_SIZE 90 #define PHOTO_ICON_SIZE 90