diff --git a/retroshare-gui/src/gui/ChannelFeed.ui b/retroshare-gui/src/gui/ChannelFeed.ui index 10deac91b..b052493a1 100644 --- a/retroshare-gui/src/gui/ChannelFeed.ui +++ b/retroshare-gui/src/gui/ChannelFeed.ui @@ -204,6 +204,12 @@ 0 + + + 220 + 0 + + 220 diff --git a/retroshare-gui/src/gui/PeersDialog.ui b/retroshare-gui/src/gui/PeersDialog.ui index e8dd66b75..8fef6d7d3 100644 --- a/retroshare-gui/src/gui/PeersDialog.ui +++ b/retroshare-gui/src/gui/PeersDialog.ui @@ -5,7 +5,7 @@ 0 0 - 825 + 721 516 @@ -526,6 +526,18 @@ p, li { white-space: pre-wrap; } + + + 250 + 0 + + + + + 1677215 + 16777215 + + Qt::CustomContextMenu diff --git a/retroshare-gui/src/gui/connect/AddFriendDialog.ui b/retroshare-gui/src/gui/connect/AddFriendDialog.ui index 64d83e956..a449651d8 100644 --- a/retroshare-gui/src/gui/connect/AddFriendDialog.ui +++ b/retroshare-gui/src/gui/connect/AddFriendDialog.ui @@ -5,8 +5,8 @@ 0 0 - 439 - 336 + 539 + 402 @@ -37,8 +37,10 @@ false - - + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html> true @@ -112,6 +114,12 @@ + + + 16777215 + 73 + + @@ -531,10 +539,13 @@ background-image: url(:/images/addfriendlabel.png) - Add a new Friend -To add a new Friend, cut and paste their email -invitation into the box below, and click done. - + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:16pt; font-weight:600; color:#32cd32;">Add a new Friend</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">To add a new Friend, cut and paste their email </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">invitation into the box below, and click done.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> </p></body></html> Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter diff --git a/retroshare-gui/src/gui/connect/AddFriendWizard.cpp b/retroshare-gui/src/gui/connect/AddFriendWizard.cpp index ea17a1662..d44b3852a 100644 --- a/retroshare-gui/src/gui/connect/AddFriendWizard.cpp +++ b/retroshare-gui/src/gui/connect/AddFriendWizard.cpp @@ -17,13 +17,13 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. - ****************************************************************/ - -#include "AddFriendWizard.h" + ****************************************************************/ + +#include "AddFriendWizard.h" //#include "rshare.h" -//#include "config/gconfig.h" - -#include "rsiface/rsiface.h" +//#include "config/gconfig.h" + +#include "rsiface/rsiface.h" #include "rsiface/rspeers.h" #include @@ -37,148 +37,171 @@ #include #include "gui/NetworkDialog.h" - -/** Constructor */ -AddFriendWizard::AddFriendWizard(NetworkDialog *cd, QWidget *parent, Qt::WFlags flags) -: QDialog(parent, flags), cDialog(cd) -{ - /* Invoke the Qt Designer generated object setup routine */ + +/** Constructor */ +AddFriendWizard::AddFriendWizard(NetworkDialog *cd, QWidget *parent, Qt::WFlags flags) +: QDialog(parent, flags), cDialog(cd) +{ + /* Invoke the Qt Designer generated object setup routine */ ui.setupUi(this); - //GConfig config; - //config.loadWidgetInformation(this); + //GConfig config; + //config.loadWidgetInformation(this); - connect(ui.loadfileButton, SIGNAL(clicked()), this, SLOT(loadfile())); + connect(ui.loadfileButton, SIGNAL(clicked()), this, SLOT(loadfile())); - setFixedSize(QSize(508, 312)); - - /* Hide platform specific features */ -#ifdef Q_WS_WIN - -#endif + setFixedSize(QSize(508, 312)); + + /* Hide platform specific features */ +#ifdef Q_WS_WIN + +#endif } -/*! -* The destructor for AddFriendWizard -*/ -AddFriendWizard::~AddFriendWizard() -{ -} - - -void AddFriendWizard::reset(QSettings *settingsPointer) -{ - // set the labelstackedWidget and textstackedWidget to the first position - //labelstackedWidget->setCurrentIndex(0); - ui.textstackedWidget->setCurrentIndex(0); - // disable the backButton: We don't need it if we are on the first position - ui.backButton->setEnabled(false); - // and we aren't at the last step, were the next button becomes the finish button - lastStep = false; - - settings = settingsPointer; - +/*! +* The destructor for AddFriendWizard +*/ +AddFriendWizard::~AddFriendWizard() +{ } -void AddFriendWizard::on_nextButton_clicked() -{ - // The current index position - int index = ui.textstackedWidget->currentIndex(); - // Test the different widgets - switch ( ui.textstackedWidget->currentIndex()) { - // - case 0 : - { - if ( ui.keyradioButton->isChecked() ) - { - ui.textstackedWidget->setCurrentWidget(ui.keypage); - - } - if ( ui.pqipemradioButton->isChecked() ) - { - ui.textstackedWidget->setCurrentWidget(ui.pqipempage); - +void AddFriendWizard::reset(QSettings *settingsPointer) +{ + // set the labelstackedWidget and textstackedWidget to the first position + //labelstackedWidget->setCurrentIndex(0); + ui.textstackedWidget->setCurrentIndex(0); + // disable the backButton: We don't need it if we are on the first position + ui.backButton->setEnabled(false); + // and we aren't at the last step, were the next button becomes the finish button + lastStep = false; + + settings = settingsPointer; + +} + + +void AddFriendWizard::on_nextButton_clicked() +{ + // The current index position + int index = ui.textstackedWidget->currentIndex(); + // Test the different widgets + switch ( ui.textstackedWidget->currentIndex()) { + // + case 0 : + { + if ( ui.keyradioButton->isChecked() ) + { + ui.textstackedWidget->setCurrentWidget(ui.keypage); + /* something complicated ;) */ + + + std::string id; + + /* get the text from the window */ + /* load into string */ + std::string certstr = ui.keyText->toPlainText().toStdString(); + + /* ask retroshare to load */ + if ((cDialog) && (rsPeers->LoadCertificateFromString(certstr, id))) + { + close(); + cDialog->showpeerdetails(id); + } + else + { + /* error message */ + int ret = QMessageBox::warning(this, tr("RetroShare"), + tr("Certificate Load Failed"), + QMessageBox::Ok, QMessageBox::Ok); + } + + } - if ( ui.inviteradioButton->isChecked() ) - { - ui.textstackedWidget->setCurrentWidget(ui.invitepage); - - } - + if ( ui.pqipemradioButton->isChecked() ) + { + ui.textstackedWidget->setCurrentWidget(ui.pqipempage); + + } + if ( ui.inviteradioButton->isChecked() ) + { + ui.textstackedWidget->setCurrentWidget(ui.invitepage); + + } + } - return; - - } - - /* - * move to the next widget, with the signal/slot also labelstackedWidget, - * it's also moved - */ - index++; - // activate the backButton, because we are at the second widget or higher - ui.backButton->setEnabled(true); - - -} - -/*! -* The on_backButton_clicked function is called when the back button is clicked. -* First it set the variable index to the currentIndex of textstackedWidget minus 1. -* So we have the previous position. Then it tests if the index goes lower then 0. -* Because of there is no value prior 0, it sets the index back to 0. -* If we was at the last widget, the button was named "Finish". If we go back, it's -* named "Next" again and the lastStep is set to false. -*/ -void AddFriendWizard::on_backButton_clicked() -{ - int index = ui.textstackedWidget->currentIndex() - 1; - if ( index <= 0 ) - { - index = 0; - ui.backButton->setEnabled(false); - } - //ui.nextButton->setText(tr("Next")); - lastStep = false; - ui.textstackedWidget->setCurrentIndex(0); -} - -/*! -* This function closes the dialog without saving the values -*/ -void AddFriendWizard::on_cancelButton_clicked() -{ - // if cancel is pressed, use the standard settings - //writeSettings(); - // leave but show that cancel was pressed - reject(); + return; + + } + + /* + * move to the next widget, with the signal/slot also labelstackedWidget, + * it's also moved + */ + index++; + // activate the backButton, because we are at the second widget or higher + ui.backButton->setEnabled(true); + + } -void AddFriendWizard::loadfile() -{ - - /* show file dialog, - * load file into screen, - * push done button! - */ - std::string id; - if (cDialog) - { - id = cDialog->loadneighbour(); - } - - /* call make Friend */ - if (id != "") - { - close(); - cDialog->showpeerdetails(id); - } - else - { - /* error message */ - int ret = QMessageBox::warning(this, tr("RetroShare"), - tr("Certificate Load Failed"), - QMessageBox::Ok, QMessageBox::Ok); - } +/*! +* The on_backButton_clicked function is called when the back button is clicked. +* First it set the variable index to the currentIndex of textstackedWidget minus 1. +* So we have the previous position. Then it tests if the index goes lower then 0. +* Because of there is no value prior 0, it sets the index back to 0. +* If we was at the last widget, the button was named "Finish". If we go back, it's +* named "Next" again and the lastStep is set to false. +*/ +void AddFriendWizard::on_backButton_clicked() +{ + int index = ui.textstackedWidget->currentIndex() - 1; + if ( index <= 0 ) + { + index = 0; + ui.backButton->setEnabled(false); + } + //ui.nextButton->setText(tr("Next")); + lastStep = false; + ui.textstackedWidget->setCurrentIndex(0); +} + +/*! +* This function closes the dialog without saving the values +*/ +void AddFriendWizard::on_cancelButton_clicked() +{ + // if cancel is pressed, use the standard settings + //writeSettings(); + // leave but show that cancel was pressed + reject(); +} + +void AddFriendWizard::loadfile() +{ + + /* show file dialog, + * load file into screen, + * push done button! + */ + std::string id; + if (cDialog) + { + id = cDialog->loadneighbour(); + } + + /* call make Friend */ + if (id != "") + { + close(); + cDialog->showpeerdetails(id); + } + else + { + /* error message */ + int ret = QMessageBox::warning(this, tr("RetroShare"), + tr("Certificate Load Failed"), + QMessageBox::Ok, QMessageBox::Ok); + } } diff --git a/retroshare-gui/src/gui/connect/InviteDialog.ui b/retroshare-gui/src/gui/connect/InviteDialog.ui index b50c15dcc..68b7460a0 100644 --- a/retroshare-gui/src/gui/connect/InviteDialog.ui +++ b/retroshare-gui/src/gui/connect/InviteDialog.ui @@ -52,7 +52,7 @@ <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Helvetica'; font-size:10pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial'; font-size:8pt;"></p></body></html> @@ -62,6 +62,12 @@ p, li { white-space: pre-wrap; } + + + 16777215 + 93 + + @@ -478,13 +484,13 @@ p, li { white-space: pre-wrap; } - background-image: url(:/images/invitefriendlabel.png) + background-image: url(:/images/invitefriendlabel.png); <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal; text-decoration:none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial'; font-size:8pt;"><span style=" font-size:16pt;">Invite a Friend</span><br /><br /><span style=" font-size:10pt;">To Invite your friends to join you with Retroshare: </span></p> +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial'; font-size:8pt;"><span style=" font-size:16pt; font-weight:600; color:#32cd32;">Invite a Friend</span><br /><span style=" font-size:10pt;">To Invite your friends to join you with Retroshare: </span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial'; font-size:10pt;">Cut and paste the text below into an email.</p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial'; font-size:10pt;">and send it to all your friends!</p></body></html> diff --git a/retroshare-gui/src/rsiface/RemoteDirModel.cpp b/retroshare-gui/src/rsiface/RemoteDirModel.cpp index 600691098..fb053aa5c 100644 --- a/retroshare-gui/src/rsiface/RemoteDirModel.cpp +++ b/retroshare-gui/src/rsiface/RemoteDirModel.cpp @@ -249,7 +249,16 @@ RemoteDirModel::RemoteDirModel(bool mode, QObject *parent) switch(coln) { case 0: - return(QIcon(":/images/folder16.png")); + QString ext = QFileInfo(QString::fromStdString(details.name)).suffix(); + if (ext == "avi" || ext == "mpg" || ext == "movie") + { + QIcon icon(":/images/folder_video.png"); + return icon; + } + else + { + return(QIcon(":/images/folder16.png")); + } break; } }