Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-16 18:39:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

improved layout and namign in MessageComposer

Browse source
This commit is contained in:
csoler 2015-12-23 13:48:56 -05:00
parent 4c50641700
commit 73f58c79f4
2 changed files with 31 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

8
retroshare-gui/src/gui/msgs/MessageComposer.cpp
View file

@ -266,11 +266,11 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags)
ui.respond_to_CB->setFlags(IDCHOOSER_ID_REQUIRED) ; ui.respond_to_CB->setFlags(IDCHOOSER_ID_REQUIRED) ;
/* Add filter types */ /* Add filter types */
ui.filterComboBox->addItem(tr("All")); ui.filterComboBox->addItem(tr("All addresses (mixed)"));
ui.filterComboBox->addItem(tr("Friend Nodes")); ui.filterComboBox->addItem(tr("Friend Nodes"));
ui.filterComboBox->addItem(tr("Persons")); ui.filterComboBox->addItem(tr("All people"));
ui.filterComboBox->addItem(tr("Contacts")); ui.filterComboBox->addItem(tr("My contacts"));
ui.filterComboBox->setCurrentIndex(0); ui.filterComboBox->setCurrentIndex(3);
connect(ui.comboStyle, SIGNAL(activated(int)),this, SLOT(changeFormatType(int))); connect(ui.comboStyle, SIGNAL(activated(int)),this, SLOT(changeFormatType(int)));
connect(ui.comboFont, SIGNAL(activated(const QString &)), this, SLOT(textFamily(const QString &))); connect(ui.comboFont, SIGNAL(activated(const QString &)), this, SLOT(textFamily(const QString &)));

77
retroshare-gui/src/gui/msgs/MessageComposer.ui
View file

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>925</width> <width>1679</width>
<height>747</height> <height>951</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -56,14 +56,14 @@
<set>QDockWidget::DockWidgetClosable</set> <set>QDockWidget::DockWidgetClosable</set>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Contacts</string> <string>Address list:</string>
</property> </property>
<widget class="QWidget" name="dockWidgetContents"> <widget class="QWidget" name="dockWidgetContents">
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="margin"> <item>
<number>1</number> <widget class="QComboBox" name="filterComboBox"/>
</property> </item>
<item row="1" column="0"> <item>
<widget class="FriendSelectionWidget" name="friendSelectionWidget" native="true"> <widget class="FriendSelectionWidget" name="friendSelectionWidget" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding"> <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
@ -100,25 +100,8 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item>
<layout class="QVBoxLayout" name="verticalLayout_4"> <layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="addToButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>&gt;&gt; To</string>
</property>
</widget>
</item>
</layout>
</item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>
@ -130,7 +113,20 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>&gt;&gt; Cc</string> <string>Cc</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="addToButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>To</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -143,7 +139,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>&gt;&gt; Bcc</string> <string>Bcc</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -160,7 +156,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>&gt;&gt; Recommend</string> <string>Recommend this friend</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -168,23 +164,6 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout">
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_4">
<property name="text">
<string>Show:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="filterComboBox"/>
</item>
</layout>
</item>
</layout> </layout>
</widget> </widget>
</widget> </widget>
@ -1105,8 +1084,8 @@ border-image: url(:/images/closepressed.png)
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>925</width> <width>1679</width>
<height>21</height> <height>37</height>
</rect> </rect>
</property> </property>
</widget> </widget>
@ -1238,8 +1217,6 @@ border-image: url(:/images/closepressed.png)
<tabstop>titleEdit</tabstop> <tabstop>titleEdit</tabstop>
<tabstop>msgText</tabstop> <tabstop>msgText</tabstop>
<tabstop>msgFileList</tabstop> <tabstop>msgFileList</tabstop>
<tabstop>addToButton</tabstop>
<tabstop>addCcButton</tabstop>
<tabstop>addBccButton</tabstop> <tabstop>addBccButton</tabstop>
<tabstop>addRecommendButton</tabstop> <tabstop>addRecommendButton</tabstop>
<tabstop>comboSize</tabstop> <tabstop>comboSize</tabstop>