diff --git a/retroshare-gui/src/gui/SearchDialog.cpp b/retroshare-gui/src/gui/SearchDialog.cpp index 329920c74..718024330 100644 --- a/retroshare-gui/src/gui/SearchDialog.cpp +++ b/retroshare-gui/src/gui/SearchDialog.cpp @@ -119,6 +119,7 @@ SearchDialog::SearchDialog(QWidget *parent) connect( ui.pushButtonDownload, SIGNAL( released ( void ) ), this, SLOT( download( void ) ) ); connect( ui.cloaseallsearchresultsButton, SIGNAL(clicked()), this, SLOT(searchRemoveAll())); connect( ui.resetButton, SIGNAL(clicked()), this, SLOT(clearKeyword())); + connect( ui.lineEdit, SIGNAL( textChanged(const QString &)), this, SLOT(togglereset())); //connect( ui.searchSummaryWidget, SIGNAL( itemSelectionChanged ( void ) ), this, SLOT( selectSearchResults( void ) ) ); @@ -173,7 +174,7 @@ SearchDialog::SearchDialog(QWidget *parent) ui.searchResultWidget->sortItems(SR_NAME_COL, Qt::AscendingOrder); - + ui.resetButton->hide(); /* Hide platform specific features */ #ifdef Q_WS_WIN @@ -1114,3 +1115,18 @@ void SearchDialog::sendLinkTo( ) nMsgDialog->show(); } + +void SearchDialog::togglereset() +{ + QString text = ui.lineEdit->text(); + + if (text.isEmpty()) + { + ui.resetButton->hide(); + } + else + { + ui.resetButton->show(); + } + +} diff --git a/retroshare-gui/src/gui/SearchDialog.h b/retroshare-gui/src/gui/SearchDialog.h index 3045d99c4..3e8394e93 100644 --- a/retroshare-gui/src/gui/SearchDialog.h +++ b/retroshare-gui/src/gui/SearchDialog.h @@ -85,6 +85,9 @@ private slots: void clearKeyword(); void sendLinkTo(); + + void togglereset(); + private: diff --git a/retroshare-gui/src/gui/SearchDialog.ui b/retroshare-gui/src/gui/SearchDialog.ui index bc7a7aeb5..7c0802066 100644 --- a/retroshare-gui/src/gui/SearchDialog.ui +++ b/retroshare-gui/src/gui/SearchDialog.ui @@ -6,8 +6,8 @@ 0 0 - 659 - 336 + 651 + 340 @@ -500,7 +500,87 @@ Qt::NoContextMenu - QToolButton, QPushButton, QComboBox { + + + + + 4 + + + 0 + + + + + + 16777215 + 32 + + + + QFrame#frame{ +background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, +stop:0 #FEFEFE, stop:1 #E8E8E8); + +border: 1px solid #CCCCCC;} + + + + 2 + + + 0 + + + 2 + + + 0 + + + 6 + + + 0 + + + + + + 22 + 22 + + + + + + + :/images/filefind.png + + + true + + + + + + + + Arial + 10 + 75 + true + + + + Search + + + + + + + QToolButton, QPushButton, QComboBox { border-image: url(:/images/btn_26.png) 4; border-width: 4; padding: 0px 6px; @@ -540,41 +620,7 @@ QToolButton:pressed, QPushButton:pressed{ border-image: url(:/images/btn_26_pressed.png) 4; } - - - - 0 - - - - - - 16777215 - 32 - - - - QFrame#frame{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, -stop:0 #FEFEFE, stop:1 #E8E8E8); - -border: 1px solid #CCCCCC;} - - - - 6 - - - 2 - - - 6 - - - 2 - - - + Any @@ -675,44 +721,107 @@ border: 1px solid #CCCCCC;} - + 0 - - - - - 3 - 0 - - - - - 0 - 23 - - + + - 1677777 - 16777215 + 16777215 + 22 - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + + border: 1px solid #8B8B8B; +background: white; + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 0 + + + + + + 3 + 0 + + + + + 0 + 11 + + + + + 1677777 + 16777215 + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <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;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Enter a Keyword here</p></body></html> - - - border: 1px solid #8B8B8B; + + + QLineEdit#lineEdit{background: transparent; +border: none;} - + + + + + + + + 16 + 16 + + + + + 16 + 16 + + + + Reset + + + QPushButton +{ + border-image: url(:/images/closenormal.png) +} + +QPushButton:hover +{ +border-image: url(:/images/closehover.png) +} + +QPushButton:pressed { +border-image: url(:/images/closepressed.png) +} + + + + + + + - + Start Search @@ -745,16 +854,6 @@ border-image: url(:/images/btn3.png) 4; - - - Reset - - - Reset - - - - Qt::Horizontal @@ -770,50 +869,58 @@ border-image: url(:/images/btn3.png) 4; - + Advanced Search + + QToolButton, QPushButton, QComboBox { +border-image: url(:/images/btn_26.png) 4; +border-width: 4; +padding: 0px 6px; +font-size: 12px; +} + +*{ +color: black; +} + +QComboBox QAbstractItemView { +background-color:white; +} + +QComboBox::down-arrow { +image: url(:/images/combobox_arrow.png); +} + +QComboBox:drop-down +{ +subcontrol-origin: padding; +subcontrol-position: top right; +border-left-style: none; +border-top-right-radius: 1px; +border-bottom-right-radius: 1px; +} + +QToolButton:hover, QPushButton:hover, QComboBox:hover { +border-image: url(:/images/btn_26_hover.png) 4; +} + +QToolButton:disabled, QPushButton:disabled, QComboBox::disabled { +color:gray; +} + +QToolButton:pressed, QPushButton:pressed{ +border-image: url(:/images/btn_26_pressed.png) 4; +} + + Advanced - - - - - 22 - 22 - - - - - - - :/images/filefind.png - - - true - - - - - - - - Arial - 10 - 75 - true - - - - Search - - - @@ -936,6 +1043,9 @@ border-image: url(:/images/btn3.png) 4; + 4 + + 6 @@ -946,6 +1056,48 @@ border-image: url(:/images/btn3.png) 4; p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">Close all Search Resullts</span></p></body></html> + + + QToolButton, QPushButton, QComboBox { +border-image: url(:/images/btn_26.png) 4; +border-width: 4; +padding: 0px 6px; +font-size: 12px; +} + +*{ +color: black; +} + +QComboBox QAbstractItemView { +background-color:white; +} + +QComboBox::down-arrow { +image: url(:/images/combobox_arrow.png); +} + +QComboBox:drop-down +{ +subcontrol-origin: padding; +subcontrol-position: top right; +border-left-style: none; +border-top-right-radius: 1px; +border-bottom-right-radius: 1px; +} + +QToolButton:hover, QPushButton:hover, QComboBox:hover { +border-image: url(:/images/btn_26_hover.png) 4; +} + +QToolButton:disabled, QPushButton:disabled, QComboBox::disabled { +color:gray; +} + +QToolButton:pressed, QPushButton:pressed{ +border-image: url(:/images/btn_26_pressed.png) 4; +} + Close All Search Results @@ -985,6 +1137,48 @@ p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">Download Selected</span></p></body></html> + + + QToolButton, QPushButton, QComboBox { +border-image: url(:/images/btn_26.png) 4; +border-width: 4; +padding: 0px 6px; +font-size: 12px; +} + +*{ +color: black; +} + +QComboBox QAbstractItemView { +background-color:white; +} + +QComboBox::down-arrow { +image: url(:/images/combobox_arrow.png); +} + +QComboBox:drop-down +{ +subcontrol-origin: padding; +subcontrol-position: top right; +border-left-style: none; +border-top-right-radius: 1px; +border-bottom-right-radius: 1px; +} + +QToolButton:hover, QPushButton:hover, QComboBox:hover { +border-image: url(:/images/btn_26_hover.png) 4; +} + +QToolButton:disabled, QPushButton:disabled, QComboBox::disabled { +color:gray; +} + +QToolButton:pressed, QPushButton:pressed{ +border-image: url(:/images/btn_26_pressed.png) 4; +} + Download diff --git a/retroshare-gui/src/gui/TransfersDialog.ui b/retroshare-gui/src/gui/TransfersDialog.ui index 6f68a1a42..e660ef6c0 100644 --- a/retroshare-gui/src/gui/TransfersDialog.ui +++ b/retroshare-gui/src/gui/TransfersDialog.ui @@ -502,70 +502,110 @@ Qt::PreventContextMenu - - + + Qt::Vertical - - - 0 - + 0 - - - - Qt::Horizontal - - + + + - 40 - 20 + 0 + 32 - - - - - - 0 + + + 16777215 + 32 + - - 6 + + QFrame#frame{ +background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, +stop:0 #FEFEFE, stop:1 #E8E8E8); + +border: 1px solid #CCCCCC;} - - - - - - - :/images/down.png - - - - - - - - 10 - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + + QFrame::StyledPanel + + + QFrame::Raised + + + + 2 + + + 2 + + + 6 + + + 2 + + + + + 0 + + + 6 + + + + + + + + :/images/down.png + + + + + + + + 10 + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <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:10pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Downloads:</span></p></body></html> - - - - + + + + + + + + + Qt::Horizontal + + + + 483 + 20 + + + + + + - + @@ -624,7 +664,7 @@ p, li { white-space: pre-wrap; } - 0 + 1 @@ -687,8 +727,8 @@ p, li { white-space: pre-wrap; } 0 0 - 100 - 30 + 596 + 102