From 5b35308f815ce8a85bb9756094aac3ae2292eabc Mon Sep 17 00:00:00 2001 From: defnax Date: Mon, 23 Nov 2009 20:46:03 +0000 Subject: [PATCH] clean up, removed not needed old sources git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1844 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/RetroShare.pro | 13 - retroshare-gui/src/gui/TurtleSearchDialog.h | 133 -- retroshare-gui/src/gui/TurtleSearchDialog.ui | 1163 ------------------ 3 files changed, 1309 deletions(-) delete mode 100644 retroshare-gui/src/gui/TurtleSearchDialog.h delete mode 100644 retroshare-gui/src/gui/TurtleSearchDialog.ui diff --git a/retroshare-gui/src/RetroShare.pro b/retroshare-gui/src/RetroShare.pro index ce29119ba..2c32e5a37 100644 --- a/retroshare-gui/src/RetroShare.pro +++ b/retroshare-gui/src/RetroShare.pro @@ -494,19 +494,6 @@ TRANSLATIONS += \ lang/retroshare_zh_CN.ts \ lang/retroshare_zh_TW.ts -# To compile for turtle hopping. I'm using this flag to avoid conflict while developping. -# Just do a -# qmake CONFIG=turtle - -turtle { - SOURCES += gui/TurtleSearchDialog.cpp - HEADERS += rsiface/rsturtle.h gui/TurtleSearchDialog.h - FORMS += gui/TurtleSearchDialog.ui - DEFINES *= TURTLE_HOPPING - DEFINES *= RS_RELEASE_VERSION -} - - # Shifted Qt4.4 dependancies to here. # qmake CONFIG=pluginmgr diff --git a/retroshare-gui/src/gui/TurtleSearchDialog.h b/retroshare-gui/src/gui/TurtleSearchDialog.h deleted file mode 100644 index 4b5405659..000000000 --- a/retroshare-gui/src/gui/TurtleSearchDialog.h +++ /dev/null @@ -1,133 +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 _TURTLESEARCHDIALOG_H -#define _TURTLESEARCHDIALOG_H - -#include -#include - -#include -#include - -//#include - -#include -#include "mainpage.h" -#include "ui_TurtleSearchDialog.h" -#include "advsearch/advancedsearchdialog.h" -#include "Preferences/rsharesettings.h" - -class FileDetail; - -class TurtleSearchDialog : public MainPage -{ - Q_OBJECT - - public: - /** Default Constructor */ - TurtleSearchDialog(QWidget *parent = 0); - /** Default Destructor */ - - - public slots: - void updateFiles(qulonglong request_id,TurtleFileInfo file) ; - - private slots: - - /** Create the context popup menu and it's submenus */ - void searchtableWidgetCostumPopupMenu( QPoint point ); - void searchtableWidget2CostumPopupMenu( QPoint point ); - - void download(); - - void broadcastonchannel(); - - void recommendtofriends(); - - - - void searchRemove(); - - void searchRemoveAll(); - - void searchKeywords(); - - /** management of the adv search dialog object when switching search modes */ - void toggleAdvancedSearchDialog(bool); - void hideEvent(QHideEvent * event); - - /** raises (and if necessary instantiates) the advanced search dialog */ - void showAdvSearchDialog(bool=true); - - /** perform the advanced search */ - void advancedSearch(Expression*); - - void selectSearchResults(); - - private: - /** render the results to the tree widget display */ - void insertFile(const std::string& txt,qulonglong search_id, const TurtleFileInfo& file); - - /** the advanced search dialog instance */ - AdvancedSearchDialog * advSearchDialog; - - /** Define the popup menus for the Context menu */ - QMenu* contextMnu; - - QMenu* contextMnu2; - - /** Defines the actions for the context menu */ - QAction* downloadAct; - QAction* broadcastonchannelAct; - QAction* recommendtofriendsAct; - - QAction* searchRemoveAct; - QAction* searchRemoveAllAct; - - /** Contains the mapping of filetype combobox to filetype extensions */ - static const int FILETYPE_IDX_ANY; - static const int FILETYPE_IDX_ARCHIVE; - static const int FILETYPE_IDX_AUDIO; - static const int FILETYPE_IDX_CDIMAGE; - static const int FILETYPE_IDX_DOCUMENT; - static const int FILETYPE_IDX_PICTURE; - static const int FILETYPE_IDX_PROGRAM; - static const int FILETYPE_IDX_VIDEO; - - - static QMap * FileTypeExtensionMap; - static bool initialised; - void initialiseFileTypeMappings(); - - /**** - QTreeWidget *searchtableWidget; - QTreeWidget *searchtablewidget2; - ****/ - - int nextSearchId; - - /** Qt Designer generated object */ - Ui::TurtleSearchDialog ui; -}; - -#endif - diff --git a/retroshare-gui/src/gui/TurtleSearchDialog.ui b/retroshare-gui/src/gui/TurtleSearchDialog.ui deleted file mode 100644 index 2b850bf6f..000000000 --- a/retroshare-gui/src/gui/TurtleSearchDialog.ui +++ /dev/null @@ -1,1163 +0,0 @@ - - TurtleSearchDialog - - - - 0 - 0 - 661 - 289 - - - - - 1 - 1 - - - - - - - - - 0 - 0 - 0 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 104 - 104 - 104 - - - - - - - 139 - 139 - 139 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 128 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 231 - 231 - 231 - - - - - - - - - 0 - 0 - 0 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 104 - 104 - 104 - - - - - - - 139 - 139 - 139 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 192 - 192 - 192 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 231 - 231 - 231 - - - - - - - - - 104 - 104 - 104 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 104 - 104 - 104 - - - - - - - 139 - 139 - 139 - - - - - - - 104 - 104 - 104 - - - - - - - 255 - 255 - 255 - - - - - - - 104 - 104 - 104 - - - - - - - 240 - 240 - 240 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 128 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 231 - 231 - 231 - - - - - - - - - Arial - 8 - 50 - false - false - false - false - - - - Qt::NoContextMenu - - - - 6 - - - 0 - - - 6 - - - 0 - - - 1 - - - 0 - - - - - 0 - - - 0 - - - - - 6 - - - 0 - - - - - 6 - - - 5 - - - - - false - - - - 0 - 0 - - - - - 34 - 34 - - - - - 34 - 34 - - - - Toggle advanced searching on and off. - - - - - - - :/images/advsearch_24x24.png:/images/advsearch_24x24.png - - - - 24 - 24 - - - - true - - - - - - - Qt::Vertical - - - - 20 - 0 - - - - - - - - - - - 255 - 0 - - - - - 390 - 24 - - - - QFrame::NoFrame - - - QFrame::Raised - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - QFrame::NoFrame - - - QFrame::Raised - - - - 0 - - - 0 - - - - - 6 - - - 0 - - - - - QFrame::NoFrame - - - QFrame::Plain - - - <h3>Simple Search:</h3> - - - - - - - Qt::Horizontal - - - - 10 - 20 - - - - - - - - - 0 - 0 - - - - Keywords - - - - - - - - 3 - 0 - - - - - 558 - 16777215 - - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 16 - 32 - - - - - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Format</p></body></html> - - - - - - - - Any - - - - :/images/FileTypeAny.png:/images/FileTypeAny.png - - - - - Archive - - - - :/images/FileTypeArchive.png:/images/FileTypeArchive.png - - - - - Audio - - - - :/images/FileTypeAudio.png:/images/FileTypeAudio.png - - - - - CD-Image - - - - :/images/FileTypeCDImage.png:/images/FileTypeCDImage.png - - - - - Document - - - - :/images/FileTypeDocument.png:/images/FileTypeDocument.png - - - - - Picture - - - - :/images/FileTypePicture.png:/images/FileTypePicture.png - - - - - Program - - - - :/images/FileTypeProgram.png:/images/FileTypeProgram.png - - - - - Video - - - - :/images/FileTypeVideo.png:/images/FileTypeVideo.png - - - - - - - - Qt::Horizontal - - - - 16 - 20 - - - - - - - - - 34 - 34 - - - - - 34 - 34 - - - - Perform simple search - - - - - - - :/images/find.png:/images/find.png - - - - 24 - 24 - - - - - - - - - - - - - true - - - - 0 - 0 - - - - QFrame::NoFrame - - - QFrame::Raised - - - - 0 - - - 0 - - - - - 6 - - - 0 - - - - - <h3>Advanced Search:</h3> - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 50 - 20 - - - - - - - - true - - - - 0 - 0 - - - - Show Advanced Search Tool - - - - - - - - - - - - - - - 6 - - - 5 - - - - - - 0 - 0 - - - - - 34 - 34 - - - - - 34 - 34 - - - - Download - - - - - - - :/images/down_24x24.png:/images/down_24x24.png - - - - 24 - 24 - - - - - - - - Qt::Vertical - - - - 20 - 0 - - - - - - - - - - - - - 0 - 1 - - - - Qt::Horizontal - - - - - 1 - 0 - - - - Qt::CustomContextMenu - - - true - - - QAbstractItemView::DragOnly - - - true - - - - - - - - - Filename - - - - - Size - - - - - Sources - - - - - Type - - - - - Hash - - - - - - - 0 - 1 - - - - - 0 - 0 - - - - - 0 - 0 - - - - true - - - Qt::CustomContextMenu - - - true - - - - KeyWords - - - - - Results - - - - - Search Id - - - - - - - - - - - - SearchTreeWidget - QTreeWidget -
gui/SearchTreeWidget.h
- - - - - - - - toggleAdvancedSearchBtn - toggled(bool) - SimpleSearchPanel - setHidden(bool) - - - 29 - 35 - - - 72 - 43 - - - - - toggleAdvancedSearchBtn - toggled(bool) - AdvancedSearchPanel - setVisible(bool) - - - 28 - 29 - - - 80 - 64 - - - - -