diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp
index ea6469052..2bc545362 100644
--- a/retroshare-gui/src/gui/chat/ChatWidget.cpp
+++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp
@@ -107,7 +107,6 @@ ChatWidget::ChatWidget(QWidget *parent) :
connect(ui->actionMoveToCursor, SIGNAL(triggered()), this, SLOT(toogle_MoveToCursor()));
connect(ui->actionSearchWithoutLimit, SIGNAL(triggered()), this, SLOT(toogle_SeachWithoutLimit()));
connect(ui->searchButton, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenuSearchButton(QPoint)));
- connect(ui->actionSearch_History, SIGNAL(triggered()), this, SLOT(searchHistory()));
notify=NULL;
ui->notifyButton->setVisible(false);
@@ -146,9 +145,6 @@ ChatWidget::ChatWidget(QWidget *parent) :
ui->infoFrame->setVisible(false);
ui->statusMessageLabel->hide();
- ui->actionSearch_History->setChecked(Settings->getChatSearchShowBarByDefault());
- searchHistory();
-
setAcceptDrops(true);
ui->chatTextEdit->setAcceptDrops(false);
ui->hashBox->setDropWidget(this);
@@ -165,7 +161,6 @@ ChatWidget::ChatWidget(QWidget *parent) :
menu->addAction(ui->actionDeleteChatHistory);
menu->addAction(ui->actionSaveChatHistory);
menu->addAction(ui->actionMessageHistory);
- menu->addAction(ui->actionSearch_History);
ui->pushtoolsButton->setMenu(menu);
ui->textBrowser->installEventFilter(this);
@@ -235,7 +230,6 @@ void ChatWidget::addTitleBarWidget(QWidget *w)
void ChatWidget::hideChatText(bool hidden)
{
ui->chatTextFrame->setHidden(hidden); ;
- ui->searchFrame->setVisible(ui->actionSearch_History->isChecked() && !hidden); ;
}
RSButtonOnText* ChatWidget::getNewButtonOnTextBrowser()
@@ -316,7 +310,6 @@ void ChatWidget::init(const ChatId &chat_id, const QString &title)
messageCount = Settings->getPublicChatHistoryCount();
ui->titleBarFrame->setVisible(false);
- ui->actionSearch_History->setVisible(false);
}
if (rsHistory->getEnable(hist_chat_type))
@@ -1427,16 +1420,6 @@ void ChatWidget::messageHistory()
imBrowser.exec();
}
-void ChatWidget::searchHistory()
-{
- if(ui->actionSearch_History->isChecked()){
- ui->searchFrame->show();
- }else {
- ui->searchFrame->hide();
- }
-
-}
-
void ChatWidget::addExtraFile()
{
QStringList files;
diff --git a/retroshare-gui/src/gui/chat/ChatWidget.h b/retroshare-gui/src/gui/chat/ChatWidget.h
index 1aa2d9e4a..af4dab505 100644
--- a/retroshare-gui/src/gui/chat/ChatWidget.h
+++ b/retroshare-gui/src/gui/chat/ChatWidget.h
@@ -132,8 +132,6 @@ private slots:
void deleteChatHistory();
void messageHistory();
void resetStatusBar() ;
- void searchHistory();
-
signals:
void infoChanged(ChatWidget*);
diff --git a/retroshare-gui/src/gui/chat/ChatWidget.ui b/retroshare-gui/src/gui/chat/ChatWidget.ui
index 5ccfacae3..4ac16a057 100644
--- a/retroshare-gui/src/gui/chat/ChatWidget.ui
+++ b/retroshare-gui/src/gui/chat/ChatWidget.ui
@@ -569,6 +569,146 @@ border-image: url(:/images/closepressed.png)
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 28
+ 28
+
+
+
+
+ 28
+ 28
+
+
+
+ Qt::NoFocus
+
+
+
+ :/images/highlight.png:/images/highlight.png
+
+
+
+ 24
+ 24
+
+
+
+ true
+
+
+ true
+
+
+
+ -
+
+
+ -
+
+
+
+ 14
+ 28
+
+
+
+
+ 14
+ 28
+
+
+
+ Qt::NoFocus
+
+
+
+ :/images/arrow-left.png:/images/arrow-left.png
+
+
+ true
+
+
+
+ -
+
+
+
+ 14
+ 28
+
+
+
+
+ 14
+ 28
+
+
+
+ Qt::NoFocus
+
+
+
+ :/images/arrow-right.png:/images/arrow-right.png
+
+
+ true
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 28
+ 28
+
+
+
+
+ 28
+ 28
+
+
+
+ Qt::NoFocus
+
+
+ Qt::CustomContextMenu
+
+
+
+ :/images/find.png:/images/find.png
+
+
+
+ 24
+ 24
+
+
+
+ true
+
+
+ true
+
+
+
-
@@ -738,170 +878,6 @@ border-image: url(:/images/closepressed.png)
- -
-
-
- QFrame::StyledPanel
-
-
- QFrame::Raised
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 28
- 28
-
-
-
-
- 28
- 28
-
-
-
- Qt::NoFocus
-
-
- Qt::CustomContextMenu
-
-
-
- :/images/find.png:/images/find.png
-
-
-
- 24
- 24
-
-
-
- true
-
-
- true
-
-
-
- -
-
-
-
- 14
- 28
-
-
-
-
- 14
- 28
-
-
-
- Qt::NoFocus
-
-
-
- :/images/arrow-right.png:/images/arrow-right.png
-
-
- true
-
-
-
- -
-
-
- -
-
-
-
- 14
- 28
-
-
-
-
- 14
- 28
-
-
-
- Qt::NoFocus
-
-
-
- :/images/arrow-left.png:/images/arrow-left.png
-
-
- true
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 28
- 28
-
-
-
-
- 28
- 28
-
-
-
- Qt::NoFocus
-
-
-
- :/images/highlight.png:/images/highlight.png
-
-
-
- 24
- 24
-
-
-
- true
-
-
- true
-
-
-
-
-
-
@@ -1033,17 +1009,6 @@ border-image: url(:/images/closepressed.png)
Choose color
-
-
- true
-
-
- Display Search Box
-
-
- Search Box
-
-
Quote
diff --git a/retroshare-gui/src/gui/settings/ChatPage.cpp b/retroshare-gui/src/gui/settings/ChatPage.cpp
index da7168f7d..3c515be49 100644
--- a/retroshare-gui/src/gui/settings/ChatPage.cpp
+++ b/retroshare-gui/src/gui/settings/ChatPage.cpp
@@ -130,7 +130,6 @@ ChatPage::save(QString &/*errmsg*/)
Settings->setChatSendMessageWithCtrlReturn(ui.sendMessageWithCtrlReturn->isChecked());
- Settings->setChatSearchShowBarByDefault(ui.cbSearch_ShowBar->isChecked());
Settings->setChatSearchCharToStartSearch(ui.sbSearch_CharToStart->value());
Settings->setChatSearchCaseSensitively(ui.cbSearch_CaseSensitively->isChecked());
Settings->setChatSearchWholeWords(ui.cbSearch_WholeWords->isChecked());
@@ -238,7 +237,6 @@ ChatPage::load()
ui.sendMessageWithCtrlReturn->setChecked(Settings->getChatSendMessageWithCtrlReturn());
- ui.cbSearch_ShowBar->setChecked(Settings->getChatSearchShowBarByDefault());
ui.sbSearch_CharToStart->setValue(Settings->getChatSearchCharToStartSearch());
ui.cbSearch_CaseSensitively->setChecked(Settings->getChatSearchCaseSensitively());
ui.cbSearch_WholeWords->setChecked(Settings->getChatSearchWholeWords());
diff --git a/retroshare-gui/src/gui/settings/rsharesettings.cpp b/retroshare-gui/src/gui/settings/rsharesettings.cpp
index 0dfc713f9..8c7220186 100644
--- a/retroshare-gui/src/gui/settings/rsharesettings.cpp
+++ b/retroshare-gui/src/gui/settings/rsharesettings.cpp
@@ -512,16 +512,6 @@ void RshareSettings::setChatSendMessageWithCtrlReturn(bool bValue)
setValueToGroup("Chat", "SendMessageWithCtrlReturn", bValue);
}
-bool RshareSettings::getChatSearchShowBarByDefault()
-{
- return valueFromGroup("Chat", "SearchShowBarByDefault", false).toBool();
-}
-
-void RshareSettings::setChatSearchShowBarByDefault(bool bValue)
-{
- setValueToGroup("Chat", "SearchShowBarByDefault", bValue);
-}
-
void RshareSettings::setChatSearchCharToStartSearch(int iValue)
{
setValueToGroup("Chat", "SearchCharToStartSearch", iValue);
diff --git a/retroshare-gui/src/gui/settings/rsharesettings.h b/retroshare-gui/src/gui/settings/rsharesettings.h
index 52963ce92..2f344b3a9 100644
--- a/retroshare-gui/src/gui/settings/rsharesettings.h
+++ b/retroshare-gui/src/gui/settings/rsharesettings.h
@@ -209,9 +209,6 @@ public:
bool getChatSendMessageWithCtrlReturn();
void setChatSendMessageWithCtrlReturn(bool bValue);
- bool getChatSearchShowBarByDefault();
- void setChatSearchShowBarByDefault(bool bValue);
-
void setChatSearchCharToStartSearch(int iValue);
int getChatSearchCharToStartSearch();