--- a/WebBrowser/CookieJar/CookiesDialog.ui Sun Jul 10 16:40:17 2016 +0200 +++ b/WebBrowser/CookieJar/CookiesDialog.ui Sun Jul 10 19:41:24 2016 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>500</width> - <height>350</height> + <height>480</height> </rect> </property> <property name="windowTitle"> @@ -16,8 +16,8 @@ <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0" colspan="4"> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> <layout class="QHBoxLayout" name="horizontalLayout_2"> <item> <spacer name="horizontalSpacer"> @@ -48,84 +48,248 @@ <property name="toolTip"> <string>Enter search term for cookies</string> </property> + <property name="placeholderText"> + <string>Search</string> + </property> </widget> </item> </layout> </item> </layout> </item> - <item row="1" column="0" colspan="4"> - <widget class="E5TableView" name="cookiesTable"> + <item> + <widget class="QTreeWidget" name="cookiesTree"> <property name="alternatingRowColors"> <bool>true</bool> </property> - <property name="selectionBehavior"> - <enum>QAbstractItemView::SelectRows</enum> - </property> - <property name="textElideMode"> - <enum>Qt::ElideMiddle</enum> - </property> - <property name="showGrid"> - <bool>false</bool> - </property> <property name="sortingEnabled"> <bool>true</bool> </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QPushButton" name="removeButton"> - <property name="toolTip"> - <string>Press to remove the selected entries</string> - </property> - <property name="text"> - <string>&Remove</string> - </property> - <property name="autoDefault"> - <bool>false</bool> + <property name="allColumnsShowFocus"> + <bool>true</bool> </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QPushButton" name="removeAllButton"> - <property name="toolTip"> - <string>Press to remove all entries</string> - </property> - <property name="text"> - <string>Remove &All</string> - </property> - <property name="autoDefault"> - <bool>false</bool> - </property> + <column> + <property name="text"> + <string>Server</string> + </property> + </column> + <column> + <property name="text"> + <string>Cookie Name</string> + </property> + </column> </widget> </item> - <item row="2" column="2"> - <widget class="QPushButton" name="addButton"> - <property name="toolTip"> - <string>Press to open the cookies exceptions dialog to add a new rule</string> + <item> + <widget class="QFrame" name="frame"> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> </property> - <property name="text"> - <string>Add R&ule...</string> - </property> - <property name="autoDefault"> - <bool>false</bool> - </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Domain:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="E5SqueezeLabel" name="domain"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string><no cookie selected></string> + </property> + <property name="textInteractionFlags"> + <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Name:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="E5SqueezeLabel" name="name"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string><no cookie selected></string> + </property> + <property name="textInteractionFlags"> + <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Path:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="E5SqueezeLabel" name="path"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string><no cookie selected></string> + </property> + <property name="textInteractionFlags"> + <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>Secure:</string> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="E5SqueezeLabel" name="secure"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string><no cookie selected></string> + </property> + <property name="textInteractionFlags"> + <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set> + </property> + </widget> + </item> + <item row="4" column="0"> + <widget class="QLabel" name="label_5"> + <property name="text"> + <string>Expiration:</string> + </property> + </widget> + </item> + <item row="4" column="1"> + <widget class="E5SqueezeLabel" name="expiration"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string><no cookie selected></string> + </property> + <property name="textInteractionFlags"> + <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set> + </property> + </widget> + </item> + <item row="5" column="0"> + <widget class="QLabel" name="label_6"> + <property name="text"> + <string>Value:</string> + </property> + </widget> + </item> + <item row="5" column="1"> + <widget class="E5SqueezeLabel" name="value"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string><no cookie selected></string> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + <property name="textInteractionFlags"> + <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set> + </property> + </widget> + </item> + </layout> </widget> </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>208</width> - <height>20</height> - </size> - </property> - </spacer> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <item> + <widget class="QPushButton" name="removeButton"> + <property name="toolTip"> + <string>Press to remove the selected entries</string> + </property> + <property name="text"> + <string>&Remove</string> + </property> + <property name="autoDefault"> + <bool>false</bool> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="removeAllButton"> + <property name="toolTip"> + <string>Press to remove all entries</string> + </property> + <property name="text"> + <string>Remove &All</string> + </property> + <property name="autoDefault"> + <bool>false</bool> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="addButton"> + <property name="toolTip"> + <string>Press to open the cookies exceptions dialog to add a new rule</string> + </property> + <property name="text"> + <string>Add R&ule...</string> + </property> + <property name="autoDefault"> + <bool>false</bool> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>208</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> </item> - <item row="3" column="0" colspan="4"> + <item> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -144,18 +308,17 @@ <header>E5Gui/E5LineEdit.h</header> </customwidget> <customwidget> - <class>E5TableView</class> - <extends>QTableView</extends> - <header>E5Gui/E5TableView.h</header> + <class>E5SqueezeLabel</class> + <extends>QLabel</extends> + <header>E5Gui/E5SqueezeLabels.h</header> </customwidget> </customwidgets> <tabstops> <tabstop>searchEdit</tabstop> - <tabstop>cookiesTable</tabstop> + <tabstop>cookiesTree</tabstop> <tabstop>removeButton</tabstop> <tabstop>removeAllButton</tabstop> <tabstop>addButton</tabstop> - <tabstop>buttonBox</tabstop> </tabstops> <resources/> <connections>