mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-07-31 10:19:24 -04:00
commit
83195e10fa
14 changed files with 175 additions and 134 deletions
|
@ -214,7 +214,6 @@ int pqissllistenbase::setuplisten()
|
||||||
if (!mPeerMgr->isHidden()) std::cerr << "Zeroed tmpaddr: " << sockaddr_storage_tostring(tmpaddr) << std::endl;
|
if (!mPeerMgr->isHidden()) std::cerr << "Zeroed tmpaddr: " << sockaddr_storage_tostring(tmpaddr) << std::endl;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
exit(1);
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -72,6 +72,19 @@ HomePage::HomePage(QWidget *parent) :
|
||||||
|
|
||||||
ui->shareButton->setMenu(menu);
|
ui->shareButton->setMenu(menu);
|
||||||
|
|
||||||
|
int S = QFontMetricsF(font()).height();
|
||||||
|
QString help_str = tr(
|
||||||
|
" <h1><img width=\"%1\" src=\":/icons/help_64.png\"> Welcome to Retroshare!</h1>\
|
||||||
|
<p>The first thing you have to do is to <b>make friends</b>. Once you create a network of Retroshare nodes, or join an existing network,\
|
||||||
|
you'll be able to exchange files, chat, talk in forums, etc. </p>\
|
||||||
|
<div align=center>\
|
||||||
|
<IMG align=\"center\" width=\"%2\" src=\":/images/network_map.png\"/> \
|
||||||
|
</div>\
|
||||||
|
<p>To do so, use the current page to exchange certificates with other persons you want your Retroshare node to connect to.</p> \
|
||||||
|
<p>Another option is to search the internet for \"Retroshare chat servers\" (independently administrated). These servers allow you to exchange \
|
||||||
|
certificates with a dedicated Retroshare node, through which\
|
||||||
|
you will be able to meet other people anonymously.</p> ").arg(QString::number(2*S)).arg(width()*0.5);
|
||||||
|
registerHelpButton(ui->helpButton,help_str) ;
|
||||||
}
|
}
|
||||||
|
|
||||||
HomePage::~HomePage()
|
HomePage::~HomePage()
|
||||||
|
|
|
@ -14,43 +14,6 @@
|
||||||
<string>Form</string>
|
<string>Form</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QGridLayout" name="gridLayout_2">
|
<layout class="QGridLayout" name="gridLayout_2">
|
||||||
<item row="0" column="0" colspan="4">
|
|
||||||
<widget class="QLabel" name="label">
|
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy hsizetype="Expanding" vsizetype="Maximum">
|
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
<property name="pixmap">
|
|
||||||
<pixmap resource="images.qrc">:/images/logo/logo_splash.png</pixmap>
|
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignCenter</set>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="4" column="1">
|
|
||||||
<widget class="QFrame" name="addFrame">
|
|
||||||
<layout class="QGridLayout" name="gridLayout_3">
|
|
||||||
<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>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="1" colspan="2">
|
<item row="2" column="1" colspan="2">
|
||||||
<widget class="QFrame" name="addframe">
|
<widget class="QFrame" name="addframe">
|
||||||
<property name="styleSheet">
|
<property name="styleSheet">
|
||||||
|
@ -95,6 +58,20 @@
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QToolButton" name="helpButton">
|
||||||
|
<property name="text">
|
||||||
|
<string>...</string>
|
||||||
|
</property>
|
||||||
|
<property name="icon">
|
||||||
|
<iconset resource="icons.qrc">
|
||||||
|
<normaloff>:/icons/help_64.png</normaloff>:/icons/help_64.png</iconset>
|
||||||
|
</property>
|
||||||
|
<property name="checkable">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
@ -191,6 +168,24 @@
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="4" column="1">
|
||||||
|
<widget class="QFrame" name="addFrame">
|
||||||
|
<layout class="QGridLayout" name="gridLayout_3">
|
||||||
|
<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>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item row="1" column="1" colspan="2">
|
<item row="1" column="1" colspan="2">
|
||||||
<widget class="QLabel" name="label_2">
|
<widget class="QLabel" name="label_2">
|
||||||
<property name="font">
|
<property name="font">
|
||||||
|
@ -208,12 +203,30 @@ private and secure decentralized commmunication platform.
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="0" column="0" colspan="4">
|
||||||
|
<widget class="QLabel" name="label">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Expanding" vsizetype="Maximum">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
<property name="pixmap">
|
||||||
|
<pixmap resource="images.qrc">:/images/logo/logo_splash.png</pixmap>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignCenter</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
<zorder>label</zorder>
|
<zorder>label</zorder>
|
||||||
<zorder>addFrame</zorder>
|
<zorder>addFrame</zorder>
|
||||||
<zorder>label_2</zorder>
|
<zorder>label_2</zorder>
|
||||||
<zorder>addframe</zorder>
|
<zorder>addframe</zorder>
|
||||||
<zorder>label_3</zorder>
|
|
||||||
</widget>
|
</widget>
|
||||||
<resources>
|
<resources>
|
||||||
<include location="icons.qrc"/>
|
<include location="icons.qrc"/>
|
||||||
|
|
|
@ -1498,6 +1498,7 @@ void MainWindow::switchVisibilityStatus(StatusElement e,bool b)
|
||||||
case StatusGrpStatus : getInstance()->statusBar() ->setVisible(b); break ;
|
case StatusGrpStatus : getInstance()->statusBar() ->setVisible(b); break ;
|
||||||
case StatusCompactMode : getInstance()->setCompactStatusMode(b) ; break ;
|
case StatusCompactMode : getInstance()->setCompactStatusMode(b) ; break ;
|
||||||
case StatusShowToolTip : getInstance()->toggleStatusToolTip(b) ; break ;
|
case StatusShowToolTip : getInstance()->toggleStatusToolTip(b) ; break ;
|
||||||
|
case StatusShowCBox : getInstance()->statusComboBoxInstance() ->setVisible(b); break ;
|
||||||
case StatusShowStatus : getInstance()->peerstatusInstance() ->setVisible(b); break ;
|
case StatusShowStatus : getInstance()->peerstatusInstance() ->setVisible(b); break ;
|
||||||
case StatusShowPeer : getInstance()->natstatusInstance() ->setVisible(b); break ;
|
case StatusShowPeer : getInstance()->natstatusInstance() ->setVisible(b); break ;
|
||||||
case StatusShowDHT : getInstance()->dhtstatusInstance() ->setVisible(b); break ;
|
case StatusShowDHT : getInstance()->dhtstatusInstance() ->setVisible(b); break ;
|
||||||
|
|
|
@ -123,7 +123,8 @@ public:
|
||||||
StatusShowOpMode = 0x0a,
|
StatusShowOpMode = 0x0a,
|
||||||
StatusShowSound = 0x0b,
|
StatusShowSound = 0x0b,
|
||||||
StatusShowToaster = 0x0c,
|
StatusShowToaster = 0x0c,
|
||||||
StatusShowSystray = 0x0d
|
StatusShowSystray = 0x0d,
|
||||||
|
StatusShowCBox = 0x0e
|
||||||
};
|
};
|
||||||
|
|
||||||
/** Create main window */
|
/** Create main window */
|
||||||
|
|
|
@ -77,7 +77,7 @@ void FloatingHelpBrowser::showHelp(bool state)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
resize(p->size() * 0.5);
|
resize(p->size() * 0.75);
|
||||||
move(p->width() / 2 - width() / 2, p->height() / 2 - height() / 2);
|
move(p->width() / 2 - width() / 2, p->height() / 2 - height() / 2);
|
||||||
update();
|
update();
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
<RCC>
|
<RCC>
|
||||||
<qresource prefix="/">
|
<qresource prefix="/">
|
||||||
|
<file>images/network_map.png</file>
|
||||||
<file>images/global_switch_on.png</file>
|
<file>images/global_switch_on.png</file>
|
||||||
<file>images/global_switch_off.png</file>
|
<file>images/global_switch_off.png</file>
|
||||||
<file>images/switch00.png</file>
|
<file>images/switch00.png</file>
|
||||||
|
|
BIN
retroshare-gui/src/gui/images/network_map.png
Normal file
BIN
retroshare-gui/src/gui/images/network_map.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 46 KiB |
|
@ -55,7 +55,7 @@ AppearancePage::AppearancePage(QWidget * parent, Qt::WindowFlags flags)
|
||||||
connect(ui.grpStatus, SIGNAL(toggled(bool)), this /* pMainWindow->statusBar(), */, SLOT(switch_status_grpStatus(bool)));
|
connect(ui.grpStatus, SIGNAL(toggled(bool)), this /* pMainWindow->statusBar(), */, SLOT(switch_status_grpStatus(bool)));
|
||||||
connect(ui.checkBoxStatusCompactMode, SIGNAL(toggled(bool)), this /* pMainWindow, */, SLOT(switch_status_compactMode(bool)));
|
connect(ui.checkBoxStatusCompactMode, SIGNAL(toggled(bool)), this /* pMainWindow, */, SLOT(switch_status_compactMode(bool)));
|
||||||
connect(ui.checkBoxDisableSysTrayToolTip, SIGNAL(toggled(bool)), this /* pMainWindow, */, SLOT(switch_status_showToolTip(bool)));
|
connect(ui.checkBoxDisableSysTrayToolTip, SIGNAL(toggled(bool)), this /* pMainWindow, */, SLOT(switch_status_showToolTip(bool)));
|
||||||
connect(ui.checkBoxShowStatusStatus, SIGNAL(toggled(bool)), this /* pMainWindow->statusComboBoxInstance(), */, SLOT(switch_status_ShowStatus(bool)));
|
connect(ui.checkBoxShowStatusStatus, SIGNAL(toggled(bool)), this /* pMainWindow->statusComboBoxInstance(), */, SLOT(switch_status_ShowCBox(bool)));
|
||||||
connect(ui.checkBoxShowPeerStatus, SIGNAL(toggled(bool)), this /* pMainWindow->peerstatusInstance(), */, SLOT(switch_status_ShowStatus(bool)));
|
connect(ui.checkBoxShowPeerStatus, SIGNAL(toggled(bool)), this /* pMainWindow->peerstatusInstance(), */, SLOT(switch_status_ShowStatus(bool)));
|
||||||
connect(ui.checkBoxShowNATStatus, SIGNAL(toggled(bool)), this /* pMainWindow->natstatusInstance(), */, SLOT(switch_status_ShowPeer(bool)));
|
connect(ui.checkBoxShowNATStatus, SIGNAL(toggled(bool)), this /* pMainWindow->natstatusInstance(), */, SLOT(switch_status_ShowPeer(bool)));
|
||||||
connect(ui.checkBoxShowDHTStatus, SIGNAL(toggled(bool)), this /* pMainWindow->dhtstatusInstance(), */, SLOT(switch_status_ShowDHT(bool)));
|
connect(ui.checkBoxShowDHTStatus, SIGNAL(toggled(bool)), this /* pMainWindow->dhtstatusInstance(), */, SLOT(switch_status_ShowDHT(bool)));
|
||||||
|
@ -110,6 +110,7 @@ void AppearancePage::switch_status_ShowOpMode(bool b) { switch_status(Main
|
||||||
void AppearancePage::switch_status_ShowSound(bool b) { switch_status(MainWindow::StatusShowSound ,"ShowSound", b) ; }
|
void AppearancePage::switch_status_ShowSound(bool b) { switch_status(MainWindow::StatusShowSound ,"ShowSound", b) ; }
|
||||||
void AppearancePage::switch_status_ShowToaster(bool b) { switch_status(MainWindow::StatusShowToaster,"ShowToaster", b) ; }
|
void AppearancePage::switch_status_ShowToaster(bool b) { switch_status(MainWindow::StatusShowToaster,"ShowToaster", b) ; }
|
||||||
void AppearancePage::switch_status_ShowSystray(bool b) { switch_status(MainWindow::StatusShowSystray,"ShowSysTrayOnStatusBar",b) ; }
|
void AppearancePage::switch_status_ShowSystray(bool b) { switch_status(MainWindow::StatusShowSystray,"ShowSysTrayOnStatusBar",b) ; }
|
||||||
|
void AppearancePage::switch_status_ShowCBox(bool b) { switch_status(MainWindow::StatusShowCBox, "ShowStatusCBox" ,b) ; }
|
||||||
|
|
||||||
void AppearancePage::switch_status(MainWindow::StatusElement s,const QString& key, bool b)
|
void AppearancePage::switch_status(MainWindow::StatusElement s,const QString& key, bool b)
|
||||||
{
|
{
|
||||||
|
|
|
@ -57,6 +57,7 @@ private slots:
|
||||||
void switch_status_ShowSound(bool) ;
|
void switch_status_ShowSound(bool) ;
|
||||||
void switch_status_ShowToaster(bool) ;
|
void switch_status_ShowToaster(bool) ;
|
||||||
void switch_status_ShowSystray(bool) ;
|
void switch_status_ShowSystray(bool) ;
|
||||||
|
void switch_status_ShowCBox(bool) ;
|
||||||
|
|
||||||
void updateLanguageCode() ;
|
void updateLanguageCode() ;
|
||||||
void updateInterfaceStyle() ;
|
void updateInterfaceStyle() ;
|
||||||
|
|
|
@ -338,13 +338,6 @@
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QGridLayout" name="grpStatusGLayout">
|
<layout class="QGridLayout" name="grpStatusGLayout">
|
||||||
<item row="4" column="2">
|
|
||||||
<widget class="QCheckBox" name="checkBoxShowSystrayOnStatus">
|
|
||||||
<property name="text">
|
|
||||||
<string>Show SysTray on Status Bar</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="4" column="1">
|
<item row="4" column="1">
|
||||||
<widget class="QCheckBox" name="checkBoxShowToasterDisable">
|
<widget class="QCheckBox" name="checkBoxShowToasterDisable">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
|
@ -359,13 +352,6 @@
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="3" column="2">
|
|
||||||
<widget class="QCheckBox" name="checkBoxShowOpModeStatus">
|
|
||||||
<property name="text">
|
|
||||||
<string>Show Operating Mode Status</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="3" column="1">
|
<item row="3" column="1">
|
||||||
<widget class="QCheckBox" name="checkBoxShowRateStatus">
|
<widget class="QCheckBox" name="checkBoxShowRateStatus">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
|
@ -432,6 +418,20 @@
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="2" column="2">
|
||||||
|
<widget class="QCheckBox" name="checkBoxShowOpModeStatus">
|
||||||
|
<property name="text">
|
||||||
|
<string>Show Operating Mode Status</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="3" column="2">
|
||||||
|
<widget class="QCheckBox" name="checkBoxShowSystrayOnStatus">
|
||||||
|
<property name="text">
|
||||||
|
<string>Show SysTray on Status Bar</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
|
#include "gui/notifyqt.h"
|
||||||
#include "GroupFrameSettingsWidget.h"
|
#include "GroupFrameSettingsWidget.h"
|
||||||
#include "ui_GroupFrameSettingsWidget.h"
|
#include "ui_GroupFrameSettingsWidget.h"
|
||||||
|
|
||||||
|
@ -55,5 +56,7 @@ void GroupFrameSettingsWidget::saveSettings()
|
||||||
groupFrameSettings.mHideTabBarWithOneTab = ui->hideTabBarWithOneTabCheckBox->isChecked();
|
groupFrameSettings.mHideTabBarWithOneTab = ui->hideTabBarWithOneTabCheckBox->isChecked();
|
||||||
|
|
||||||
Settings->setGroupFrameSettings(mType, groupFrameSettings);
|
Settings->setGroupFrameSettings(mType, groupFrameSettings);
|
||||||
|
|
||||||
|
NotifyQt::getInstance()->notifySettingsChanged();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -70,19 +70,6 @@ ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags)
|
||||||
ui.whiteListIpsTable->setColumnHidden(COLUMN_STATUS,true) ;
|
ui.whiteListIpsTable->setColumnHidden(COLUMN_STATUS,true) ;
|
||||||
ui.whiteListIpsTable->verticalHeader()->hide() ;
|
ui.whiteListIpsTable->verticalHeader()->hide() ;
|
||||||
|
|
||||||
QObject::connect(ui.filteredIpsTable,SIGNAL(customContextMenuRequested(const QPoint&)),this,SLOT(ipFilterContextMenu(const QPoint&))) ;
|
|
||||||
QObject::connect(ui.whiteListIpsTable,SIGNAL(customContextMenuRequested(const QPoint&)),this,SLOT(ipWhiteListContextMenu(const QPoint&))) ;
|
|
||||||
QObject::connect(ui.denyAll_CB,SIGNAL(toggled(bool)),this,SLOT(toggleIpFiltering(bool)));
|
|
||||||
QObject::connect(ui.includeFromDHT_CB,SIGNAL(toggled(bool)),this,SLOT(toggleAutoIncludeDHT(bool)));
|
|
||||||
QObject::connect(ui.includeFromFriends_CB,SIGNAL(toggled(bool)),this,SLOT(toggleAutoIncludeFriends(bool)));
|
|
||||||
QObject::connect(ui.groupIPRanges_CB,SIGNAL(toggled(bool)),this,SLOT(toggleGroupIps(bool)));
|
|
||||||
QObject::connect(ui.groupIPRanges_SB,SIGNAL(valueChanged(int)),this,SLOT(setGroupIpLimit(int)));
|
|
||||||
QObject::connect(ui.ipInputAddBlackList_PB,SIGNAL(clicked()),this,SLOT(addIpRangeToBlackList()));
|
|
||||||
QObject::connect(ui.ipInputAddWhiteList_PB,SIGNAL(clicked()),this,SLOT(addIpRangeToWhiteList()));
|
|
||||||
QObject::connect(ui.ipInput_LE,SIGNAL(textChanged(const QString&)),this,SLOT(checkIpRange(const QString&)));
|
|
||||||
QObject::connect(ui.filteredIpsTable,SIGNAL(currentCellChanged(int,int,int,int)),this,SLOT(updateSelectedBlackListIP(int,int,int,int)));
|
|
||||||
QObject::connect(ui.whiteListIpsTable,SIGNAL(currentCellChanged(int,int,int,int)),this,SLOT(updateSelectedWhiteListIP(int,int,int,int)));
|
|
||||||
|
|
||||||
QTimer *timer = new QTimer(this);
|
QTimer *timer = new QTimer(this);
|
||||||
timer->connect(timer, SIGNAL(timeout()), this, SLOT(updateStatus()));
|
timer->connect(timer, SIGNAL(timeout()), this, SLOT(updateStatus()));
|
||||||
timer->start(1000);
|
timer->start(1000);
|
||||||
|
@ -102,6 +89,22 @@ ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags)
|
||||||
|
|
||||||
ui.hiddenpage_incoming->setVisible(false);
|
ui.hiddenpage_incoming->setVisible(false);
|
||||||
|
|
||||||
|
QObject::connect(ui.filteredIpsTable,SIGNAL(customContextMenuRequested(const QPoint&)),this,SLOT(ipFilterContextMenu(const QPoint&))) ;
|
||||||
|
QObject::connect(ui.whiteListIpsTable,SIGNAL(customContextMenuRequested(const QPoint&)),this,SLOT(ipWhiteListContextMenu(const QPoint&))) ;
|
||||||
|
QObject::connect(ui.denyAll_CB,SIGNAL(toggled(bool)),this,SLOT(toggleIpFiltering(bool)));
|
||||||
|
QObject::connect(ui.includeFromDHT_CB,SIGNAL(toggled(bool)),this,SLOT(toggleAutoIncludeDHT(bool)));
|
||||||
|
QObject::connect(ui.includeFromFriends_CB,SIGNAL(toggled(bool)),this,SLOT(toggleAutoIncludeFriends(bool)));
|
||||||
|
QObject::connect(ui.groupIPRanges_CB,SIGNAL(toggled(bool)),this,SLOT(toggleGroupIps(bool)));
|
||||||
|
QObject::connect(ui.groupIPRanges_SB,SIGNAL(valueChanged(int)),this,SLOT(setGroupIpLimit(int)));
|
||||||
|
QObject::connect(ui.ipInputAddBlackList_PB,SIGNAL(clicked()),this,SLOT(addIpRangeToBlackList()));
|
||||||
|
QObject::connect(ui.ipInputAddWhiteList_PB,SIGNAL(clicked()),this,SLOT(addIpRangeToWhiteList()));
|
||||||
|
QObject::connect(ui.ipInput_LE,SIGNAL(textChanged(const QString&)),this,SLOT(checkIpRange(const QString&)));
|
||||||
|
QObject::connect(ui.filteredIpsTable,SIGNAL(currentCellChanged(int,int,int,int)),this,SLOT(updateSelectedBlackListIP(int,int,int,int)));
|
||||||
|
QObject::connect(ui.whiteListIpsTable,SIGNAL(currentCellChanged(int,int,int,int)),this,SLOT(updateSelectedWhiteListIP(int,int,int,int)));
|
||||||
|
|
||||||
|
QObject::connect(ui.localPort,SIGNAL(valueChanged(int)),this,SLOT(saveAddresses()));
|
||||||
|
QObject::connect(ui.extPort,SIGNAL(valueChanged(int)),this,SLOT(saveAddresses()));
|
||||||
|
|
||||||
connect( ui.netModeComboBox, SIGNAL( activated ( int ) ), this, SLOT( toggleUPnP( ) ) );
|
connect( ui.netModeComboBox, SIGNAL( activated ( int ) ), this, SLOT( toggleUPnP( ) ) );
|
||||||
connect( ui.allowIpDeterminationCB, SIGNAL( toggled( bool ) ), this, SLOT( toggleIpDetermination(bool) ) );
|
connect( ui.allowIpDeterminationCB, SIGNAL( toggled( bool ) ), this, SLOT( toggleIpDetermination(bool) ) );
|
||||||
connect( ui.cleanKnownIPs_PB, SIGNAL( clicked( ) ), this, SLOT( clearKnownAddressList() ) );
|
connect( ui.cleanKnownIPs_PB, SIGNAL( clicked( ) ), this, SLOT( clearKnownAddressList() ) );
|
||||||
|
@ -225,6 +228,14 @@ void ServerPage::load()
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// (csoler) Disabling some signals in this block in order to avoid
|
||||||
|
// some nasty feedback.
|
||||||
|
{
|
||||||
|
ui.localPort->blockSignals(true);
|
||||||
|
ui.extPort->blockSignals(true);
|
||||||
|
ui.localAddress->blockSignals(true);
|
||||||
|
ui.extAddress->blockSignals(true);
|
||||||
|
|
||||||
loadFilteredIps() ;
|
loadFilteredIps() ;
|
||||||
|
|
||||||
ui.netModeComboBox->show() ;
|
ui.netModeComboBox->show() ;
|
||||||
|
@ -262,25 +273,17 @@ void ServerPage::load()
|
||||||
if (detail.vs_dht != RS_VS_DHT_OFF)
|
if (detail.vs_dht != RS_VS_DHT_OFF)
|
||||||
{
|
{
|
||||||
if (detail.vs_disc != RS_VS_DISC_OFF)
|
if (detail.vs_disc != RS_VS_DISC_OFF)
|
||||||
{
|
|
||||||
netIndex = 0; // PUBLIC
|
netIndex = 0; // PUBLIC
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
|
||||||
netIndex = 2; // INVERTED
|
netIndex = 2; // INVERTED
|
||||||
}
|
}
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (detail.vs_disc != RS_VS_DISC_OFF)
|
if (detail.vs_disc != RS_VS_DISC_OFF)
|
||||||
{
|
|
||||||
netIndex = 1; // PRIVATE
|
netIndex = 1; // PRIVATE
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
|
||||||
netIndex = 3; // NONE
|
netIndex = 3; // NONE
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
ui.discComboBox->setCurrentIndex(netIndex);
|
ui.discComboBox->setCurrentIndex(netIndex);
|
||||||
|
|
||||||
|
@ -292,7 +295,6 @@ void ServerPage::load()
|
||||||
|
|
||||||
toggleUPnP();
|
toggleUPnP();
|
||||||
|
|
||||||
|
|
||||||
/* Addresses must be set here - otherwise can't edit it */
|
/* Addresses must be set here - otherwise can't edit it */
|
||||||
/* set local address */
|
/* set local address */
|
||||||
ui.localAddress->setText(QString::fromStdString(detail.localAddr));
|
ui.localAddress->setText(QString::fromStdString(detail.localAddr));
|
||||||
|
@ -323,6 +325,12 @@ void ServerPage::load()
|
||||||
ui.hiddenpage_proxyPort_i2p -> setValue(proxyport);
|
ui.hiddenpage_proxyPort_i2p -> setValue(proxyport);
|
||||||
|
|
||||||
updateOutProxyIndicator();
|
updateOutProxyIndicator();
|
||||||
|
|
||||||
|
ui.localPort->blockSignals(false);
|
||||||
|
ui.extPort->blockSignals(false);
|
||||||
|
ui.localAddress->blockSignals(false);
|
||||||
|
ui.extAddress->blockSignals(false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ServerPage::toggleAutoIncludeFriends(bool b)
|
void ServerPage::toggleAutoIncludeFriends(bool b)
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>1220</width>
|
<width>1220</width>
|
||||||
<height>884</height>
|
<height>896</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="ServerPageVLayout">
|
<layout class="QVBoxLayout" name="ServerPageVLayout">
|
||||||
|
@ -26,7 +26,7 @@
|
||||||
<item>
|
<item>
|
||||||
<widget class="QTabWidget" name="tabWidget">
|
<widget class="QTabWidget" name="tabWidget">
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
<number>2</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="tabNetConf">
|
<widget class="QWidget" name="tabNetConf">
|
||||||
<attribute name="title">
|
<attribute name="title">
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue