mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-12-23 22:49:37 -05:00
-added new icons for Authed/denied16
-set header text aligment to AlignHCenter/AlignVCenter -removded not needed Authcode column git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@671 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax
parent
7372007866
commit
2ac326f076
@ -47,8 +47,8 @@
|
||||
#define IMAGE_PEERDETAILS ":/images/peerdetails_16x16.png"
|
||||
#define IMAGE_AUTH ":/images/encrypted16.png"
|
||||
/* Images for Status icons */
|
||||
#define IMAGE_AUTHED ":/images/dauthed.png"
|
||||
#define IMAGE_DENIED ":/images/ddeny.png"
|
||||
#define IMAGE_AUTHED ":/images/accepted16.png"
|
||||
#define IMAGE_DENIED ":/images/denied16.png"
|
||||
|
||||
RsCertId getNeighRsCertId(QTreeWidgetItem *i);
|
||||
|
||||
@ -85,7 +85,6 @@ NetworkDialog::NetworkDialog(QWidget *parent)
|
||||
_header->setResizeMode (7, QHeaderView::Interactive);
|
||||
_header->setResizeMode (8, QHeaderView::Interactive);
|
||||
_header->setResizeMode (9, QHeaderView::Interactive);
|
||||
_header->setResizeMode (10, QHeaderView::Interactive);
|
||||
|
||||
_header->resizeSection ( 0, 25 );
|
||||
_header->resizeSection ( 1, 100 );
|
||||
@ -98,6 +97,19 @@ NetworkDialog::NetworkDialog(QWidget *parent)
|
||||
_header->resizeSection ( 8, 100 );
|
||||
_header->resizeSection ( 9, 100 );
|
||||
|
||||
// set header text aligment
|
||||
QTreeWidgetItem * headerItem = ui.connecttreeWidget->headerItem();
|
||||
headerItem->setTextAlignment(0, Qt::AlignHCenter | Qt::AlignVCenter);
|
||||
headerItem->setTextAlignment(1, Qt::AlignHCenter | Qt::AlignVCenter);
|
||||
headerItem->setTextAlignment(2, Qt::AlignHCenter | Qt::AlignVCenter);
|
||||
headerItem->setTextAlignment(3, Qt::AlignHCenter | Qt::AlignVCenter);
|
||||
headerItem->setTextAlignment(4, Qt::AlignHCenter | Qt::AlignVCenter);
|
||||
headerItem->setTextAlignment(5, Qt::AlignHCenter | Qt::AlignVCenter);
|
||||
headerItem->setTextAlignment(6, Qt::AlignHCenter | Qt::AlignVCenter);
|
||||
headerItem->setTextAlignment(7, Qt::AlignHCenter | Qt::AlignVCenter);
|
||||
headerItem->setTextAlignment(8, Qt::AlignHCenter | Qt::AlignVCenter);
|
||||
headerItem->setTextAlignment(9, Qt::AlignHCenter | Qt::AlignVCenter);
|
||||
|
||||
networkview = new NetworkView(ui.networkviewTab);
|
||||
QVBoxLayout *layout = new QVBoxLayout;
|
||||
layout->addWidget(networkview);
|
||||
@ -320,7 +332,7 @@ void NetworkDialog::insertConnect()
|
||||
}
|
||||
}
|
||||
|
||||
item -> setText(10, QString::fromStdString(detail.authcode));
|
||||
//item -> setText(10, QString::fromStdString(detail.authcode));
|
||||
|
||||
/* change background */
|
||||
int i;
|
||||
@ -329,7 +341,7 @@ void NetworkDialog::insertConnect()
|
||||
if (detail.lastConnect < 10000) /* 3 hours? */
|
||||
{
|
||||
/* bright green */
|
||||
for(i = 1; i < 11; i++)
|
||||
for(i = 1; i <10; i++)
|
||||
{
|
||||
item -> setBackground(i,QBrush(Qt::darkGreen));
|
||||
item -> setIcon(0,(QIcon(IMAGE_AUTHED)));
|
||||
@ -337,7 +349,7 @@ void NetworkDialog::insertConnect()
|
||||
}
|
||||
else
|
||||
{
|
||||
for(i = 1; i < 11; i++)
|
||||
for(i = 1; i < 10; i++)
|
||||
{
|
||||
item -> setBackground(i,QBrush(Qt::darkGreen));
|
||||
item -> setIcon(0,(QIcon(IMAGE_AUTHED)));
|
||||
@ -348,7 +360,7 @@ void NetworkDialog::insertConnect()
|
||||
{
|
||||
if (detail.trustLvl > RS_TRUST_LVL_MARGINAL)
|
||||
{
|
||||
for(i = 1; i < 11; i++)
|
||||
for(i = 1; i < 10; i++)
|
||||
{
|
||||
item -> setBackground(i,QBrush(Qt::cyan));
|
||||
item -> setIcon(0,(QIcon(IMAGE_DENIED)));
|
||||
@ -356,7 +368,7 @@ void NetworkDialog::insertConnect()
|
||||
}
|
||||
else if (detail.lastConnect < 10000) /* 3 hours? */
|
||||
{
|
||||
for(i = 1; i < 11; i++)
|
||||
for(i = 1; i < 10; i++)
|
||||
{
|
||||
item -> setBackground(i,QBrush(Qt::yellow));
|
||||
item -> setIcon(0,(QIcon(IMAGE_DENIED)));
|
||||
@ -364,7 +376,7 @@ void NetworkDialog::insertConnect()
|
||||
}
|
||||
else
|
||||
{
|
||||
for(i = 1; i < 11; i++)
|
||||
for(i = 1; i < 10; i++)
|
||||
{
|
||||
item -> setBackground(i,QBrush(Qt::gray));
|
||||
item -> setIcon(0,(QIcon(IMAGE_DENIED)));
|
||||
@ -379,7 +391,7 @@ void NetworkDialog::insertConnect()
|
||||
|
||||
/* remove old items ??? */
|
||||
connectWidget->clear();
|
||||
connectWidget->setColumnCount(11);
|
||||
connectWidget->setColumnCount(10);
|
||||
|
||||
/* add the items in! */
|
||||
connectWidget->insertTopLevelItems(0, items);
|
||||
|
||||
@ -34,43 +34,30 @@
|
||||
<number>0</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="networkTab" >
|
||||
<property name="geometry" >
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>564</width>
|
||||
<height>411</height>
|
||||
</rect>
|
||||
</property>
|
||||
<attribute name="title" >
|
||||
<string>Network</string>
|
||||
</attribute>
|
||||
<layout class="QGridLayout" >
|
||||
<property name="leftMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="topMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="rightMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="bottomMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="verticalSpacing" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="margin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item row="0" column="0" >
|
||||
<layout class="QGridLayout" >
|
||||
<property name="leftMargin" >
|
||||
<property name="margin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="topMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="rightMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="bottomMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="horizontalSpacing" >
|
||||
<number>6</number>
|
||||
</property>
|
||||
<property name="verticalSpacing" >
|
||||
<property name="spacing" >
|
||||
<number>6</number>
|
||||
</property>
|
||||
<item row="0" column="0" >
|
||||
@ -79,7 +66,7 @@
|
||||
<string/>
|
||||
</property>
|
||||
<property name="pixmap" >
|
||||
<pixmap resource="images.qrc" >:/images/network16.png</pixmap>
|
||||
<pixmap>:/images/network16.png</pixmap>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -98,7 +85,7 @@ p, li { white-space: pre-wrap; }
|
||||
<property name="orientation" >
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" >
|
||||
<property name="sizeHint" stdset="0" >
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
@ -198,11 +185,6 @@ p, li { white-space: pre-wrap; }
|
||||
<string>Cert Id</string>
|
||||
</property>
|
||||
</column>
|
||||
<column>
|
||||
<property name="text" >
|
||||
<string>Auth Code</string>
|
||||
</property>
|
||||
</column>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0" >
|
||||
@ -220,6 +202,14 @@ p, li { white-space: pre-wrap; }
|
||||
<number>0</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="log_tab" >
|
||||
<property name="geometry" >
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>558</width>
|
||||
<height>115</height>
|
||||
</rect>
|
||||
</property>
|
||||
<attribute name="title" >
|
||||
<string>Log</string>
|
||||
</attribute>
|
||||
@ -227,16 +217,7 @@ p, li { white-space: pre-wrap; }
|
||||
<property name="spacing" >
|
||||
<number>6</number>
|
||||
</property>
|
||||
<property name="leftMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="topMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="rightMargin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="bottomMargin" >
|
||||
<property name="margin" >
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
@ -265,6 +246,14 @@ p, li { white-space: pre-wrap; }
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="networkviewTab" >
|
||||
<property name="geometry" >
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>564</width>
|
||||
<height>411</height>
|
||||
</rect>
|
||||
</property>
|
||||
<attribute name="title" >
|
||||
<string>Network View</string>
|
||||
</attribute>
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
<file>help/authors.html</file>
|
||||
<file>help/licence.html</file>
|
||||
<file>help/thanks.html</file>
|
||||
<file>images/accepted16.png</file>
|
||||
<file>images/browse-looking.gif</file>
|
||||
<file>images/addfriendlabel.png</file>
|
||||
<file>images/back.png</file>
|
||||
@ -13,6 +14,7 @@
|
||||
<file>images/channeldelete.png</file>
|
||||
<file>images/channelsubscribe.png</file>
|
||||
<file>images/contacts24.png</file>
|
||||
<file>images/denied16.png</file>
|
||||
<file>images/FileTypeAny.png</file>
|
||||
<file>images/FileTypeArchive.png</file>
|
||||
<file>images/FileTypeAudio.png</file>
|
||||
|
||||
BIN
retroshare-gui/src/gui/images/accepted16.png
Normal file
BIN
retroshare-gui/src/gui/images/accepted16.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 612 B |
BIN
retroshare-gui/src/gui/images/denied16.png
Normal file
BIN
retroshare-gui/src/gui/images/denied16.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.5 KiB |
Loading…
Reference in New Issue
Block a user