added for each toggleview correct icons if is hidden/show and set ToolTips .
added for PhotoDialog toggleview function to hide added some icons for PhotoDialog treewidget added a new Button in Forums for New Forum Message again some icon changes git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@679 b45a01b8-16f6-495d-af2f-9b41ad6348cc
@ -64,6 +64,7 @@ ForumsDialog::ForumsDialog(QWidget *parent)
|
|||||||
connect( ui.threadTreeWidget, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( threadListCustomPopupMenu( QPoint ) ) );
|
connect( ui.threadTreeWidget, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( threadListCustomPopupMenu( QPoint ) ) );
|
||||||
|
|
||||||
connect(ui.newForumButton, SIGNAL(clicked()), this, SLOT(newforum()));
|
connect(ui.newForumButton, SIGNAL(clicked()), this, SLOT(newforum()));
|
||||||
|
connect(ui.newmessageButton, SIGNAL(clicked()), this, SLOT(createmessage()));
|
||||||
|
|
||||||
|
|
||||||
connect( ui.forumTreeWidget, SIGNAL( currentItemChanged ( QTreeWidgetItem *, QTreeWidgetItem *) ), this,
|
connect( ui.forumTreeWidget, SIGNAL( currentItemChanged ( QTreeWidgetItem *, QTreeWidgetItem *) ), this,
|
||||||
@ -138,10 +139,16 @@ ForumsDialog::ForumsDialog(QWidget *parent)
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
/* Set header resize modes and initial section sizes */
|
/* Set header resize modes and initial section sizes */
|
||||||
QHeaderView * msgwheader = ui.forumTreeWidget->header () ;
|
QHeaderView * ftheader = ui.forumTreeWidget->header () ;
|
||||||
msgwheader->setResizeMode (0, QHeaderView::Interactive);
|
ftheader->setResizeMode (0, QHeaderView::Interactive);
|
||||||
|
|
||||||
msgwheader->resizeSection ( 0, 170 );
|
ftheader->resizeSection ( 0, 170 );
|
||||||
|
|
||||||
|
/* Set header resize modes and initial section sizes */
|
||||||
|
QHeaderView * ttheader = ui.threadTreeWidget->header () ;
|
||||||
|
ttheader->setResizeMode (0, QHeaderView::Interactive);
|
||||||
|
|
||||||
|
ttheader->resizeSection ( 0, 170 );
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -182,7 +189,7 @@ void ForumsDialog::threadListCustomPopupMenu( QPoint point )
|
|||||||
QMenu contextMnu( this );
|
QMenu contextMnu( this );
|
||||||
QMouseEvent *mevent = new QMouseEvent( QEvent::MouseButtonPress, point, Qt::RightButton, Qt::RightButton, Qt::NoModifier );
|
QMouseEvent *mevent = new QMouseEvent( QEvent::MouseButtonPress, point, Qt::RightButton, Qt::RightButton, Qt::NoModifier );
|
||||||
|
|
||||||
QAction *replyAct = new QAction(QIcon(IMAGE_DOWNLOAD), tr( "Reply" ), this );
|
QAction *replyAct = new QAction(QIcon(IMAGE_MESSAGEREPLY), tr( "Reply" ), this );
|
||||||
connect( replyAct , SIGNAL( triggered() ), this, SLOT( createmessage() ) );
|
connect( replyAct , SIGNAL( triggered() ), this, SLOT( createmessage() ) );
|
||||||
|
|
||||||
QAction *viewAct = new QAction(QIcon(IMAGE_DOWNLOADALL), tr( "View Whole Thread" ), this );
|
QAction *viewAct = new QAction(QIcon(IMAGE_DOWNLOADALL), tr( "View Whole Thread" ), this );
|
||||||
@ -256,6 +263,8 @@ void ForumsDialog::togglefileview()
|
|||||||
{
|
{
|
||||||
newSizeList.push_back(totalSize);
|
newSizeList.push_back(totalSize);
|
||||||
newSizeList.push_back(0);
|
newSizeList.push_back(0);
|
||||||
|
ui.expandButton->setIcon(QIcon(QString(":/images/edit_add24.png")));
|
||||||
|
ui.expandButton->setToolTip("Expand");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -264,6 +273,8 @@ void ForumsDialog::togglefileview()
|
|||||||
int nMsgSize = (totalSize / 2);
|
int nMsgSize = (totalSize / 2);
|
||||||
newSizeList.push_back(nlistSize);
|
newSizeList.push_back(nlistSize);
|
||||||
newSizeList.push_back(nMsgSize);
|
newSizeList.push_back(nMsgSize);
|
||||||
|
ui.expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png")));
|
||||||
|
ui.expandButton->setToolTip("Hide");
|
||||||
}
|
}
|
||||||
|
|
||||||
ui.msgSplitter->setSizes(newSizeList);
|
ui.msgSplitter->setSizes(newSizeList);
|
||||||
|
@ -557,6 +557,20 @@
|
|||||||
<layout class="QVBoxLayout" >
|
<layout class="QVBoxLayout" >
|
||||||
<item>
|
<item>
|
||||||
<layout class="QHBoxLayout" >
|
<layout class="QHBoxLayout" >
|
||||||
|
<item>
|
||||||
|
<widget class="QPushButton" name="newmessageButton" >
|
||||||
|
<property name="toolTip" >
|
||||||
|
<string>New Message</string>
|
||||||
|
</property>
|
||||||
|
<property name="text" >
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
<property name="icon" >
|
||||||
|
<iconset resource="images.qrc" >
|
||||||
|
<normaloff>:/images/mail_new.png</normaloff>:/images/mail_new.png</iconset>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="label_17" >
|
<widget class="QLabel" name="label_17" >
|
||||||
<property name="sizePolicy" >
|
<property name="sizePolicy" >
|
||||||
@ -710,7 +724,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
</property>
|
</property>
|
||||||
<property name="icon" >
|
<property name="icon" >
|
||||||
<iconset resource="images.qrc" >
|
<iconset resource="images.qrc" >
|
||||||
<normaloff>:/images/add_24x24.png</normaloff>:/images/add_24x24.png</iconset>
|
<normaloff>:/images/edit_remove24.png</normaloff>:/images/edit_remove24.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
@ -803,11 +803,15 @@ void LinksDialog::toggleWindows( void )
|
|||||||
{
|
{
|
||||||
newSizeList.push_back(totalSize);
|
newSizeList.push_back(totalSize);
|
||||||
newSizeList.push_back(0);
|
newSizeList.push_back(0);
|
||||||
|
ui.expandButton->setIcon(QIcon(QString(":/images/edit_add24.png")));
|
||||||
|
ui.expandButton->setToolTip("Expand");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
newSizeList.push_back(totalSize * 3/4);
|
newSizeList.push_back(totalSize * 3/4);
|
||||||
newSizeList.push_back(totalSize * 1/4);
|
newSizeList.push_back(totalSize * 1/4);
|
||||||
|
ui.expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png")));
|
||||||
|
ui.expandButton->setToolTip("Hide");
|
||||||
}
|
}
|
||||||
|
|
||||||
ui.msgSplitter->setSizes(newSizeList);
|
ui.msgSplitter->setSizes(newSizeList);
|
||||||
|
@ -38,7 +38,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
<property name="orientation" >
|
<property name="orientation" >
|
||||||
<enum>Qt::Horizontal</enum>
|
<enum>Qt::Horizontal</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizeHint" >
|
<property name="sizeHint" stdset="0" >
|
||||||
<size>
|
<size>
|
||||||
<width>461</width>
|
<width>461</width>
|
||||||
<height>20</height>
|
<height>20</height>
|
||||||
@ -86,7 +86,8 @@ p, li { white-space: pre-wrap; }
|
|||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="icon" >
|
<property name="icon" >
|
||||||
<iconset resource="images.qrc" >:/images/add_24x24.png</iconset>
|
<iconset resource="images.qrc" >
|
||||||
|
<normaloff>:/images/edit_remove24.png</normaloff>:/images/edit_remove24.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@ -95,7 +96,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
<property name="orientation" >
|
<property name="orientation" >
|
||||||
<enum>Qt::Horizontal</enum>
|
<enum>Qt::Horizontal</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizeHint" >
|
<property name="sizeHint" stdset="0" >
|
||||||
<size>
|
<size>
|
||||||
<width>16</width>
|
<width>16</width>
|
||||||
<height>20</height>
|
<height>20</height>
|
||||||
@ -146,7 +147,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
<property name="orientation" >
|
<property name="orientation" >
|
||||||
<enum>Qt::Horizontal</enum>
|
<enum>Qt::Horizontal</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizeHint" >
|
<property name="sizeHint" stdset="0" >
|
||||||
<size>
|
<size>
|
||||||
<width>16</width>
|
<width>16</width>
|
||||||
<height>20</height>
|
<height>20</height>
|
||||||
@ -197,7 +198,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
<property name="orientation" >
|
<property name="orientation" >
|
||||||
<enum>Qt::Horizontal</enum>
|
<enum>Qt::Horizontal</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizeHint" >
|
<property name="sizeHint" stdset="0" >
|
||||||
<size>
|
<size>
|
||||||
<width>16</width>
|
<width>16</width>
|
||||||
<height>20</height>
|
<height>20</height>
|
||||||
@ -243,7 +244,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
<property name="orientation" >
|
<property name="orientation" >
|
||||||
<enum>Qt::Horizontal</enum>
|
<enum>Qt::Horizontal</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizeHint" >
|
<property name="sizeHint" stdset="0" >
|
||||||
<size>
|
<size>
|
||||||
<width>16</width>
|
<width>16</width>
|
||||||
<height>20</height>
|
<height>20</height>
|
||||||
@ -315,7 +316,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
<property name="orientation" >
|
<property name="orientation" >
|
||||||
<enum>Qt::Horizontal</enum>
|
<enum>Qt::Horizontal</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizeHint" >
|
<property name="sizeHint" stdset="0" >
|
||||||
<size>
|
<size>
|
||||||
<width>311</width>
|
<width>311</width>
|
||||||
<height>32</height>
|
<height>32</height>
|
||||||
@ -397,7 +398,8 @@ p, li { white-space: pre-wrap; }
|
|||||||
<string>+2 Great!</string>
|
<string>+2 Great!</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="icon" >
|
<property name="icon" >
|
||||||
<iconset resource="images.qrc" >:/images/filerating5.png</iconset>
|
<iconset resource="images.qrc" >
|
||||||
|
<normaloff>:/images/filerating5.png</normaloff>:/images/filerating5.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
@ -405,7 +407,8 @@ p, li { white-space: pre-wrap; }
|
|||||||
<string>+1 Good</string>
|
<string>+1 Good</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="icon" >
|
<property name="icon" >
|
||||||
<iconset resource="images.qrc" >:/images/filerating4.png</iconset>
|
<iconset resource="images.qrc" >
|
||||||
|
<normaloff>:/images/filerating4.png</normaloff>:/images/filerating4.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
@ -413,7 +416,8 @@ p, li { white-space: pre-wrap; }
|
|||||||
<string>0 Okay</string>
|
<string>0 Okay</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="icon" >
|
<property name="icon" >
|
||||||
<iconset resource="images.qrc" >:/images/filerating3.png</iconset>
|
<iconset resource="images.qrc" >
|
||||||
|
<normaloff>:/images/filerating3.png</normaloff>:/images/filerating3.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
@ -421,7 +425,8 @@ p, li { white-space: pre-wrap; }
|
|||||||
<string>-1 Sux</string>
|
<string>-1 Sux</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="icon" >
|
<property name="icon" >
|
||||||
<iconset resource="images.qrc" >:/images/filerating2.png</iconset>
|
<iconset resource="images.qrc" >
|
||||||
|
<normaloff>:/images/filerating2.png</normaloff>:/images/filerating2.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
@ -429,7 +434,8 @@ p, li { white-space: pre-wrap; }
|
|||||||
<string>-2 Bad Link</string>
|
<string>-2 Bad Link</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="icon" >
|
<property name="icon" >
|
||||||
<iconset resource="images.qrc" >:/images/filerating1.png</iconset>
|
<iconset resource="images.qrc" >
|
||||||
|
<normaloff>:/images/filerating1.png</normaloff>:/images/filerating1.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
</item>
|
</item>
|
||||||
</widget>
|
</widget>
|
||||||
|
@ -230,6 +230,8 @@ void MessagesDialog::togglefileview()
|
|||||||
newSizeList.push_back(listSize + recommendSize / 3);
|
newSizeList.push_back(listSize + recommendSize / 3);
|
||||||
newSizeList.push_back(msgSize + recommendSize * 2 / 3);
|
newSizeList.push_back(msgSize + recommendSize * 2 / 3);
|
||||||
newSizeList.push_back(0);
|
newSizeList.push_back(0);
|
||||||
|
ui.expandFilesButton->setIcon(QIcon(QString(":/images/edit_add24.png")));
|
||||||
|
ui.expandFilesButton->setToolTip("Expand");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -239,6 +241,8 @@ void MessagesDialog::togglefileview()
|
|||||||
newSizeList.push_back(nlistSize);
|
newSizeList.push_back(nlistSize);
|
||||||
newSizeList.push_back(nMsgSize);
|
newSizeList.push_back(nMsgSize);
|
||||||
newSizeList.push_back(totalSize * 1 / 3);
|
newSizeList.push_back(totalSize * 1 / 3);
|
||||||
|
ui.expandFilesButton->setIcon(QIcon(QString(":/images/edit_remove24.png")));
|
||||||
|
ui.expandFilesButton->setToolTip("Hide");
|
||||||
}
|
}
|
||||||
|
|
||||||
ui.msgSplitter->setSizes(newSizeList);
|
ui.msgSplitter->setSizes(newSizeList);
|
||||||
|
@ -526,7 +526,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">New Message</p></body></html></string>
|
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">New Message</p></body></html></string>
|
||||||
</property>
|
</property>
|
||||||
<property name="styleSheet" >
|
<property name="styleSheet" >
|
||||||
<string/>
|
<string notr="true" />
|
||||||
</property>
|
</property>
|
||||||
<property name="text" >
|
<property name="text" >
|
||||||
<string/>
|
<string/>
|
||||||
@ -563,7 +563,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">reply to selected message</p></body></html></string>
|
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">reply to selected message</p></body></html></string>
|
||||||
</property>
|
</property>
|
||||||
<property name="styleSheet" >
|
<property name="styleSheet" >
|
||||||
<string/>
|
<string notr="true" />
|
||||||
</property>
|
</property>
|
||||||
<property name="text" >
|
<property name="text" >
|
||||||
<string/>
|
<string/>
|
||||||
@ -597,7 +597,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">remove selected message</p></body></html></string>
|
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">remove selected message</p></body></html></string>
|
||||||
</property>
|
</property>
|
||||||
<property name="styleSheet" >
|
<property name="styleSheet" >
|
||||||
<string/>
|
<string notr="true" />
|
||||||
</property>
|
</property>
|
||||||
<property name="text" >
|
<property name="text" >
|
||||||
<string/>
|
<string/>
|
||||||
@ -646,7 +646,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
<property name="orientation" >
|
<property name="orientation" >
|
||||||
<enum>Qt::Horizontal</enum>
|
<enum>Qt::Horizontal</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizeHint" >
|
<property name="sizeHint" stdset="0" >
|
||||||
<size>
|
<size>
|
||||||
<width>571</width>
|
<width>571</width>
|
||||||
<height>24</height>
|
<height>24</height>
|
||||||
@ -698,7 +698,8 @@ p, li { white-space: pre-wrap; }
|
|||||||
<string>Inbox</string>
|
<string>Inbox</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="icon" >
|
<property name="icon" >
|
||||||
<iconset resource="images.qrc" >:/images/folder-inbox.png</iconset>
|
<iconset resource="images.qrc" >
|
||||||
|
<normaloff>:/images/folder-inbox.png</normaloff>:/images/folder-inbox.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
@ -706,7 +707,8 @@ p, li { white-space: pre-wrap; }
|
|||||||
<string>Outbox</string>
|
<string>Outbox</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="icon" >
|
<property name="icon" >
|
||||||
<iconset resource="images.qrc" >:/images/folder-outbox.png</iconset>
|
<iconset resource="images.qrc" >
|
||||||
|
<normaloff>:/images/folder-outbox.png</normaloff>:/images/folder-outbox.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
@ -714,7 +716,8 @@ p, li { white-space: pre-wrap; }
|
|||||||
<string>Draft</string>
|
<string>Draft</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="icon" >
|
<property name="icon" >
|
||||||
<iconset resource="images.qrc" >:/images/folder-draft.png</iconset>
|
<iconset resource="images.qrc" >
|
||||||
|
<normaloff>:/images/folder-draft.png</normaloff>:/images/folder-draft.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
@ -722,7 +725,8 @@ p, li { white-space: pre-wrap; }
|
|||||||
<string>Sent</string>
|
<string>Sent</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="icon" >
|
<property name="icon" >
|
||||||
<iconset resource="images.qrc" >:/images/folder-sent.png</iconset>
|
<iconset resource="images.qrc" >
|
||||||
|
<normaloff>:/images/folder-sent.png</normaloff>:/images/folder-sent.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
</item>
|
</item>
|
||||||
</widget>
|
</widget>
|
||||||
@ -754,7 +758,8 @@ p, li { white-space: pre-wrap; }
|
|||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="icon" >
|
<property name="icon" >
|
||||||
<iconset resource="images.qrc" >:/images/attachment.png</iconset>
|
<iconset resource="images.qrc" >
|
||||||
|
<normaloff>:/images/attachment.png</normaloff>:/images/attachment.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
</column>
|
</column>
|
||||||
<column>
|
<column>
|
||||||
@ -787,7 +792,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
<property name="sizeType" >
|
<property name="sizeType" >
|
||||||
<enum>QSizePolicy::Preferred</enum>
|
<enum>QSizePolicy::Preferred</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizeHint" >
|
<property name="sizeHint" stdset="0" >
|
||||||
<size>
|
<size>
|
||||||
<width>20</width>
|
<width>20</width>
|
||||||
<height>40</height>
|
<height>40</height>
|
||||||
@ -1045,22 +1050,10 @@ p, li { white-space: pre-wrap; }
|
|||||||
<layout class="QHBoxLayout" >
|
<layout class="QHBoxLayout" >
|
||||||
<item>
|
<item>
|
||||||
<layout class="QGridLayout" >
|
<layout class="QGridLayout" >
|
||||||
<property name="leftMargin" >
|
<property name="margin" >
|
||||||
<number>0</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<property name="topMargin" >
|
<property name="spacing" >
|
||||||
<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" >
|
|
||||||
<number>6</number>
|
<number>6</number>
|
||||||
</property>
|
</property>
|
||||||
<item row="0" column="1" >
|
<item row="0" column="1" >
|
||||||
@ -1102,7 +1095,8 @@ p, li { white-space: pre-wrap; }
|
|||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="icon" >
|
<property name="icon" >
|
||||||
<iconset resource="images.qrc" >:/images/add_24x24.png</iconset>
|
<iconset resource="images.qrc" >
|
||||||
|
<normaloff>:/images/edit_remove24.png</normaloff>:/images/edit_remove24.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
@ -1113,7 +1107,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
<property name="orientation" >
|
<property name="orientation" >
|
||||||
<enum>Qt::Horizontal</enum>
|
<enum>Qt::Horizontal</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizeHint" >
|
<property name="sizeHint" stdset="0" >
|
||||||
<size>
|
<size>
|
||||||
<width>351</width>
|
<width>351</width>
|
||||||
<height>20</height>
|
<height>20</height>
|
||||||
@ -1133,7 +1127,8 @@ p, li { white-space: pre-wrap; }
|
|||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<property name="icon" >
|
<property name="icon" >
|
||||||
<iconset resource="images.qrc" >:/images/down.png</iconset>
|
<iconset resource="images.qrc" >
|
||||||
|
<normaloff>:/images/down.png</normaloff>:/images/down.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
@ -45,11 +45,14 @@
|
|||||||
/* Images for context menu icons */
|
/* Images for context menu icons */
|
||||||
#define IMAGE_REMOVEFRIEND ":/images/removefriend16.png"
|
#define IMAGE_REMOVEFRIEND ":/images/removefriend16.png"
|
||||||
#define IMAGE_EXPIORTFRIEND ":/images/exportpeers_16x16.png"
|
#define IMAGE_EXPIORTFRIEND ":/images/exportpeers_16x16.png"
|
||||||
|
#define IMAGE_REMOVE ":/images/cancel.png"
|
||||||
#define IMAGE_CHAT ":/images/chat.png"
|
#define IMAGE_CHAT ":/images/chat.png"
|
||||||
/* Images for Status icons */
|
/* Images for Status icons */
|
||||||
#define IMAGE_ONLINE ":/images/donline.png"
|
#define IMAGE_ONLINE ":/images/donline.png"
|
||||||
#define IMAGE_OFFLINE ":/images/dhidden.png"
|
#define IMAGE_OFFLINE ":/images/dhidden.png"
|
||||||
#define IMAGE_PEER ":/images/user/identity16.png"
|
#define IMAGE_PEER ":/images/user/identity16.png"
|
||||||
|
#define IMAGE_PHOTOS ":/images/image16.png"
|
||||||
|
|
||||||
|
|
||||||
#define PHOTO_ICON_SIZE 90
|
#define PHOTO_ICON_SIZE 90
|
||||||
|
|
||||||
@ -90,6 +93,7 @@ PhotoDialog::PhotoDialog(QWidget *parent)
|
|||||||
|
|
||||||
connect( ui.photoTreeWidget, SIGNAL( itemDoubleClicked ( QTreeWidgetItem * , int ) ), this, SLOT( showPhoto( QTreeWidgetItem *, int ) ) );
|
connect( ui.photoTreeWidget, SIGNAL( itemDoubleClicked ( QTreeWidgetItem * , int ) ), this, SLOT( showPhoto( QTreeWidgetItem *, int ) ) );
|
||||||
connect( ui.addButton, SIGNAL( clicked( ) ), this, SLOT( addPhotos( ) ) );
|
connect( ui.addButton, SIGNAL( clicked( ) ), this, SLOT( addPhotos( ) ) );
|
||||||
|
connect( ui.expandButton, SIGNAL(clicked()), this, SLOT(togglefileview()));
|
||||||
|
|
||||||
/* hide the Tree +/- */
|
/* hide the Tree +/- */
|
||||||
ui.photoTreeWidget -> setRootIsDecorated( false );
|
ui.photoTreeWidget -> setRootIsDecorated( false );
|
||||||
@ -155,7 +159,7 @@ void PhotoDialog::photoTreeWidgetCustomPopupMenu( QPoint point )
|
|||||||
QMenu contextMnu( this );
|
QMenu contextMnu( this );
|
||||||
QMouseEvent *mevent = new QMouseEvent( QEvent::MouseButtonPress, point, Qt::RightButton, Qt::RightButton, Qt::NoModifier );
|
QMouseEvent *mevent = new QMouseEvent( QEvent::MouseButtonPress, point, Qt::RightButton, Qt::RightButton, Qt::NoModifier );
|
||||||
|
|
||||||
QAction *rm = new QAction(QIcon(IMAGE_EXPIORTFRIEND), tr( "Remove" ), this );
|
QAction *rm = new QAction(QIcon(IMAGE_REMOVE), tr( "Remove" ), this );
|
||||||
connect( rm , SIGNAL( triggered() ), this, SLOT( removePhoto() ) );
|
connect( rm , SIGNAL( triggered() ), this, SLOT( removePhoto() ) );
|
||||||
|
|
||||||
contextMnu.clear();
|
contextMnu.clear();
|
||||||
@ -164,6 +168,61 @@ void PhotoDialog::photoTreeWidgetCustomPopupMenu( QPoint point )
|
|||||||
contextMnu.exec( mevent->globalPos() );
|
contextMnu.exec( mevent->globalPos() );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void PhotoDialog::togglefileview()
|
||||||
|
{
|
||||||
|
/* if msg header visible -> hide by changing splitter
|
||||||
|
* three widgets...
|
||||||
|
*/
|
||||||
|
|
||||||
|
QList<int> sizeList = ui.photoSplitter->sizes();
|
||||||
|
QList<int>::iterator it;
|
||||||
|
|
||||||
|
int listSize = 0;
|
||||||
|
int msgSize = 0;
|
||||||
|
int i = 0;
|
||||||
|
|
||||||
|
for(it = sizeList.begin(); it != sizeList.end(); it++, i++)
|
||||||
|
{
|
||||||
|
if (i == 0)
|
||||||
|
{
|
||||||
|
listSize = (*it);
|
||||||
|
}
|
||||||
|
else if (i == 1)
|
||||||
|
{
|
||||||
|
msgSize = (*it);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int totalSize = listSize + msgSize;
|
||||||
|
|
||||||
|
bool toShrink = true;
|
||||||
|
if (msgSize < (int) totalSize / 10)
|
||||||
|
{
|
||||||
|
toShrink = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
QList<int> newSizeList;
|
||||||
|
if (toShrink)
|
||||||
|
{
|
||||||
|
newSizeList.push_back(totalSize);
|
||||||
|
newSizeList.push_back(0);
|
||||||
|
ui.expandButton->setIcon(QIcon(QString(":/images/edit_add24.png")));
|
||||||
|
ui.expandButton->setToolTip("Expand");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
/* no change */
|
||||||
|
int nlistSize = (totalSize / 2);
|
||||||
|
int nMsgSize = (totalSize / 2);
|
||||||
|
newSizeList.push_back(nlistSize);
|
||||||
|
newSizeList.push_back(nMsgSize);
|
||||||
|
ui.expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png")));
|
||||||
|
ui.expandButton->setToolTip("Hide");
|
||||||
|
}
|
||||||
|
|
||||||
|
ui.photoSplitter->setSizes(newSizeList);
|
||||||
|
}
|
||||||
|
|
||||||
void PhotoDialog::insertShowLists()
|
void PhotoDialog::insertShowLists()
|
||||||
{
|
{
|
||||||
/* clear it all */
|
/* clear it all */
|
||||||
@ -202,6 +261,7 @@ void PhotoDialog::addShows(std::string id)
|
|||||||
allItem->setText(PHOTO_PEER_COL_PID, QString::fromStdString(id));
|
allItem->setText(PHOTO_PEER_COL_PID, QString::fromStdString(id));
|
||||||
allItem->setText(PHOTO_PEER_COL_SID, "");
|
allItem->setText(PHOTO_PEER_COL_SID, "");
|
||||||
allItem->setText(PHOTO_PEER_COL_PHOTOID, "");
|
allItem->setText(PHOTO_PEER_COL_PHOTOID, "");
|
||||||
|
allItem->setIcon(0,(QIcon(IMAGE_PHOTOS)));
|
||||||
|
|
||||||
peerItem->addChild(allItem);
|
peerItem->addChild(allItem);
|
||||||
|
|
||||||
@ -216,6 +276,7 @@ void PhotoDialog::addShows(std::string id)
|
|||||||
photoItem->setText(PHOTO_PEER_COL_PID, QString::fromStdString(id));
|
photoItem->setText(PHOTO_PEER_COL_PID, QString::fromStdString(id));
|
||||||
photoItem->setText(PHOTO_PEER_COL_SID, "");
|
photoItem->setText(PHOTO_PEER_COL_SID, "");
|
||||||
photoItem->setText(PHOTO_PEER_COL_PHOTOID, QString::fromStdString(*it));
|
photoItem->setText(PHOTO_PEER_COL_PHOTOID, QString::fromStdString(*it));
|
||||||
|
photoItem->setIcon(0,(QIcon(IMAGE_PHOTOS)));
|
||||||
|
|
||||||
allItem->addChild(photoItem);
|
allItem->addChild(photoItem);
|
||||||
}
|
}
|
||||||
|
@ -54,6 +54,9 @@ private slots:
|
|||||||
|
|
||||||
void checkUpdate();
|
void checkUpdate();
|
||||||
|
|
||||||
|
/* handle splitter */
|
||||||
|
void togglefileview();
|
||||||
|
|
||||||
void showPhoto( QTreeWidgetItem *item, int column);
|
void showPhoto( QTreeWidgetItem *item, int column);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -56,7 +56,7 @@ p, li { white-space: pre-wrap; }
|
|||||||
</spacer>
|
</spacer>
|
||||||
</item>
|
</item>
|
||||||
<item row="1" column="0" colspan="3" >
|
<item row="1" column="0" colspan="3" >
|
||||||
<widget class="QSplitter" name="splitter_2" >
|
<widget class="QSplitter" name="photoSplitter" >
|
||||||
<property name="orientation" >
|
<property name="orientation" >
|
||||||
<enum>Qt::Vertical</enum>
|
<enum>Qt::Vertical</enum>
|
||||||
</property>
|
</property>
|
||||||
@ -143,15 +143,22 @@ p, li { white-space: pre-wrap; }
|
|||||||
</property>
|
</property>
|
||||||
<property name="icon" >
|
<property name="icon" >
|
||||||
<iconset resource="images.qrc" >
|
<iconset resource="images.qrc" >
|
||||||
<normaloff>:/images/add_24x24.png</normaloff>:/images/add_24x24.png</iconset>
|
<normaloff>:/images/edit_remove24.png</normaloff>:/images/edit_remove24.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QPushButton" name="addButton" >
|
<widget class="QPushButton" name="addButton" >
|
||||||
|
<property name="toolTip" >
|
||||||
|
<string>Add Photo(s)</string>
|
||||||
|
</property>
|
||||||
<property name="text" >
|
<property name="text" >
|
||||||
<string>Add Photo(s)</string>
|
<string>Add Photo(s)</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="icon" >
|
||||||
|
<iconset resource="images.qrc" >
|
||||||
|
<normaloff>:/images/add_image24.png</normaloff>:/images/add_image24.png</iconset>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
@ -179,6 +186,10 @@ p, li { white-space: pre-wrap; }
|
|||||||
<property name="text" >
|
<property name="text" >
|
||||||
<string>Update Details</string>
|
<string>Update Details</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="icon" >
|
||||||
|
<iconset resource="images.qrc" >
|
||||||
|
<normaloff>:/images/quick_restart24.png</normaloff>:/images/quick_restart24.png</iconset>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
|
@ -131,7 +131,7 @@
|
|||||||
<property name="orientation" >
|
<property name="orientation" >
|
||||||
<enum>Qt::Horizontal</enum>
|
<enum>Qt::Horizontal</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizeHint" >
|
<property name="sizeHint" stdset="0" >
|
||||||
<size>
|
<size>
|
||||||
<width>40</width>
|
<width>40</width>
|
||||||
<height>20</height>
|
<height>20</height>
|
||||||
@ -169,7 +169,7 @@
|
|||||||
<property name="orientation" >
|
<property name="orientation" >
|
||||||
<enum>Qt::Horizontal</enum>
|
<enum>Qt::Horizontal</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizeHint" >
|
<property name="sizeHint" stdset="0" >
|
||||||
<size>
|
<size>
|
||||||
<width>40</width>
|
<width>40</width>
|
||||||
<height>20</height>
|
<height>20</height>
|
||||||
@ -189,6 +189,10 @@
|
|||||||
<property name="text" >
|
<property name="text" >
|
||||||
<string>Back</string>
|
<string>Back</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="icon" >
|
||||||
|
<iconset resource="images.qrc" >
|
||||||
|
<normaloff>:/images/back.png</normaloff>:/images/back.png</iconset>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
@ -210,6 +214,10 @@
|
|||||||
<property name="text" >
|
<property name="text" >
|
||||||
<string>Forward</string>
|
<string>Forward</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="icon" >
|
||||||
|
<iconset resource="images.qrc" >
|
||||||
|
<normaloff>:/images/forward.png</normaloff>:/images/forward.png</iconset>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
@ -217,7 +225,7 @@
|
|||||||
<property name="orientation" >
|
<property name="orientation" >
|
||||||
<enum>Qt::Horizontal</enum>
|
<enum>Qt::Horizontal</enum>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizeHint" >
|
<property name="sizeHint" stdset="0" >
|
||||||
<size>
|
<size>
|
||||||
<width>40</width>
|
<width>40</width>
|
||||||
<height>20</height>
|
<height>20</height>
|
||||||
@ -231,6 +239,8 @@
|
|||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
<resources/>
|
<resources>
|
||||||
|
<include location="images.qrc" />
|
||||||
|
</resources>
|
||||||
<connections/>
|
<connections/>
|
||||||
</ui>
|
</ui>
|
||||||
|
@ -4,6 +4,7 @@
|
|||||||
<file>help/licence.html</file>
|
<file>help/licence.html</file>
|
||||||
<file>help/thanks.html</file>
|
<file>help/thanks.html</file>
|
||||||
<file>images/accepted16.png</file>
|
<file>images/accepted16.png</file>
|
||||||
|
<file>images/add_image24.png</file>
|
||||||
<file>images/browse-looking.gif</file>
|
<file>images/browse-looking.gif</file>
|
||||||
<file>images/addfriendlabel.png</file>
|
<file>images/addfriendlabel.png</file>
|
||||||
<file>images/back.png</file>
|
<file>images/back.png</file>
|
||||||
@ -83,9 +84,11 @@
|
|||||||
<file>images/download.png</file>
|
<file>images/download.png</file>
|
||||||
<file>images/download16.png</file>
|
<file>images/download16.png</file>
|
||||||
<file>images/dphone.png</file>
|
<file>images/dphone.png</file>
|
||||||
|
<file>images/edit_add24.png</file>
|
||||||
<file>images/edit-bold.png</file>
|
<file>images/edit-bold.png</file>
|
||||||
<file>images/edit-italic.png</file>
|
<file>images/edit-italic.png</file>
|
||||||
<file>images/edit-underline.png</file>
|
<file>images/edit-underline.png</file>
|
||||||
|
<file>images/edit_remove24.png</file>
|
||||||
<file>images/encrypted16.png</file>
|
<file>images/encrypted16.png</file>
|
||||||
<file>images/encrypted48.png</file>
|
<file>images/encrypted48.png</file>
|
||||||
<file>images/evolution.png</file>
|
<file>images/evolution.png</file>
|
||||||
@ -175,6 +178,7 @@
|
|||||||
<file>images/mail_get.png</file>
|
<file>images/mail_get.png</file>
|
||||||
<file>images/mail_reply.png</file>
|
<file>images/mail_reply.png</file>
|
||||||
<file>images/mail_send.png</file>
|
<file>images/mail_send.png</file>
|
||||||
|
<file>images/mail_new.png</file>
|
||||||
<file>images/message-mail.png</file>
|
<file>images/message-mail.png</file>
|
||||||
<file>images/message-mail-read.png</file>m
|
<file>images/message-mail-read.png</file>m
|
||||||
<file>images/message-news.png</file>
|
<file>images/message-news.png</file>
|
||||||
@ -194,6 +198,7 @@
|
|||||||
<file>images/peers_24x24.png</file>
|
<file>images/peers_24x24.png</file>
|
||||||
<file>images/print24.png</file>
|
<file>images/print24.png</file>
|
||||||
<file>images/player_play.png</file>
|
<file>images/player_play.png</file>
|
||||||
|
<file>images/quick_restart24.png</file>
|
||||||
<file>images/removefriend16.png</file>
|
<file>images/removefriend16.png</file>
|
||||||
<file>images/replymail-pressed.png</file>
|
<file>images/replymail-pressed.png</file>
|
||||||
<file>images/replymail24-hover.png</file>
|
<file>images/replymail24-hover.png</file>
|
||||||
|
BIN
retroshare-gui/src/gui/images/add_image24.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
BIN
retroshare-gui/src/gui/images/edit_add24.png
Normal file
After Width: | Height: | Size: 1.0 KiB |
BIN
retroshare-gui/src/gui/images/edit_remove24.png
Normal file
After Width: | Height: | Size: 723 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 769 B After Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 3.3 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 3.5 KiB |
BIN
retroshare-gui/src/gui/images/quick_restart24.png
Normal file
After Width: | Height: | Size: 4.0 KiB |