diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.ui b/retroshare-gui/src/gui/ChatLobbyWidget.ui index c1809ef5e..c0ad1552f 100644 --- a/retroshare-gui/src/gui/ChatLobbyWidget.ui +++ b/retroshare-gui/src/gui/ChatLobbyWidget.ui @@ -35,7 +35,10 @@ - :/images/user/agt_forum24.png + :/images/chat_22.png + + + false diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp index 88caf7381..eae1dcad1 100644 --- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp +++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp @@ -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")) ; diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui index 03975e964..c9719812a 100644 --- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui +++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui @@ -35,7 +35,7 @@ - :/images/reload24.png + :/images/hi24-app-ktorrent.png false diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index 45a30a82e..0fb92cee3 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -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; diff --git a/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp b/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp index 8a3107817..9b6adb5c5 100644 --- a/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp +++ b/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp @@ -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)) ; } diff --git a/retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp b/retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp index 93148ecc9..ba7b1a464 100644 --- a/retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp +++ b/retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp @@ -37,7 +37,7 @@ CreateLobbyDialog::CreateLobbyDialog(const std::list& 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 ; diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp index 99c6be9c7..1bc7722fd 100755 --- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp +++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp @@ -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"); diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index 2492a8870..548290b28 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -19,7 +19,7 @@ images/pgp.png images/rs_wizard.png images/about.png - images/avatar_request.png + images/avatar_request.png images/avatar_refused.png images/avatar_request_unknown.png images/backblue.png @@ -136,7 +136,10 @@ images/button_cancel.png images/calendar.png images/chat.png + images/chat_22.png images/chat_24.png + images/chat_32.png + images/chat_64.png images/cancel.png images/close-down.png images/close_normal.png @@ -170,6 +173,7 @@ images/disabled_plugin_48.png images/evolution.png images/exit_24x24.png + images/exit_32.png images/expand_frame.png images/exportpeers_16x16.png images/extension_32.png @@ -207,7 +211,7 @@ images/flags/hu.png images/flags/it.png images/flags/ja_JP.png - images/flags/ko.png + images/flags/ko.png images/flags/nl.png images/flags/pl.png images/flags/pt.png @@ -251,6 +255,7 @@ images/hide_frame.png images/highlight.png images/hi16-app-ktorrent.png + images/hi24-app-ktorrent.png images/hot_0.png images/hot_1.png images/hot_2.png @@ -330,6 +335,7 @@ images/messenger.png images/mute-off-16.png images/mute-on-16.png + images/my_documents_16.png images/network.png images/network16.png images/network32.png @@ -474,7 +480,7 @@ images/user/identity24idle.png images/user/identityavaiblecyan24.png images/user/invite24.png - images/user/agt_forum24.png + images/user/agt_forum24.png images/user/agt_forum32.png images/user/identitygray16.png images/user/add_user16.png @@ -621,6 +627,7 @@ images/connect/connectFriendWatermark.png images/connect/connectFriendLogo.png images/connect/connectFriendBanner.png + images/connect/connectFriendBanner1.png images/connect/info16.png images/connect/mail_send.png help/version.html diff --git a/retroshare-gui/src/gui/images/chat_128.png b/retroshare-gui/src/gui/images/chat_128.png new file mode 100644 index 000000000..7212a977d Binary files /dev/null and b/retroshare-gui/src/gui/images/chat_128.png differ diff --git a/retroshare-gui/src/gui/images/chat_22.png b/retroshare-gui/src/gui/images/chat_22.png new file mode 100644 index 000000000..16d6336f6 Binary files /dev/null and b/retroshare-gui/src/gui/images/chat_22.png differ diff --git a/retroshare-gui/src/gui/images/chat_32.png b/retroshare-gui/src/gui/images/chat_32.png new file mode 100644 index 000000000..f9c6f2496 Binary files /dev/null and b/retroshare-gui/src/gui/images/chat_32.png differ diff --git a/retroshare-gui/src/gui/images/chat_48.png b/retroshare-gui/src/gui/images/chat_48.png new file mode 100644 index 000000000..4c06659f4 Binary files /dev/null and b/retroshare-gui/src/gui/images/chat_48.png differ diff --git a/retroshare-gui/src/gui/images/chat_64.png b/retroshare-gui/src/gui/images/chat_64.png new file mode 100644 index 000000000..ef6dc9613 Binary files /dev/null and b/retroshare-gui/src/gui/images/chat_64.png differ diff --git a/retroshare-gui/src/gui/images/chat_x24.png b/retroshare-gui/src/gui/images/chat_x24.png new file mode 100644 index 000000000..163d0d371 Binary files /dev/null and b/retroshare-gui/src/gui/images/chat_x24.png differ diff --git a/retroshare-gui/src/gui/images/connect/connectFriendBanner1.png b/retroshare-gui/src/gui/images/connect/connectFriendBanner1.png new file mode 100644 index 000000000..b38760044 Binary files /dev/null and b/retroshare-gui/src/gui/images/connect/connectFriendBanner1.png differ diff --git a/retroshare-gui/src/gui/images/exit_32.png b/retroshare-gui/src/gui/images/exit_32.png new file mode 100644 index 000000000..609d4d8ab Binary files /dev/null and b/retroshare-gui/src/gui/images/exit_32.png differ diff --git a/retroshare-gui/src/gui/images/hi24-app-ktorrent.png b/retroshare-gui/src/gui/images/hi24-app-ktorrent.png new file mode 100644 index 000000000..052fb20bc Binary files /dev/null and b/retroshare-gui/src/gui/images/hi24-app-ktorrent.png differ diff --git a/retroshare-gui/src/gui/images/my_documents_16.png b/retroshare-gui/src/gui/images/my_documents_16.png new file mode 100644 index 000000000..571ad0851 Binary files /dev/null and b/retroshare-gui/src/gui/images/my_documents_16.png differ diff --git a/retroshare-gui/src/gui/images/my_documents_22.png b/retroshare-gui/src/gui/images/my_documents_22.png new file mode 100644 index 000000000..3afad57ab Binary files /dev/null and b/retroshare-gui/src/gui/images/my_documents_22.png differ diff --git a/retroshare-gui/src/gui/images/my_documents_32.png b/retroshare-gui/src/gui/images/my_documents_32.png new file mode 100644 index 000000000..7b7661d2c Binary files /dev/null and b/retroshare-gui/src/gui/images/my_documents_32.png differ diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss index 653b4d12e..1a04ab9eb 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss +++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss @@ -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 {