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

* Rolled back Modifications to SearchDialog and PopupChatDialog.

Browse source 
- unable to get windows to compile with PopupChat on windows.
	- not happy with new SearchDialog. Not an improvement on old dialog + uses Qt4.4

 * updated version numbers...
 * added a couple of windows scripts.
 


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1200 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2009-05-08 23:07:08 +00:00
parent 705a51ac1f
commit 65e02ba4de
13 changed files with 779 additions and 676 deletions
Download patch file Download diff file Expand all files Collapse all files

40
retroshare-gui/src/gui/SearchDialog.cpp
View file

@ -91,26 +91,23 @@ SearchDialog::SearchDialog(QWidget *parent)
/* initialise the filetypes mapping */
if (!SearchDialog::initialised)
{
initialiseFileTypeMappings();
initialiseFileTypeMappings();
}
/* Advanced search panel specifica */
RshareSettings rsharesettings;
QString key (UI_PREF_ADVANCED_SEARCH);
bool useAdvanced = rsharesettings.value(key, QVariant(false)).toBool();
/*if (useAdvanced)
if (useAdvanced)
{
ui.toggleAdvancedSearchBtn->setChecked(true);
ui.SimpleSearchPanel->hide();
} else {
ui.AdvancedSearchPanel->hide();
}*/
}
//connect(ui.toggleAdvancedSearchBtn, SIGNAL(toggled(bool)), this, SLOT(toggleAdvancedSearchDialog(bool)));
//connect(ui.focusAdvSearchDialogBtn, SIGNAL(clicked()), this, SLOT(showAdvSearchDialog()));
connect(ui.toggleAdvancedSearchBtn, SIGNAL(clicked()), this, SLOT(showAdvSearchDialog()));
connect(ui.cloaseallsearchresultsButton, SIGNAL(clicked()), this, SLOT(searchRemoveAll()));
connect(ui.resetButton, SIGNAL(clicked()), this, SLOT(clearKeyword()));
connect(ui.toggleAdvancedSearchBtn, SIGNAL(toggled(bool)), this, SLOT(toggleAdvancedSearchDialog(bool)));
connect(ui.focusAdvSearchDialogBtn, SIGNAL(clicked()), this, SLOT(showAdvSearchDialog()));
/* End Advanced Search Panel specifics */
@ -126,8 +123,6 @@ SearchDialog::SearchDialog(QWidget *parent)
connect ( ui.searchSummaryWidget, SIGNAL( currentItemChanged ( QTreeWidgetItem *, QTreeWidgetItem * ) ),
this, SLOT( selectSearchResults( void ) ) );
connect( ui.searchResultWidget, SIGNAL( itemDoubleClicked ( QTreeWidgetItem *, int)), this, SLOT(download()));
/* hide the Tree +/- */
@ -149,8 +144,8 @@ SearchDialog::SearchDialog(QWidget *parent)
_smheader->setResizeMode (2, QHeaderView::Interactive);
_smheader->resizeSection ( 0, 80 );
_smheader->resizeSection ( 1, 60 );
_smheader->resizeSection ( 2, 30 );
_smheader->resizeSection ( 1, 75 );
_smheader->resizeSection ( 2, 75 );
ui.searchResultWidget->setColumnCount(6);
_smheader = ui.searchResultWidget->header () ;
@ -168,11 +163,11 @@ SearchDialog::SearchDialog(QWidget *parent)
// set header text aligment
QTreeWidgetItem * headerItem = ui.searchResultWidget->headerItem();
headerItem->setTextAlignment(2, Qt::AlignRight | Qt::AlignRight);
headerItem->setTextAlignment(3, Qt::AlignRight | Qt::AlignRight);
QTreeWidgetItem * headerItem = ui.searchResultWidget->headerItem();
headerItem->setTextAlignment(2, Qt::AlignRight | Qt::AlignRight);
headerItem->setTextAlignment(3, Qt::AlignRight | Qt::AlignRight);
ui.searchResultWidget->sortItems(SR_NAME_COL, Qt::AscendingOrder);
ui.searchResultWidget->sortItems(SR_NAME_COL, Qt::AscendingOrder);
@ -226,9 +221,9 @@ void SearchDialog::searchtableWidgetCostumPopupMenu( QPoint point )
contextMnu->clear();
contextMnu->addAction( downloadAct);
//contextMnu->addSeparator();
//contextMnu->addAction( broadcastonchannelAct);
//contextMnu->addAction( recommendtofriendsAct);
contextMnu->addSeparator();
contextMnu->addAction( broadcastonchannelAct);
contextMnu->addAction( recommendtofriendsAct);
}
QMouseEvent *mevent = new QMouseEvent( QEvent::MouseButtonPress, point,
@ -367,13 +362,6 @@ void SearchDialog::searchRemoveAll()
nextSearchId = 1;
}
/** clear keywords **/
void SearchDialog::clearKeyword()
{
ui.lineEdit->clear();
ui.FileTypeComboBox->setCurrentIndex(0);
}
/* *****************************************************************
Advanced search implementation
*******************************************************************/