Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-28 00:07:09 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added window icon for the application. All windows without a parent are now showing this icon.

Browse Source 
Tweaked standard style of the feed items.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5545 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-09-13 09:52:17 +00:00
parent 7505fa35e8
commit 5c5776d486
4 changed files with 68 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
retroshare-gui/src/gui/NewsFeed.ui
View File

@ -10,32 +10,32 @@
<height>256</height> <height>256</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<property name="margin">
<number>0</number>
</property>
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0"> <property name="margin">
<layout class="QGridLayout" name="gridLayout"> <number>0</number>
</property>
<item>
<layout class="QHBoxLayout" name="headerLayout">
<property name="spacing">
<number>3</number>
</property>
<property name="leftMargin"> <property name="leftMargin">
<number>6</number> <number>3</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>6</number> <number>2</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>0</number> <number>2</number>
</property> </property>
<property name="horizontalSpacing"> <property name="bottomMargin">
<number>6</number> <number>2</number>
</property> </property>
<property name="verticalSpacing"> <item>
<number>0</number> <widget class="QLabel" name="imageLabel">
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -47,8 +47,8 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item>
<widget class="QLabel" name="newslabel"> <widget class="QLabel" name="newsLabel">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -67,16 +67,37 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="feedOptionsButton">
<property name="text">
<string>Options</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="removeAllButton">
<property name="text">
<string>Remove All</string>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item row="1" column="0" colspan="5"> <item>
<widget class="QFrame" name="frame"> <widget class="QFrame" name="frame">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
@ -91,7 +112,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>424</width> <width>426</width>
<height>16</height> <height>16</height>
</rect> </rect>
</property> </property>
@ -115,33 +136,6 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="0" column="3">
<widget class="QPushButton" name="removeAllButton">
<property name="text">
<string>Remove All</string>
</property>
</widget>
</item>
<item row="0" column="1">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>321</width>
<height>13</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="feedOptionsButton">
<property name="text">
<string>Options</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<resources> <resources>

18
retroshare-gui/src/gui/feeds/MsgItem.ui
View File

@ -28,9 +28,9 @@
<colorrole role="Window"> <colorrole role="Window">
<brush brushstyle="SolidPattern"> <brush brushstyle="SolidPattern">
<color alpha="255"> <color alpha="255">
<red>48</red> <red>51</red>
<green>162</green> <green>174</green>
<blue>240</blue> <blue>255</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
@ -39,9 +39,9 @@
<colorrole role="Window"> <colorrole role="Window">
<brush brushstyle="SolidPattern"> <brush brushstyle="SolidPattern">
<color alpha="255"> <color alpha="255">
<red>48</red> <red>51</red>
<green>162</green> <green>174</green>
<blue>240</blue> <blue>255</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
@ -50,9 +50,9 @@
<colorrole role="Window"> <colorrole role="Window">
<brush brushstyle="SolidPattern"> <brush brushstyle="SolidPattern">
<color alpha="255"> <color alpha="255">
<red>48</red> <red>51</red>
<green>162</green> <green>174</green>
<blue>240</blue> <blue>255</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>

18
retroshare-gui/src/gui/feeds/PeerItem.ui
View File

@ -28,9 +28,9 @@
<colorrole role="Window"> <colorrole role="Window">
<brush brushstyle="SolidPattern"> <brush brushstyle="SolidPattern">
<color alpha="255"> <color alpha="255">
<red>143</red> <red>157</red>
<green>188</green> <green>206</green>
<blue>88</blue> <blue>96</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
@ -39,9 +39,9 @@
<colorrole role="Window"> <colorrole role="Window">
<brush brushstyle="SolidPattern"> <brush brushstyle="SolidPattern">
<color alpha="255"> <color alpha="255">
<red>143</red> <red>157</red>
<green>188</green> <green>206</green>
<blue>88</blue> <blue>96</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
@ -50,9 +50,9 @@
<colorrole role="Window"> <colorrole role="Window">
<brush brushstyle="SolidPattern"> <brush brushstyle="SolidPattern">
<color alpha="255"> <color alpha="255">
<red>143</red> <red>157</red>
<green>188</green> <green>206</green>
<blue>88</blue> <blue>96</blue>
</color> </color>
</brush> </brush>
</colorrole> </colorrole>

3
retroshare-gui/src/rshare.cpp
View File

@ -92,6 +92,9 @@ Rshare::Rshare(QStringList args, int &argc, char **argv, const QString &dir)
{ {
qInstallMsgHandler(qt_msg_handler); qInstallMsgHandler(qt_msg_handler);
/* set default window icon */
setWindowIcon(QIcon(":/images/rstray3.png"));
/* Read in all our command-line arguments. */ /* Read in all our command-line arguments. */
parseArguments(args); parseArguments(args);