mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-06-19 11:54:22 -04:00
added Add Image Button
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@415 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
f39e7819e6
commit
96ee910c5f
5 changed files with 63 additions and 1 deletions
|
@ -130,6 +130,7 @@
|
||||||
<file>images/loadcert16.png</file>
|
<file>images/loadcert16.png</file>
|
||||||
<file>images/locale.png</file>
|
<file>images/locale.png</file>
|
||||||
<file>images/lphoto.png</file>
|
<file>images/lphoto.png</file>
|
||||||
|
<file>images/lphoto24.png</file>
|
||||||
<file>images/logobar/logo_bar_fill.png</file>
|
<file>images/logobar/logo_bar_fill.png</file>
|
||||||
<file>images/logobar/logo_bar_start.png</file>
|
<file>images/logobar/logo_bar_start.png</file>
|
||||||
<file>images/logobar/rslogo.png</file>
|
<file>images/logobar/rslogo.png</file>
|
||||||
|
|
BIN
retroshare-gui/src/gui/images/lphoto24.png
Normal file
BIN
retroshare-gui/src/gui/images/lphoto24.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.8 KiB |
|
@ -51,6 +51,7 @@
|
||||||
#include <QTextCursor>
|
#include <QTextCursor>
|
||||||
#include <QTextList>
|
#include <QTextList>
|
||||||
#include <QTextStream>
|
#include <QTextStream>
|
||||||
|
#include <QTextDocumentFragment>
|
||||||
|
|
||||||
|
|
||||||
/** Constructor */
|
/** Constructor */
|
||||||
|
@ -78,6 +79,7 @@ ChanMsgDialog::ChanMsgDialog(bool msg, QWidget *parent, Qt::WFlags flags)
|
||||||
connect(ui.underlinebtn, SIGNAL(clicked()), this, SLOT(textUnderline()));
|
connect(ui.underlinebtn, SIGNAL(clicked()), this, SLOT(textUnderline()));
|
||||||
connect(ui.italicbtn, SIGNAL(clicked()), this, SLOT(textItalic()));
|
connect(ui.italicbtn, SIGNAL(clicked()), this, SLOT(textItalic()));
|
||||||
connect(ui.colorbtn, SIGNAL(clicked()), this, SLOT(textColor()));
|
connect(ui.colorbtn, SIGNAL(clicked()), this, SLOT(textColor()));
|
||||||
|
connect(ui.imagebtn, SIGNAL(clicked()), this, SLOT(addImage()));
|
||||||
connect(ui.actionContactsView, SIGNAL(triggered()), this, SLOT(toggleContacts()));
|
connect(ui.actionContactsView, SIGNAL(triggered()), this, SLOT(toggleContacts()));
|
||||||
connect(ui.actionSaveas, SIGNAL(triggered()), this, SLOT(fileSaveAs()));
|
connect(ui.actionSaveas, SIGNAL(triggered()), this, SLOT(fileSaveAs()));
|
||||||
|
|
||||||
|
@ -177,6 +179,7 @@ ChanMsgDialog::ChanMsgDialog(bool msg, QWidget *parent, Qt::WFlags flags)
|
||||||
ui.underlinebtn->setIcon(QIcon(QString(":/images/textedit/textitalic.png")));
|
ui.underlinebtn->setIcon(QIcon(QString(":/images/textedit/textitalic.png")));
|
||||||
ui.italicbtn->setIcon(QIcon(QString(":/images/textedit/textunder.png")));
|
ui.italicbtn->setIcon(QIcon(QString(":/images/textedit/textunder.png")));
|
||||||
ui.textalignmentbtn->setIcon(QIcon(QString(":/images/textedit/textcenter.png")));
|
ui.textalignmentbtn->setIcon(QIcon(QString(":/images/textedit/textcenter.png")));
|
||||||
|
ui.imagebtn->setIcon(QIcon(QString(":/images/lphoto24.png")));
|
||||||
ui.actionContactsView->setIcon(QIcon(":/images/contacts24.png"));
|
ui.actionContactsView->setIcon(QIcon(":/images/contacts24.png"));
|
||||||
ui.actionSaveas->setIcon(QIcon(":/images/save24.png"));
|
ui.actionSaveas->setIcon(QIcon(":/images/save24.png"));
|
||||||
|
|
||||||
|
@ -988,3 +991,32 @@ void ChanMsgDialog::toggleContacts()
|
||||||
ui.contactsdockWidget->setVisible(!ui.contactsdockWidget->isVisible());
|
ui.contactsdockWidget->setVisible(!ui.contactsdockWidget->isVisible());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ChanMsgDialog::addImage()
|
||||||
|
{
|
||||||
|
|
||||||
|
QString fileimg = QFileDialog::getOpenFileName( this, tr( "Choose Image" ),
|
||||||
|
QString(setter.value("LastDir").toString()) ,tr("Image Files supported (*.png *.jpeg *.jpg *.gif)"));
|
||||||
|
|
||||||
|
if ( fileimg.isEmpty() ) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
QImage base(fileimg);
|
||||||
|
|
||||||
|
QString pathimage = fileimg.left(fileimg.lastIndexOf("/"))+"/";
|
||||||
|
setter.setValue("LastDir",pathimage);
|
||||||
|
|
||||||
|
Create_New_Image_Tag(fileimg);
|
||||||
|
}
|
||||||
|
|
||||||
|
void ChanMsgDialog::Create_New_Image_Tag( const QString urlremoteorlocal )
|
||||||
|
{
|
||||||
|
/*if (image_extension(urlremoteorlocal)) {*/
|
||||||
|
QString subtext = QString("<p><img src=\"%1\" />").arg(urlremoteorlocal);
|
||||||
|
///////////subtext.append("<br/><br/>Description on image.</p>");
|
||||||
|
QTextDocumentFragment fragment = QTextDocumentFragment::fromHtml(subtext);
|
||||||
|
ui.msgText->textCursor().insertFragment(fragment);
|
||||||
|
//emit statusMessage(QString("Image new :").arg(urlremoteorlocal));
|
||||||
|
//}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
@ -55,12 +55,15 @@ void insertChannelSendList(); /* for Channels */
|
||||||
void insertFileList(); /* for Both */
|
void insertFileList(); /* for Both */
|
||||||
void insertTitleText(std::string title);
|
void insertTitleText(std::string title);
|
||||||
void insertMsgText(std::string msg);
|
void insertMsgText(std::string msg);
|
||||||
|
void Create_New_Image_Tag( const QString urlremoteorlocal );
|
||||||
|
QSettings setter;
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
|
|
||||||
/* actions to take.... */
|
/* actions to take.... */
|
||||||
void sendMessage();
|
void sendMessage();
|
||||||
void cancelMessage();
|
void cancelMessage();
|
||||||
|
void addImage();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void closeEvent (QCloseEvent * event);
|
void closeEvent (QCloseEvent * event);
|
||||||
|
@ -86,7 +89,9 @@ private slots:
|
||||||
void fileOpen();
|
void fileOpen();
|
||||||
bool fileSave();
|
bool fileSave();
|
||||||
bool fileSaveAs();
|
bool fileSaveAs();
|
||||||
void filePrint();
|
void filePrint();
|
||||||
|
|
||||||
|
|
||||||
//void filePrintPreview();
|
//void filePrintPreview();
|
||||||
void filePrintPdf();
|
void filePrintPdf();
|
||||||
|
|
||||||
|
@ -110,6 +115,7 @@ private:
|
||||||
void setupEditActions();
|
void setupEditActions();
|
||||||
bool load(const QString &f);
|
bool load(const QString &f);
|
||||||
bool maybeSave();
|
bool maybeSave();
|
||||||
|
//bool image_extension( QString nametomake );
|
||||||
void setCurrentFileName(const QString &fileName);
|
void setCurrentFileName(const QString &fileName);
|
||||||
|
|
||||||
void mergeFormatOnWordOrSelection(const QTextCharFormat &format);
|
void mergeFormatOnWordOrSelection(const QTextCharFormat &format);
|
||||||
|
@ -138,6 +144,7 @@ private:
|
||||||
QTreeView *channelstreeView;
|
QTreeView *channelstreeView;
|
||||||
|
|
||||||
QString fileName;
|
QString fileName;
|
||||||
|
QString nametomake;
|
||||||
|
|
||||||
bool mIsMsg; /* different behaviour for Msg or ChanMsg */
|
bool mIsMsg; /* different behaviour for Msg or ChanMsg */
|
||||||
|
|
||||||
|
|
|
@ -278,6 +278,28 @@ p, li { white-space: pre-wrap; }
|
||||||
</property>
|
</property>
|
||||||
</spacer>
|
</spacer>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="0" column="8" >
|
||||||
|
<widget class="QPushButton" name="imagebtn" >
|
||||||
|
<property name="minimumSize" >
|
||||||
|
<size>
|
||||||
|
<width>24</width>
|
||||||
|
<height>24</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="maximumSize" >
|
||||||
|
<size>
|
||||||
|
<width>24</width>
|
||||||
|
<height>24</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="toolTip" >
|
||||||
|
<string>Add a Image</string>
|
||||||
|
</property>
|
||||||
|
<property name="text" >
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
<item row="2" column="0" >
|
<item row="2" column="0" >
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue