From: <mrj...@us...> - 2008-02-10 17:30:29
|
Revision: 2541 http://tora.svn.sourceforge.net/tora/?rev=2541&view=rev Author: mrjohnson0 Date: 2008-02-10 09:30:35 -0800 (Sun, 10 Feb 2008) Log Message: ----------- ported q3buttongroup Modified Paths: -------------- trunk/tora/src/tobrowser.cpp trunk/tora/src/tobrowserfilterui.ui Modified: trunk/tora/src/tobrowser.cpp =================================================================== --- trunk/tora/src/tobrowser.cpp 2008-02-09 21:02:24 UTC (rev 2540) +++ trunk/tora/src/tobrowser.cpp 2008-02-10 17:30:35 UTC (rev 2541) @@ -85,6 +85,7 @@ #include <QPixmap> #include <QString> #include <QVBoxLayout> +#include <QButtonGroup> #include "icons/addindex.xpm" #include "icons/addtable.xpm" @@ -431,9 +432,29 @@ }; class toBrowserFilterSetup : public QDialog, public Ui::toBrowserFilterUI { +private: + QButtonGroup *ButtonsGroup; + QButtonGroup *TypeGroup; + public: void setup(bool temp) { toHelp::connectDialog(this); + + // qbuttongroup is not a widget. awesome. guess they'll fix + // that in qt5. + ButtonsGroup = new QButtonGroup(ButtonsBox); + ButtonsGroup->addButton(None, 0); + ButtonsGroup->addButton(StartWith, 1); + ButtonsGroup->addButton(EndWith, 2); + ButtonsGroup->addButton(Contains, 3); + ButtonsGroup->addButton(CommaSeparate, 4); + ButtonsGroup->addButton(RegExp, 5); + + TypeGroup = new QButtonGroup(TablespaceType); + TypeGroup->addButton(IncludeAll, 0); + TypeGroup->addButton(Include, 1); + TypeGroup->addButton(Exclude, 2); + if (!temp) { OnlyOwnSchema->hide(); Tablespaces->setNumberColumn(false); @@ -460,9 +481,15 @@ setupUi(this); setup(temp); - Buttons->setButton(cur.Type); + QAbstractButton *b = ButtonsGroup->button(cur.Type); + if(b) + b->setChecked(true); + if (!TablespaceType->isHidden()) { - TablespaceType->setButton(cur.TablespaceType); + b = TypeGroup->button(cur.TablespaceType); + if(b) + b->setChecked(true); + for(std::list<QString>::iterator i = cur.Tablespaces.begin(); i != cur.Tablespaces.end(); i++) { @@ -487,11 +514,11 @@ tablespaces.insert(tablespaces.end(), (*it)->text(0)); } - return new toBrowserFilter(Buttons->id(Buttons->selected()), + return new toBrowserFilter(ButtonsGroup->id(ButtonsGroup->checkedButton()), IgnoreCase->isChecked(), Invert->isChecked(), String->text(), - TablespaceType->id(TablespaceType->selected()), + TypeGroup->id(TypeGroup->checkedButton()), tablespaces, OnlyOwnSchema->isChecked()); } Modified: trunk/tora/src/tobrowserfilterui.ui =================================================================== --- trunk/tora/src/tobrowserfilterui.ui 2008-02-09 21:02:24 UTC (rev 2540) +++ trunk/tora/src/tobrowserfilterui.ui 2008-02-10 17:30:35 UTC (rev 2541) @@ -1,362 +1,426 @@ -<ui version="4.0" stdsetdef="1" > - <author></author> - <comment></comment> - <exportmacro></exportmacro> - <class>toBrowserFilterUI</class> - <widget class="QDialog" name="toBrowserFilterUI" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>464</width> - <height>378</height> - </rect> - </property> - <property name="windowTitle" > - <string>Filter setting</string> - </property> - <layout class="QGridLayout" > - <property name="margin" > - <number>11</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item row="4" column="0" > - <spacer name="Spacer1" > - <property name="sizeHint" > - <size> - <width>20</width> - <height>20</height> - </size> +<ui version="4.0" > + <class>toBrowserFilterUI</class> + <widget class="QDialog" name="toBrowserFilterUI" > + <property name="geometry" > + <rect> + <x>0</x> + <y>0</y> + <width>646</width> + <height>484</height> + </rect> + </property> + <property name="windowTitle" > + <string>Filter setting</string> + </property> + <layout class="QGridLayout" > + <property name="leftMargin" > + <number>11</number> + </property> + <property name="topMargin" > + <number>11</number> + </property> + <property name="rightMargin" > + <number>11</number> + </property> + <property name="bottomMargin" > + <number>11</number> + </property> + <property name="horizontalSpacing" > + <number>6</number> + </property> + <property name="verticalSpacing" > + <number>6</number> + </property> + <item row="4" column="0" > + <spacer> + <property name="orientation" > + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType" > + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" > + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="4" column="1" > + <widget class="QPushButton" name="OkButton" > + <property name="sizePolicy" > + <sizepolicy vsizetype="Fixed" hsizetype="Fixed" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text" > + <string>&Ok</string> + </property> + <property name="default" > + <bool>true</bool> + </property> + </widget> + </item> + <item row="4" column="2" > + <widget class="QPushButton" name="Cancel" > + <property name="sizePolicy" > + <sizepolicy vsizetype="Fixed" hsizetype="Fixed" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text" > + <string>Cancel</string> + </property> + </widget> + </item> + <item row="1" column="0" colspan="3" > + <widget class="QGroupBox" name="ButtonsBox" > + <property name="sizePolicy" > + <sizepolicy vsizetype="Maximum" hsizetype="Preferred" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize" > + <size> + <width>0</width> + <height>0</height> + </size> + </property> + <property name="title" > + <string>Filter on name</string> + </property> + <layout class="QVBoxLayout" > + <item> + <layout class="QHBoxLayout" > + <item> + <widget class="QRadioButton" name="None" > + <property name="text" > + <string>&No filter</string> </property> - <property name="sizeType" > - <enum>QSizePolicy::Expanding</enum> + <property name="checked" > + <bool>true</bool> </property> - <property name="orientation" > - <enum>Qt::Horizontal</enum> + <property name="buttonGroupId" stdset="0" > + <number>0</number> </property> - </spacer> - </item> - <item row="4" column="1" > - <widget class="QPushButton" name="OkButton" > - <property name="sizePolicy" > - <sizepolicy> - <hsizetype>0</hsizetype> - <vsizetype>0</vsizetype> - </sizepolicy> + </widget> + </item> + <item> + <widget class="QRadioButton" name="StartWith" > + <property name="toolTip" > + <string>Object name start with</string> </property> <property name="text" > - <string>&Ok</string> + <string>&Start with</string> </property> - <property name="default" > - <bool>true</bool> + <property name="buttonGroupId" stdset="0" > + <number>1</number> </property> - </widget> - </item> - <item row="4" column="2" > - <widget class="QPushButton" name="Cancel" > - <property name="sizePolicy" > - <sizepolicy> - <hsizetype>0</hsizetype> - <vsizetype>0</vsizetype> - </sizepolicy> + </widget> + </item> + <item> + <widget class="QRadioButton" name="EndWith" > + <property name="toolTip" > + <string>Object name ends in</string> </property> <property name="text" > - <string>Cancel</string> + <string>&End with</string> </property> - </widget> - </item> - <item rowspan="1" row="1" column="0" colspan="3" > - <widget class="Q3ButtonGroup" name="Buttons" > - <property name="sizePolicy" > - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>4</vsizetype> - </sizepolicy> + <property name="buttonGroupId" stdset="0" > + <number>2</number> </property> - <property name="title" > - <string>Filter on name</string> + </widget> + </item> + <item> + <widget class="QRadioButton" name="Contains" > + <property name="toolTip" > + <string>Object name contains</string> </property> - <layout class="QGridLayout" > - <property name="margin" > - <number>11</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item rowspan="1" row="1" column="0" colspan="6" > - <widget class="QLineEdit" name="String" > - <property name="enabled" > - <bool>false</bool> - </property> - </widget> - </item> - <item row="0" column="0" > - <widget class="QRadioButton" name="None" > - <property name="text" > - <string>&No filter</string> - </property> - <property name="checked" > - <bool>true</bool> - </property> - <property name="buttonGroupId" > - <number>0</number> - </property> - </widget> - </item> - <item row="0" column="1" > - <widget class="QRadioButton" name="StartWith" > - <property name="text" > - <string>&Start with</string> - </property> - <property name="buttonGroupId" > - <number>1</number> - </property> - <property name="toolTip" > - <string>Object name start with</string> - </property> - </widget> - </item> - <item row="0" column="2" > - <widget class="QRadioButton" name="EndWith" > - <property name="text" > - <string>&End with</string> - </property> - <property name="buttonGroupId" > - <number>2</number> - </property> - <property name="toolTip" > - <string>Object name ends in</string> - </property> - </widget> - </item> - <item row="0" column="3" > - <widget class="QRadioButton" name="Contains" > - <property name="text" > - <string>&Contains</string> - </property> - <property name="buttonGroupId" > - <number>3</number> - </property> - <property name="toolTip" > - <string>Object name contains</string> - </property> - </widget> - </item> - <item row="0" column="5" > - <widget class="QRadioButton" name="RegExp" > - <property name="text" > - <string>&RegExp</string> - </property> - <property name="buttonGroupId" > - <number>5</number> - </property> - <property name="toolTip" > - <string>Object name matches RegExp</string> - </property> - </widget> - </item> - <item row="0" column="4" > - <widget class="QRadioButton" name="CommaSeparate" > - <property name="text" > - <string>&Comma list</string> - </property> - <property name="buttonGroupId" > - <number>4</number> - </property> - <property name="toolTip" > - <string>Comma separated list of object names</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item row="3" column="0" > - <spacer name="Spacer2" > - <property name="sizeHint" > - <size> - <width>20</width> - <height>20</height> - </size> + <property name="text" > + <string>&Contains</string> </property> - <property name="sizeType" > - <enum>QSizePolicy::Expanding</enum> + <property name="buttonGroupId" stdset="0" > + <number>3</number> </property> - <property name="orientation" > - <enum>Qt::Vertical</enum> + </widget> + </item> + <item> + <widget class="QRadioButton" name="CommaSeparate" > + <property name="toolTip" > + <string>Comma separated list of object names</string> </property> - </spacer> - </item> - <item rowspan="1" row="2" column="0" colspan="3" > - <widget class="Q3ButtonGroup" name="TablespaceType" > - <property name="sizePolicy" > - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>7</vsizetype> - </sizepolicy> + <property name="text" > + <string>&Comma list</string> </property> - <property name="title" > - <string>Filter on tablespace</string> + <property name="buttonGroupId" stdset="0" > + <number>4</number> </property> - <layout class="QGridLayout" > - <property name="margin" > - <number>11</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item row="0" column="0" > - <widget class="QRadioButton" name="IncludeAll" > - <property name="text" > - <string>Include &All</string> - </property> - <property name="checked" > - <bool>true</bool> - </property> - </widget> - </item> - <item row="0" column="1" > - <widget class="QRadioButton" name="Include" > - <property name="text" > - <string>&Include</string> - </property> - </widget> - </item> - <item row="0" column="2" > - <widget class="QRadioButton" name="Exclude" > - <property name="text" > - <string>&Exclude</string> - </property> - </widget> - </item> - <item rowspan="1" row="1" column="0" colspan="3" > - <widget class="toResultView" name="Tablespaces" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="focusPolicy" > - <enum>Qt::StrongFocus</enum> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item rowspan="1" row="0" column="0" colspan="3" > - <layout class="QHBoxLayout" > - <property name="margin" > - <number>0</number> + </widget> + </item> + <item> + <widget class="QRadioButton" name="RegExp" > + <property name="toolTip" > + <string>Object name matches RegExp</string> </property> - <property name="spacing" > - <number>6</number> + <property name="text" > + <string>&RegExp</string> </property> - <item> - <widget class="QCheckBox" name="OnlyOwnSchema" > - <property name="text" > - <string>Only display own schema</string> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="IgnoreCase" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="text" > - <string>Ignore &Case</string> - </property> - <property name="checked" > - <bool>true</bool> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="Invert" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="text" > - <string>&Invert selection</string> - </property> - </widget> - </item> - </layout> + <property name="buttonGroupId" stdset="0" > + <number>5</number> + </property> + </widget> + </item> + </layout> </item> + <item> + <widget class="QLineEdit" name="String" > + <property name="enabled" > + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item row="2" column="0" colspan="3" > + <widget class="QGroupBox" name="TablespaceType" > + <property name="sizePolicy" > + <sizepolicy vsizetype="Expanding" hsizetype="Preferred" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="title" > + <string>Filter on tablespace</string> + </property> + <layout class="QGridLayout" > + <property name="leftMargin" > + <number>11</number> + </property> + <property name="topMargin" > + <number>11</number> + </property> + <property name="rightMargin" > + <number>11</number> + </property> + <property name="bottomMargin" > + <number>11</number> + </property> + <property name="horizontalSpacing" > + <number>6</number> + </property> + <property name="verticalSpacing" > + <number>6</number> + </property> + <item row="0" column="0" > + <widget class="QRadioButton" name="IncludeAll" > + <property name="text" > + <string>Include &All</string> + </property> + <property name="checked" > + <bool>true</bool> + </property> + </widget> + </item> + <item row="0" column="1" > + <widget class="QRadioButton" name="Include" > + <property name="text" > + <string>&Include</string> + </property> + </widget> + </item> + <item row="0" column="2" > + <widget class="QRadioButton" name="Exclude" > + <property name="text" > + <string>&Exclude</string> + </property> + </widget> + </item> + <item row="1" column="0" colspan="3" > + <widget class="toResultView" native="1" name="Tablespaces" > + <property name="enabled" > + <bool>false</bool> + </property> + <property name="focusPolicy" > + <enum>Qt::StrongFocus</enum> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item row="0" column="0" colspan="3" > + <layout class="QHBoxLayout" > + <property name="spacing" > + <number>6</number> + </property> + <property name="leftMargin" > + <number>0</number> + </property> + <property name="topMargin" > + <number>0</number> + </property> + <property name="rightMargin" > + <number>0</number> + </property> + <property name="bottomMargin" > + <number>0</number> + </property> + <item> + <widget class="QCheckBox" name="OnlyOwnSchema" > + <property name="text" > + <string>Only display own schema</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="IgnoreCase" > + <property name="enabled" > + <bool>false</bool> + </property> + <property name="text" > + <string>Ignore &Case</string> + </property> + <property name="checked" > + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="Invert" > + <property name="enabled" > + <bool>false</bool> + </property> + <property name="text" > + <string>&Invert selection</string> + </property> + </widget> + </item> </layout> - </widget> - <customwidgets> - <customwidget> - <class>toResultView</class> - <extends>QWidget</extends> - <header location="local" >toresultview.h</header> - <sizehint> - <width>50</width> - <height>50</height> - </sizehint> - <container>0</container> - <sizepolicy> - <hordata>5</hordata> - <verdata>5</verdata> - </sizepolicy> - <pixmap>image0</pixmap> - </customwidget> - </customwidgets> - <tabstops> - <tabstop>OnlyOwnSchema</tabstop> - <tabstop>IgnoreCase</tabstop> - <tabstop>Invert</tabstop> - <tabstop>None</tabstop> - <tabstop>String</tabstop> - <tabstop>IncludeAll</tabstop> - <tabstop>Include</tabstop> - <tabstop>Exclude</tabstop> - <tabstop>Tablespaces</tabstop> - <tabstop>OkButton</tabstop> - <tabstop>Cancel</tabstop> - </tabstops> - <images> - <image name="image0" > - <data format="XPM.GZ" length="646" >789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data> - </image> - </images> - <connections> - <connection> - <sender>None</sender> - <signal>toggled(bool)</signal> - <receiver>String</receiver> - <slot>setDisabled(bool)</slot> - </connection> - <connection> - <sender>None</sender> - <signal>toggled(bool)</signal> - <receiver>IgnoreCase</receiver> - <slot>setDisabled(bool)</slot> - </connection> - <connection> - <sender>None</sender> - <signal>toggled(bool)</signal> - <receiver>Invert</receiver> - <slot>setDisabled(bool)</slot> - </connection> - <connection> - <sender>Cancel</sender> - <signal>clicked()</signal> - <receiver>toBrowserFilterUI</receiver> - <slot>reject()</slot> - </connection> - <connection> - <sender>OkButton</sender> - <signal>clicked()</signal> - <receiver>toBrowserFilterUI</receiver> - <slot>accept()</slot> - </connection> - <connection> - <sender>IncludeAll</sender> - <signal>toggled(bool)</signal> - <receiver>Tablespaces</receiver> - <slot>setDisabled(bool)</slot> - </connection> - </connections> + </item> + </layout> + </widget> + <customwidgets> + <customwidget> + <class>toResultView</class> + <extends>QWidget</extends> + <header>toresultview.h</header> + </customwidget> + </customwidgets> + <tabstops> + <tabstop>OnlyOwnSchema</tabstop> + <tabstop>IgnoreCase</tabstop> + <tabstop>Invert</tabstop> + <tabstop>None</tabstop> + <tabstop>String</tabstop> + <tabstop>IncludeAll</tabstop> + <tabstop>Include</tabstop> + <tabstop>Exclude</tabstop> + <tabstop>Tablespaces</tabstop> + <tabstop>OkButton</tabstop> + <tabstop>Cancel</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>None</sender> + <signal>toggled(bool)</signal> + <receiver>String</receiver> + <slot>setDisabled(bool)</slot> + <hints> + <hint type="sourcelabel" > + <x>20</x> + <y>20</y> + </hint> + <hint type="destinationlabel" > + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + <connection> + <sender>None</sender> + <signal>toggled(bool)</signal> + <receiver>IgnoreCase</receiver> + <slot>setDisabled(bool)</slot> + <hints> + <hint type="sourcelabel" > + <x>20</x> + <y>20</y> + </hint> + <hint type="destinationlabel" > + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + <connection> + <sender>None</sender> + <signal>toggled(bool)</signal> + <receiver>Invert</receiver> + <slot>setDisabled(bool)</slot> + <hints> + <hint type="sourcelabel" > + <x>20</x> + <y>20</y> + </hint> + <hint type="destinationlabel" > + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + <connection> + <sender>Cancel</sender> + <signal>clicked()</signal> + <receiver>toBrowserFilterUI</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel" > + <x>20</x> + <y>20</y> + </hint> + <hint type="destinationlabel" > + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + <connection> + <sender>OkButton</sender> + <signal>clicked()</signal> + <receiver>toBrowserFilterUI</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel" > + <x>20</x> + <y>20</y> + </hint> + <hint type="destinationlabel" > + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + <connection> + <sender>IncludeAll</sender> + <signal>toggled(bool)</signal> + <receiver>Tablespaces</receiver> + <slot>setDisabled(bool)</slot> + <hints> + <hint type="sourcelabel" > + <x>20</x> + <y>20</y> + </hint> + <hint type="destinationlabel" > + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + </connections> </ui> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |