Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-11-28 03:20:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

-added Log feature for QT .

Browse source 
-fixed Prefences and General Dialog
-disabled show function from main.cpp it will not allow to start minimized, it blocks minimize gui function.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@686 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2008-08-15 17:49:57 +00:00
parent 8b9e64f9f6
commit cb891ff08a
29 changed files with 961 additions and 1063 deletions
Download patch file Download diff file Expand all files Collapse all files

11
retroshare-gui/src/gui/MainWindow.cpp
View file

@ -107,6 +107,9 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
/* Invoke the Qt Designer generated QObject setup routine */
ui.setupUi(this);
/* Create RshareSettings object */
_settings = new RshareSettings();
setWindowTitle(tr("RetroShare %1").arg(retroshareVersion()));
mSMPlayer = NULL;
@ -115,6 +118,10 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
// Setting icons
this->setWindowIcon(QIcon(QString::fromUtf8(":/images/rstray3.png")));
/*if(!_settings->value(QString::fromUtf8("StartMinimized"), false).toBool()) {
show();
}*/
/* Create all the dialogs of which we only want one instance */
_bandwidthGraph = new BandwidthGraph();
@ -516,9 +523,7 @@ void MainWindow::createActions()
_helpAct = new QAction(QIcon(IMG_HELP), tr("Help"), this);
connect(_helpAct, SIGNAL(triggered()), this, SLOT(showHelpDialog()));
//connect(ui.btntoggletoolbox, SIGNAL(toggled(bool)), this, SLOT(showToolboxFrame(bool)));
}
/** If the user attempts to quit the app, a check-warning is issued. This warning can be

10
retroshare-gui/src/gui/MainWindow.h
View file

@ -53,7 +53,7 @@
#include "ui_MainWindow.h"
#include "../config/rsharesettings.h"
#include "Preferences/rsharesettings.h"
class SMPlayer;
@ -147,12 +147,6 @@ private slots:
void showSettings();
void setStyle();
/** Called when console button is toggled */
//void showConsoleFrame(bool show);
/** Called when console button is toggled */
//void showToolboxFrame(bool show);
/** Called when user attempts to quit via quit button*/
void doQuit();
@ -186,6 +180,8 @@ private:
PreferencesWindow* _preferencesWindow;
/** A RetroShareSettings object used for saving/loading settings */
RshareSettings* _settings;
/** Creates a new action for a Main page. */
QAction* createPageAction(QIcon img, QString text, QActionGroup *group);

22
retroshare-gui/src/gui/NetworkDialog.cpp
View file

@ -28,7 +28,6 @@
#include "NetworkDialog.h"
#include "NetworkView.h"
#include "connect/ConnectDialog.h"
#include "authdlg/AuthorizationDialog.h"
#include "rsiface/rsiface.h"
#include "rsiface/rspeers.h"
#include <sstream>
@ -138,16 +137,12 @@ void NetworkDialog::connecttreeWidgetCostumPopupMenu( QPoint point )
peerdetailsAct = new QAction(QIcon(IMAGE_PEERDETAILS), tr( "Make Friend / Peer Details" ), this );
connect( peerdetailsAct , SIGNAL( triggered() ), this, SLOT( peerdetails() ) );
//authAct = new QAction(QIcon(IMAGE_AUTH), tr( "Authenticate" ), this );
//connect( authAct , SIGNAL( triggered() ), this, SLOT( peerdetails() ) );
loadcertAct = new QAction(QIcon(IMAGE_LOADCERT), tr( "Load Certificate" ), this );
connect( loadcertAct , SIGNAL( triggered() ), this, SLOT( loadneighbour() ) );
contextMnu.clear();
contextMnu.addAction( peerdetailsAct);
//contextMnu.addAction( authAct);
contextMnu.addAction( loadcertAct);
contextMnu.exec( mevent->globalPos() );
}
@ -182,23 +177,6 @@ void NetworkDialog::showpeerdetails(std::string id)
}
}
/** Shows Connect Dialog */
void NetworkDialog::showAuthDialog()
{
static AuthorizationDialog *authorizationdialog = new AuthorizationDialog();
QTreeWidgetItem *wi = getCurrentNeighbour();
if (!wi)
return;
RsCertId id = getNeighRsCertId(wi);
std::ostringstream out;
out << id;
authorizationdialog->setAuthCode(out.str(), wi->text(9).toStdString());
authorizationdialog->show();
}
/** Open a QFileDialog to browse for a pem/pqi file. */
void NetworkDialog::loadcert()

2
retroshare-gui/src/gui/NetworkDialog.h
View file

@ -52,8 +52,6 @@ public slots:
private slots:
void showAuthDialog();
void peerdetails();
/** Create the context popup menu and it's submenus */

5
retroshare-gui/src/gui/Preferences/GeneralDialog.cpp
View file

@ -43,7 +43,7 @@ GeneralDialog::GeneralDialog(QWidget *parent)
} else {
/* Don't let people hide the main window, since that's all they have. */
ui.chkShowOnStartup->hide();
//show();
show();
}
/* Hide platform specific features */
#ifndef Q_WS_WIN
@ -64,6 +64,9 @@ GeneralDialog::save(QString &errmsg)
Q_UNUSED(errmsg);
_settings->setValue(QString::fromUtf8("StartMinimized"), startMinimized());
_settings->setRunRetroshareOnBoot(
ui.chkRunRetroshareAtSystemStartup->isChecked());
return true;
}

2
retroshare-gui/src/gui/Preferences/GeneralDialog.h
View file

@ -53,7 +53,7 @@ private slots:
void toggleShowOnStartup(bool checked);
private:
/** A VidaliaSettings object used for saving/loading settings */
/** A RetroShare Settings object used for saving/loading settings */
RshareSettings* _settings;

6
retroshare-gui/src/gui/Preferences/PreferencesWindow.cpp
View file

@ -38,7 +38,9 @@
#define IMAGE_LOG ":/images/log_24x24.png"
#define IMAGE_ABOUT ":/images/informations_24x24.png"
#define IMAGE_SAVE ":/images/media-floppy.png"
#define IMAGE_HELP ":/images/help24.png"
#define IMAGE_HELP ":/images/help24.png"
#define IMAGE_APPEARRANCE ":/images/looknfeel.png"
/** Constructor */
PreferencesWindow::PreferencesWindow(QWidget *parent, Qt::WFlags flags)
@ -59,7 +61,7 @@ PreferencesWindow::PreferencesWindow(QWidget *parent, Qt::WFlags flags)
createPageAction(QIcon(IMAGE_DIRECTORIES), tr("Directories"), grp));
ui.stackPages->add(new AppearanceDialog(ui.stackPages),
createPageAction(QIcon(IMAGE_DIRECTORIES), tr("AppearanceDialog"), grp));
createPageAction(QIcon(IMAGE_APPEARRANCE), tr("Appearance"), grp));
/*foreach (ConfigPage *page, ui.stackPages->pages()) {
connect(page, SIGNAL(helpRequested(QString)),

10
retroshare-gui/src/gui/TransfersDialog.cpp
View file

@ -22,7 +22,6 @@
#include "rshare.h"
#include "TransfersDialog.h"
#include "moreinfo/moreinfo.h"
#include "DLListDelegate.h"
#include "ULListDelegate.h"
@ -186,8 +185,6 @@ void TransfersDialog::downloadListCostumPopupMenu( QPoint point )
contextMnu.addSeparator();
contextMnu.addAction( cancelAct);
// contextMnu.addSeparator();
// contextMnu.addAction( showdowninfoAct);
contextMnu.addSeparator();
contextMnu.addAction( clearcompletedAct);
contextMnu.exec( mevent->globalPos() );
@ -224,13 +221,6 @@ void TransfersDialog::playSelectedTransfer()
}
/** Shows Downloads Informations */
void TransfersDialog::showDownInfoWindow()
{
moreinfo *detailsdlg = new moreinfo();
detailsdlg->show();
}
void TransfersDialog::updateProgress(int value)
{
for(int i = 0; i <= DLListModel->rowCount(); i++) {

1
retroshare-gui/src/gui/TransfersDialog.h
View file

@ -53,7 +53,6 @@ public:
void insertTransfers();
private slots:
void showDownInfoWindow();
/** Create the context popup menu and it's submenus */
void downloadListCostumPopupMenu( QPoint point );

123
retroshare-gui/src/gui/authdlg/AuthorizationDialog.cpp
View file

@ -1,123 +0,0 @@
/****************************************************************
* RetroShare is distributed under the following license:
*
* Copyright (C) 2006, crypton
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
****************************************************************/
#include "rshare.h"
#include "AuthorizationDialog.h"
#include "rsiface/rsiface.h"
#include "rsiface/rspeers.h"
#include <iostream>
/** Default constructor */
AuthorizationDialog::AuthorizationDialog(QWidget *parent, Qt::WFlags flags)
: QDialog(parent, flags)
{
/* Invoke Qt Designer generated QObject setup routine */
ui.setupUi(this);
// GConfig config;
// config.loadWidgetInformation(this);
// Create the status bar
//statusBar()->showMessage("Please enter the correct AUTH CODE !");
setFixedSize(QSize(267, 103));
connect(ui.cancelButton, SIGNAL(clicked()), this, SLOT(closedlg()));
connect(ui.okButton, SIGNAL(clicked()), this, SLOT(authAttempt()));
//connect(ui.Ledit_name, SIGNAL(textChanged()), this, SLOT(checkAuthCode()));
connect(ui.Ledit_name, SIGNAL(textChanged ( const QString & ) ), this, SLOT(checkAuthCode( const QString & )));
}
/**
Overloads the default show() slot so we can set opacity*/
void
AuthorizationDialog::show()
{
//loadSettings();
if(!this->isVisible()) {
QDialog::show();
}
}
void AuthorizationDialog::closeEvent (QCloseEvent * event)
{
// GConfig config;
// config.saveWidgetInformation(this);
QWidget::closeEvent(event);
}
void AuthorizationDialog::closedlg()
{
close();
}
void AuthorizationDialog::setAuthCode(std::string id, std::string code)
{
authId = id;
authCode = code;
ui.Ledit_name->setText(QString::fromStdString(code));
//ui.okButton ->setEnabled(true);
}
void AuthorizationDialog::checkAuthCode(const QString &txt)
{
//std::cerr << "AuthCode:" << authCode << std::endl;
//std::cerr << "Entered:" << ui.Ledit_name -> text().toStdString() << std::endl;
//std::cerr << "Entered:" << txt.toStdString() << std::endl;
if (authCode == txt.toStdString())
{
/* enable ok button */
ui.okButton ->setEnabled(true);
}
else
{
/* disable ok button */
ui.okButton ->setEnabled(false);
}
}
void AuthorizationDialog::authAttempt()
{
/* well lets do it ! */
std::cerr << "Attempting AuthCode:" << authCode << std::endl;
rsPeers->AuthCertificate(authId, authCode);
rsPeers->addFriend(authId);
/* close it up! */
closedlg();
}

70
retroshare-gui/src/gui/authdlg/AuthorizationDialog.h
View file

@ -1,70 +0,0 @@
/****************************************************************
* RShare is distributed under the following license:
*
* Copyright (C) 2006, crypton
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
****************************************************************/
#ifndef _AUTHORIZATIONDIALOG_H
#define _AUTHORIZATIONDIALOG_H
#include <config/rsharesettings.h>
#include "ui_AuthorizationDialog.h"
#include <string>
class AuthorizationDialog : public QDialog
{
Q_OBJECT
public:
/** Default constructor */
AuthorizationDialog(QWidget *parent = 0, Qt::WFlags flags = 0);
/** Default destructor */
void setAuthCode(std::string id, std::string code);
public slots:
/** Overloaded QWidget.show */
void checkAuthCode( const QString &txt );
void show();
protected:
void closeEvent (QCloseEvent * event);
private slots:
void closedlg();
void authAttempt();
private:
std::string authCode;
std::string authId;
/** Loads the saved connectidialog settings */
// void loadSettings();
/** Qt Designer generated object */
Ui::AuthorizationDialog ui;
};
#endif

148
retroshare-gui/src/gui/authdlg/AuthorizationDialog.ui
View file

@ -1,148 +0,0 @@
<ui version="4.0" >
<class>AuthorizationDialog</class>
<widget class="QDialog" name="AuthorizationDialog" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>267</width>
<height>103</height>
</rect>
</property>
<property name="windowTitle" >
<string>Authenticate</string>
</property>
<property name="windowIcon" >
<iconset resource="../images.qrc" >:/images/encrypted22.png</iconset>
</property>
<layout class="QVBoxLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QLabel" name="label" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>5</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<string>Authenticate Friend By Entering Their Code</string>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="0" >
<widget class="QLabel" name="label_2" >
<property name="text" >
<string>AUTH CODE:</string>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QLineEdit" name="Ledit_name" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="0" column="2" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>131</width>
<height>31</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="okButton" >
<property name="enabled" >
<bool>false</bool>
</property>
<property name="minimumSize" >
<size>
<width>77</width>
<height>0</height>
</size>
</property>
<property name="text" >
<string>OK</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="cancelButton" >
<property name="minimumSize" >
<size>
<width>77</width>
<height>0</height>
</size>
</property>
<property name="text" >
<string>Cancel</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<tabstops>
<tabstop>Ledit_name</tabstop>
<tabstop>okButton</tabstop>
<tabstop>cancelButton</tabstop>
</tabstops>
<resources>
<include location="../images.qrc" />
</resources>
<connections/>
</ui>

57
retroshare-gui/src/gui/moreinfo/moreinfo.cpp
View file

@ -1,57 +0,0 @@
/****************************************************************
* RetroShare is distributed under the following license:
*
* Copyright (C) 2006, crypton
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
****************************************************************/
#include "moreinfo.h"
/** Default constructor */
moreinfo::moreinfo(QWidget *parent, Qt::WFlags flags)
: QDialog(parent, flags)
{
/* Invoke Qt Designer generated QObject setup routine */
ui.setupUi(this);
setFixedSize(QSize(400, 300));
//Closing window
connect(ui.pushButton, SIGNAL(clicked()), this, SLOT(cancel()));
}
void
moreinfo::show()
{
//loadSettings();
if(!this->isVisible()) {
QDialog::show();
}
}
void moreinfo::closeEvent (QCloseEvent * event)
{
QWidget::closeEvent(event);
}
void moreinfo::cancel()
{
close();
}

58
retroshare-gui/src/gui/moreinfo/moreinfo.h
View file

@ -1,58 +0,0 @@
/****************************************************************
* RetroShare is distributed under the following license:
*
* Copyright (C) 2006, crypton
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
****************************************************************/
#ifndef _MOREINFO_H
#define _MOREINFO_H
#include "ui_moreinfo.h"
class moreinfo : public QDialog
{
Q_OBJECT
public:
/** Default constructor */
moreinfo(QWidget *parent = 0, Qt::WFlags flags = 0);
/** Default destructor */
public slots:
/** Overloaded QWidget.show */
void show();
void cancel();
protected:
void closeEvent (QCloseEvent * event);
private slots:
private:
/** Qt Designer generated object */
Ui::moreinfo ui;
};
#endif

51
retroshare-gui/src/gui/moreinfo/moreinfo.ui
View file

@ -1,51 +0,0 @@
<ui version="4.0" >
<class>moreinfo</class>
<widget class="QDialog" name="moreinfo" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
</rect>
</property>
<property name="windowTitle" >
<string>Details</string>
</property>
<widget class="QPushButton" name="pushButton" >
<property name="geometry" >
<rect>
<x>310</x>
<y>270</y>
<width>75</width>
<height>23</height>
</rect>
</property>
<property name="text" >
<string>OK</string>
</property>
</widget>
<widget class="QTableWidget" name="tableWidget" >
<property name="geometry" >
<rect>
<x>10</x>
<y>10</y>
<width>381</width>
<height>251</height>
</rect>
</property>
<column>
<property name="text" >
<string>Name</string>
</property>
</column>
<column>
<property name="text" >
<string>Value</string>
</property>
</column>
</widget>
</widget>
<resources/>
<connections/>
</ui>