[QGIS Commit] r10423 - in trunk/qgis/src: app/attributetable ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Thu Mar 26 17:50:54 EDT 2009
Author: timlinux
Date: 2009-03-26 17:50:53 -0400 (Thu, 26 Mar 2009)
New Revision: 10423
Modified:
trunk/qgis/src/app/attributetable/BeataDialog.cpp
trunk/qgis/src/app/attributetable/BeataDialog.h
trunk/qgis/src/ui/BeataGui.ui
Log:
Updates to table widget layout
Modified: trunk/qgis/src/app/attributetable/BeataDialog.cpp
===================================================================
--- trunk/qgis/src/app/attributetable/BeataDialog.cpp 2009-03-26 21:25:03 UTC (rev 10422)
+++ trunk/qgis/src/app/attributetable/BeataDialog.cpp 2009-03-26 21:50:53 UTC (rev 10423)
@@ -79,38 +79,31 @@
setWindowTitle( tr( "Attribute table - %1" ).arg( mLayer->name() ) );
- mMenuActions = new QMenu();
- mMenuActions->addAction(tr("Advanced search"), this, SLOT(advancedSearch()));
- mMenuActions->addSeparator();
- mMenuActions->addAction(getThemeIcon( "/mActionCopySelected.png" ), tr("Copy selected rows"), this, SLOT(copySelectedRowsToClipboard()));
- mMenuActions->addAction(getThemeIcon( "/mActionZoomToSelected.png" ), tr("Zoom to selected"), this, SLOT(zoomMapToSelectedRows()));
- mMenuActions->addAction(getThemeIcon( "/mActionSelectedToTop.png" ), tr("Move selected to top"), this, SLOT(selectedToTop()));
- mMenuActions->addAction(getThemeIcon( "/mActionUnselectAttributes.png" ), tr("Clear selection"), this, SLOT(removeSelection()));
- mMenuActions->addAction(getThemeIcon( "/mActionInvertSelection.png" ), tr("Invert selection"), this, SLOT(invertSelection()));
- mMenuActions->addSeparator();
-
+ mRemoveSelectionButton->setIcon(getThemeIcon( "/mActionUnselectAttributes.png" ));
+ mSelectedToTopButton->setIcon(getThemeIcon( "/mActionSelectedToTop.png" ));
+ mCopySelectedRowsButton->setIcon(getThemeIcon( "/mActionCopySelected.png" ));
+ mZoomMapToSelectedRowsButton->setIcon(getThemeIcon( "/mActionZoomToSelected.png" ) );
+ mInvertSelectionButton->setIcon(getThemeIcon( "/mActionInvertSelection.png" ) );
+ mToggleEditingButton->setIcon(getThemeIcon( "/mActionToggleEditing.png" ) );
// toggle editing
- mActionToggleEditing = mMenuActions->addAction(getThemeIcon( "/mActionToggleEditing.png" ), tr("Toggle editing"), this, SLOT(toggleEditing()));
- mActionToggleEditing->setCheckable( true );
- mActionToggleEditing->setEnabled( mLayer->dataProvider()->capabilities() & QgsVectorDataProvider::ChangeAttributeValues );
+ mToggleEditingButton->setCheckable( true );
+ mToggleEditingButton->setEnabled( mLayer->dataProvider()->capabilities() & QgsVectorDataProvider::ChangeAttributeValues );
+
// info from table to application
connect( this, SIGNAL( editingToggled( QgsMapLayer * ) ), QgisApp::instance(), SLOT( toggleEditing( QgsMapLayer * ) ) );
// info from layer to table
connect( mLayer, SIGNAL( editingStarted() ), this, SLOT( editingToggled() ) );
connect( mLayer, SIGNAL( editingStopped() ), this, SLOT( editingToggled() ) );
- connect(btnShowAll, SIGNAL(clicked()), this, SLOT(clickedShowAll()));
- connect(btnShowSelected, SIGNAL(clicked()), this, SLOT(clickedShowSelected()));
-
connect(searchButton, SIGNAL(clicked()), this, SLOT(search()));
- connect(actionsButton, SIGNAL(clicked()), this, SLOT(showAdvanced()));
connect(mLayer, SIGNAL(selectionChanged()), this, SLOT(updateSelectionFromLayer()));
connect(mLayer, SIGNAL(layerDeleted()), this, SLOT( close()));
connect(mView->verticalHeader(), SIGNAL(sectionClicked(int)), this, SLOT(updateRowSelection(int)));
connect(mModel, SIGNAL(modelChanged()), this, SLOT(updateSelection()));
- clickedShowAll(); // make sure the show all button is checked
+ //make sure to show all recs on first load
+ on_cbxShowSelectedOnly_toggled( false );
mLastClickedHeaderIndex = 0;
mSelectionModel = new QItemSelectionModel(mFilterModel);
@@ -160,7 +153,7 @@
mMenuActions->exec(QCursor::pos());
}
-void BeataDialog::selectedToTop()
+void BeataDialog::on_mSelectedToTopButton_clicked()
{
int freeIndex = 0;
@@ -200,55 +193,34 @@
updateSelection();
}
-void BeataDialog::copySelectedRowsToClipboard()
+void BeataDialog::on_mCopySelectedRowsButton_clicked()
{
QgisApp::instance()->editCopy(mLayer);
}
-void BeataDialog::zoomMapToSelectedRows()
+void BeataDialog::on_mZoomMapToSelectedRowsButton_clicked()
{
QgisApp::instance()->zoomToSelected();
}
-void BeataDialog::invertSelection()
+void BeataDialog::on_mInvertSelectionButton_clicked()
{
mLayer->invertSelection();
}
-void BeataDialog::removeSelection()
+void BeataDialog::on_mRemoveSelectionButton_clicked()
{
mLayer->removeSelection();
}
-void BeataDialog::clickedShowAll()
+void BeataDialog::on_cbxShowSelectedOnly_toggled( bool theFlag )
{
- // the button can't be unchecked by clicking it
- // gets unchecked when show selected is clicked
- if (!btnShowAll->isChecked())
- {
- btnShowAll->setChecked(true);
- }
- btnShowSelected->setChecked(false);
-
- mFilterModel->mHideUnselected = false;
+ mFilterModel->mHideUnselected = theFlag;
mFilterModel->invalidate();
//TODO: weird
//mModel->changeLayout();
}
-void BeataDialog::clickedShowSelected()
-{
- if (!btnShowSelected->isChecked())
- {
- btnShowSelected->setChecked(true);
- }
- btnShowAll->setChecked(false);
-
- mFilterModel->mHideUnselected = true;
- mFilterModel->invalidate();
- //mModel->changeLayout();
-}
-
void BeataDialog::columnBoxInit()
{
QgsFieldMap fieldMap = mLayer->dataProvider()->fields();
@@ -502,7 +474,7 @@
doSearch(str);
}
-void BeataDialog::advancedSearch()
+void BeataDialog::on_mAdvancedSearchButton_clicked()
{
QgsSearchQueryBuilder dlg(mLayer, this);
dlg.setSearchString(mQuery->displayText());
@@ -511,14 +483,14 @@
doSearch(dlg.searchString());
}
-void BeataDialog::toggleEditing()
+void BeataDialog::on_mToggleEditingButton_toggled()
{
emit editingToggled( mLayer );
}
void BeataDialog::editingToggled()
{
- mActionToggleEditing->setChecked( mLayer->isEditable() );
+ mToggleEditingButton->setChecked( mLayer->isEditable() );
// (probably reload data if user stopped editing - possible revert)
mModel->reload(mModel->index(0,0), mModel->index(mModel->rowCount(), mModel->columnCount()));
Modified: trunk/qgis/src/app/attributetable/BeataDialog.h
===================================================================
--- trunk/qgis/src/app/attributetable/BeataDialog.h 2009-03-26 21:25:03 UTC (rev 10422)
+++ trunk/qgis/src/app/attributetable/BeataDialog.h 2009-03-26 21:50:53 UTC (rev 10423)
@@ -56,23 +56,22 @@
void submit();
void revert();
void search();
- void advancedSearch();
+ void on_mAdvancedSearchButton_clicked();
void updateSelection();
void updateSelectionFromLayer();
void updateRowSelection(int index);
void updateRowSelection(int first, int last, bool startNewSelection);
- void clickedShowAll();
- void clickedShowSelected();
+ void on_cbxShowSelectedOnly_toggled( bool theFlag );
+ void on_mCopySelectedRowsButton_clicked();
- void startEditing();
- void invertSelection();
- void removeSelection();
- void copySelectedRowsToClipboard();
- void zoomMapToSelectedRows();
- void selectedToTop();
+ void on_mToggleEditingButton_toggled();
+ void on_mInvertSelectionButton_clicked();
+ void on_mRemoveSelectionButton_clicked();
+ void on_mZoomMapToSelectedRowsButton_clicked();
+ void on_mSelectedToTopButton_clicked();
void showAdvanced();
- void toggleEditing();
+ void startEditing();
signals:
void editingToggled( QgsMapLayer * );
Modified: trunk/qgis/src/ui/BeataGui.ui
===================================================================
--- trunk/qgis/src/ui/BeataGui.ui 2009-03-26 21:25:03 UTC (rev 10422)
+++ trunk/qgis/src/ui/BeataGui.ui 2009-03-26 21:50:53 UTC (rev 10423)
@@ -26,7 +26,7 @@
<number>0</number>
</property>
<property name="horizontalSpacing" >
- <number>0</number>
+ <number>2</number>
</property>
<property name="verticalSpacing" >
<number>0</number>
@@ -41,16 +41,150 @@
<item row="1" column="0" >
<layout class="QHBoxLayout" >
<item>
- <widget class="QPushButton" name="searchButton" >
+ <widget class="QToolButton" name="mRemoveSelectionButton" >
+ <property name="toolTip" >
+ <string>Remove selection</string>
+ </property>
<property name="text" >
- <string>&Search</string>
+ <string/>
</property>
+ <property name="icon" >
+ <iconset>../../images/themes/default/mActionUnselectAttributes.png</iconset>
+ </property>
+ <property name="iconSize" >
+ <size>
+ <width>18</width>
+ <height>18</height>
+ </size>
+ </property>
+ <property name="shortcut" >
+ <string/>
+ </property>
</widget>
</item>
<item>
+ <widget class="QToolButton" name="mSelectedToTopButton" >
+ <property name="toolTip" >
+ <string>Move selected to top</string>
+ </property>
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="icon" >
+ <iconset>../../images/themes/default/mActionSelectedToTop.png</iconset>
+ </property>
+ <property name="iconSize" >
+ <size>
+ <width>18</width>
+ <height>18</height>
+ </size>
+ </property>
+ <property name="shortcut" >
+ <string>Ctrl+T</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="mInvertSelectionButton" >
+ <property name="toolTip" >
+ <string>Invert selection</string>
+ </property>
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="icon" >
+ <iconset>../../images/themes/default/mActionInvertSelection.png</iconset>
+ </property>
+ <property name="iconSize" >
+ <size>
+ <width>18</width>
+ <height>18</height>
+ </size>
+ </property>
+ <property name="shortcut" >
+ <string>Ctrl+S</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="mCopySelectedRowsButton" >
+ <property name="toolTip" >
+ <string>Copy selected rows to clipboard (Ctrl+C)</string>
+ </property>
+ <property name="whatsThis" >
+ <string>Copies the selected rows to the clipboard</string>
+ </property>
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="icon" >
+ <iconset>../../images/themes/default/mActionEditCopy.png</iconset>
+ </property>
+ <property name="iconSize" >
+ <size>
+ <width>18</width>
+ <height>18</height>
+ </size>
+ </property>
+ <property name="shortcut" >
+ <string>Ctrl+C</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="mZoomMapToSelectedRowsButton" >
+ <property name="toolTip" >
+ <string>Zoom map to the selected rows (Ctrl-J)</string>
+ </property>
+ <property name="whatsThis" >
+ <string>Zoom map to the selected rows</string>
+ </property>
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="icon" >
+ <iconset>../../images/themes/default/mActionZoomToSelected.png</iconset>
+ </property>
+ <property name="iconSize" >
+ <size>
+ <width>18</width>
+ <height>18</height>
+ </size>
+ </property>
+ <property name="shortcut" >
+ <string>Ctrl+J</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QToolButton" name="mToggleEditingButton" >
+ <property name="toolTip" >
+ <string>Toggle editing mode</string>
+ </property>
+ <property name="whatsThis" >
+ <string>Click to toggle table editing</string>
+ </property>
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="icon" >
+ <iconset>../../images/themes/default/mActionToggleEditing.png</iconset>
+ </property>
+ <property name="iconSize" >
+ <size>
+ <width>18</width>
+ <height>18</height>
+ </size>
+ </property>
+ <property name="checkable" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
<widget class="QLabel" name="searchFor" >
<property name="text" >
- <string>for</string>
+ <string>Look for</string>
</property>
</widget>
</item>
@@ -68,36 +202,54 @@
<widget class="QComboBox" name="columnBox" />
</item>
<item>
- <widget class="QPushButton" name="btnShowAll" >
- <property name="focusPolicy" >
- <enum>Qt::NoFocus</enum>
+ <widget class="QPushButton" name="searchButton" >
+ <property name="text" >
+ <string>&Search</string>
</property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="2" column="0" >
+ <layout class="QHBoxLayout" >
+ <item>
+ <widget class="QCheckBox" name="cbxShowSelectedOnly" >
<property name="text" >
- <string>&All</string>
+ <string>Show selected records only</string>
</property>
- <property name="checkable" >
- <bool>true</bool>
- </property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="btnShowSelected" >
- <property name="focusPolicy" >
- <enum>Qt::NoFocus</enum>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
</property>
+ <property name="sizeHint" >
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="label" >
<property name="text" >
- <string>S&elected</string>
+ <string>Advanced search</string>
</property>
- <property name="checkable" >
- <bool>true</bool>
- </property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="actionsButton" >
+ <widget class="QToolButton" name="mAdvancedSearchButton" >
<property name="text" >
- <string>Actions...</string>
+ <string>...</string>
</property>
+ <property name="iconSize" >
+ <size>
+ <width>12</width>
+ <height>12</height>
+ </size>
+ </property>
</widget>
</item>
</layout>
@@ -116,9 +268,6 @@
<tabstop>searchButton</tabstop>
<tabstop>query</tabstop>
<tabstop>columnBox</tabstop>
- <tabstop>btnShowAll</tabstop>
- <tabstop>btnShowSelected</tabstop>
- <tabstop>actionsButton</tabstop>
</tabstops>
<resources/>
<connections/>
More information about the QGIS-commit
mailing list