Fixed to get again gui resize able , search not allowed more to set gui to a minimum size.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2457 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2010-02-28 01:03:37 +00:00
parent 8079a6d454
commit eee9ca1635
2 changed files with 222 additions and 168 deletions

View File

@ -168,13 +168,18 @@ SearchDialog::SearchDialog(QWidget *parent)
// set header text aligment // set header text aligment
QTreeWidgetItem * headerItem = ui.searchResultWidget->headerItem(); QTreeWidgetItem * headerItem = ui.searchResultWidget->headerItem();
headerItem->setTextAlignment(1, Qt::AlignRight | Qt::AlignRight); headerItem->setTextAlignment(1, Qt::AlignRight | Qt::AlignRight);
headerItem->setTextAlignment(2, Qt::AlignRight | Qt::AlignRight); headerItem->setTextAlignment(2, Qt::AlignRight | Qt::AlignRight);
ui.searchResultWidget->sortItems(SR_NAME_COL, Qt::AscendingOrder); ui.searchResultWidget->sortItems(SR_NAME_COL, Qt::AscendingOrder);
ui.resetButton->hide(); ui.resetButton->hide();
ui._ownFiles_CB->setMinimumWidth(20);
ui._friendListsearch_SB->setMinimumWidth(20);
ui._anonF2Fsearch_CB->setMinimumWidth(20);
ui.label->setMinimumWidth(20);
/* Hide platform specific features */ /* Hide platform specific features */
#ifdef Q_WS_WIN #ifdef Q_WS_WIN

View File

@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1064</width> <width>559</width>
<height>340</height> <height>340</height>
</rect> </rect>
</property> </property>
@ -502,8 +502,11 @@
<property name="styleSheet"> <property name="styleSheet">
<string notr="true"/> <string notr="true"/>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0"> <property name="verticalSpacing">
<number>0</number>
</property>
<item row="0" column="0" colspan="5">
<widget class="QFrame" name="frame"> <widget class="QFrame" name="frame">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
@ -923,7 +926,7 @@ border-image: url(:/images/btn_26_pressed.png) 4;
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0" colspan="5">
<widget class="QSplitter" name="splitter"> <widget class="QSplitter" name="splitter">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -1034,160 +1037,149 @@ border-image: url(:/images/btn_26_pressed.png) 4;
</widget> </widget>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0" colspan="5">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <widget class="QFrame" name="frame_3">
<item> <property name="maximumSize">
<widget class="QPushButton" name="cloaseallsearchresultsButton"> <size>
<property name="toolTip"> <width>16777215</width>
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <height>48</height>
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; </size>
p, li { white-space: pre-wrap; } </property>
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt; <property name="styleSheet">
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt;Close all Search Resullts&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string notr="true">QFrame#frame_3{
</property> background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
<property name="styleSheet"> stop:0 #FEFEFE, stop:1 #E8E8E8);
<string notr="true">QToolButton, QPushButton, QComboBox {
border-image: url(:/images/btn_26.png) 4;
border-width: 4;
padding: 0px 6px;
font-size: 12px;
}
*{ border: 1px solid #CCCCCC;}</string>
color: black; </property>
} <layout class="QGridLayout" name="gridLayout_2">
<property name="horizontalSpacing">
QComboBox QAbstractItemView { <number>6</number>
background-color:white; </property>
} <property name="verticalSpacing">
<number>1</number>
QComboBox::down-arrow { </property>
image: url(:/images/combobox_arrow.png); <property name="margin">
} <number>2</number>
</property>
QComboBox:drop-down <item row="0" column="0">
{ <widget class="QCheckBox" name="_friendListsearch_SB">
subcontrol-origin: padding; <property name="toolTip">
subcontrol-position: top right; <string>Search inside &quot;browsable&quot; files of your friends</string>
border-left-style: none; </property>
border-top-right-radius: 1px; <property name="text">
border-bottom-right-radius: 1px; <string>Search in friends lists</string>
} </property>
<property name="checked">
QToolButton:hover, QPushButton:hover, QComboBox:hover { <bool>true</bool>
border-image: url(:/images/btn_26_hover.png) 4; </property>
} </widget>
</item>
QToolButton:disabled, QPushButton:disabled, QComboBox::disabled { <item row="0" column="1">
color:gray; <widget class="QCheckBox" name="_anonF2Fsearch_CB">
} <property name="toolTip">
<string>Multi-hop search at distance 6 in the network
QToolButton:pressed, QPushButton:pressed{
border-image: url(:/images/btn_26_pressed.png) 4;
}
</string>
</property>
<property name="text">
<string>Clear All Search Results</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="_ownFiles_CB">
<property name="toolTip">
<string>Include files from your own file list in the search result</string>
</property>
<property name="text">
<string>Include own files</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="_friendListsearch_SB">
<property name="toolTip">
<string>Search inside &quot;browsable&quot; files of your friends</string>
</property>
<property name="text">
<string>Search in friends lists</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="_anonF2Fsearch_CB">
<property name="toolTip">
<string>Multi-hop search at distance 6 in the network
(always reports available files)</string> (always reports available files)</string>
</property> </property>
<property name="text"> <property name="text">
<string>F2F search</string> <string>F2F search</string>
</property> </property>
<property name="checked"> <property name="checked">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="2" column="0">
<widget class="QLabel" name="label"> <widget class="QCheckBox" name="_ownFiles_CB">
<property name="text"> <property name="sizePolicy">
<string>Limit number of results to :</string> <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
</property> <horstretch>0</horstretch>
</widget> <verstretch>0</verstretch>
</item> </sizepolicy>
<item> </property>
<widget class="QSpinBox" name="_max_results_SB"> <property name="toolTip">
<property name="minimum"> <string>Include files from your own file list in the search result</string>
<number>100</number> </property>
</property> <property name="text">
<property name="maximum"> <string>Include own files</string>
<number>5000</number> </property>
</property> </widget>
<property name="singleStep"> </item>
<number>100</number> <item row="2" column="1">
</property> <widget class="QLabel" name="label">
<property name="value"> <property name="text">
<number>1000</number> <string>Limit number of results to :</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="2" column="2">
<spacer> <widget class="QSpinBox" name="_max_results_SB">
<property name="orientation"> <property name="suffix">
<enum>Qt::Horizontal</enum> <string/>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="minimum">
<size> <number>100</number>
<width>218</width> </property>
<height>21</height> <property name="maximum">
</size> <number>5000</number>
</property> </property>
</spacer> <property name="singleStep">
</item> <number>100</number>
<item> </property>
<widget class="QPushButton" name="pushButtonDownload"> <property name="value">
<property name="minimumSize"> <number>1000</number>
<size> </property>
<width>120</width> </widget>
<height>0</height> </item>
</size> <item row="0" column="2" colspan="4">
</property> <spacer name="horizontalSpacer">
<property name="maximumSize"> <property name="orientation">
<size> <enum>Qt::Horizontal</enum>
<width>16777215</width> </property>
<height>26</height> <property name="sizeHint" stdset="0">
</size> <size>
</property> <width>40</width>
<property name="toolTip"> <height>5</height>
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; </size>
</property>
</spacer>
</item>
<item row="2" column="3">
<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>
<item row="2" column="5">
<widget class="QPushButton" name="pushButtonDownload">
<property name="minimumSize">
<size>
<width>120</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>26</height>
</size>
</property>
<property name="toolTip">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt; &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt;Download Selected&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt;Download Selected&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QToolButton, QPushButton, QComboBox { <string notr="true">QToolButton, QPushButton, QComboBox {
border-image: url(:/images/btn_26.png) 4; border-image: url(:/images/btn_26.png) 4;
border-width: 4; border-width: 4;
padding: 0px 6px; padding: 0px 6px;
@ -1227,17 +1219,74 @@ QToolButton:pressed, QPushButton:pressed{
border-image: url(:/images/btn_26_pressed.png) 4; border-image: url(:/images/btn_26_pressed.png) 4;
} }
</string> </string>
</property> </property>
<property name="text"> <property name="text">
<string>Download</string> <string>Download</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="images.qrc"> <iconset resource="images.qrc">
<normaloff>:/images/download16.png</normaloff>:/images/download16.png</iconset> <normaloff>:/images/download16.png</normaloff>:/images/download16.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item row="2" column="4">
<widget class="QPushButton" name="cloaseallsearchresultsButton">
<property name="toolTip">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt;Close all Search Resullts&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="styleSheet">
<string notr="true">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;
}
</string>
</property>
<property name="text">
<string>Clear</string>
</property>
</widget>
</item>
</layout>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>