Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #686 from csoler/v0.6-ImprovedGUI

Browse Source 
V0.6 improved gui
This commit is contained in:
csoler 2017-02-15 22:04:15 +01:00 committed by GitHub
commit 6cc9468696
10 changed files with 423 additions and 484 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
retroshare-gui/src/gui/settings/AppearancePage.cpp
View File

@ -86,7 +86,7 @@ AppearancePage::AppearancePage(QWidget * parent, Qt::WindowFlags flags)
} }
connect(ui.cmboTollButtonsSize, SIGNAL(currentIndexChanged(int)), this, SLOT(updateCmboToolButtonSize() )); connect(ui.cmboTollButtonsSize, SIGNAL(currentIndexChanged(int)), this, SLOT(updateCmboToolButtonSize() ));
connect(ui.cmboListItemSize, SIGNAL(currentIndexChanged(int)), this, SLOT(updateCmboListItemSize() )); // connect(ui.cmboListItemSize, SIGNAL(currentIndexChanged(int)), this, SLOT(updateCmboListItemSize() ));
connect(ui.cmboTollButtonsStyle, SIGNAL(currentIndexChanged(int)), this, SLOT(updateCmboToolButtonStyle())); connect(ui.cmboTollButtonsStyle, SIGNAL(currentIndexChanged(int)), this, SLOT(updateCmboToolButtonStyle()));
connect(ui.cmboLanguage, SIGNAL(currentIndexChanged(int)), this, SLOT(updateLanguageCode() )); connect(ui.cmboLanguage, SIGNAL(currentIndexChanged(int)), this, SLOT(updateLanguageCode() ));
connect(ui.cmboStyle, SIGNAL(currentIndexChanged(int)), this, SLOT(updateInterfaceStyle() )); connect(ui.cmboStyle, SIGNAL(currentIndexChanged(int)), this, SLOT(updateInterfaceStyle() ));
@ -94,7 +94,7 @@ AppearancePage::AppearancePage(QWidget * parent, Qt::WindowFlags flags)
connect(ui.checkBoxDisableSysTrayToolTip, SIGNAL(toggled(bool)), this, SLOT(updateStatusToolTip() )); connect(ui.checkBoxDisableSysTrayToolTip, SIGNAL(toggled(bool)), this, SLOT(updateStatusToolTip() ));
connect(ui.mainPageButtonType_CB, SIGNAL(currentIndexChanged(int)), this, SLOT(updateRbtPageOnToolBar() )); connect(ui.mainPageButtonType_CB, SIGNAL(currentIndexChanged(int)), this, SLOT(updateRbtPageOnToolBar() ));
connect(ui.menuItemsButtonType_CB, SIGNAL(currentIndexChanged(int)), this, SLOT(updateActionButtonLoc() )); // connect(ui.menuItemsButtonType_CB, SIGNAL(currentIndexChanged(int)), this, SLOT(updateActionButtonLoc() ));
} }
void AppearancePage::switch_status_grpStatus(bool b) { switch_status(MainWindow::StatusGrpStatus ,"ShowStatusBar", b) ; } void AppearancePage::switch_status_grpStatus(bool b) { switch_status(MainWindow::StatusGrpStatus ,"ShowStatusBar", b) ; }
@ -133,11 +133,7 @@ void AppearancePage::updateSheetName() { Settings->setSheetName(ui.cmboSt
void AppearancePage::updateRbtPageOnToolBar() void AppearancePage::updateRbtPageOnToolBar()
{ {
Settings->setPageButtonLoc(!ui.mainPageButtonType_CB->currentIndex()); Settings->setPageButtonLoc(!ui.mainPageButtonType_CB->currentIndex());
NotifyQt::getInstance()->notifySettingsChanged(); Settings->setActionButtonLoc(!ui.mainPageButtonType_CB->currentIndex());
}
void AppearancePage::updateActionButtonLoc()
{
Settings->setActionButtonLoc(!ui.menuItemsButtonType_CB->currentIndex());
NotifyQt::getInstance()->notifySettingsChanged(); NotifyQt::getInstance()->notifySettingsChanged();
} }
void AppearancePage::updateStatusToolTip() { MainWindow::getInstance()->toggleStatusToolTip(ui.checkBoxDisableSysTrayToolTip->isChecked()); } void AppearancePage::updateStatusToolTip() { MainWindow::getInstance()->toggleStatusToolTip(ui.checkBoxDisableSysTrayToolTip->isChecked()); }
@ -168,50 +164,56 @@ void AppearancePage::updateCmboToolButtonSize()
{ {
case 0: case 0:
Settings->setToolButtonSize(8); Settings->setToolButtonSize(8);
break;
case 1:
Settings->setToolButtonSize(16);
break;
case 2:
default:
Settings->setToolButtonSize(24);
break;
case 3:
Settings->setToolButtonSize(32);
break;
case 4:
Settings->setToolButtonSize(64);
break;
case 5:
Settings->setToolButtonSize(128);
}
NotifyQt::getInstance()->notifySettingsChanged();
}
void AppearancePage::updateCmboListItemSize()
{
switch (ui.cmboListItemSize->currentIndex())
{
case 0:
Settings->setListItemIconSize(8); Settings->setListItemIconSize(8);
break; break;
case 1: case 1:
Settings->setToolButtonSize(16);
Settings->setListItemIconSize(16); Settings->setListItemIconSize(16);
break; break;
case 2: case 2:
default: default:
Settings->setToolButtonSize(24);
Settings->setListItemIconSize(24); Settings->setListItemIconSize(24);
break; break;
case 3: case 3:
Settings->setToolButtonSize(32);
Settings->setListItemIconSize(32); Settings->setListItemIconSize(32);
break; break;
case 4: case 4:
Settings->setListItemIconSize(64); Settings->setToolButtonSize(64);
Settings->setListItemIconSize(64);
break; break;
case 5: case 5:
Settings->setListItemIconSize(128); Settings->setToolButtonSize(128);
Settings->setListItemIconSize(128);
} }
NotifyQt::getInstance()->notifySettingsChanged(); NotifyQt::getInstance()->notifySettingsChanged();
} }
// void AppearancePage::updateCmboListItemSize()
// {
// switch (ui.cmboListItemSize->currentIndex())
// {
// case 0:
// Settings->setListItemIconSize(8);
// break;
// case 1:
// Settings->setListItemIconSize(16);
// break;
// case 2:
// default:
// Settings->setListItemIconSize(24);
// break;
// case 3:
// Settings->setListItemIconSize(32);
// break;
// case 4:
// Settings->setListItemIconSize(64);
// break;
// case 5:
// Settings->setListItemIconSize(128);
// }
// NotifyQt::getInstance()->notifySettingsChanged();
// }
void AppearancePage::updateStyle() { Rshare::setStyle(ui.cmboStyle->currentText()); } void AppearancePage::updateStyle() { Rshare::setStyle(ui.cmboStyle->currentText()); }
@ -232,7 +234,7 @@ void AppearancePage::load()
ui.cmboStyleSheet->setCurrentIndex(index); ui.cmboStyleSheet->setCurrentIndex(index);
ui.mainPageButtonType_CB->setCurrentIndex(!Settings->getPageButtonLoc()); ui.mainPageButtonType_CB->setCurrentIndex(!Settings->getPageButtonLoc());
ui.menuItemsButtonType_CB->setCurrentIndex(!Settings->getActionButtonLoc()); // ui.menuItemsButtonType_CB->setCurrentIndex(!Settings->getActionButtonLoc());
switch (Settings->getToolButtonStyle()) switch (Settings->getToolButtonStyle())
{ {
@ -270,27 +272,27 @@ void AppearancePage::load()
case 128: case 128:
ui.cmboTollButtonsSize->setCurrentIndex(5); ui.cmboTollButtonsSize->setCurrentIndex(5);
} }
switch (Settings->getListItemIconSize()) // switch (Settings->getListItemIconSize())
{ // {
case 8: // case 8:
ui.cmboListItemSize->setCurrentIndex(0); // ui.cmboListItemSize->setCurrentIndex(0);
break; // break;
case 16: // case 16:
ui.cmboListItemSize->setCurrentIndex(1); // ui.cmboListItemSize->setCurrentIndex(1);
break; // break;
case 24: // case 24:
default: // default:
ui.cmboListItemSize->setCurrentIndex(2); // ui.cmboListItemSize->setCurrentIndex(2);
break; // break;
case 32: // case 32:
ui.cmboListItemSize->setCurrentIndex(3); // ui.cmboListItemSize->setCurrentIndex(3);
break; // break;
case 64: // case 64:
ui.cmboListItemSize->setCurrentIndex(4); // ui.cmboListItemSize->setCurrentIndex(4);
break; // break;
case 128: // case 128:
ui.cmboListItemSize->setCurrentIndex(5); // ui.cmboListItemSize->setCurrentIndex(5);
} // }
ui.grpStatus->setChecked(Settings->valueFromGroup("StatusBar", "ShowStatusBar", QVariant(true)).toBool()); ui.grpStatus->setChecked(Settings->valueFromGroup("StatusBar", "ShowStatusBar", QVariant(true)).toBool());
ui.checkBoxStatusCompactMode->setChecked(Settings->valueFromGroup("StatusBar", "CompactMode", QVariant(false)).toBool()); ui.checkBoxStatusCompactMode->setChecked(Settings->valueFromGroup("StatusBar", "CompactMode", QVariant(false)).toBool());

4
retroshare-gui/src/gui/settings/AppearancePage.h
View File

@ -62,12 +62,12 @@ private slots:
void updateInterfaceStyle() ; void updateInterfaceStyle() ;
void updateSheetName() ; void updateSheetName() ;
void updateRbtPageOnToolBar(); void updateRbtPageOnToolBar();
void updateActionButtonLoc() ; // void updateActionButtonLoc() ;
void updateStatusToolTip() ; void updateStatusToolTip() ;
void updateCmboToolButtonStyle(); void updateCmboToolButtonStyle();
void updateCmboToolButtonSize(); void updateCmboToolButtonSize();
void updateCmboListItemSize(); // void updateCmboListItemSize();
void updateStyle() ; void updateStyle() ;
private: private:

87
retroshare-gui/src/gui/settings/AppearancePage.ui
View File

@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1160</width> <width>1170</width>
<height>897</height> <height>897</height>
</rect> </rect>
</property> </property>
@ -237,44 +237,6 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="labelActionToolBar">
<property name="text">
<string>Menu items:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="menuItemsButtonType_CB">
<item>
<property name="text">
<string>Buttons</string>
</property>
</item>
<item>
<property name="text">
<string>Item list</string>
</property>
</item>
</widget>
</item>
<item>
<spacer name="frameActionHSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>300</width>
<height>16</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item> <item>
<widget class="QFrame" name="frameToolListStyle"> <widget class="QFrame" name="frameToolListStyle">
<property name="sizePolicy"> <property name="sizePolicy">
@ -324,19 +286,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1">
<widget class="QLabel" name="labelListItemStyle">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Choose the style of List Items.</string>
</property>
</widget>
</item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QComboBox" name="cmboTollButtonsSize"> <widget class="QComboBox" name="cmboTollButtonsSize">
<item> <item>
@ -371,40 +320,6 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="1" column="1">
<widget class="QComboBox" name="cmboListItemSize">
<item>
<property name="text">
<string>Icon Size = 8x8</string>
</property>
</item>
<item>
<property name="text">
<string>Icon Size = 16x16</string>
</property>
</item>
<item>
<property name="text">
<string>Icon Size = 24x24</string>
</property>
</item>
<item>
<property name="text">
<string>Icon Size = 32x32</string>
</property>
</item>
<item>
<property name="text">
<string>Icon Size = 64x64</string>
</property>
</item>
<item>
<property name="text">
<string>Icon Size = 128x128</string>
</property>
</item>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>

109
retroshare-gui/src/gui/settings/ChatPage.cpp
View File

@ -45,12 +45,11 @@
#define IMAGE_CHAT_DELETE ":/images/deletemail24.png" #define IMAGE_CHAT_DELETE ":/images/deletemail24.png"
#define IMAGE_CHAT_COPY ":/images/copyrslink.png" #define IMAGE_CHAT_COPY ":/images/copyrslink.png"
static QString loadStyleInfo(ChatStyle::enumStyleType type, QListWidget *listWidget, QComboBox *comboBox, QString &styleVariant) static QString loadStyleInfo(ChatStyle::enumStyleType type, QComboBox *style_CB, QComboBox *comboBox, QString &styleVariant)
{ {
QList<ChatStyleInfo> styles; QList<ChatStyleInfo> styles;
QList<ChatStyleInfo>::iterator style; QList<ChatStyleInfo>::iterator style;
QListWidgetItem *item; int activeItem = 0;
QListWidgetItem *activeItem = NULL;
QString stylePath; QString stylePath;
@ -69,17 +68,22 @@ static QString loadStyleInfo(ChatStyle::enumStyleType type, QListWidget *listWid
} }
ChatStyle::getAvailableStyles(type, styles); ChatStyle::getAvailableStyles(type, styles);
for (style = styles.begin(); style != styles.end(); ++style) {
item = new QListWidgetItem(style->styleName); while(style_CB->count())
item->setData(Qt::UserRole, qVariantFromValue(*style)); style_CB->removeItem(0) ;
listWidget->addItem(item);
int n=0;
for (style = styles.begin(); style != styles.end(); ++style,++n)
{
style_CB->insertItem(n,style->styleName);
style_CB->setItemData(n, qVariantFromValue(*style),Qt::UserRole);
if (style->stylePath == stylePath) { if (style->stylePath == stylePath) {
activeItem = item; activeItem = n;
} }
} }
listWidget->setCurrentItem(activeItem); style_CB->setCurrentIndex(activeItem);
/* now the combobox should be filled */ /* now the combobox should be filled */
@ -165,40 +169,31 @@ void ChatPage::updateHistoryParams()
void ChatPage::updatePublicStyle() void ChatPage::updatePublicStyle()
{ {
ChatStyleInfo info; ChatStyleInfo info = ui.publicStyle->itemData(ui.historyStyle->currentIndex(),Qt::UserRole).value<ChatStyleInfo>();
QListWidgetItem *item = ui.publicList->currentItem();
if (item) { if (publicStylePath != info.stylePath || publicStyleVariant != ui.publicComboBoxVariant->currentText()) {
info = item->data(Qt::UserRole).value<ChatStyleInfo>(); Settings->setPublicChatStyle(info.stylePath, ui.publicComboBoxVariant->currentText());
if (publicStylePath != info.stylePath || publicStyleVariant != ui.publicComboBoxVariant->currentText()) { NotifyQt::getInstance()->notifyChatStyleChanged(ChatStyle::TYPE_PUBLIC);
Settings->setPublicChatStyle(info.stylePath, ui.publicComboBoxVariant->currentText());
NotifyQt::getInstance()->notifyChatStyleChanged(ChatStyle::TYPE_PUBLIC);
}
} }
} }
void ChatPage::updatePrivateStyle() void ChatPage::updatePrivateStyle()
{ {
ChatStyleInfo info; ChatStyleInfo info = ui.privateStyle->itemData(ui.historyStyle->currentIndex(),Qt::UserRole).value<ChatStyleInfo>();
QListWidgetItem *item = ui.privateList->currentItem();
if (item) { if (privateStylePath != info.stylePath || privateStyleVariant != ui.privateComboBoxVariant->currentText()) {
info = item->data(Qt::UserRole).value<ChatStyleInfo>(); Settings->setPrivateChatStyle(info.stylePath, ui.privateComboBoxVariant->currentText());
if (privateStylePath != info.stylePath || privateStyleVariant != ui.privateComboBoxVariant->currentText()) { NotifyQt::getInstance()->notifyChatStyleChanged(ChatStyle::TYPE_PRIVATE);
Settings->setPrivateChatStyle(info.stylePath, ui.privateComboBoxVariant->currentText());
NotifyQt::getInstance()->notifyChatStyleChanged(ChatStyle::TYPE_PRIVATE);
}
} }
} }
void ChatPage::updateHistoryStyle() void ChatPage::updateHistoryStyle()
{ {
ChatStyleInfo info; ChatStyleInfo info = ui.historyStyle->itemData(ui.historyStyle->currentIndex(),Qt::UserRole).value<ChatStyleInfo>();
QListWidgetItem *item = ui.historyList->currentItem();
if (item) { if (historyStylePath != info.stylePath || historyStyleVariant != ui.historyComboBoxVariant->currentText()) {
info = item->data(Qt::UserRole).value<ChatStyleInfo>(); Settings->setHistoryChatStyle(info.stylePath, ui.historyComboBoxVariant->currentText());
if (historyStylePath != info.stylePath || historyStyleVariant != ui.historyComboBoxVariant->currentText()) { NotifyQt::getInstance()->notifyChatStyleChanged(ChatStyle::TYPE_HISTORY);
Settings->setHistoryChatStyle(info.stylePath, ui.historyComboBoxVariant->currentText());
NotifyQt::getInstance()->notifyChatStyleChanged(ChatStyle::TYPE_HISTORY);
}
} }
} }
@ -251,13 +246,13 @@ ChatPage::ChatPage(QWidget * parent, Qt::WindowFlags flags)
connect(ui.privateChatSaveCount, SIGNAL(valueChanged(int)), this, SLOT(updateHistoryParams())); connect(ui.privateChatSaveCount, SIGNAL(valueChanged(int)), this, SLOT(updateHistoryParams()));
connect(ui.lobbyChatSaveCount, SIGNAL(valueChanged(int)), this, SLOT(updateHistoryParams())); connect(ui.lobbyChatSaveCount, SIGNAL(valueChanged(int)), this, SLOT(updateHistoryParams()));
connect(ui.publicList, SIGNAL(currentRowChanged(int)), this, SLOT(updatePublicStyle())) ; connect(ui.publicStyle, SIGNAL(currentIndexChanged(int)), this, SLOT(updatePublicStyle())) ;
connect(ui.publicComboBoxVariant, SIGNAL(currentIndexChanged(int)), this, SLOT(updatePublicStyle())) ; connect(ui.publicComboBoxVariant, SIGNAL(currentIndexChanged(int)), this, SLOT(updatePublicStyle())) ;
connect(ui.privateList, SIGNAL(currentRowChanged(int)), this, SLOT(updatePrivateStyle())) ; connect(ui.privateStyle, SIGNAL(currentIndexChanged(int)), this, SLOT(updatePrivateStyle())) ;
connect(ui.privateComboBoxVariant, SIGNAL(currentIndexChanged(int)), this, SLOT(updatePrivateStyle())) ; connect(ui.privateComboBoxVariant, SIGNAL(currentIndexChanged(int)), this, SLOT(updatePrivateStyle())) ;
connect(ui.historyList, SIGNAL(currentRowChanged(int)), this, SLOT(updateHistoryStyle())) ; connect(ui.historyStyle, SIGNAL(currentIndexChanged(int)), this, SLOT(updateHistoryStyle())) ;
connect(ui.historyComboBoxVariant, SIGNAL(currentIndexChanged(int)), this, SLOT(updateHistoryStyle())) ; connect(ui.historyComboBoxVariant, SIGNAL(currentIndexChanged(int)), this, SLOT(updateHistoryStyle())) ;
connect(ui.max_storage_period, SIGNAL(valueChanged(int)), this, SLOT(updateHistoryStorage())) ; connect(ui.max_storage_period, SIGNAL(valueChanged(int)), this, SLOT(updateHistoryStorage())) ;
@ -268,6 +263,10 @@ ChatPage::ChatPage(QWidget * parent, Qt::WindowFlags flags)
connect(ui.chat_Blink, SIGNAL(toggled(bool)), this, SLOT(updateChatFlags())); connect(ui.chat_Blink, SIGNAL(toggled(bool)), this, SLOT(updateChatFlags()));
connect(ui.chatLobby_Blink, SIGNAL(toggled(bool)), this, SLOT(updateChatLobbyFlags())); connect(ui.chatLobby_Blink, SIGNAL(toggled(bool)), this, SLOT(updateChatLobbyFlags()));
connect(ui.publicStyle, SIGNAL(currentIndexChanged(int)), this,SLOT(on_publicList_currentRowChanged(int)));
connect(ui.privateStyle, SIGNAL(currentIndexChanged(int)), this,SLOT(on_privateList_currentRowChanged(int)));
connect(ui.historyStyle, SIGNAL(currentIndexChanged(int)), this,SLOT(on_historyList_currentRowChanged(int)));
} }
void ChatPage::updateChatFlags() void ChatPage::updateChatFlags()
{ {
@ -359,9 +358,9 @@ ChatPage::load()
ui.max_storage_period->setValue(rsHistory->getMaxStorageDuration()/86400) ; ui.max_storage_period->setValue(rsHistory->getMaxStorageDuration()/86400) ;
/* Load styles */ /* Load styles */
publicStylePath = loadStyleInfo(ChatStyle::TYPE_PUBLIC, ui.publicList, ui.publicComboBoxVariant, publicStyleVariant); publicStylePath = loadStyleInfo(ChatStyle::TYPE_PUBLIC, ui.publicStyle, ui.publicComboBoxVariant, publicStyleVariant);
privateStylePath = loadStyleInfo(ChatStyle::TYPE_PRIVATE, ui.privateList, ui.privateComboBoxVariant, privateStyleVariant); privateStylePath = loadStyleInfo(ChatStyle::TYPE_PRIVATE, ui.privateStyle, ui.privateComboBoxVariant, privateStyleVariant);
historyStylePath = loadStyleInfo(ChatStyle::TYPE_HISTORY, ui.historyList, ui.historyComboBoxVariant, historyStyleVariant); historyStylePath = loadStyleInfo(ChatStyle::TYPE_HISTORY, ui.historyStyle, ui.historyComboBoxVariant, historyStyleVariant);
RsGxsId gxs_id ; RsGxsId gxs_id ;
rsMsgs->getDefaultIdentityForChatLobby(gxs_id) ; rsMsgs->getDefaultIdentityForChatLobby(gxs_id) ;
@ -438,23 +437,17 @@ void ChatPage::setPreviewMessages(QString &stylePath, QString styleVariant, QTex
textBrowser->append(style.formatMessage(ChatStyle::FORMATMSG_OUTGOING, tr("UserName"), timestmp, tr("/me is sending a message with /me"), 0, backgroundColor)); textBrowser->append(style.formatMessage(ChatStyle::FORMATMSG_OUTGOING, tr("UserName"), timestmp, tr("/me is sending a message with /me"), 0, backgroundColor));
} }
void ChatPage::fillPreview(QListWidget *listWidget, QComboBox *comboBox, QTextBrowser *textBrowser) void ChatPage::fillPreview(QComboBox *listWidget, QComboBox *comboBox, QTextBrowser *textBrowser)
{ {
QListWidgetItem *item = listWidget->currentItem(); ChatStyleInfo info = listWidget->itemData(listWidget->currentIndex(),Qt::UserRole).value<ChatStyleInfo>();
if (item) {
ChatStyleInfo info = item->data(Qt::UserRole).value<ChatStyleInfo>();
setPreviewMessages(info.stylePath, comboBox->currentText(), textBrowser); setPreviewMessages(info.stylePath, comboBox->currentText(), textBrowser);
} else {
textBrowser->clear();
}
} }
void ChatPage::on_publicList_currentRowChanged(int currentRow) void ChatPage::on_publicList_currentRowChanged(int currentRow)
{ {
if (currentRow != -1) { if (currentRow != -1) {
QListWidgetItem *item = ui.publicList->item(currentRow); ChatStyleInfo info = ui.publicStyle->itemData(currentRow,Qt::UserRole).value<ChatStyleInfo>();
ChatStyleInfo info = item->data(Qt::UserRole).value<ChatStyleInfo>();
QString author = info.authorName; QString author = info.authorName;
if (info.authorEmail.isEmpty() == false) { if (info.authorEmail.isEmpty() == false) {
@ -483,14 +476,13 @@ void ChatPage::on_publicList_currentRowChanged(int currentRow)
ui.publicComboBoxVariant->setDisabled(true); ui.publicComboBoxVariant->setDisabled(true);
} }
fillPreview(ui.publicList, ui.publicComboBoxVariant, ui.publicPreview); fillPreview(ui.publicStyle, ui.publicComboBoxVariant, ui.publicPreview);
} }
void ChatPage::on_privateList_currentRowChanged(int currentRow) void ChatPage::on_privateList_currentRowChanged(int currentRow)
{ {
if (currentRow != -1) { if (currentRow != -1) {
QListWidgetItem *item = ui.privateList->item(currentRow); ChatStyleInfo info = ui.privateStyle->itemData(ui.privateStyle->currentIndex(),Qt::UserRole).value<ChatStyleInfo>();
ChatStyleInfo info = item->data(Qt::UserRole).value<ChatStyleInfo>();
QString author = info.authorName; QString author = info.authorName;
if (info.authorEmail.isEmpty() == false) { if (info.authorEmail.isEmpty() == false) {
@ -519,14 +511,13 @@ void ChatPage::on_privateList_currentRowChanged(int currentRow)
ui.privateComboBoxVariant->setDisabled(true); ui.privateComboBoxVariant->setDisabled(true);
} }
fillPreview(ui.privateList, ui.privateComboBoxVariant, ui.privatePreview); fillPreview(ui.privateStyle, ui.privateComboBoxVariant, ui.privatePreview);
} }
void ChatPage::on_historyList_currentRowChanged(int currentRow) void ChatPage::on_historyList_currentRowChanged(int currentRow)
{ {
if (currentRow != -1) { if (currentRow != -1) {
QListWidgetItem *item = ui.historyList->item(currentRow); ChatStyleInfo info = ui.historyStyle->itemData(ui.historyStyle->currentIndex(),Qt::UserRole).value<ChatStyleInfo>();
ChatStyleInfo info = item->data(Qt::UserRole).value<ChatStyleInfo>();
QString author = info.authorName; QString author = info.authorName;
if (info.authorEmail.isEmpty() == false) { if (info.authorEmail.isEmpty() == false) {
@ -555,22 +546,22 @@ void ChatPage::on_historyList_currentRowChanged(int currentRow)
ui.historyComboBoxVariant->setDisabled(true); ui.historyComboBoxVariant->setDisabled(true);
} }
fillPreview(ui.historyList, ui.historyComboBoxVariant, ui.historyPreview); fillPreview(ui.historyStyle, ui.historyComboBoxVariant, ui.historyPreview);
} }
void ChatPage::on_publicComboBoxVariant_currentIndexChanged(int /*index*/) void ChatPage::on_publicComboBoxVariant_currentIndexChanged(int /*index*/)
{ {
fillPreview(ui.publicList, ui.publicComboBoxVariant, ui.publicPreview); fillPreview(ui.publicStyle, ui.publicComboBoxVariant, ui.publicPreview);
} }
void ChatPage::on_privateComboBoxVariant_currentIndexChanged(int /*index*/) void ChatPage::on_privateComboBoxVariant_currentIndexChanged(int /*index*/)
{ {
fillPreview(ui.privateList, ui.privateComboBoxVariant, ui.privatePreview); fillPreview(ui.privateStyle, ui.privateComboBoxVariant, ui.privatePreview);
} }
void ChatPage::on_historyComboBoxVariant_currentIndexChanged(int /*index*/) void ChatPage::on_historyComboBoxVariant_currentIndexChanged(int /*index*/)
{ {
fillPreview(ui.historyList, ui.historyComboBoxVariant, ui.historyPreview); fillPreview(ui.historyStyle, ui.historyComboBoxVariant, ui.historyPreview);
} }
void ChatPage::on_cbSearch_WithoutLimit_toggled(bool checked) void ChatPage::on_cbSearch_WithoutLimit_toggled(bool checked)

2
retroshare-gui/src/gui/settings/ChatPage.h
View File

@ -70,7 +70,7 @@ class ChatPage : public ConfigPage
private: private:
void setPreviewMessages(QString &stylePath, QString styleVariant, QTextBrowser *textBrowser); void setPreviewMessages(QString &stylePath, QString styleVariant, QTextBrowser *textBrowser);
void fillPreview(QListWidget *listWidget, QComboBox *comboBox, QTextBrowser *textBrowser); void fillPreview(QComboBox *listWidget, QComboBox *comboBox, QTextBrowser *textBrowser);
QFont fontTempChat; QFont fontTempChat;

437
retroshare-gui/src/gui/settings/ChatPage.ui
View File

@ -6,15 +6,15 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>635</width> <width>1216</width>
<height>600</height> <height>1107</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout"> <layout class="QGridLayout">
<item row="3" column="0"> <item row="3" column="0">
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>2</number>
</property> </property>
<widget class="QWidget" name="general"> <widget class="QWidget" name="general">
<attribute name="title"> <attribute name="title">
@ -866,109 +866,75 @@
<enum>QTabWidget::North</enum> <enum>QTabWidget::North</enum>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>2</number>
</property> </property>
<widget class="QWidget" name="publicTab"> <widget class="QWidget" name="publicTab">
<attribute name="title"> <attribute name="title">
<string>Group chat</string> <string>Group chat</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="publicTabVLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<layout class="QHBoxLayout" name="publicStyleHLayout"> <widget class="QTextBrowser" name="publicPreview">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<layout class="QVBoxLayout" name="publicStyleListVLayout"> <widget class="QLabel" name="label">
<item> <property name="text">
<widget class="QListWidget" name="publicList"> <string>Style:</string>
<property name="sizePolicy"> </property>
<sizepolicy hsizetype="Fixed" vsizetype="Preferred"> </widget>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>170</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="publicStyleVarHLayout">
<item>
<widget class="QLabel" name="publicLabelVariant">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Variant</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="publicComboBoxVariant">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item> </item>
<item> <item>
<widget class="QTextBrowser" name="publicPreview"> <widget class="QComboBox" name="publicStyle"/>
</item>
<item>
<widget class="QLabel" name="publicLabelVariant">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Variant:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="publicComboBoxVariant">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="publicInfoLayout"> <layout class="QHBoxLayout" name="publicInfoLayout">
<item>
<layout class="QVBoxLayout" name="publicLabelLayout">
<property name="sizeConstraint">
<enum>QLayout::SetFixedSize</enum>
</property>
<item>
<widget class="QLabel" name="publicLabelAuthor">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Author:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="publicLabelDescription">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Description:</string>
</property>
</widget>
</item>
</layout>
</item>
<item> <item>
<layout class="QVBoxLayout" name="publicLayout"> <layout class="QVBoxLayout" name="publicLayout">
<item> <item>
@ -999,6 +965,19 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>
@ -1007,103 +986,69 @@
<attribute name="title"> <attribute name="title">
<string>Private chat</string> <string>Private chat</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="privateTabVLayout"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<layout class="QHBoxLayout" name="privateStyleHLayout"> <widget class="QTextBrowser" name="privatePreview">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>
<layout class="QVBoxLayout" name="privateStyleListVLayout"> <widget class="QLabel" name="label_2">
<item> <property name="text">
<widget class="QListWidget" name="privateList"> <string>Style:</string>
<property name="sizePolicy"> </property>
<sizepolicy hsizetype="Fixed" vsizetype="Preferred"> </widget>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>170</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="privateStyleVarHLayout">
<item>
<widget class="QLabel" name="privateLabelVariant">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Variant</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="privateComboBoxVariant">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item> </item>
<item> <item>
<widget class="QTextBrowser" name="privatePreview"> <widget class="QComboBox" name="privateStyle"/>
</item>
<item>
<widget class="QLabel" name="privateLabelVariant">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Variant:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="privateComboBoxVariant">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="privateInfoLayout"> <layout class="QHBoxLayout" name="privateInfoLayout">
<item>
<layout class="QVBoxLayout" name="privateLabelLayout">
<property name="sizeConstraint">
<enum>QLayout::SetFixedSize</enum>
</property>
<item>
<widget class="QLabel" name="privateLabelAuthor">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Author:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="privateLabelDescription">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Description:</string>
</property>
</widget>
</item>
</layout>
</item>
<item> <item>
<layout class="QVBoxLayout" name="privateLayout"> <layout class="QVBoxLayout" name="privateLayout">
<item> <item>
@ -1134,6 +1079,19 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>
@ -1142,103 +1100,69 @@
<attribute name="title"> <attribute name="title">
<string>History</string> <string>History</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="historyTabVLayout"> <layout class="QVBoxLayout" name="verticalLayout_3">
<item> <item>
<layout class="QHBoxLayout" name="historyStyleHLayout"> <widget class="QTextBrowser" name="historyPreview">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item> <item>
<layout class="QVBoxLayout" name="historyStyleListVLayout"> <widget class="QLabel" name="label_3">
<item> <property name="text">
<widget class="QListWidget" name="historyList"> <string>Style:</string>
<property name="sizePolicy"> </property>
<sizepolicy hsizetype="Fixed" vsizetype="Preferred"> </widget>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>170</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="historyStyleVarHLayout">
<item>
<widget class="QLabel" name="historyLabelVariant">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Variant</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="historyComboBoxVariant">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item> </item>
<item> <item>
<widget class="QTextBrowser" name="historyPreview"> <widget class="QComboBox" name="historyStyle"/>
</item>
<item>
<widget class="QLabel" name="historyLabelVariant">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Variant:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="historyComboBoxVariant">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="historyInfoLayout"> <layout class="QHBoxLayout" name="historyInfoLayout">
<item>
<layout class="QVBoxLayout" name="historyLabelLayout">
<property name="sizeConstraint">
<enum>QLayout::SetFixedSize</enum>
</property>
<item>
<widget class="QLabel" name="historyLabelAuthor">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Author:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="historyLabelDescription">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Description:</string>
</property>
</widget>
</item>
</layout>
</item>
<item> <item>
<layout class="QVBoxLayout" name="historyLayout"> <layout class="QVBoxLayout" name="historyLayout">
<item> <item>
@ -1269,6 +1193,19 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>

49
retroshare-gui/src/gui/settings/PluginsPage.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>423</width> <width>423</width>
<height>340</height> <height>514</height>
</rect> </rect>
</property> </property>
<property name="contextMenuPolicy"> <property name="contextMenuPolicy">
@ -16,6 +16,12 @@
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<widget class="QCheckBox" name="enableAll"> <widget class="QCheckBox" name="enableAll">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string>Authorize all plugins</string> <string>Authorize all plugins</string>
</property> </property>
@ -29,6 +35,12 @@
<layout class="QVBoxLayout" name="verticalLayout_4"> <layout class="QVBoxLayout" name="verticalLayout_4">
<item> <item>
<widget class="QScrollArea" name="scrollArea"> <widget class="QScrollArea" name="scrollArea">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::NoFrame</enum> <enum>QFrame::NoFrame</enum>
</property> </property>
@ -40,7 +52,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>920</width> <width>345</width>
<height>16</height> <height>16</height>
</rect> </rect>
</property> </property>
@ -54,7 +66,16 @@
<property name="spacing"> <property name="spacing">
<number>3</number> <number>3</number>
</property> </property>
<property name="margin"> <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> <number>0</number>
</property> </property>
</layout> </layout>
@ -71,11 +92,31 @@
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QTextBrowser" name="_lookupDirectories_TB"/> <widget class="QTextBrowser" name="_lookupDirectories_TB">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
<resources/> <resources/>

57
retroshare-gui/src/gui/settings/RelayPage.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>486</width> <width>794</width>
<height>360</height> <height>546</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
@ -64,7 +64,16 @@
<string>Relay options</string> <string>Relay options</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="margin"> <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> <number>0</number>
</property> </property>
<property name="spacing"> <property name="spacing">
@ -318,25 +327,6 @@
<string>Relay Server Setup</string> <string>Relay Server Setup</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<property name="horizontalSpacing">
<number>6</number>
</property>
<property name="verticalSpacing">
<number>0</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QLineEdit" name="DhtLineEdit">
<property name="inputMask">
<string notr="true">HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH; </string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QCheckBox" name="keyOkBox"> <widget class="QCheckBox" name="keyOkBox">
<property name="enabled"> <property name="enabled">
@ -357,6 +347,16 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0">
<widget class="QLineEdit" name="DhtLineEdit">
<property name="inputMask">
<string notr="true">HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2"> <item row="1" column="0" colspan="2">
<widget class="QTreeWidget" name="serverTreeWidget"> <widget class="QTreeWidget" name="serverTreeWidget">
<column> <column>
@ -376,6 +376,19 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
<resources/> <resources/>

33
retroshare-gui/src/gui/settings/ServerPage.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>724</width> <width>1220</width>
<height>568</height> <height>884</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>0</number> <number>2</number>
</property> </property>
<widget class="QWidget" name="tabNetConf"> <widget class="QWidget" name="tabNetConf">
<attribute name="title"> <attribute name="title">
@ -506,11 +506,25 @@ behind a firewall or a VPN.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
<zorder>showDiscStatusBar</zorder> <zorder>showDiscStatusBar</zorder>
<zorder>allowIpDeterminationCB</zorder> <zorder>allowIpDeterminationCB</zorder>
<zorder>IPServersLV</zorder> <zorder>IPServersLV</zorder>
<zorder>ipAddressList</zorder> <zorder>ipAddressList</zorder>
<zorder>verticalSpacer</zorder>
</widget> </widget>
<widget class="QWidget" name="tabIPFilters"> <widget class="QWidget" name="tabIPFilters">
<attribute name="title"> <attribute name="title">
@ -765,6 +779,19 @@ behind a firewall or a VPN.</string>
</item> </item>
</layout> </layout>
</item> </item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>

17
retroshare-gui/src/gui/settings/TransferPage.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>741</width> <width>754</width>
<height>422</height> <height>512</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
@ -181,6 +181,19 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>