Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-24 13:59:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

revert back some changes

Browse source
This commit is contained in:
defnax 2020-02-14 16:00:14 +01:00
parent 2bd3e32d4a
commit f9e972daf9
2 changed files with 17 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

26
retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.cpp
View file

@ -19,7 +19,6 @@
*******************************************************************************/ *******************************************************************************/
#include <QBuffer> #include <QBuffer>
#include <QMessageBox>
#include "AlbumCreateDialog.h" #include "AlbumCreateDialog.h"
#include "ui_AlbumCreateDialog.h" #include "ui_AlbumCreateDialog.h"
@ -38,7 +37,7 @@ AlbumCreateDialog::AlbumCreateDialog(TokenQueue *photoQueue, RsPhoto *rs_photo,
#if QT_VERSION >= 0x040700 #if QT_VERSION >= 0x040700
ui->lineEdit_Title->setPlaceholderText(tr("Untitle Album")); ui->lineEdit_Title_2->setPlaceholderText(tr("Untitle Album"));
ui->lineEdit_Caption_2->setPlaceholderText(tr("Say something about this album...")); ui->lineEdit_Caption_2->setPlaceholderText(tr("Say something about this album..."));
//ui->textEdit_Description->setPlaceholderText(tr("Say something about this album...")) ; //ui->textEdit_Description->setPlaceholderText(tr("Say something about this album...")) ;
ui->lineEdit_Where->setPlaceholderText(tr("Where were these taken?")); ui->lineEdit_Where->setPlaceholderText(tr("Where were these taken?"));
@ -56,8 +55,7 @@ AlbumCreateDialog::AlbumCreateDialog(TokenQueue *photoQueue, RsPhoto *rs_photo,
mPhotoDrop = ui->scrollAreaWidgetContents; mPhotoDrop = ui->scrollAreaWidgetContents;
mPhotoDrop->setPhotoItemHolder(this); mPhotoDrop->setPhotoItemHolder(this);
/* fill in the available OwnIds for sharing */
ui->IdChooser->loadIds(IDCHOOSER_ID_REQUIRED, RsGxsId());
} }
AlbumCreateDialog::~AlbumCreateDialog() AlbumCreateDialog::~AlbumCreateDialog()
@ -74,30 +72,12 @@ void AlbumCreateDialog::publishAlbum()
// get fields for album to publish, publish and then exit dialog // get fields for album to publish, publish and then exit dialog
RsPhotoAlbum album; RsPhotoAlbum album;
RsGxsId authorId;
switch (ui->IdChooser->getChosenId(authorId)) {
case GxsIdChooser::KnowId:
case GxsIdChooser::UnKnowId:
break;
case GxsIdChooser::NoId:
case GxsIdChooser::None:
default:
std::cerr << "AlbumCreateDialog::publishAlbum() ERROR GETTING AuthorId!, Post Failed";
std::cerr << std::endl;
QMessageBox::warning(this, tr("RetroShare"),tr("Please create or choose a Signing Id first"), QMessageBox::Ok, QMessageBox::Ok);
return;
}
album.mMeta.mGroupName = ui->lineEdit_Title->text().toStdString();
album.mCategory = ui->comboBox_Category->currentText().toStdString();
album.mCaption = ui->lineEdit_Caption_2->text().toStdString(); album.mCaption = ui->lineEdit_Caption_2->text().toStdString();
album.mPhotographer = ui->lineEdit_Photographer->text().toStdString(); album.mPhotographer = ui->lineEdit_Photographer->text().toStdString();
album.mMeta.mGroupName = ui->lineEdit_Title_2->text().toStdString();
album.mDescription = ui->textEdit_Description->toPlainText().toStdString(); album.mDescription = ui->textEdit_Description->toPlainText().toStdString();
album.mWhere = ui->lineEdit_Where->text().toStdString(); album.mWhere = ui->lineEdit_Where->text().toStdString();
album.mPhotographer = ui->lineEdit_Photographer->text().toStdString(); album.mPhotographer = ui->lineEdit_Photographer->text().toStdString();
album.mMeta.mAuthorId = authorId;
getAlbumThumbnail(album.mThumbnail); getAlbumThumbnail(album.mThumbnail);

64
retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.ui
View file

@ -17,16 +17,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QGridLayout" name="gridLayout_4">
<property name="leftMargin"> <property name="margin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing"> <property name="spacing">
@ -55,16 +46,7 @@
<enum>QFrame::NoFrame</enum> <enum>QFrame::NoFrame</enum>
</property> </property>
<layout class="QGridLayout" name="gridLayout_6"> <layout class="QGridLayout" name="gridLayout_6">
<property name="leftMargin"> <property name="margin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing"> <property name="spacing">
@ -72,16 +54,7 @@
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<property name="leftMargin"> <property name="margin">
<number>3</number>
</property>
<property name="topMargin">
<number>3</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
<number>3</number> <number>3</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
@ -92,7 +65,7 @@
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLineEdit" name="lineEdit_Title"/> <widget class="QLineEdit" name="lineEdit_Title_2"/>
</item> </item>
<item row="0" column="2" rowspan="2"> <item row="0" column="2" rowspan="2">
<widget class="QToolButton" name="AlbumThumbNail"> <widget class="QToolButton" name="AlbumThumbNail">
@ -137,7 +110,7 @@ border-radius: 10px;
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QComboBox" name="comboBox_Category"> <widget class="QComboBox" name="comboBox_Category_2">
<item> <item>
<property name="text"> <property name="text">
<string>Animals</string> <string>Animals</string>
@ -381,13 +354,18 @@ border-radius: 10px;
</widget> </widget>
</item> </item>
<item> <item>
<widget class="GxsIdChooser" name="IdChooser"> <widget class="QComboBox" name="comboBox">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<item>
<property name="text">
<string>Publish with Identity</string>
</property>
</item>
</widget> </widget>
</item> </item>
</layout> </layout>
@ -453,8 +431,8 @@ p, li { white-space: pre-wrap; }
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>61</width> <width>621</width>
<height>18</height> <height>458</height>
</rect> </rect>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
@ -473,16 +451,7 @@ p, li { white-space: pre-wrap; }
<item row="2" column="0"> <item row="2" column="0">
<widget class="QFrame" name="frame"> <widget class="QFrame" name="frame">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="leftMargin"> <property name="margin">
<number>9</number>
</property>
<property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number> <number>9</number>
</property> </property>
<item> <item>
@ -544,11 +513,6 @@ p, li { white-space: pre-wrap; }
<header>gui/PhotoShare/PhotoDrop.h</header> <header>gui/PhotoShare/PhotoDrop.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>GxsIdChooser</class>
<extends>QComboBox</extends>
<header>gui/gxs/GxsIdChooser.h</header>
</customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../images.qrc"/> <include location="../images.qrc"/>