Skip to content

Commit

Permalink
Applied patch #603. Thanks! (also fixed a compilation error introduce…
Browse files Browse the repository at this point in the history
…d in r6610)

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6618 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
homann committed Feb 17, 2007
1 parent 2c15ad5 commit 0ea1add
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions src/app/qgsattributeactiondialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ QgsAttributeActionDialog::QgsAttributeActionDialog(QgsAttributeAction* actions,
void QgsAttributeActionDialog::init()
{
Q3Header* header = attributeActionTable->horizontalHeader();
header->setLabel(0, "Name");
header->setLabel(1, "Action");
header->setLabel(2, "Capture");
header->setLabel(0, tr("Name") );
header->setLabel(1, tr("Action") );
header->setLabel(2, tr("Capture") );

attributeActionTable->setColumnStretchable(0, true);
attributeActionTable->setColumnStretchable(1, true);
Expand Down Expand Up @@ -139,7 +139,7 @@ void QgsAttributeActionDialog::browse()
// widget

QString action = QFileDialog::getOpenFileName(
this, "Select an action");
this, tr("Select an action","File dialog window title") );

if (!action.isNull())
actionAction->insert(action);
Expand Down
2 changes: 1 addition & 1 deletion src/providers/postgres/qgspostgresprovider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1240,7 +1240,7 @@ void QgsPostgresProvider::findColumns(tableCols& cols)
"\"?\\.\"?" + QRegExp::escape(temp.column_name) +
"\"? AS \"?(\\w+)\"?,* .*");

QgsDebugMsg(viewQuery + "\n" + viewDef + "\n" + s.pattern());
QgsDebugMsg(viewDef + "\n" + s.pattern());

if (s.indexIn(viewDef) != -1)
{
Expand Down

0 comments on commit 0ea1add

Please sign in to comment.