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

added new icons and splash images from Feal, cleaning up old icons, still need more cleanup

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7154 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2014-02-28 17:01:14 +00:00
parent 15af443c31
commit ddf811f80a
46 changed files with 74 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/gui/AboutDialog.cpp
View File

@ -177,7 +177,7 @@ void AboutDialog::on_help_button_clicked()
AWidget::AWidget() {
setMouseTracking(true);
QImage image(":/images/about.png");
QImage image(":/images/logo/logo_info.png");
QPainter p(&image);
p.setPen(Qt::black);
QFont font = p.font();

14
retroshare-gui/src/gui/GenCertDialog.ui
View File

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset resource="images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
<normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<property name="margin">
@ -149,6 +149,12 @@
</item>
<item>
<widget class="QPushButton" name="importIdentity_PB">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Import new identity</string>
</property>
@ -156,6 +162,12 @@
</item>
<item>
<widget class="QPushButton" name="exportIdentity_PB">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Export selected identity</string>
</property>

8
retroshare-gui/src/gui/MainWindow.cpp
View File

@ -148,9 +148,9 @@
#define IMG_HELP ":/images/help24.png"
#define IMAGE_NEWSFEED ":/images/newsfeed128.png"
#define IMAGE_PLUGINS ":/images/extension_32.png"
#define IMAGE_NOONLINE ":/images/rstray0.png"
#define IMAGE_ONEONLINE ":/images/rstray1.png"
#define IMAGE_TWOONLINE ":/images/rstray2.png"
#define IMAGE_NOONLINE ":/images/logo/logo_24_0.png"
#define IMAGE_ONEONLINE ":/images/logo/logo_24_1.png"
#define IMAGE_TWOONLINE ":/images/logo/logo_24_2.png"
#define IMAGE_BLOGS ":/images/kblogger.png"
#define IMAGE_DHT ":/images/dht16.png"
#define IMAGE_CHATLOBBY ":/images/chat_32.png"
@ -209,7 +209,7 @@ MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags flags)
QDesktopServices::setUrlHandler("https", this, "externalLinkActivated");
// Setting icons
this->setWindowIcon(QIcon(QString::fromUtf8(":/images/rstray3.png")));
this->setWindowIcon(QIcon(QString::fromUtf8(":/images/logo/logo_16.png")));
/* Create all the dialogs of which we only want one instance */
_bandwidthGraph = new BandwidthGraph();

4
retroshare-gui/src/gui/MessengerWindow.ui
View File

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset resource="images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
<normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
</property>
<widget class="QWidget" name="centralwidget">
<layout class="QGridLayout" name="gridLayout">
@ -142,7 +142,7 @@
<x>0</x>
<y>0</y>
<width>258</width>
<height>21</height>
<height>20</height>
</rect>
</property>
</widget>

2
retroshare-gui/src/gui/QuickStartWizard.ui
View File

@ -30,7 +30,7 @@
</property>
<property name="windowIcon">
<iconset resource="images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
<normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
</property>
<property name="modal">
<bool>true</bool>

6
retroshare-gui/src/gui/RttStatistics.ui
View File

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset resource="images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
<normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
@ -38,8 +38,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>587</width>
<height>384</height>
<width>593</width>
<height>390</height>
</rect>
</property>
</widget>

2
retroshare-gui/src/gui/ShareDialog.ui
View File

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset resource="images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
<normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<property name="margin">

2
retroshare-gui/src/gui/ShareManager.ui
View File

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset resource="images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
<normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<property name="margin">

2
retroshare-gui/src/gui/StartDialog.ui
View File

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset resource="images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
<normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="margin">

2
retroshare-gui/src/gui/advsearch/AdvancedSearchDialog.ui
View File

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset resource="../images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
<normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<property name="margin">

4
retroshare-gui/src/gui/bwctrl/BwCtrlWindow.ui
View File

@ -18,7 +18,7 @@
</property>
<property name="windowIcon">
<iconset resource="../images.qrc">
<normaloff>:/images/dht16.png</normaloff>:/images/dht16.png</iconset>
<normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
</property>
<widget class="QWidget" name="centralWidget">
<layout class="QVBoxLayout" name="verticalLayout">
@ -104,7 +104,7 @@
<x>0</x>
<y>0</y>
<width>525</width>
<height>21</height>
<height>20</height>
</rect>
</property>
</widget>

2
retroshare-gui/src/gui/bwgraph/bwgraph.ui
View File

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset resource="../images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
<normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
</property>
<widget class="QWidget" name="centralwidget">
<layout class="QGridLayout" name="gridLayout">

3
retroshare-gui/src/gui/connect/ConfCertDialog.ui
View File

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset resource="../images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
<normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout_5">
<property name="horizontalSpacing">
@ -964,6 +964,7 @@ Some services (Discovery, anonymous routing) can be switched off globally, which
<include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
</resources>
<connections/>
</ui>

3
retroshare-gui/src/gui/connect/ConnectFriendWizard.ui
View File

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset resource="../images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
<normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
</property>
<widget class="ConnectFriendPage" name="IntroPage">
<property name="title">
@ -1076,6 +1076,7 @@
<resources>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
</resources>
<connections/>
</ui>

2
retroshare-gui/src/gui/connect/ConnectProgressDialog.ui
View File

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset resource="../images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
<normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">

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

@ -18,7 +18,7 @@
</property>
<property name="windowIcon">
<iconset resource="../images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
<normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout_8">
<property name="margin">
@ -293,7 +293,7 @@ p, li { white-space: pre-wrap; }
<rect>
<x>0</x>
<y>0</y>
<width>518</width>
<width>98</width>
<height>24</height>
</rect>
</property>
@ -381,6 +381,7 @@ p, li { white-space: pre-wrap; }
</customwidgets>
<resources>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
</resources>
<connections/>
</ui>

4
retroshare-gui/src/gui/gxsforums/CreateGxsForumMsg.ui
View File

@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset resource="../images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
<normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
@ -203,7 +203,7 @@
&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:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
&lt;p 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:8pt;&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>

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

@ -323,6 +323,19 @@
<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_24.png</file>
<file>images/logo/logo_24_0.png</file>
<file>images/logo/logo_24_1.png</file>
<file>images/logo/logo_24_2.png</file>
<file>images/logo/logo_32.png</file>
<file>images/logo/logo_48.png</file>
<file>images/logo/logo_64.png</file>
<file>images/logo/logo_128.png</file>
<file>images/logo/logo_256.png</file>
<file>images/logo/logo_512.png</file>
<file>images/logo/logo_info.png</file>
<file>images/logo/logo_splash.png</file>
<file>images/logobar/logo_bar_fill.png</file>
<file>images/logobar/logo_bar_start.png</file>
<file>images/logobar/rslogo.png</file>
@ -370,9 +383,6 @@
<file>images/openimage.png</file>
<file>images/pasterslink.png</file>
<file>images/package_games1.png</file>
<file>images/peerdetails_16x16.png</file>
<file>images/peers_16x16.png</file>
<file>images/peers_24x24.png</file>
<file>images/pin32.png</file>
<file>images/print24.png</file>
<file>images/priorityauto.png</file>
@ -401,7 +411,6 @@
<file>images/reload24.png</file>
<file>images/reset.png</file>
<file>images/resume.png</file>
<file>images/RetroShare16.png</file>
<file>images/retrosharelogo1.png</file>
<file>images/retrosharelogo2.png</file>
<file>images/retrosharelogo32.png</file>

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 575 B

BIN
retroshare-gui/src/gui/images/logo/logo_128.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.8 KiB

BIN
retroshare-gui/src/gui/images/logo/logo_16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 807 B

BIN
retroshare-gui/src/gui/images/logo/logo_24.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
retroshare-gui/src/gui/images/logo/logo_24_0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
retroshare-gui/src/gui/images/logo/logo_24_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
retroshare-gui/src/gui/images/logo/logo_24_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
retroshare-gui/src/gui/images/logo/logo_256.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
retroshare-gui/src/gui/images/logo/logo_32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
retroshare-gui/src/gui/images/logo/logo_48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
retroshare-gui/src/gui/images/logo/logo_512.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 44 KiB

BIN
retroshare-gui/src/gui/images/logo/logo_64.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
retroshare-gui/src/gui/images/logo/logo_info.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 44 KiB

BIN
retroshare-gui/src/gui/images/logo/logo_splash.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 77 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 767 B

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 717 B

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
retroshare-gui/src/gui/images/rswinicon.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 73 KiB

BIN
retroshare-gui/src/gui/images/tst.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.6 KiB

2
retroshare-gui/src/gui/profile/ProfileManager.ui
View File

@ -24,7 +24,7 @@
</property>
<property name="windowIcon">
<iconset resource="../images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
<normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<property name="margin">

3
retroshare-gui/src/gui/profile/StatusMessage.ui
View File

@ -33,7 +33,7 @@
</property>
<property name="windowIcon">
<iconset resource="../images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
<normaloff>:/images/logo/logo_16.png</normaloff>:/images/logo/logo_16.png</iconset>
</property>
<widget class="QFrame" name="frame">
<property name="geometry">
@ -174,6 +174,7 @@ border: 1px solid #CCCCCC;}
</widget>
<resources>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
</resources>
<connections/>
</ui>

3
retroshare-gui/src/gui/toaster/ChatLobbyToaster.ui
View File

@ -70,7 +70,7 @@
</size>
</property>
<property name="pixmap">
<pixmap resource="../images.qrc">:/images/rstray3.png</pixmap>
<pixmap resource="../images.qrc">:/images/logo/logo_16.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@ -187,6 +187,7 @@
</customwidgets>
<resources>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
</resources>
<connections/>
</ui>

3
retroshare-gui/src/gui/toaster/ChatToaster.ui
View File

@ -70,7 +70,7 @@
</size>
</property>
<property name="pixmap">
<pixmap resource="../images.qrc">:/images/rstray3.png</pixmap>
<pixmap resource="../images.qrc">:/images/logo/logo_16.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@ -187,6 +187,7 @@
</customwidgets>
<resources>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
</resources>
<connections/>
</ui>

6
retroshare-gui/src/gui/toaster/DownloadToaster.ui
View File

@ -69,8 +69,11 @@
<height>16</height>
</size>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="pixmap">
<pixmap resource="../images.qrc">:/images/rstray3.png</pixmap>
<pixmap resource="../images.qrc">:/images/logo/logo_16.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@ -185,6 +188,7 @@
</tabstops>
<resources>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
</resources>
<connections/>
</ui>

3
retroshare-gui/src/gui/toaster/FriendRequestToaster.ui
View File

@ -70,7 +70,7 @@
</size>
</property>
<property name="pixmap">
<pixmap resource="../images.qrc">:/images/rstray3.png</pixmap>
<pixmap resource="../images.qrc">:/images/logo/logo_16.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@ -193,6 +193,7 @@
</customwidgets>
<resources>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
</resources>
<connections/>
</ui>

3
retroshare-gui/src/gui/toaster/GroupChatToaster.ui
View File

@ -70,7 +70,7 @@
</size>
</property>
<property name="pixmap">
<pixmap resource="../images.qrc">:/images/rstray3.png</pixmap>
<pixmap resource="../images.qrc">:/images/logo/logo_16.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@ -187,6 +187,7 @@
</customwidgets>
<resources>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
</resources>
<connections/>
</ui>

3
retroshare-gui/src/gui/toaster/MessageToaster.ui
View File

@ -70,7 +70,7 @@
</size>
</property>
<property name="pixmap">
<pixmap resource="../images.qrc">:/images/rstray3.png</pixmap>
<pixmap resource="../images.qrc">:/images/logo/logo_16.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@ -198,6 +198,7 @@
</widget>
<resources>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
</resources>
<connections/>
</ui>

3
retroshare-gui/src/gui/toaster/OnlineToaster.ui
View File

@ -70,7 +70,7 @@
</size>
</property>
<property name="pixmap">
<pixmap resource="../images.qrc">:/images/rstray3.png</pixmap>
<pixmap resource="../images.qrc">:/images/logo/logo_16.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@ -187,6 +187,7 @@
</customwidgets>
<resources>
<include location="../images.qrc"/>
<include location="../images.qrc"/>
</resources>
<connections/>
</ui>