Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-17 13:24:15 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

moved placeholder text from .ui to .cpp to allow compilation with old Qt

Browse Source
This commit is contained in:
csoler 2016-06-03 21:11:12 -04:00
parent 99f54a2ff7
commit d8189d08f7
2 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp
View File

@ -98,7 +98,10 @@ CreateCircleDialog::CreateCircleDialog()
mIsExistingCircle = false;
mIsExternalCircle = true;
mClearList = true;
#if QT_VERSION >= 0x040700
ui.circleName->setPlaceholderText(QApplication::translate("CreateCircleDialog", "Circle name", 0, QApplication::UnicodeUTF8));
#endif
//ui.idChooser->loadIds(0,RsGxsId());
ui.circleComboBox->loadCircles(GXS_CIRCLE_CHOOSER_EXTERNAL, RsGxsCircleId());
}

43
retroshare-gui/src/gui/Circles/CreateCircleDialog.ui
View File

@ -6,15 +6,24 @@
<rect>
<x>0</x>
<y>0</y>
<width>881</width>
<height>515</height>
<width>924</width>
<height>578</height>
</rect>
</property>
<property name="windowTitle">
<string/>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<property name="margin">
<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="spacing">
@ -146,7 +155,16 @@
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<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>
<item>
@ -246,11 +264,7 @@
</widget>
</item>
<item row="0" column="1" colspan="3">
<widget class="QLineEdit" name="circleName">
<property name="placeholderText">
<string>Circle name</string>
</property>
</widget>
<widget class="QLineEdit" name="circleName"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="idChooserLabel">
@ -323,7 +337,16 @@
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<property name="margin">
<property name="leftMargin">
<number>2</number>
</property>
<property name="topMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>2</number>
</property>
<property name="bottomMargin">
<number>2</number>
</property>
<item row="0" column="0">