Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed icons and default text

Browse Source 
fixed layout, at bottom display only Create and Cancel Buttons

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6652 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2013-08-30 16:30:23 +00:00
parent 2aa3201774
commit 8aaa4db85c
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
retroshare-gui/src/gui/gxs/GxsGroupDialog.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>695</width> <width>695</width>
<height>658</height> <height>448</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -35,8 +35,8 @@
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="3"> <item row="0" column="0">
<widget class="QGroupBox" name="groupBoxLogo"> <widget class="QGroupBox" name="groupBoxLogo">
<property name="title"> <property name="title">
<string/> <string/>
@ -156,7 +156,7 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="0" column="3" rowspan="8"> <item row="0" column="1" rowspan="6">
<widget class="QDockWidget" name="contactsdockWidget"> <widget class="QDockWidget" name="contactsdockWidget">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
@ -243,7 +243,7 @@
</widget> </widget>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="3"> <item row="1" column="0">
<layout class="QVBoxLayout"> <layout class="QVBoxLayout">
<item> <item>
<widget class="QLabel" name="groupDescLabel"> <widget class="QLabel" name="groupDescLabel">
@ -257,7 +257,7 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="2" column="0" colspan="3"> <item row="2" column="0">
<widget class="QGroupBox" name="distribGroupBox"> <widget class="QGroupBox" name="distribGroupBox">
<property name="title"> <property name="title">
<string>Message Distribution</string> <string>Message Distribution</string>
@ -323,7 +323,7 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="3" column="0" colspan="3"> <item row="3" column="0">
<widget class="QGroupBox" name="publishGroupBox"> <widget class="QGroupBox" name="publishGroupBox">
<property name="title"> <property name="title">
<string>Publish Signatures</string> <string>Publish Signatures</string>
@ -366,7 +366,7 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="4" column="0" colspan="3"> <item row="4" column="0">
<widget class="QGroupBox" name="personalGroupBox"> <widget class="QGroupBox" name="personalGroupBox">
<property name="title"> <property name="title">
<string>Personal Signatures</string> <string>Personal Signatures</string>
@ -402,7 +402,7 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="5" column="0" colspan="3"> <item row="5" column="0">
<widget class="QGroupBox" name="commentGroupBox"> <widget class="QGroupBox" name="commentGroupBox">
<property name="title"> <property name="title">
<string>Comments</string> <string>Comments</string>
@ -431,7 +431,7 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="6" column="0" colspan="3"> <item row="6" column="0" colspan="2">
<widget class="QFrame" name="extraFrame"> <widget class="QFrame" name="extraFrame">
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::StyledPanel</enum> <enum>QFrame::StyledPanel</enum>
@ -441,7 +441,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="1"> <item row="7" column="0" colspan="2">
<widget class="QDialogButtonBox" name="buttonBox"> <widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons"> <property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
@ -479,6 +479,7 @@
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../images.qrc"/> <include location="../images.qrc"/>
<include location="../images.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

5
retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp
View File

@ -76,11 +76,14 @@ void GxsChannelGroupDialog::initUi()
setUiText(UITYPE_SERVICE_HEADER, tr("Edit Channel")); setUiText(UITYPE_SERVICE_HEADER, tr("Edit Channel"));
break; break;
} }
setUiText(UITYPE_KEY_SHARE_CHECKBOX, tr("Add Channel Admins"));
setUiText(UITYPE_CONTACTS_DOCK, tr("Select Channel Admins"));
} }
QPixmap GxsChannelGroupDialog::serviceImage() QPixmap GxsChannelGroupDialog::serviceImage()
{ {
return QPixmap(":/images/konversation64.png"); return QPixmap(":/images/add_channel64.png");
} }
bool GxsChannelGroupDialog::service_CreateGroup(uint32_t &token, const RsGroupMetaData &meta) bool GxsChannelGroupDialog::service_CreateGroup(uint32_t &token, const RsGroupMetaData &meta)