diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp index dfba6030a..90cfdafaa 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.cpp +++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp @@ -322,11 +322,13 @@ IdDialog::IdDialog(QWidget *parent) : ui->idTreeWidget->setColumnWidth(RSID_COL_NICKNAME, 14 * fontWidth); ui->idTreeWidget->setColumnWidth(RSID_COL_KEYID, 20 * fontWidth); ui->idTreeWidget->setColumnWidth(RSID_COL_IDTYPE, 18 * fontWidth); - ui->idTreeWidget->setColumnWidth(RSID_COL_VOTES, 7 * fontWidth); + ui->idTreeWidget->setColumnWidth(RSID_COL_VOTES, 2 * fontWidth); ui->idTreeWidget->setItemDelegateForColumn(RSID_COL_VOTES,new ReputationItemDelegate(RsReputations::ReputationLevel(0xff))) ; - //QHeaderView_setSectionResizeMode(ui->idTreeWidget->header(), QHeaderView::ResizeToContents); + /* Set header resize modes and initial section sizes */ + QHeaderView * idheader = ui->idTreeWidget->header(); + QHeaderView_setSectionResizeModeColumn(idheader, RSID_COL_VOTES, QHeaderView::ResizeToContents); mIdQueue = new TokenQueue(rsIdentity->getTokenService(), this); diff --git a/retroshare-gui/src/gui/Identity/IdDialog.ui b/retroshare-gui/src/gui/Identity/IdDialog.ui index a4e096b5f..9f87a4147 100644 --- a/retroshare-gui/src/gui/Identity/IdDialog.ui +++ b/retroshare-gui/src/gui/Identity/IdDialog.ui @@ -243,11 +243,18 @@ - Reputation + + + + Votes AlignLeading|AlignVCenter + + + :/icons/flag-green.png:/icons/flag-green.png + diff --git a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp index 65e51fc45..13b0e1047 100644 --- a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp +++ b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp @@ -51,8 +51,8 @@ #define REPUTATION_LOCALLY_POSITIVE_ICON ":/icons/bullet_green_yellow_star_128.png" #define REPUTATION_REMOTELY_POSITIVE_ICON ":/icons/bullet_green_128.png" #define REPUTATION_NEUTRAL_ICON ":/icons/bullet_grey_128.png" -#define REPUTATION_REMOTELY_NEGATIVE_ICON ":/icons/yellow_biohazard64.png" -#define REPUTATION_LOCALLY_NEGATIVE_ICON ":/icons/red_biohazard64.png" +#define REPUTATION_REMOTELY_NEGATIVE_ICON ":/icons/biohazard_yellow.png" +#define REPUTATION_LOCALLY_NEGATIVE_ICON ":/icons/biohazard_red.png" #define REPUTATION_VOID ":/icons/void_128.png" #define TIMER_INTERVAL 500 diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp index 8e5eefa8f..cc0890077 100644 --- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp +++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp @@ -224,8 +224,11 @@ GxsForumThreadWidget::GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget /* Set header resize modes and initial section sizes */ QHeaderView * ttheader = ui->threadTreeWidget->header () ; QHeaderView_setSectionResizeModeColumn(ttheader, COLUMN_THREAD_TITLE, QHeaderView::Interactive); + QHeaderView_setSectionResizeModeColumn(ttheader, COLUMN_THREAD_DISTRIBUTION, QHeaderView::ResizeToContents); + ttheader->resizeSection (COLUMN_THREAD_DATE, 140); ttheader->resizeSection (COLUMN_THREAD_TITLE, 440); + ttheader->resizeSection (COLUMN_THREAD_DISTRIBUTION, 24); ttheader->resizeSection (COLUMN_THREAD_AUTHOR, 150); ui->threadTreeWidget->sortItems(COLUMN_THREAD_DATE, Qt::DescendingOrder); diff --git a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui index ba0dd9640..3a93e9973 100644 --- a/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui +++ b/retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.ui @@ -240,8 +240,15 @@ + + + Distribution + + + :/icons/flag-green.png:/icons/flag-green.png + @@ -556,6 +563,7 @@ + diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc index f7ad9d574..a89ead9d8 100644 --- a/retroshare-gui/src/gui/icons.qrc +++ b/retroshare-gui/src/gui/icons.qrc @@ -6,6 +6,8 @@ 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 @@ -23,6 +25,7 @@ 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 @@ -106,7 +109,6 @@ icons/posted_128.png icons/posted_red_128.png icons/quit_128.png - icons/red_biohazard64.png icons/search_red_128.png icons/security_high_128.png icons/security_low_128.png @@ -222,6 +224,5 @@ icons/warning_yellow_128.png icons/yahoo.png icons/yandex.png - icons/yellow_biohazard64.png diff --git a/retroshare-gui/src/gui/icons/biohazard_red.png b/retroshare-gui/src/gui/icons/biohazard_red.png new file mode 100644 index 000000000..b08f4f84d Binary files /dev/null and b/retroshare-gui/src/gui/icons/biohazard_red.png differ diff --git a/retroshare-gui/src/gui/icons/biohazard_yellow.png b/retroshare-gui/src/gui/icons/biohazard_yellow.png new file mode 100644 index 000000000..7eaedc389 Binary files /dev/null and b/retroshare-gui/src/gui/icons/biohazard_yellow.png differ diff --git a/retroshare-gui/src/gui/icons/flag-green.png b/retroshare-gui/src/gui/icons/flag-green.png new file mode 100644 index 000000000..8d450bf2f Binary files /dev/null and b/retroshare-gui/src/gui/icons/flag-green.png differ diff --git a/retroshare-gui/src/gui/icons/red_biohazard64.png b/retroshare-gui/src/gui/icons/red_biohazard64.png deleted file mode 100644 index eacbf9f8d..000000000 Binary files a/retroshare-gui/src/gui/icons/red_biohazard64.png and /dev/null differ diff --git a/retroshare-gui/src/gui/icons/yellow_biohazard64.png b/retroshare-gui/src/gui/icons/yellow_biohazard64.png deleted file mode 100644 index 09accbf83..000000000 Binary files a/retroshare-gui/src/gui/icons/yellow_biohazard64.png and /dev/null differ