From d73e850122181458cd2e76159a82046120fddf2a Mon Sep 17 00:00:00 2001 From: defnax Date: Thu, 11 May 2017 18:14:21 +0200 Subject: [PATCH] look n feel improvements --- retroshare-gui/src/gui/HomePage.ui | 247 ++++++---- retroshare-gui/src/gui/StartDialog.ui | 217 ++++++--- retroshare-gui/src/gui/icons.qrc | 459 +++++++++--------- retroshare-gui/src/gui/icons/svg/password.svg | 54 +++ .../src/gui/qss/stylesheet/Standard.qss | 17 + 5 files changed, 605 insertions(+), 389 deletions(-) create mode 100644 retroshare-gui/src/gui/icons/svg/password.svg diff --git a/retroshare-gui/src/gui/HomePage.ui b/retroshare-gui/src/gui/HomePage.ui index d2aba3dfc..60c87b0b9 100644 --- a/retroshare-gui/src/gui/HomePage.ui +++ b/retroshare-gui/src/gui/HomePage.ui @@ -6,103 +6,15 @@ 0 0 - 1558 - 703 + 675 + 544 Form - - - - - - - - - - - 11 - - - - - - - Did you receive a certificate from a friend? - - - - - - - Add friends certificate - - - - :/icons/png/invite.png:/icons/png/invite.png - - - - 24 - 24 - - - - Qt::ToolButtonTextBesideIcon - - - false - - - - - - - Add certificate file - - - - :/icons/svg/folders1.svg:/icons/svg/folders1.svg - - - - 24 - 24 - - - - Qt::ToolButtonTextBesideIcon - - - false - - - - - - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - + 9 @@ -245,7 +157,7 @@ private and secure decentralized communication platform. - + Launch startup wizard @@ -256,15 +168,149 @@ private and secure decentralized communication platform. - - - - Open Web Help + + + + - - - :/icons/settings/webinterface.svg:/icons/settings/webinterface.svg + + + + + + 11 + + + + + + + Did you receive a certificate from a friend? + + + + + + + Add friends certificate + + + + :/icons/png/invite.png:/icons/png/invite.png + + + + 24 + 24 + + + + Qt::ToolButtonTextBesideIcon + + + false + + + + + + + Add certificate file + + + + :/icons/svg/folders1.svg:/icons/svg/folders1.svg + + + + 24 + 24 + + + + Qt::ToolButtonTextBesideIcon + + + false + + + + + + + + + + QFrame::StyledPanel + + QFrame::Raised + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + + + 11 + + + + Do you need help with RetroShare? + + + + + + + Open Web Help + + + + :/icons/settings/webinterface.svg:/icons/settings/webinterface.svg + + + + 24 + 24 + + + + Qt::ToolButtonTextBesideIcon + + + + @@ -273,7 +319,8 @@ private and secure decentralized communication platform. label_2 addframe runStartWizard_PB - openwebhelp + frame + helpframe diff --git a/retroshare-gui/src/gui/StartDialog.ui b/retroshare-gui/src/gui/StartDialog.ui index 0681835e6..572df161d 100644 --- a/retroshare-gui/src/gui/StartDialog.ui +++ b/retroshare-gui/src/gui/StartDialog.ui @@ -6,8 +6,8 @@ 0 0 - 656 - 645 + 516 + 569 @@ -17,7 +17,7 @@ :/images/logo/logo_32.png:/images/logo/logo_32.png - + 0 @@ -44,7 +44,7 @@ - + Qt::Horizontal @@ -110,12 +110,12 @@ - :/images/logo/logo_splash.png + :/images/logo/logo_spash2.png - + Qt::Horizontal @@ -129,7 +129,52 @@ - + + + + Qt::Horizontal + + + QSizePolicy::Minimum + + + + 60 + 20 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Horizontal + + + QSizePolicy::Minimum + + + + 60 + 20 + + + + + true @@ -140,35 +185,79 @@ 0 + + + - - - + + + 9 + + + + + + 22 + 22 + + - Profile - Location: + + + + :/icons/svg/person.svg + + + true - + - - + + + + + 22 + 22 + + - Password: + + + + :/icons/svg/password.svg + + + true - + QLineEdit::Password - + + + + Password: + + + + + + + Profile - Location: + + + + Remember Password @@ -178,68 +267,70 @@ + + + + + 12 + + + + Log In + + + true + + + false + + + - - - - Log In - - - true - - - false - - - - - - - Opens a dialog for creating a new profile or + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Opens a dialog for creating a new profile or adding locations to an existing profile. The current identities/locations will not be affected. - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="Create new Profile..."><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; text-decoration: underline; color:#0000ff;">Manage profiles and nodes...</span></a></p></body></html> - - - - - - - - 16 - 65 - - - - QFrame::NoFrame - - - QFrame::Raised - - + + + + - - - LogoBar - QFrame -
gui/LogoBar.h
- 1 -
-
+ diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc index a89ead9d8..e9b7d32bd 100644 --- a/retroshare-gui/src/gui/icons.qrc +++ b/retroshare-gui/src/gui/icons.qrc @@ -1,228 +1,235 @@ - - icons/add_user_256.png - icons/anonymous_blue_128.png - icons/anonymous_green_128.png - icons/aol.png - icons/avatar_128.png - icons/avatar_grey_128.png - icons/biohazard_red.png - icons/biohazard_yellow.png - icons/blank_blue_128.png - icons/blank_green_128.png - icons/blank_red_128.png - icons/browsable_blue_128.png - icons/browsable_green_128.png - icons/bullet_blue_128.png - icons/bullet_green_128.png - icons/bullet_green_yellow_star_128.png - icons/bullet_grey_128.png - icons/bullet_red_128.png - icons/bullet_yellow_128.png - icons/channels_128.png - icons/channels_red_128.png - icons/chat_128.png - icons/chat_red_128.png - icons/circles_128.png - icons/circles_new_128.png - icons/flag-green.png - icons/friends_128.png - icons/global_switch_off_128.png - icons/global_switch_on_128.png - icons/gmail.png - icons/help_128.png - icons/help_64.png - icons/information_128.png - icons/internet_128.png - icons/invite64.png - icons/knews_128.png - icons/knews_red_128.png - icons/konversation_128.png - icons/konversation128.png - icons/konversation_red_128.png - icons/ktorrent_128.png - icons/ktorrent_red_128.png - icons/logo_0_connected_128.png - icons/logo_128.png - icons/logo_1_connected_128.png - icons/logo_2_connected_128.png - icons/mail_128.png - icons/mail_old_128.png - icons/mail_red_128.png - icons/newsfeed128.png - icons/outlook.png - icons/plugins_128.png - icons/png/add.png - icons/png/attach-image.png - icons/png/attach.png - icons/png/channels-notify.png - icons/png/channels.png - icons/png/chat-bubble-notify.png - icons/png/chat-bubble.png - icons/png/chat-lobbies-notify.png - icons/png/chat-lobbies.png - icons/png/circles.png - icons/png/empty-circle.png - icons/png/exit.png - icons/png/feedreader-notify.png - icons/png/feedreader.png - icons/png/filesharing-notify.png - icons/png/filesharing.png - icons/png/font.png - icons/png/forums-notify.png - icons/png/forums.png - icons/png/fullscreen_arrows.png - icons/png/highlight.png - icons/png/info.png - icons/png/invite.png - icons/png/keyring.png - icons/png/leave.png - icons/png/messages-notify.png - icons/png/messages.png - icons/png/microphone_mute.png - icons/png/microphone.png - icons/png/netgraph.png - icons/png/network-notify.png - icons/png/network.png - icons/png/network-puplic.png - icons/png/newsfeed-notify.png - icons/png/newsfeed.png - icons/png/options.png - icons/png/people-notify.png - icons/png/people.png - icons/png/person.png - icons/png/phone_hangup.png - icons/png/phone.png - icons/png/posted-notify.png - icons/png/posted.png - icons/png/search.png - icons/png/send-message-blocked.png - icons/png/send-message.png - icons/png/settings.png - icons/png/smiley.png - icons/png/speaker_mute.png - icons/png/speaker.png - icons/png/thumbs-down.png - icons/png/thumbs-neutral.png - icons/png/thumbs-up.png - icons/png/video.png - icons/posted_128.png - icons/posted_red_128.png - icons/quit_128.png - icons/search_red_128.png - icons/security_high_128.png - icons/security_low_128.png - icons/security_medium_128.png - icons/settings/appearance.svg - icons/settings/channels.svg - icons/settings/chat.svg - icons/settings/directories.svg - icons/settings/filesharing.svg - icons/settings/forums.svg - icons/settings/general.svg - icons/settings/messages.svg - icons/settings/network.svg - icons/settings/notify.svg - icons/settings/people.svg - icons/settings/permissions.svg - icons/settings/plugins.svg - icons/settings/posted.svg - icons/settings/profile.svg - icons/settings/server.svg - icons/settings/sound.svg - icons/settings/webinterface.svg - icons/star_overlay_128.png - icons/svg/add.svg - icons/svg/attach-image.svg - icons/svg/attach.svg - icons/svg/channels-notify.svg - icons/svg/channels.svg - icons/svg/chat-bubble-notify.svg - icons/svg/chat-bubble.svg - icons/svg/chat-lobbies-notify.svg - icons/svg/chat-lobbies.svg - icons/svg/circles.svg - icons/svg/download.svg - icons/svg/empty-circle.svg - icons/svg/exit-red.svg - icons/svg/exit.svg - icons/svg/feedreader-notify.svg - icons/svg/feedreader.svg - icons/svg/filesharing-notify.svg - icons/svg/filesharing.svg - icons/svg/folders1.svg - icons/svg/folders.svg - icons/svg/font.svg - icons/svg/forums-notify.svg - icons/svg/forums.svg - icons/svg/fullscreen_arrows.svg - icons/svg/highlight.svg - icons/svg/info.svg - icons/svg/invite.svg - icons/svg/keyring.svg - icons/svg/leave.svg - icons/svg/magnifying-glass.svg - icons/svg/messages-notify.svg - icons/svg/messages.svg - icons/svg/microphone_mute.svg - icons/svg/microphone.svg - icons/svg/netgraph.svg - icons/svg/network-notify.svg - icons/svg/network-puplic.svg - icons/svg/network.svg - icons/svg/newsfeed-notify.svg - icons/svg/newsfeed.svg - icons/svg/options.svg - icons/svg/paste.svg - icons/svg/people-notify.svg - icons/svg/people.svg - icons/svg/person.svg - icons/svg/phone_hangup.svg - icons/svg/phone.svg - icons/svg/posted-notify.svg - icons/svg/posted.svg - icons/svg/profile.svg - icons/svg/retroshare-info.svg - icons/svg/retroshare-splash.svg - icons/svg/retroshare-symbol_black_bg.svg - icons/svg/retroshare-symbol_gradients.svg - icons/svg/retroshare-symbol-minimal.svg - icons/svg/search.svg - icons/svg/send-message-blocked.svg - icons/svg/send-message.svg - icons/svg/settings.svg - icons/svg/share.svg - icons/svg/smiley.svg - icons/svg/speaker_mute.svg - icons/svg/speaker.svg - icons/svg/thumbs-down.svg - icons/svg/thumbs-neutral.svg - icons/svg/thumbs-up.svg - icons/svg/upload.svg - icons/svg/video.svg - icons/switch00_128.png - icons/switch01_128.png - icons/switch10_128.png - icons/switch11_128.png - icons/system_128.png - icons/tile_checking_48.png - icons/tile_downloaded_48.png - icons/tile_downloading_48.png - icons/tile_inactive_48.png - icons/tor-logo.png - icons/tor-off.png - icons/tor-on.png - icons/tor-starting.png - icons/tor-stopping.png - icons/user-away_64.png - icons/user-away-extended_64.png - icons/user-busy_64.png - icons/user-offline_64.png - icons/user-online_64.png - icons/void_128.png - icons/warning_red_128.png - icons/warning_yellow_128.png - icons/yahoo.png - icons/yandex.png - + + icons/svg/password.svg + icons/stars/star0.png + icons/stars/star1.png + icons/stars/star2.png + icons/stars/star3.png + icons/stars/star4.png + icons/stars/star5.png + icons/add_user_256.png + icons/anonymous_blue_128.png + icons/anonymous_green_128.png + icons/aol.png + icons/avatar_128.png + icons/avatar_grey_128.png + icons/biohazard_red.png + icons/biohazard_yellow.png + icons/blank_blue_128.png + icons/blank_green_128.png + icons/blank_red_128.png + icons/browsable_blue_128.png + icons/browsable_green_128.png + icons/bullet_blue_128.png + icons/bullet_green_128.png + icons/bullet_green_yellow_star_128.png + icons/bullet_grey_128.png + icons/bullet_red_128.png + icons/bullet_yellow_128.png + icons/channels_128.png + icons/channels_red_128.png + icons/chat_128.png + icons/chat_red_128.png + icons/circles_128.png + icons/circles_new_128.png + icons/flag-green.png + icons/friends_128.png + icons/global_switch_off_128.png + icons/global_switch_on_128.png + icons/gmail.png + icons/help_128.png + icons/help_64.png + icons/information_128.png + icons/internet_128.png + icons/invite64.png + icons/knews_128.png + icons/knews_red_128.png + icons/konversation_128.png + icons/konversation128.png + icons/konversation_red_128.png + icons/ktorrent_128.png + icons/ktorrent_red_128.png + icons/logo_0_connected_128.png + icons/logo_128.png + icons/logo_1_connected_128.png + icons/logo_2_connected_128.png + icons/mail_128.png + icons/mail_old_128.png + icons/mail_red_128.png + icons/newsfeed128.png + icons/outlook.png + icons/plugins_128.png + icons/png/add.png + icons/png/attach-image.png + icons/png/attach.png + icons/png/channels-notify.png + icons/png/channels.png + icons/png/chat-bubble-notify.png + icons/png/chat-bubble.png + icons/png/chat-lobbies-notify.png + icons/png/chat-lobbies.png + icons/png/circles.png + icons/png/empty-circle.png + icons/png/exit.png + icons/png/feedreader-notify.png + icons/png/feedreader.png + icons/png/filesharing-notify.png + icons/png/filesharing.png + icons/png/font.png + icons/png/forums-notify.png + icons/png/forums.png + icons/png/fullscreen_arrows.png + icons/png/highlight.png + icons/png/info.png + icons/png/invite.png + icons/png/keyring.png + icons/png/leave.png + icons/png/messages-notify.png + icons/png/messages.png + icons/png/microphone_mute.png + icons/png/microphone.png + icons/png/netgraph.png + icons/png/network-notify.png + icons/png/network.png + icons/png/network-puplic.png + icons/png/newsfeed-notify.png + icons/png/newsfeed.png + icons/png/options.png + icons/png/people-notify.png + icons/png/people.png + icons/png/person.png + icons/png/phone_hangup.png + icons/png/phone.png + icons/png/posted-notify.png + icons/png/posted.png + icons/png/search.png + icons/png/send-message-blocked.png + icons/png/send-message.png + icons/png/settings.png + icons/png/smiley.png + icons/png/speaker_mute.png + icons/png/speaker.png + icons/png/thumbs-down.png + icons/png/thumbs-neutral.png + icons/png/thumbs-up.png + icons/png/video.png + icons/posted_128.png + icons/posted_red_128.png + icons/quit_128.png + icons/search_red_128.png + icons/security_high_128.png + icons/security_low_128.png + icons/security_medium_128.png + icons/settings/appearance.svg + icons/settings/channels.svg + icons/settings/chat.svg + icons/settings/directories.svg + icons/settings/filesharing.svg + icons/settings/forums.svg + icons/settings/general.svg + icons/settings/messages.svg + icons/settings/network.svg + icons/settings/notify.svg + icons/settings/people.svg + icons/settings/permissions.svg + icons/settings/plugins.svg + icons/settings/posted.svg + icons/settings/profile.svg + icons/settings/server.svg + icons/settings/sound.svg + icons/settings/webinterface.svg + icons/star_overlay_128.png + icons/svg/add.svg + icons/svg/attach-image.svg + icons/svg/attach.svg + icons/svg/channels-notify.svg + icons/svg/channels.svg + icons/svg/chat-bubble-notify.svg + icons/svg/chat-bubble.svg + icons/svg/chat-lobbies-notify.svg + icons/svg/chat-lobbies.svg + icons/svg/circles.svg + icons/svg/download.svg + icons/svg/empty-circle.svg + icons/svg/exit-red.svg + icons/svg/exit.svg + icons/svg/feedreader-notify.svg + icons/svg/feedreader.svg + icons/svg/filesharing-notify.svg + icons/svg/filesharing.svg + icons/svg/folders1.svg + icons/svg/folders.svg + icons/svg/font.svg + icons/svg/forums-notify.svg + icons/svg/forums.svg + icons/svg/fullscreen_arrows.svg + icons/svg/highlight.svg + icons/svg/info.svg + icons/svg/invite.svg + icons/svg/keyring.svg + icons/svg/leave.svg + icons/svg/magnifying-glass.svg + icons/svg/messages-notify.svg + icons/svg/messages.svg + icons/svg/microphone_mute.svg + icons/svg/microphone.svg + icons/svg/netgraph.svg + icons/svg/network-notify.svg + icons/svg/network-puplic.svg + icons/svg/network.svg + icons/svg/newsfeed-notify.svg + icons/svg/newsfeed.svg + icons/svg/options.svg + icons/svg/paste.svg + icons/svg/people-notify.svg + icons/svg/people.svg + icons/svg/person.svg + icons/svg/phone_hangup.svg + icons/svg/phone.svg + icons/svg/posted-notify.svg + icons/svg/posted.svg + icons/svg/profile.svg + icons/svg/retroshare-info.svg + icons/svg/retroshare-splash.svg + icons/svg/retroshare-symbol_black_bg.svg + icons/svg/retroshare-symbol_gradients.svg + icons/svg/retroshare-symbol-minimal.svg + icons/svg/search.svg + icons/svg/send-message-blocked.svg + icons/svg/send-message.svg + icons/svg/settings.svg + icons/svg/share.svg + icons/svg/smiley.svg + icons/svg/speaker_mute.svg + icons/svg/speaker.svg + icons/svg/thumbs-down.svg + icons/svg/thumbs-neutral.svg + icons/svg/thumbs-up.svg + icons/svg/upload.svg + icons/svg/video.svg + icons/switch00_128.png + icons/switch01_128.png + icons/switch10_128.png + icons/switch11_128.png + icons/system_128.png + icons/tile_checking_48.png + icons/tile_downloaded_48.png + icons/tile_downloading_48.png + icons/tile_inactive_48.png + icons/tor-logo.png + icons/tor-off.png + icons/tor-on.png + icons/tor-starting.png + icons/tor-stopping.png + icons/user-away_64.png + icons/user-away-extended_64.png + icons/user-busy_64.png + icons/user-offline_64.png + icons/user-online_64.png + icons/void_128.png + icons/warning_red_128.png + icons/warning_yellow_128.png + icons/yahoo.png + icons/yandex.png + diff --git a/retroshare-gui/src/gui/icons/svg/password.svg b/retroshare-gui/src/gui/icons/svg/password.svg new file mode 100644 index 000000000..1ad0b352d --- /dev/null +++ b/retroshare-gui/src/gui/icons/svg/password.svg @@ -0,0 +1,54 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss index b183eb77c..c3f0c1012 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss +++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss @@ -756,3 +756,20 @@ ConnectFriendWizard QFrame#friendFrame { border-radius: 6px; background: white; } + +HomePage QFrame#helpframe{ + border: 2px solid #009933; + border-radius: 6px; + background: white; +} + +StartDialog QPushButton#loadButton { + border-image: url(:/images/btn_blue.png) 4; + border-width: 4; + font: bold; + color: white; +} + +StartDialog QPushButton#loadButton:hover { + border-image: url(:/images/btn_blue_hover.png) 4; +} \ No newline at end of file