diff --git a/retroshare-gui/src/gui/StatisticDialog.ui b/retroshare-gui/src/gui/StatisticDialog.ui index 2db7f9367..7cb3cb2a1 100644 --- a/retroshare-gui/src/gui/StatisticDialog.ui +++ b/retroshare-gui/src/gui/StatisticDialog.ui @@ -522,47 +522,112 @@ Statistics + + + Now + + + + + Transfer + + + + :/images/transferupdown.png:/images/transferupdown.png + + + + + + + Session UL:DL Ratio: + + + + + + + + Cumulative UL:DL Ratio + + + + + + Download - - :/images/downloads_24x24.png:/images/downloads_24x24.png + + :/images/download.png:/images/download.png + + + Session: + + + :/images/StatisticsDetail.png:/images/StatisticsDetail.png + + + + Downloaded: + + + Average Downloadspeed: + + + Count of Downloads: + + + Overall + + + :/images/StatsCumulative.png:/images/StatsCumulative.png + + + + Downloaded: + + + Count of Downloads: + + + @@ -571,42 +636,74 @@ Upload - - :/images/uploads_24x24.png:/images/uploads_24x24.png + + :/images/up.png:/images/up.png + + + Session + + + :/images/StatisticsDetail.png:/images/StatisticsDetail.png + + + + Uploaded: + + + Average Uploadspeed: + + + Count of Uploads: + + + Overall + + + :/images/StatsCumulative.png:/images/StatsCumulative.png + + + + Uploaded + + + Count of Uploads: + + + @@ -615,62 +712,126 @@ Connections: - - :/images/connections_24x24.png:/images/connections_24x24.png + + :/images/connect_friend.png:/images/connect_friend.png + + + Session + + + :/images/StatisticsDetail.png:/images/StatisticsDetail.png + + + + Connections: + + + Peers: + + + Overall + + + :/images/StatsCumulative.png:/images/StatsCumulative.png + + + + Connections: + + + Peers: + + + - Misc + Time Statistics + + + + :/images/kalarm.png:/images/kalarm.png + + + - Session: + Session + + + + :/images/StatisticsDetail.png:/images/StatisticsDetail.png + + + - Uptime: + Uptime + + + + + + + + Since: + + + - Overall: + Cumulative + + + + :/images/StatsCumulative.png:/images/StatsCumulative.png + + + Uptime + + + @@ -678,30 +839,52 @@ Records + + + :/images/records.png:/images/records.png + + + + Uploadspeed: + + + Downloadspeed: + + + Connections: + + + Peers: + + + Uptime: + + + diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index fa78487cc..cfbe30004 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -21,6 +21,12 @@ images/channels24.png images/channels32.png images/contacts24.png + images/connection.png + images/Client0.png + images/Client1.png + images/Client2.png + images/Client3.png + images/Client4.png images/denied16.png images/FileTypeAny.png images/FileTypeArchive.png @@ -42,7 +48,7 @@ images/avatar_background.png images/backgroundimage.png images/button_cancel.png - images/calendar.png + images/calendar.png images/chat.png images/chat/bar_end.png images/chat/bar_fill.png @@ -100,11 +106,14 @@ images/evolution.png images/exit_24x24.png images/expand_hover.png - images/expand_frame.png + images/expand_frame.png images/exportpeers_16x16.png images/extension_32.png images/filefind.png images/fileinfo.png + images/filename.png + images/filepriority.png + images/filecomments.png images/filerating0.png images/filerating1.png images/filerating2.png @@ -113,7 +122,7 @@ images/filerating5.png images/fileshare16.png images/fileshare24.png - images/fileshare48.png + images/fileshare48.png images/find.png images/emoticons/kopete/kopete020.png images/flags/af.png @@ -142,7 +151,7 @@ images/folder-draft24.png images/folder_inbox64.png images/folder-inbox.png - images/folder-inbox-new.png + images/folder-inbox-new.png images/folder-outbox.png images/folder-sent.png images/folder_doments.png @@ -152,8 +161,8 @@ images/folder_yellow.png images/folder_green16.png images/folder_open.png - images/folder_video.png - images/folder_blueshared.png + images/folder_video.png + images/folder_blueshared.png images/forward.png images/friendsfolder24.png images/kgames.png @@ -164,7 +173,7 @@ images/help.png images/help24.png images/hide_toolbox_frame.png - images/hide_frame.png + images/hide_frame.png images/highlight.png images/hi16-app-ktorrent.png images/image16.png @@ -173,6 +182,7 @@ images/invite-friend24.png images/invitefriendlabel.png images/connect_friend.png + images/kalarm.png images/kbackgammon.png images/kblogger.png images/kcmsystem24.png @@ -183,7 +193,7 @@ images/konversation.png images/konversation16.png images/ksysguard.png - images/ksysguard32.png + images/ksysguard32.png images/ktorrent.png images/ktorrent32.png images/knewsticker24.png @@ -202,15 +212,15 @@ images/mail_get.png images/mail_reply.png images/mail_replyall.png - images/mail_forward.png + images/mail_forward.png images/mail_send.png images/mail_new.png images/mail_send24.png images/mailforward24-hover.png images/message-mail.png images/message-mail-read.png - images/message-mail-imapdelete.png - images/message-mail-replied-read.png + images/message-mail-imapdelete.png + images/message-mail-replied-read.png images/message-news.png images/message.png images/messenger.png @@ -228,8 +238,14 @@ images/peers_16x16.png images/peers_24x24.png images/print24.png + images/priorityauto.png + images/priorityhigh.png + images/prioritylow.png + images/priorityquestion.png + images/pause.png images/player_play.png images/quick_restart24.png + images/records.png images/removefriend16.png images/replymail-pressed.png images/replymail24-hover.png @@ -252,8 +268,13 @@ images/show_toolbox_frame.png images/smplayer_icon32.png images/start.png + images/stop.png + images/StatsCumulative.png + images/StatisticsDetail.png images/startall.png images/server_24x24.png + images/transferupdown.png + images/uploads.png images/loader/16-loader.gif images/loader/32-loader.gif images/loader/progress.gif diff --git a/retroshare-gui/src/gui/images/Client0.png b/retroshare-gui/src/gui/images/Client0.png new file mode 100644 index 000000000..5585cf80f Binary files /dev/null and b/retroshare-gui/src/gui/images/Client0.png differ diff --git a/retroshare-gui/src/gui/images/Client1.png b/retroshare-gui/src/gui/images/Client1.png new file mode 100644 index 000000000..b495f7db4 Binary files /dev/null and b/retroshare-gui/src/gui/images/Client1.png differ diff --git a/retroshare-gui/src/gui/images/Client2.png b/retroshare-gui/src/gui/images/Client2.png new file mode 100644 index 000000000..68acf1166 Binary files /dev/null and b/retroshare-gui/src/gui/images/Client2.png differ diff --git a/retroshare-gui/src/gui/images/Client3.png b/retroshare-gui/src/gui/images/Client3.png new file mode 100644 index 000000000..16139a95a Binary files /dev/null and b/retroshare-gui/src/gui/images/Client3.png differ diff --git a/retroshare-gui/src/gui/images/Client4.png b/retroshare-gui/src/gui/images/Client4.png new file mode 100644 index 000000000..31708ec64 Binary files /dev/null and b/retroshare-gui/src/gui/images/Client4.png differ diff --git a/retroshare-gui/src/gui/images/StatisticsDetail.png b/retroshare-gui/src/gui/images/StatisticsDetail.png new file mode 100644 index 000000000..e1a1bafd2 Binary files /dev/null and b/retroshare-gui/src/gui/images/StatisticsDetail.png differ diff --git a/retroshare-gui/src/gui/images/StatsCumulative.png b/retroshare-gui/src/gui/images/StatsCumulative.png new file mode 100644 index 000000000..174813e77 Binary files /dev/null and b/retroshare-gui/src/gui/images/StatsCumulative.png differ diff --git a/retroshare-gui/src/gui/images/connection.png b/retroshare-gui/src/gui/images/connection.png new file mode 100644 index 000000000..e22cb6c7c Binary files /dev/null and b/retroshare-gui/src/gui/images/connection.png differ diff --git a/retroshare-gui/src/gui/images/download.png b/retroshare-gui/src/gui/images/download.png index 2a7788133..ff38dd4ca 100644 Binary files a/retroshare-gui/src/gui/images/download.png and b/retroshare-gui/src/gui/images/download.png differ diff --git a/retroshare-gui/src/gui/images/filecomments.png b/retroshare-gui/src/gui/images/filecomments.png new file mode 100644 index 000000000..7e1423f4e Binary files /dev/null and b/retroshare-gui/src/gui/images/filecomments.png differ diff --git a/retroshare-gui/src/gui/images/fileinfo.png b/retroshare-gui/src/gui/images/fileinfo.png index 006da6aac..578466bd6 100644 Binary files a/retroshare-gui/src/gui/images/fileinfo.png and b/retroshare-gui/src/gui/images/fileinfo.png differ diff --git a/retroshare-gui/src/gui/images/filename.png b/retroshare-gui/src/gui/images/filename.png new file mode 100644 index 000000000..dabf31e61 Binary files /dev/null and b/retroshare-gui/src/gui/images/filename.png differ diff --git a/retroshare-gui/src/gui/images/filepriority.png b/retroshare-gui/src/gui/images/filepriority.png new file mode 100644 index 000000000..96f0c20dd Binary files /dev/null and b/retroshare-gui/src/gui/images/filepriority.png differ diff --git a/retroshare-gui/src/gui/images/kalarm.png b/retroshare-gui/src/gui/images/kalarm.png new file mode 100644 index 000000000..0fdb87d72 Binary files /dev/null and b/retroshare-gui/src/gui/images/kalarm.png differ diff --git a/retroshare-gui/src/gui/images/pause.png b/retroshare-gui/src/gui/images/pause.png new file mode 100644 index 000000000..6374a4026 Binary files /dev/null and b/retroshare-gui/src/gui/images/pause.png differ diff --git a/retroshare-gui/src/gui/images/priorityauto.png b/retroshare-gui/src/gui/images/priorityauto.png new file mode 100644 index 000000000..36816479d Binary files /dev/null and b/retroshare-gui/src/gui/images/priorityauto.png differ diff --git a/retroshare-gui/src/gui/images/priorityhigh.png b/retroshare-gui/src/gui/images/priorityhigh.png new file mode 100644 index 000000000..7418516f5 Binary files /dev/null and b/retroshare-gui/src/gui/images/priorityhigh.png differ diff --git a/retroshare-gui/src/gui/images/prioritylow.png b/retroshare-gui/src/gui/images/prioritylow.png new file mode 100644 index 000000000..d32a3e70b Binary files /dev/null and b/retroshare-gui/src/gui/images/prioritylow.png differ diff --git a/retroshare-gui/src/gui/images/priorityquestion.png b/retroshare-gui/src/gui/images/priorityquestion.png new file mode 100644 index 000000000..9126fb3d9 Binary files /dev/null and b/retroshare-gui/src/gui/images/priorityquestion.png differ diff --git a/retroshare-gui/src/gui/images/records.png b/retroshare-gui/src/gui/images/records.png new file mode 100644 index 000000000..0aa5ec2a4 Binary files /dev/null and b/retroshare-gui/src/gui/images/records.png differ diff --git a/retroshare-gui/src/gui/images/stop.png b/retroshare-gui/src/gui/images/stop.png new file mode 100644 index 000000000..b3313507d Binary files /dev/null and b/retroshare-gui/src/gui/images/stop.png differ diff --git a/retroshare-gui/src/gui/images/transferupdown.png b/retroshare-gui/src/gui/images/transferupdown.png new file mode 100644 index 000000000..96838be85 Binary files /dev/null and b/retroshare-gui/src/gui/images/transferupdown.png differ diff --git a/retroshare-gui/src/gui/images/uploads.png b/retroshare-gui/src/gui/images/uploads.png new file mode 100644 index 000000000..c1e63c893 Binary files /dev/null and b/retroshare-gui/src/gui/images/uploads.png differ