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

changed and replaced some icons (needs fresh recompile)

Browse Source 
changed the default headerframe colors

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6579 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2013-08-15 16:20:14 +00:00
parent 6ca05401fc
commit 20c35ea27f
21 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
retroshare-gui/src/gui/ChatLobbyWidget.ui
View File

@ -35,7 +35,10 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="images.qrc">:/images/user/agt_forum24.png</pixmap>
<pixmap resource="images.qrc">:/images/chat_22.png</pixmap>
</property>
<property name="scaledContents">
<bool>false</bool>
</property>
</widget>
</item>

12
retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
View File

@ -85,9 +85,11 @@
#define IMAGE_PRIORITYNORMAL ":/images/prioritynormal.png"
#define IMAGE_PRIORITYHIGH ":/images/priorityhigh.png"
#define IMAGE_PRIORITYAUTO ":/images/priorityauto.png"
#define IMAGE_SEARCH ":/images/filefind.png"
#define IMAGE_EXPAND ":/images/edit_add24.png"
#define IMAGE_COLLAPSE ":/images/edit_remove24.png"
#define IMAGE_SEARCH ":/images/filefind.png"
#define IMAGE_EXPAND ":/images/edit_add24.png"
#define IMAGE_COLLAPSE ":/images/edit_remove24.png"
#define IMAGE_FRIENDSFILES ":/images/fileshare16.png"
#define IMAGE_MYFILES ":images/my_documents_16.png"
Q_DECLARE_METATYPE(FileProgressInfo)
@ -321,9 +323,9 @@ TransfersDialog::TransfersDialog(QWidget *parent)
QObject::connect(ui.downloadList->selectionModel(),SIGNAL(selectionChanged (const QItemSelection&, const QItemSelection&)),this,SLOT(showFileDetails())) ;
ui.tabWidget->insertTab(2,searchDialog = new SearchDialog(), QIcon(IMAGE_SEARCH), tr("Search")) ;
ui.tabWidget->insertTab(3,remoteSharedFiles = new RemoteSharedFilesDialog(), QIcon(IMAGE_SEARCH), tr("Friends files")) ;
ui.tabWidget->insertTab(3,remoteSharedFiles = new RemoteSharedFilesDialog(), QIcon(IMAGE_FRIENDSFILES), tr("Friends files")) ;
ui.tabWidget->addTab(localSharedFiles = new LocalSharedFilesDialog(), QIcon(IMAGE_SEARCH), tr("My files")) ;
ui.tabWidget->addTab(localSharedFiles = new LocalSharedFilesDialog(), QIcon(IMAGE_MYFILES), tr("My files")) ;
//ui.tabWidget->addTab( new TurtleRouterStatistics(), tr("Router Statistics")) ;
//ui.tabWidget->addTab( new TurtleRouterDialog(), tr("Router Requests")) ;

2
retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui
View File

@ -35,7 +35,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="../images.qrc">:/images/reload24.png</pixmap>
<pixmap resource="../images.qrc">:/images/hi24-app-ktorrent.png</pixmap>
</property>
<property name="scaledContents">
<bool>false</bool>

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

@ -154,7 +154,7 @@
#define IMAGE_TWOONLINE ":/images/rstray2.png"
#define IMAGE_BLOGS ":/images/kblogger.png"
#define IMAGE_DHT ":/images/dht16.png"
#define IMAGE_CHATLOBBY ":/images/user/agt_forum32.png"
#define IMAGE_CHATLOBBY ":/images/chat_32.png"
/*static*/ MainWindow *MainWindow::_instance = NULL;

2
retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
View File

@ -89,7 +89,7 @@ ChatLobbyDialog::ChatLobbyDialog(const ChatLobbyId& lid, QWidget *parent, Qt::WF
{
QIcon icon ;
icon.addPixmap(QPixmap(":/images/deletemail24.png")) ;
icon.addPixmap(QPixmap(":/images/exit_32.png")) ;
unsubscribeButton->setIcon(icon) ;
unsubscribeButton->setIconSize(QSize(22,22)) ;
}

2
retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp
View File

@ -37,7 +37,7 @@ CreateLobbyDialog::CreateLobbyDialog(const std::list<std::string>& peer_list, in
ui = new Ui::CreateLobbyDialog() ;
ui->setupUi(this);
ui->headerFrame->setHeaderImage(QPixmap(":/images/user/agt_forum64.png"));
ui->headerFrame->setHeaderImage(QPixmap(":/images/chat_64.png"));
ui->headerFrame->setHeaderText(tr("Create Chat Lobby"));
std::string default_nick ;

2
retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
View File

@ -86,7 +86,7 @@ ConnectFriendWizard::ConnectFriendWizard(QWidget *parent) :
// we have no good pictures for watermarks
// setPixmap(QWizard::WatermarkPixmap, QPixmap(":/images/connectFriendWatermark.png"));
setPixmap(QWizard::BannerPixmap, QPixmap(":/images/connect/connectFriendBanner.png"));
setPixmap(QWizard::BannerPixmap, QPixmap(":/images/connect/connectFriendBanner1.png"));
/* register global fields */
ui->ErrorMessagePage->registerField("errorMessage", ui->messageLabel, "text");

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

@ -136,7 +136,10 @@
<file>images/button_cancel.png</file>
<file>images/calendar.png</file>
<file>images/chat.png</file>
<file>images/chat_22.png</file>
<file>images/chat_24.png</file>
<file>images/chat_32.png</file>
<file>images/chat_64.png</file>
<file>images/cancel.png</file>
<file>images/close-down.png</file>
<file>images/close_normal.png</file>
@ -170,6 +173,7 @@
<file>images/disabled_plugin_48.png</file>
<file>images/evolution.png</file>
<file>images/exit_24x24.png</file>
<file>images/exit_32.png</file>
<file>images/expand_frame.png</file>
<file>images/exportpeers_16x16.png</file>
<file>images/extension_32.png</file>
@ -251,6 +255,7 @@
<file>images/hide_frame.png</file>
<file>images/highlight.png</file>
<file>images/hi16-app-ktorrent.png</file>
<file>images/hi24-app-ktorrent.png</file>
<file>images/hot_0.png</file>
<file>images/hot_1.png</file>
<file>images/hot_2.png</file>
@ -330,6 +335,7 @@
<file>images/messenger.png</file>
<file>images/mute-off-16.png</file>
<file>images/mute-on-16.png</file>
<file>images/my_documents_16.png</file>
<file>images/network.png</file>
<file>images/network16.png</file>
<file>images/network32.png</file>
@ -621,6 +627,7 @@
<file>images/connect/connectFriendWatermark.png</file>
<file>images/connect/connectFriendLogo.png</file>
<file>images/connect/connectFriendBanner.png</file>
<file>images/connect/connectFriendBanner1.png</file>
<file>images/connect/info16.png</file>
<file>images/connect/mail_send.png</file>
<file>help/version.html</file>

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

BIN
retroshare-gui/src/gui/images/chat_22.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/chat_32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.3 KiB

BIN
retroshare-gui/src/gui/images/chat_x24.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/connect/connectFriendBanner1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 83 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
retroshare-gui/src/gui/images/hi24-app-ktorrent.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

11
retroshare-gui/src/gui/qss/stylesheet/Standard.qss
View File

@ -10,7 +10,7 @@ QFrame#titleBarFrame, QFrame#toolBarFrame {
/* HeaderFrame */
HeaderFrame > QFrame#frame {
background-image: url(:/images/headerFrame.png);
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #9BDBF9, stop:1 #1592CD);
border: 0px;
}
@ -36,19 +36,19 @@ GenCertDialog > QFrame#frame {
/* ProfileManager */
ProfileManager > QFrame#frame {
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FEFEFE, stop:1 #E8E8E8);
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #9BDBF9, stop:1 #1592CD);
border: 1px solid #CCCCCC;
}
/* FriendsDialog */
FriendsDialog QFrame#headFrame {
background-image: url(:/images/headerFrame.png);
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #9BDBF9, stop:1 #1592CD);
border: 0px;
}
FriendsDialog QFrame#headFrame > QLabel#nicknameLabel {
color: rgb(50, 205, 50);
color: rgb(255, 255, 255);
}
FriendsDialog QTextEdit#msgText, FriendsDialog QTextEdit#lineEdit {
@ -134,7 +134,8 @@ ChatWidget QFrame#infoFrame {
/* Messages */
MessageComposer > QToolBar#toolBar {
background-image: url(:/images/headerFrame.png);
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #9BDBF9, stop:1 #1592CD);
}
MessagesDialog QFrame#folderFrame, MessagesDialog QFrame#quickViewFrame {