Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-27 08:29:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed label and combobox size

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7840 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2015-01-12 12:01:20 +00:00
parent 6aaaa1a07e
commit 7bc98f1cd5
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
retroshare-gui/src/gui/msgs/MessageComposer.cpp
View File

@ -241,10 +241,19 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags)
/* Add filter types */
ui.filterComboBox->addItem(tr("All"));
ui.filterComboBox->addItem(tr("Friends"));
ui.filterComboBox->addItem(tr("Friends of Friends"));
ui.filterComboBox->addItem(tr("Friend Nodes"));
ui.filterComboBox->addItem(tr("Anonymous"));
ui.filterComboBox->setCurrentIndex(0);
/*ui.comboStyle->addItem("Standard");
ui.comboStyle->addItem("Bullet List (Disc)");
ui.comboStyle->addItem("Bullet List (Circle)");
ui.comboStyle->addItem("Bullet List (Square)");
ui.comboStyle->addItem("Ordered List (Decimal)");
ui.comboStyle->addItem("Ordered List (Alpha lower)");
ui.comboStyle->addItem("Ordered List (Alpha upper)");*/
//connect(ui.comboStyle, SIGNAL(activated(int)),this, SLOT(textStyle(int)));
connect(ui.comboStyle, SIGNAL(activated(int)),this, SLOT(changeFormatType(int)));
connect(ui.comboFont, SIGNAL(activated(const QString &)), this, SLOT(textFamily(const QString &)));
@ -283,7 +292,7 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags)
ui.recipientWidget->setColumnCount(COLUMN_RECIPIENT_COUNT);
QHeaderView *header = ui.recipientWidget->horizontalHeader();
header->resizeSection(COLUMN_RECIPIENT_TYPE, 50);
header->resizeSection(COLUMN_RECIPIENT_TYPE, 70);
header->resizeSection(COLUMN_RECIPIENT_ICON, 22);
QHeaderView_setSectionResizeMode(header, COLUMN_RECIPIENT_TYPE, QHeaderView::Fixed);
QHeaderView_setSectionResizeMode(header, COLUMN_RECIPIENT_ICON, QHeaderView::Fixed);
@ -631,14 +640,21 @@ void MessageComposer::buildCompleter()
std::list<RsGroupInfo> groupInfoList;
std::list<RsGroupInfo>::iterator groupIt;
rsPeers->getGroupInfoList(groupInfoList);
std::list<RsPeerId> peers;
std::list<RsPeerId>::iterator peerIt;
rsPeers->getFriendList(peers);
std::list<RsGxsId> gxsIds;
std::list<RsGxsId>::iterator idIt;
// create completer list for friends
QStringList completerList;
QStringList completerGroupList;
/*for (std::list<RsGxsId>::const_iterator idIt = gxsIds.begin(); idIt != gxsIds.end(); ++idIt) {
completerList.append(*idIt);
}*/
for (peerIt = peers.begin(); peerIt != peers.end(); ++peerIt) {
RsPeerDetails detail;

8
retroshare-gui/src/gui/msgs/MessageComposer.ui
View File

@ -204,6 +204,12 @@
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="minimumSize">
<size>
<width>70</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Subject:</string>
</property>
@ -937,7 +943,7 @@ border-image: url(:/images/closepressed.png)
<widget class="QLabel" name="fromLabel">
<property name="minimumSize">
<size>
<width>50</width>
<width>70</width>
<height>0</height>
</size>
</property>