diff --git a/images/images.qrc b/images/images.qrc new file mode 100644 index 00000000000..b87d039c201 --- /dev/null +++ b/images/images.qrc @@ -0,0 +1,6 @@ + + + icons/qgis-icon-16x16.png + icons/qgis-icon-60x60.png + + diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index c60885d7bb3..c64af1f42b7 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -216,12 +216,12 @@ ENDIF (PYTHON_FOUND) IF (WIN32) # 'WIN32' removes console, which is Bad when debugging IF (CMAKE_BUILD_TYPE MATCHES Debug) - ADD_EXECUTABLE(qgis ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS}) + ADD_EXECUTABLE(qgis ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS} ${IMAGE_RCC_SRCS}) ELSE (CMAKE_BUILD_TYPE MATCHES Debug) - ADD_EXECUTABLE(qgis WIN32 ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS}) + ADD_EXECUTABLE(qgis WIN32 ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS} ${IMAGE_RCC_SRCS}) ENDIF (CMAKE_BUILD_TYPE MATCHES Debug) ELSE (WIN32) - ADD_EXECUTABLE(qgis ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS}) + ADD_EXECUTABLE(qgis ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS} ${IMAGE_RCC_SRCS}) ENDIF (WIN32) TARGET_LINK_LIBRARIES(qgis @@ -230,6 +230,7 @@ TARGET_LINK_LIBRARIES(qgis ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} ${QT_QTNETWORK_LIBRARY} + ${QT_QTSQL_LIBRARY} #should only be needed for win ${QT_QTMAIN_LIBRARY} qgis_core @@ -237,9 +238,6 @@ TARGET_LINK_LIBRARIES(qgis ) IF (${QTVERSION} STRLESS "4.3.0") TARGET_LINK_LIBRARIES(qgis ${QT_QT3SUPPORT_LIBRARY} ) - IF (APPLE) - TARGET_LINK_LIBRARIES(qgis ${QT_QTSQL_LIBRARY} ) - ENDIF (APPLE) ENDIF (${QTVERSION} STRLESS "4.3.0") IF (APPLE) diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp index 2dac9707764..c16cf503580 100644 --- a/src/app/qgisapp.cpp +++ b/src/app/qgisapp.cpp @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -214,7 +215,7 @@ static void buildSupportedVectorFileFilter_(QString & fileFilters); static void setTitleBarText_( QWidget & qgisApp ) { QString caption = QgisApp::tr("Quantum GIS - "); - caption += QString("%1 ('%2') ").arg(QGis::qgisVersion).arg(QGis::qgisReleaseName) + " "; + caption += QString("%1 ").arg(QGis::qgisVersion) + " "; if ( QgsProject::instance()->title().isEmpty() ) { @@ -305,7 +306,8 @@ static void customSrsValidation_(QgsSpatialRefSys* srs) : QMainWindow(parent,fl), mSplash(splash) { - setupUi(this); +// setupUi(this); + resize(640, 480); mSplash->showMessage(tr("Checking database"), Qt::AlignHCenter | Qt::AlignBottom); qApp->processEvents(); @@ -327,8 +329,8 @@ static void customSrsValidation_(QgsSpatialRefSys* srs) setTheme(mThemeName); updateRecentProjectPaths(); createCanvas(); - createOverview(); createLegend(); + createOverview(); createMapTips(); mComposer = new QgsComposer(this); // Map composer @@ -378,7 +380,7 @@ static void customSrsValidation_(QgsSpatialRefSys* srs) // now build raster file filter QgsRasterLayer::buildSupportedRasterFileFilter( mRasterFileFilter ); - +/* // Set the background colour for toolbox and overview as they default to // white instead of the window color QPalette myPalette = toolBox->palette(); @@ -389,7 +391,7 @@ static void customSrsValidation_(QgsSpatialRefSys* srs) myPalette.setColor(QPalette::Button, myPalette.window().color()); mMapLegend->setPalette(myPalette); //and for overview control this is done in createOverView method - +*/ // Do this last in the ctor to ensure that all members are instantiated properly setupConnections(); // @@ -493,12 +495,12 @@ void QgisApp::readSettings() // Add the recently accessed project file paths to the File menu mRecentProjectPaths = settings.readListEntry("/UI/recentProjectsList"); - +/* // Set the behaviour when the map splitters are resized bool splitterRedraw = settings.value("/qgis/splitterRedraw", true).toBool(); canvasLegendSplit->setOpaqueResize(splitterRedraw); legendOverviewSplit->setOpaqueResize(splitterRedraw); -} +*/} ////////////////////////////////////////////////////////////////////// @@ -1314,10 +1316,11 @@ void QgisApp::createCanvas() mMapCanvas = new QgsMapCanvas(this, "theMapCanvas" ); mMapCanvas->setWhatsThis(tr("Map canvas. This is where raster and vector layers are displayed when added to the map")); - mMapCanvas->setMinimumWidth(10); - QVBoxLayout *myCanvasLayout = new QVBoxLayout; - myCanvasLayout->addWidget(mMapCanvas); - tabWidget->widget(0)->setLayout(myCanvasLayout); +// mMapCanvas->setMinimumWidth(10); +// QVBoxLayout *myCanvasLayout = new QVBoxLayout; +// myCanvasLayout->addWidget(mMapCanvas); +// tabWidget->widget(0)->setLayout(myCanvasLayout); + setCentralWidget(mMapCanvas); // set the focus to the map canvas mMapCanvas->setFocus(); @@ -1367,10 +1370,16 @@ void QgisApp::createOverview() QBitmap overviewPanBmpMask = QBitmap::fromData(QSize(16, 16), pan_mask_bits); mOverviewMapCursor = new QCursor(overviewPanBmp, overviewPanBmpMask, 5, 5); overviewCanvas->setCursor(*mOverviewMapCursor); - QVBoxLayout *myOverviewLayout = new QVBoxLayout; - myOverviewLayout->addWidget(overviewCanvas); - overviewFrame->setLayout(myOverviewLayout); - +// QVBoxLayout *myOverviewLayout = new QVBoxLayout; +// myOverviewLayout->addWidget(overviewCanvas); +// overviewFrame->setLayout(myOverviewLayout); + mOverviewDock = new QDockWidget(tr("Overview"), this); + mOverviewDock->setObjectName("Overview"); + mOverviewDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); + mOverviewDock->setWidget(overviewCanvas); + addDockWidget(Qt::LeftDockWidgetArea, mOverviewDock); + mViewMenu->addAction(mOverviewDock->toggleViewAction()); + mMapCanvas->setOverview(overviewCanvas); // moved here to set anti aliasing to both map canvas and overview @@ -1395,9 +1404,16 @@ void QgisApp::createLegend() mMapLegend->setToggleEditingAction(mActionToggleEditing); mMapLegend->setWhatsThis(tr("Map legend that displays all the layers currently on the map canvas. Click on the check box to turn a layer on or off. Double click on a layer in the legend to customize its appearance and set other properties.")); - QVBoxLayout *myLegendLayout = new QVBoxLayout; - myLegendLayout->addWidget(mMapLegend); - toolBox->widget(0)->setLayout(myLegendLayout); +// QVBoxLayout *myLegendLayout = new QVBoxLayout; +// myLegendLayout->addWidget(mMapLegend); +// toolBox->widget(0)->setLayout(myLegendLayout); + mLegendDock = new QDockWidget(tr("Legend"), this); + mLegendDock->setObjectName("Legend"); + mLegendDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); +// mLegendDock->setFeatures(mLegendDock->features() & ~QDockWidget::DockWidgetClosable); + mLegendDock->setWidget(mMapLegend); + addDockWidget(Qt::LeftDockWidgetArea, mLegendDock); + mViewMenu->addAction(mLegendDock->toggleViewAction()); return; } @@ -1503,8 +1519,8 @@ void QgisApp::saveWindowState() // store window geometry settings.setValue("/UI/geometry", saveGeometry()); - settings.setValue("/UI/canvasSplitterState", canvasLegendSplit->saveState()); - settings.setValue("/UI/legendSplitterState", legendOverviewSplit->saveState()); +// settings.setValue("/UI/canvasSplitterState", canvasLegendSplit->saveState()); +// settings.setValue("/UI/legendSplitterState", legendOverviewSplit->saveState()); } void QgisApp::restoreWindowState() @@ -1516,8 +1532,8 @@ void QgisApp::restoreWindowState() // restore window geometry restoreGeometry(settings.value("/UI/geometry").toByteArray()); - canvasLegendSplit->restoreState(settings.value("/UI/canvasSplitterState").toByteArray()); - legendOverviewSplit->restoreState(settings.value("/UI/legendSplitterState").toByteArray()); +// canvasLegendSplit->restoreState(settings.value("/UI/canvasSplitterState").toByteArray()); +// legendOverviewSplit->restoreState(settings.value("/UI/legendSplitterState").toByteArray()); } ///////////// END OF GUI SETUP ROUTINES /////////////// @@ -1527,20 +1543,20 @@ void QgisApp::about() if (!abt) { QApplication::setOverrideCursor(Qt::WaitCursor); abt = new QgsAbout(); - QString versionString = tr("Version "); - versionString += QGis::qgisVersion; - versionString += " ("; - versionString += QGis::qgisSvnVersion; - versionString += ")"; + QString versionString = tr("You are using QGIS version %1 built against code revision %2.") + .arg(QGis::qgisVersion) + .arg(QGis::qgisSvnVersion); #ifdef HAVE_POSTGRESQL - versionString += tr(" with PostgreSQL support"); + versionString += tr(" This copy of QGIS has been built with PostgreSQL support."); #else - versionString += tr(" (no PostgreSQL support)"); + versionString += tr(" This copy of QGIS has been built without PostgreSQL support."); #endif - versionString += tr("\nCompiled against Qt ") + QT_VERSION_STR - + tr(", running against Qt ") + qVersion(); + versionString += tr("\nThis binary was compiled against Qt %1," + "and is currently running against Qt %2") + .arg(QT_VERSION_STR) + .arg(qVersion()); #ifdef WIN32 // special version stuff for windows (if required) @@ -1548,12 +1564,6 @@ void QgisApp::about() #endif abt->setVersion(versionString); - QString urls = "

" + - tr("Quantum GIS is licensed under the GNU General Public License") + - "

" + - tr("http://www.gnu.org/licenses") + - "

"; - abt->setURLs(urls); QString whatsNew = "" + tr("Version") + " "; whatsNew += QGis::qgisVersion; whatsNew += "

" + tr("New features") + "

" + @@ -1589,9 +1599,6 @@ void QgisApp::about() abt->setWhatsNew(whatsNew); - // add the available plugins to the list - QString providerInfo = "" + tr("Available Data Provider Plugins") + "
"; - abt->setPluginInfo(providerInfo + QgsProviderRegistry::instance()->pluginList(true)); QApplication::restoreOverrideCursor(); } abt->show(); @@ -4264,9 +4271,9 @@ void QgisApp::options() double zoomFactor = mySettings.value("/qgis/zoom_factor", 2).toDouble(); mMapCanvas->setWheelAction((QgsMapCanvas::WheelAction) action, zoomFactor); - bool splitterRedraw = mySettings.value("/qgis/splitterRedraw", true).toBool(); - canvasLegendSplit->setOpaqueResize(splitterRedraw); - legendOverviewSplit->setOpaqueResize(splitterRedraw); +// bool splitterRedraw = mySettings.value("/qgis/splitterRedraw", true).toBool(); +// canvasLegendSplit->setOpaqueResize(splitterRedraw); +// legendOverviewSplit->setOpaqueResize(splitterRedraw); } } diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h index ee3c60bcf6a..ec96155eeb2 100644 --- a/src/app/qgisapp.h +++ b/src/app/qgisapp.h @@ -35,6 +35,7 @@ class QMenu; class QPixmap; class QSplashScreen; class QValidator; +class QActionGroup; class QgisAppInterface; class QgsClipboard; @@ -52,7 +53,6 @@ class QgsRasterLayer; class QgsRect; class QgsVectorLayer; -#include #include #include @@ -62,7 +62,7 @@ class QgsVectorLayer; /*! \class QgisApp * \brief Main window for the Qgis application */ -class QgisApp : public QMainWindow, public Ui::QgisAppBase +class QgisApp : public QMainWindow { Q_OBJECT; public: @@ -535,7 +535,10 @@ private: QMenu *mSettingsMenu; QMenu *mHelpMenu; - class Tools + QDockWidget *mLegendDock; + QDockWidget *mOverviewDock; + +class Tools { public: QgsMapTool* mZoomIn; diff --git a/src/app/qgisappinterface.cpp b/src/app/qgisappinterface.cpp index 6be4f2823ae..1e5ed21cd4e 100644 --- a/src/app/qgisappinterface.cpp +++ b/src/app/qgisappinterface.cpp @@ -133,7 +133,7 @@ QWidget * QgisAppInterface::getMainWindow() QToolBox* QgisAppInterface::getToolBox() { - return qgis->toolBox; + return NULL; } void QgisAppInterface::refreshLegend(QgsMapLayer *l) diff --git a/src/app/qgsabout.cpp b/src/app/qgsabout.cpp index 9b7ec3c3c45..16cceb8db2c 100644 --- a/src/app/qgsabout.cpp +++ b/src/app/qgsabout.cpp @@ -18,16 +18,13 @@ #include "qgsabout.h" #include "qgsapplication.h" +#include "qgsproviderregistry.h" #include "qgslogger.h" -#ifdef Q_WS_MAC -#include -#else -#include -#include -#include -#endif +#include #include #include +#include +#include #include /* Uncomment this block to use preloaded images @@ -48,17 +45,12 @@ QgsAbout::~QgsAbout() void QgsAbout::init() { - - // Set up text in dialog. - QString format("

%1

%3

"); - QString sentence1 = tr("Quantum GIS is licensed under the GNU General Public License"); - QString link("http://www.gnu.org/licenses"); - lblUrls->setHtml(format.arg(sentence1).arg(link).arg(link)); - QgsDebugMsg(format.arg(sentence1).arg(link).arg(link)); + setPluginInfo(); // set the 60x60 icon pixmap QPixmap icon(QgsApplication::iconsPath() + "qgis-icon-60x60.png"); qgisIcon->setPixmap(icon); + //read the authors file to populate the contributors list QStringList lines; @@ -114,27 +106,23 @@ void QgsAbout::init() ".............................................\n").toLocal8Bit().data()); #endif if ( sponsorFile.open( QIODevice::ReadOnly ) ) { - QString sponsorHTML = "

" - + tr("QGIS Sponsors") + "

" - - + tr("The following have sponsored QGIS by contributing money to fund development and other project costs") - + "
" - + "" - + "" - + "" - + ""; + QString sponsorHTML = "" + + tr("

The following have sponsored QGIS by contributing " + "money to fund development and other project costs

") + + "
" + "
" + tr("Name") + "" + tr("Website") + "" + tr("Name") + "" + tr("Website") + "
" + "" + ""; QString website; QTextStream sponsorStream( &sponsorFile ); // Always use UTF-8 sponsorStream.setCodec("UTF-8"); QString sline; - int count = 0; while ( !sponsorStream.atEnd() ) { sline = sponsorStream.readLine(); // line of text excluding '\n' //ignore the line if it starts with a hash.... if (sline.left(1)=="#") continue; - count++; QStringList myTokens = QStringList::split("|",sline); if(myTokens.size() > 1) { @@ -144,25 +132,16 @@ void QgsAbout::init() { website = " "; } - if(count == 1){ - sponsorHTML += ""; - } - if(count == 2) - { - // a spacer between donator columns - sponsorHTML += ""; - } + sponsorHTML += ""; sponsorHTML += ""; - if(count == 2){ - // close the row - sponsorHTML += ""; - count = 0; - } - + // close the row + sponsorHTML += ""; } - sponsorHTML += "
" + tr("Name") + "" + tr("Website") + "
" + myTokens[0] + "" + website + "
"; + sponsorHTML += ""; - txtSponsors->setAcceptRichText(true); + QString myStyle = QgsApplication::reportStyleSheet(); + txtSponsors->clear(); + txtSponsors->document()->setDefaultStyleSheet(myStyle); txtSponsors->setHtml(sponsorHTML); #ifdef QGISDEBUG std::cout << "sponsorHTML:" << sponsorHTML.toAscii().constData() << std::endl; @@ -176,19 +155,43 @@ void QgsAbout::setVersion(QString v) lblVersion->setText(v); } -void QgsAbout::setURLs(QString urls) -{ - lblUrls->setText(urls); -} - void QgsAbout::setWhatsNew(QString txt) { - txtWhatsNew->setText(txt); + QString myStyle = QgsApplication::reportStyleSheet(); + txtWhatsNew->clear(); + txtWhatsNew->document()->setDefaultStyleSheet(myStyle); + txtWhatsNew->setHtml(txt); } -void QgsAbout::setPluginInfo(QString txt) +void QgsAbout::setPluginInfo() { - txtBrowserPlugins->setText(txt); + QString myString; + //provide info about the plugins available + myString += "" + tr("Available QGIS Data Provider Plugins") + "
"; + myString += QgsProviderRegistry::instance()->pluginList(true); + //qt database plugins + myString += "" + tr("Available Qt Database Plugins") + "
"; + myString += "
    \n
  1. \n"; + QStringList myDbDriverList = QSqlDatabase::drivers (); + myString += myDbDriverList.join("
    2. \n
  2. "); + myString += "
    3. \n
\n"; + //qt image plugins + myString += "" + tr("Available Qt Image Plugins") + "
"; + myString += "
    \n
  1. \n"; + QList myImageFormats = QImageReader::supportedImageFormats(); + QList::const_iterator myIterator = myImageFormats.begin(); + while( myIterator != myImageFormats.end() ) + { + QString myFormat = (*myIterator).data(); + myString += myFormat + "
    2. \n
  2. "; + ++myIterator; + } + myString += "
    3. \n
\n"; + + QString myStyle = QgsApplication::reportStyleSheet(); + txtBrowserPlugins->clear(); + txtBrowserPlugins->document()->setDefaultStyleSheet(myStyle); + txtBrowserPlugins->setText(myString); } void QgsAbout::on_buttonCancel_clicked() @@ -213,7 +216,7 @@ void QgsAbout::on_listBox1_currentItemChanged(QListWidgetItem *theItem) printf ("Loading mug: %s\n", (const char *)myString.toLocal8Bit().data()); #endif QPixmap *pixmap = new QPixmap(myString); - pixAuthorMug->setPixmap(*pixmap); + //pixAuthorMug->setPixmap(*pixmap); /* Uncomment this block to use preloaded images pixAuthorMug->setPixmap(mugs[myString]); */ @@ -233,55 +236,8 @@ void QgsAbout::on_btnQgisHome_clicked() void QgsAbout::openUrl(QString url) { -#ifdef Q_WS_MAC - /* Use Mac OS X Launch Services which uses the user's default browser - * and will just open a new window if that browser is already running. - * QProcess creates a new browser process for each invocation and expects a - * commandline application rather than a bundled application. - */ - CFURLRef urlRef = CFURLCreateWithBytes(kCFAllocatorDefault, - reinterpret_cast(url.utf8().data()), url.length(), - kCFStringEncodingUTF8, NULL); - OSStatus status = LSOpenCFURLRef(urlRef, NULL); - status = 0; // avoid compiler warnings - CFRelease(urlRef); -#else - QSettings settings; - QString browser = settings.readEntry("/qgis/browser"); - if (browser.length() == 0) - { - // ask user for browser and use it - bool ok; - QString text = QInputDialog::getText(tr("QGIS Browser Selection"), - tr("Enter the name of a web browser to use (eg. konqueror).\n" - "Enter the full path if the browser is not in your PATH.\n" - "You can change this option later by selection Options from" - " the Settings menu (Help Browser tab)."), - QLineEdit::Normal, - QString::null, &ok, this); - if (ok && !text.isEmpty()) - { - // user entered something and pressed OK - browser = text; - // save the setting - settings.writeEntry("/qgis/browser", browser); - } else - { - browser = ""; - } - } - if (browser.length() > 0) - { - // find the installed location of the help files - // open index.html using browser - //XXX for debug on win32 QMessageBox::information(this, "Help opening...", browser + " - " + url); - QProcess *helpProcess = new QProcess(this); - helpProcess->start(browser, QStringList() << url); - } -#endif - /* mHelpViewer = new QgsHelpViewer(this,"helpviewer",false); - mHelpViewer->showContent(mAppDir +"/share/doc","index.html"); - mHelpViewer->show(); */ + //use the users default browser + QDesktopServices::openUrl(url); } /* diff --git a/src/app/qgsabout.h b/src/app/qgsabout.h index 0336d46dee2..69881357bbd 100644 --- a/src/app/qgsabout.h +++ b/src/app/qgsabout.h @@ -27,12 +27,11 @@ class QgsAbout : public QDialog, private Ui::QgsAbout QgsAbout(); ~QgsAbout(); void setVersion(QString v); - void setURLs(QString urls); void setWhatsNew(QString txt); - void setPluginInfo(QString txt); static QString fileSystemSafe(QString string); private: + void setPluginInfo(); void init(); void openUrl(QString url); diff --git a/src/app/qgsaddattrdialog.cpp b/src/app/qgsaddattrdialog.cpp index 51f0d230584..e700745abd9 100644 --- a/src/app/qgsaddattrdialog.cpp +++ b/src/app/qgsaddattrdialog.cpp @@ -22,8 +22,6 @@ QgsAddAttrDialog::QgsAddAttrDialog(QgsVectorDataProvider* provider, QWidget *par : QDialog(parent, fl), mDataProvider(provider) { setupUi(this); - connect(mOkButton, SIGNAL(clicked()), this, SLOT(accept())); - connect(mCancelButton, SIGNAL(clicked()), this, SLOT(reject())); //fill data types into the combo box const QSet& typelist=mDataProvider->supportedNativeTypes(); @@ -38,8 +36,6 @@ QgsAddAttrDialog::QgsAddAttrDialog(const std::list& typelist, QWidget * : QDialog(parent, fl), mDataProvider(0) { setupUi(this); - connect(mOkButton, SIGNAL(clicked()), this, SLOT(accept())); - connect(mCancelButton, SIGNAL(clicked()), this, SLOT(reject())); for(std::list::const_iterator iter=typelist.begin();iter!=typelist.end();++iter) { diff --git a/src/app/qgsbookmarks.cpp b/src/app/qgsbookmarks.cpp index 0a46aca56dc..dad7fcfd039 100644 --- a/src/app/qgsbookmarks.cpp +++ b/src/app/qgsbookmarks.cpp @@ -26,6 +26,7 @@ #include #include #include +#include //standard includes #include @@ -38,9 +39,6 @@ QgsBookmarks::QgsBookmarks(QWidget *parent, Qt::WFlags fl) mParent(parent) { setupUi(this); - connect(btnClose, SIGNAL(clicked()), this, SLOT(close())); - connect(this, SIGNAL(finished(int)), this, SLOT(saveWindowLocation())); - // user database is created at QGIS startup in QgisApp::createDB // we just check whether there is our database [MD] QFileInfo myFileInfo; @@ -55,13 +53,29 @@ QgsBookmarks::QgsBookmarks(QWidget *parent, Qt::WFlags fl) // Note proper queens english on next line initialise(); + // + // Create the zoomto and delete buttons and add them to the + // toolbar + // + QPushButton * btnDelete = new QPushButton(tr("&Delete")); + QPushButton * btnZoomTo = new QPushButton(tr("&Zoom to")); + btnZoomTo->setDefault(true); + buttonBox->addButton(btnDelete, QDialogButtonBox::ActionRole); + buttonBox->addButton(btnZoomTo, QDialogButtonBox::ActionRole); + // connect the slot up to catch when a bookmark is deleted + connect(btnDelete, SIGNAL(clicked()), this, SLOT(on_btnDelete_clicked())); + // connect the slot up to catch when a bookmark is zoomed to + connect(btnZoomTo, SIGNAL(clicked()), this, SLOT(on_btnZoomTo_clicked())); // connect the slot up to catch when a new bookmark is added connect(mParent, SIGNAL(bookmarkAdded()), this, SLOT(refreshBookmarks())); + //and for help requested + connect(buttonBox, SIGNAL(helpRequested()), this, SLOT(helpRequested())); } // Destructor QgsBookmarks::~QgsBookmarks() { + saveWindowLocation(); } void QgsBookmarks::refreshBookmarks() @@ -248,7 +262,7 @@ int QgsBookmarks::connectDb() return rc; } -void QgsBookmarks::on_btnHelp_clicked() +void QgsBookmarks::helpRequested() { QgsContextHelp::run(context_id); } diff --git a/src/app/qgsbookmarks.h b/src/app/qgsbookmarks.h index e037aaed637..2c1e67ef6e4 100644 --- a/src/app/qgsbookmarks.h +++ b/src/app/qgsbookmarks.h @@ -36,7 +36,7 @@ private slots: void on_btnDelete_clicked(); void on_btnZoomTo_clicked(); void on_lstBookmarks_doubleClicked(QTreeWidgetItem *); - void on_btnHelp_clicked(); + void helpRequested(); void refreshBookmarks(); private: QWidget *mParent; diff --git a/src/app/qgsgraduatedsymboldialog.cpp b/src/app/qgsgraduatedsymboldialog.cpp index ffcd4d755b2..256c46535f6 100644 --- a/src/app/qgsgraduatedsymboldialog.cpp +++ b/src/app/qgsgraduatedsymboldialog.cpp @@ -35,7 +35,6 @@ QgsGraduatedSymbolDialog::QgsGraduatedSymbolDialog(QgsVectorLayer * layer): QDia #endif setOrientation(Qt::Vertical); - setSizeGripEnabled(true); //find out the numerical fields of mVectorLayer QgsVectorDataProvider *provider = mVectorLayer->getDataProvider(); diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp index eca3b18e8f1..cfd0d434ea0 100644 --- a/src/app/qgsrasterlayerproperties.cpp +++ b/src/app/qgsrasterlayerproperties.cpp @@ -842,8 +842,8 @@ void QgsRasterLayerProperties::sync() */ //populate the metadata tab's text browser widget with gdal metadata info QString myStyle = QgsApplication::reportStyleSheet(); - txtbMetadata->setHtml(mRasterLayer->getMetadata()); txtbMetadata->document()->setDefaultStyleSheet(myStyle); + txtbMetadata->setHtml(mRasterLayer->getMetadata()); } // QgsRasterLayerProperties::sync() diff --git a/src/app/qgssinglesymboldialog.cpp b/src/app/qgssinglesymboldialog.cpp index 082d2981706..d3d551214a5 100644 --- a/src/app/qgssinglesymboldialog.cpp +++ b/src/app/qgssinglesymboldialog.cpp @@ -128,22 +128,22 @@ QgsSingleSymbolDialog::QgsSingleSymbolDialog(QgsVectorLayer * layer): QDialog(), // //set pattern icons and state // - cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("SolidPattern")),tr("Solid Pattern"),"SolidPattern"); - cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("HorPattern")),tr("Hor Pattern"),"HorPattern"); - cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("VerPattern")),tr("Ver Pattern"),"VerPattern"); - cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("CrossPattern")),tr("Cross Pattern"),"CrossPattern"); - cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("BDiagPattern")),tr("BDiag Pattern"),"BDiagPattern"); - cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("FDiagPattern")),tr("FDiag Pattern"),"FDiagPattern"); - cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("DiagCrossPattern")),tr("Diag Cross Pattern"),"DiagCrossPattern"); - cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("Dense1Pattern")),tr("Dense1 Pattern"),"Dense1Pattern"); - cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("Dense2Pattern")),tr("Dense2 Pattern"),"Dense2Pattern"); - cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("Dense3Pattern")),tr("Dense3 Pattern"),"Dense3Pattern"); - cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("Dense4Pattern")),tr("Dense4 Pattern"),"Dense4Pattern"); - cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("Dense5Pattern")),tr("Dense5 Pattern"),"Dense5Pattern"); - cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("Dense6Pattern")),tr("Dense6 Pattern"),"Dense6Pattern"); - cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("Dense7Pattern")),tr("Dense7 Pattern"),"Dense7Pattern"); + cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("SolidPattern")),tr("Solid"),"SolidPattern"); + cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("HorPattern")),tr("Horizontal"),"HorPattern"); + cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("VerPattern")),tr("Vertical"),"VerPattern"); + cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("CrossPattern")),tr("Cross"),"CrossPattern"); + cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("BDiagPattern")),tr("BDiagonal"),"BDiagPattern"); + cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("FDiagPattern")),tr("FDiagonal"),"FDiagPattern"); + cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("DiagCrossPattern")),tr("Diagonal X"),"DiagCrossPattern"); + cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("Dense1Pattern")),tr("Dense1"),"Dense1Pattern"); + cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("Dense2Pattern")),tr("Dense2"),"Dense2Pattern"); + cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("Dense3Pattern")),tr("Dense3"),"Dense3Pattern"); + cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("Dense4Pattern")),tr("Dense4"),"Dense4Pattern"); + cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("Dense5Pattern")),tr("Dense5"),"Dense5Pattern"); + cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("Dense6Pattern")),tr("Dense6"),"Dense6Pattern"); + cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("Dense7Pattern")),tr("Dense7"),"Dense7Pattern"); cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("NoBrush")),tr("No Brush"),"NoBrush"); - cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("TexturePattern")),tr("Texture Pattern"),"TexturePattern"); + cboFillStyle->addItem(QIcon(QgsSymbologyUtils::char2PatternPixmap("TexturePattern")),tr("Texture"),"TexturePattern"); if (mVectorLayer) { diff --git a/src/app/qgsuniquevaluedialog.cpp b/src/app/qgsuniquevaluedialog.cpp index 44c79cfbbc8..f75d9c06c9e 100644 --- a/src/app/qgsuniquevaluedialog.cpp +++ b/src/app/qgsuniquevaluedialog.cpp @@ -29,8 +29,7 @@ QgsUniqueValueDialog::QgsUniqueValueDialog(QgsVectorLayer* vl): QDialog(), mVectorLayer(vl), sydialog(vl) { setupUi(this); - setSizeGripEnabled(true); - + setOrientation(Qt::Vertical); //find out the fields of mVectorLayer QgsVectorDataProvider *provider; if ((provider = dynamic_cast(mVectorLayer->getDataProvider()))) diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp index 91f13075e56..8622ccbcced 100644 --- a/src/app/qgsvectorlayerproperties.cpp +++ b/src/app/qgsvectorlayerproperties.cpp @@ -19,6 +19,7 @@ #include +#include "qgsapplication.h" #include "qgsattributeactiondialog.h" #include "qgscontexthelp.h" #include "qgscontinuouscolordialog.h" @@ -248,7 +249,10 @@ void QgsVectorLayerProperties::reset( void ) layer->label()->setFields ( layer->getDataProvider()->fields() ); //set the metadata contents - teMetadata->setText(getMetadata()); + QString myStyle = QgsApplication::reportStyleSheet(); + teMetadata->clear(); + teMetadata->document()->setDefaultStyleSheet(myStyle); + teMetadata->setHtml(getMetadata()); actionDialog->init(); labelDialog->init(); labelCheckBox->setChecked(layer->labelOn()); @@ -282,7 +286,10 @@ void QgsVectorLayerProperties::apply() // set the subset sql for the layer layer->setSubsetString(txtSubsetSQL->toPlainText()); // update the metadata with the updated sql subset - teMetadata->setText(getMetadata()); + QString myStyle = QgsApplication::reportStyleSheet(); + teMetadata->clear(); + teMetadata->document()->setDefaultStyleSheet(myStyle); + teMetadata->setHtml(getMetadata()); // update the extents of the layer (fetched from the provider) layer->updateExtents(); } @@ -399,27 +406,27 @@ QString QgsVectorLayerProperties::getMetadata() //------------- - myMetedata += ""; + myMetedata += ""; myMetedata += tr("General:"); myMetedata += ""; // data comment if (!(layer->dataComment().isEmpty())) { - myMetedata += ""; + myMetedata += ""; myMetedata += tr("Layer comment: ") + layer->dataComment(); myMetedata += ""; } //storage type - myMetedata += ""; + myMetedata += ""; myMetedata += tr("Storage type of this layer : ") + layer->storageType(); myMetedata += ""; // data source - myMetedata += ""; + myMetedata += ""; myMetedata += tr("Source for this layer : ") + layer->publicSource(); myMetedata += ""; @@ -436,7 +443,7 @@ QString QgsVectorLayerProperties::getMetadata() { QString vectorTypeString( QGis::qgisVectorGeometryType[layer->vectorType()] ); - myMetedata += ""; + myMetedata += ""; myMetedata += tr("Geometry type of the features in this layer : ") + vectorTypeString; myMetedata += ""; @@ -444,12 +451,12 @@ QString QgsVectorLayerProperties::getMetadata() //feature count - myMetedata += ""; + myMetedata += ""; myMetedata += tr("The number of features in this layer : ") + QString::number(layer->featureCount()); myMetedata += ""; //capabilities - myMetedata += ""; + myMetedata += ""; myMetedata += tr("Editing capabilities of this layer : ") + layer->capabilitiesString(); myMetedata += ""; @@ -457,11 +464,11 @@ QString QgsVectorLayerProperties::getMetadata() //------------- QgsRect myExtent = layer->extent(); - myMetedata += ""; + myMetedata += ""; myMetedata += tr("Extents:"); myMetedata += ""; //extents in layer cs TODO...maybe make a little nested table to improve layout... - myMetedata += ""; + myMetedata += ""; myMetedata += tr("In layer spatial reference system units : ") + tr("xMin,yMin ") + QString::number(myExtent.xMin()) + @@ -480,7 +487,7 @@ QString QgsVectorLayerProperties::getMetadata() /* // TODO: currently disabled, will revisit later [MD] QgsRect myProjectedExtent = coordinateTransform->transformBoundingBox(layer->extent()); - myMetedata += ""; + myMetedata += ""; myMetedata += tr("In project spatial reference system units : ") + tr("xMin,yMin ") + QString::number(myProjectedExtent.xMin()) + @@ -496,10 +503,10 @@ QString QgsVectorLayerProperties::getMetadata() // // Display layer spatial ref system // - myMetedata += ""; + myMetedata += ""; myMetedata += tr("Layer Spatial Reference System:"); myMetedata += ""; - myMetedata += ""; + myMetedata += ""; myMetedata += layer->srs().proj4String().replace(QRegExp("\"")," \""); myMetedata += ""; @@ -511,7 +518,7 @@ QString QgsVectorLayerProperties::getMetadata() myMetedata += ""; myMetedata += tr("Project (Output) Spatial Reference System:"); myMetedata += ""; - myMetedata += ""; + myMetedata += ""; myMetedata += coordinateTransform->destSRS().proj4String().replace(QRegExp("\"")," \""); myMetedata += ""; */ @@ -522,7 +529,7 @@ QString QgsVectorLayerProperties::getMetadata() UNUSED(cse); QgsDebugMsg( cse.what() ); - myMetedata += ""; + myMetedata += ""; myMetedata += tr("In project spatial reference system units : "); myMetedata += " (Invalid transformation of layer extents) "; myMetedata += ""; @@ -533,27 +540,27 @@ QString QgsVectorLayerProperties::getMetadata() // // Add the info about each field in the attribute table // - myMetedata += ""; + myMetedata += ""; myMetedata += tr("Attribute field info:"); myMetedata += ""; - myMetedata += ""; + myMetedata += ""; // Start a nested table in this trow myMetedata += ""; - myMetedata += ""; - myMetedata += ""; - myMetedata += ""; - myMetedata += ""; - myMetedata += ""; //get info for each field by looping through them @@ -563,19 +570,19 @@ QString QgsVectorLayerProperties::getMetadata() { const QgsField& myField = *it; - myMetedata += ""; - myMetedata += ""; - myMetedata += ""; - myMetedata += ""; - myMetedata += ""; } diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp index ad4e1c7f2dc..2caf9765beb 100644 --- a/src/core/qgsapplication.cpp +++ b/src/core/qgsapplication.cpp @@ -222,18 +222,46 @@ void QgsApplication::exitQgis() QString QgsApplication::reportStyleSheet() { - QString myStyle = ".glossy,h1,h2,h3{ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #616161, stop: 0.5 #505050, stop: 0.6 #434343, stop:1 #656565); color: white; padding-left: 4px; border: 1px solid #6c6c6c; }"; - myStyle += "h1 {font-size : 22pt;}"; - myStyle += "h2 {font-size : 18pt;}"; - myStyle += "h3 {font-size : 14pt;}"; - myStyle += ".cellHeader {color:#466aa5; font-size : 12pt;}"; - myStyle += ".largeCell {color:#000000; font-size : 12pt;}"; - myStyle += "table " + QString myStyle; + myStyle = ".glossy{ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #616161, stop: 0.5 #505050, stop: 0.6 #434343, stop:1 #656565);" + "color: white;" + "padding-left: 4px;" + "padding-top: 20px;" + "padding-bottom: 8px;" + "border: 1px solid #6c6c6c;" + "}" + ".glossyBlue{ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #3087d3, stop: 0.5 #3794e2, stop: 0.6 #43a6f9, stop:1 #2f87d1);" + "color: white;" + "padding-left: 4px;" + "padding-top: 20px;" + "padding-bottom: 8px;" + "border: 1px solid #44a7fb;" + "}" + "h1 {font-size : 22pt; }" + "h2 {font-size : 18pt; }" + "h3 {font-size : 14pt; }" + ".glossyh3{ " + "background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #616161, stop: 0.5 #505050, stop: 0.6 #434343, stop:1 #656565);" + "color: white; " + "padding-left: 4px; " + "padding-top: 20px;" + "padding-bottom: 8px; " + "border: 1px solid #6c6c6c; }" + ".headerCell, th {color:#466aa5; " + "font-size : 12pt; " + "font-weight: bold; " + "width: 100%;" + "align: left;" + "}" + ".parameterHeader {font-weight: bold;}" + ".largeCell {color:#000000; font-size : 12pt;}" + ".alternateCell {font-weight: bold;}" + ".rocTable " "{" " border-width: 1px 1px 1px 1px;" " border-spacing: 2px;" - " border-style: solid solid solid solid;" - " border-color: black black black black;" + " border-style: solid solid solid solid;" //unsupported + " border-color: black black black black;" //unsupported " border-collapse: separate;" " background-color: white;" "}"; diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp index ce87fb8522b..2cb83c621bd 100644 --- a/src/core/raster/qgsrasterlayer.cpp +++ b/src/core/raster/qgsrasterlayer.cpp @@ -3442,7 +3442,7 @@ static QString makeTableCell_( QString const & value ) { - return ""; + return "

\n" + value + "

\n"; } // makeTableCell_ @@ -3490,40 +3490,37 @@ cStringList2Q_( char ** stringList ) QString QgsRasterLayer::getMetadata() { - QString myMetadataQString ; - myMetadataQString += "
"; - myMetedata += "" + tr("Field") + ""; + myMetedata += "
"; + myMetedata += tr("Field"); myMetedata += ""; - myMetedata += "" + tr("Type") + ""; + myMetedata += ""; + myMetedata += tr("Type"); myMetedata += ""; - myMetedata += "" + tr("Length") + ""; + myMetedata += ""; + myMetedata += tr("Length"); myMetedata += ""; - myMetedata += "" + tr("Precision") + ""; + myMetedata += ""; + myMetedata += tr("Precision"); myMetedata += ""; - myMetedata += "" + tr("Comment") + ""; + myMetedata += ""; + myMetedata += tr("Comment"); myMetedata += "
"; + myMetedata += "
"; myMetedata += myField.name(); myMetedata += ""; + myMetedata += ""; myMetedata += myField.typeName(); myMetedata += ""; + myMetedata += ""; myMetedata += QString("%1").arg(myField.length()); myMetedata += ""; + myMetedata += ""; myMetedata += QString("%1").arg(myField.precision()); myMetedata += ""; + myMetedata += ""; myMetedata += QString("%1").arg(myField.comment()); myMetedata += "
" + value + "
"; - myMetadataQString += ""; - myMetadataQString += ""; + myMetadata += "

\n"; if (!mProviderKey.isEmpty()) { // Insert provider-specific (e.g. WMS-specific) metadata - myMetadataQString += mDataProvider->getMetadata(); + myMetadata += mDataProvider->getMetadata(); } else { // my added code (MColetti) - myMetadataQString += ""; - myMetadataQString += ""; + myMetadata += "

"; + myMetadata += tr("Dataset Description"); + myMetadata += "

\n"; + myMetadata += "

"; + myMetadata += QFile::decodeName(GDALGetDescription(mGdalDataset)); + myMetadata += "

\n"; char ** GDALmetadata = GDALGetMetadata(mGdalDataset,NULL); @@ -3531,7 +3528,7 @@ QString QgsRasterLayer::getMetadata() if ( GDALmetadata ) { QStringList metadata = cStringList2Q_( GDALmetadata ); - myMetadataQString += makeTableCells_( metadata ); + myMetadata += makeTableCells_( metadata ); } else { @@ -3540,13 +3537,14 @@ QString QgsRasterLayer::getMetadata() for ( int i = 1; i <= GDALGetRasterCount(mGdalDataset); ++i ) { + myMetadata += "

" + tr("Band %1").arg(i) + "

\n"; GDALRasterBandH gdalBand = GDALGetRasterBand(mGdalDataset,i); GDALmetadata = GDALGetMetadata(gdalBand,NULL); if ( GDALmetadata ) { QStringList metadata = cStringList2Q_( GDALmetadata ); - myMetadataQString += makeTableCells_( metadata ); + myMetadata += makeTableCells_( metadata ); } else { @@ -3558,7 +3556,7 @@ QString QgsRasterLayer::getMetadata() if ( GDALcategories ) { QStringList categories = cStringList2Q_( GDALcategories ); - myMetadataQString += makeTableCells_( categories ); + myMetadata += makeTableCells_( categories ); } else { @@ -3569,80 +3567,80 @@ QString QgsRasterLayer::getMetadata() // end my added code - myMetadataQString += ""; - myMetadataQString += ""; + myMetadata += "

\n"; //just use the first band GDALRasterBandH myGdalBand = GDALGetRasterBand(mGdalDataset,1); - myMetadataQString += ""; - myMetadataQString += ""; + myMetadata += "

\n"; - myMetadataQString += ""; - myMetadataQString += ""; - myMetadataQString += ""; + myMetadata += "

\n"; - myMetadataQString += ""; - myMetadataQString += ""; + myMetadata += "

\n"; } // if (mProviderKey.isEmpty()) - myMetadataQString += ""; - myMetadataQString += ""; + myMetadata += "

"; + myMetadata += tr("Layer Spatial Reference System: "); + myMetadata += "

\n"; + myMetadata += "

"; + myMetadata += mSRS->proj4String(); + myMetadata += "

\n"; // output coordinate system // TODO: this is not related to layer, to be removed? [MD] /* - myMetadataQString += ""; - myMetadataQString += ""; + myMetadata += ""; - myMetadataQString += ""; + myMetadata += "

"; + myMetadata += tr("Origin:"); + myMetadata += "

\n"; + myMetadata += "

"; + myMetadata += QString::number(mGeoTransform[0]); + myMetadata += ","; + myMetadata += QString::number(mGeoTransform[3]); + myMetadata += "

\n"; - myMetadataQString += ""; - myMetadataQString += ""; + myMetadata += "

"; + myMetadata += tr("Pixel Size:"); + myMetadata += "

\n"; + myMetadata += "

"; + myMetadata += QString::number(mGeoTransform[1]); + myMetadata += ","; + myMetadata += QString::number(mGeoTransform[5]); + myMetadata += "

\n"; } // // Add the stats for each band to the output table // - myMetadataQString += ""; //end of stats container table row } // if (mProviderKey.isEmpty()) - // - // Close the table - // - - myMetadataQString += "
"; - myMetadataQString += tr("Driver:"); - myMetadataQString += "
"; + QString myMetadata ; + myMetadata += "

" + tr("Driver:") + "

\n"; + myMetadata += "

"; if (mProviderKey.isEmpty()) { - myMetadataQString += QString(GDALGetDescription(GDALGetDatasetDriver(mGdalDataset))); - myMetadataQString += "
"; - myMetadataQString += QString(GDALGetMetadataItem(GDALGetDatasetDriver(mGdalDataset),GDAL_DMD_LONGNAME,NULL)); + myMetadata += QString(GDALGetDescription(GDALGetDatasetDriver(mGdalDataset))); + myMetadata += "
"; + myMetadata += QString(GDALGetMetadataItem(GDALGetDatasetDriver(mGdalDataset),GDAL_DMD_LONGNAME,NULL)); } else { - myMetadataQString += mDataProvider->description(); + myMetadata += mDataProvider->description(); } - myMetadataQString += "

"; - myMetadataQString += tr("Dataset Description"); - myMetadataQString += "
"; - myMetadataQString += QFile::decodeName(GDALGetDescription(mGdalDataset)); - myMetadataQString += "
"; - myMetadataQString += tr("Dimensions:"); - myMetadataQString += "
"; - myMetadataQString += tr("X: ") + QString::number(GDALGetRasterXSize(mGdalDataset)) + + myMetadata += "

"; + myMetadata += tr("Dimensions:"); + myMetadata += "

\n"; + myMetadata += "

"; + myMetadata += tr("X: ") + QString::number(GDALGetRasterXSize(mGdalDataset)) + tr(" Y: ") + QString::number(GDALGetRasterYSize(mGdalDataset)) + tr(" Bands: ") + QString::number(GDALGetRasterCount(mGdalDataset)); - myMetadataQString += "

"; - myMetadataQString += tr("No Data Value"); - myMetadataQString += "
"; + myMetadata += "

"; + myMetadata += tr("No Data Value"); + myMetadata += "

\n"; + myMetadata += "

"; if(mValidNoDataValue) { - myMetadataQString += QString::number(mNoDataValue); + myMetadata += QString::number(mNoDataValue); } else { - myMetadataQString += "*" + tr("NoDataValue not set") + "*"; + myMetadata += "*" + tr("NoDataValue not set") + "*"; } - myMetadataQString += "

"; - myMetadataQString += tr("Data Type:"); - myMetadataQString += "
"; + myMetadata += "

\n"; + myMetadata += "

"; + myMetadata += tr("Data Type:"); + myMetadata += "

\n"; + myMetadata += "

"; switch (GDALGetRasterDataType(myGdalBand)) { case GDT_Byte: - myMetadataQString += tr("GDT_Byte - Eight bit unsigned integer"); + myMetadata += tr("GDT_Byte - Eight bit unsigned integer"); break; case GDT_UInt16: - myMetadataQString += tr("GDT_UInt16 - Sixteen bit unsigned integer "); + myMetadata += tr("GDT_UInt16 - Sixteen bit unsigned integer "); break; case GDT_Int16: - myMetadataQString += tr("GDT_Int16 - Sixteen bit signed integer "); + myMetadata += tr("GDT_Int16 - Sixteen bit signed integer "); break; case GDT_UInt32: - myMetadataQString += tr("GDT_UInt32 - Thirty two bit unsigned integer "); + myMetadata += tr("GDT_UInt32 - Thirty two bit unsigned integer "); break; case GDT_Int32: - myMetadataQString += tr("GDT_Int32 - Thirty two bit signed integer "); + myMetadata += tr("GDT_Int32 - Thirty two bit signed integer "); break; case GDT_Float32: - myMetadataQString += tr("GDT_Float32 - Thirty two bit floating point "); + myMetadata += tr("GDT_Float32 - Thirty two bit floating point "); break; case GDT_Float64: - myMetadataQString += tr("GDT_Float64 - Sixty four bit floating point "); + myMetadata += tr("GDT_Float64 - Sixty four bit floating point "); break; case GDT_CInt16: - myMetadataQString += tr("GDT_CInt16 - Complex Int16 "); + myMetadata += tr("GDT_CInt16 - Complex Int16 "); break; case GDT_CInt32: - myMetadataQString += tr("GDT_CInt32 - Complex Int32 "); + myMetadata += tr("GDT_CInt32 - Complex Int32 "); break; case GDT_CFloat32: - myMetadataQString += tr("GDT_CFloat32 - Complex Float32 "); + myMetadata += tr("GDT_CFloat32 - Complex Float32 "); break; case GDT_CFloat64: - myMetadataQString += tr("GDT_CFloat64 - Complex Float64 "); + myMetadata += tr("GDT_CFloat64 - Complex Float64 "); break; default: - myMetadataQString += tr("Could not determine raster data type."); + myMetadata += tr("Could not determine raster data type."); } - myMetadataQString += "

"; - myMetadataQString += tr("Pyramid overviews:"); - myMetadataQString += "
"; + myMetadata += "

"; + myMetadata += tr("Pyramid overviews:"); + myMetadata += "

\n"; + myMetadata += "

"; if( GDALGetOverviewCount(myGdalBand) > 0 ) { @@ -3653,29 +3651,29 @@ QString QgsRasterLayer::getMetadata() { GDALRasterBandH myOverview; myOverview = GDALGetOverview( myGdalBand, myOverviewInt ); - myMetadataQString += "

X : " + QString::number(GDALGetRasterBandXSize( myOverview )); - myMetadataQString += ",Y " + QString::number(GDALGetRasterBandYSize( myOverview ) ) + "

"; + myMetadata += "

X : " + QString::number(GDALGetRasterBandXSize( myOverview )); + myMetadata += ",Y " + QString::number(GDALGetRasterBandYSize( myOverview ) ) + "

"; } } - myMetadataQString += "
"; - myMetadataQString += tr("Layer Spatial Reference System: "); - myMetadataQString += "
"; - myMetadataQString += mSRS->proj4String(); - myMetadataQString += "
"; - myMetadataQString += tr("Project Spatial Reference System: "); - myMetadataQString += "
"; - myMetadataQString += mCoordinateTransform->destSRS().proj4String(); - myMetadataQString += "
"; + myMetadata += tr("Project Spatial Reference System: "); + myMetadata += "

\n"; + myMetadata += "

"; + myMetadata += mCoordinateTransform->destSRS().proj4String(); + myMetadata += "

\n"; */ if (mProviderKey.isEmpty()) @@ -3688,69 +3686,58 @@ QString QgsRasterLayer::getMetadata() } else { - myMetadataQString += "
"; - myMetadataQString += tr("Origin:"); - myMetadataQString += "
"; - myMetadataQString += QString::number(mGeoTransform[0]); - myMetadataQString += ","; - myMetadataQString += QString::number(mGeoTransform[3]); - myMetadataQString += "
"; - myMetadataQString += tr("Pixel Size:"); - myMetadataQString += "
"; - myMetadataQString += QString::number(mGeoTransform[1]); - myMetadataQString += ","; - myMetadataQString += QString::number(mGeoTransform[5]); - myMetadataQString += "
"; - - // Start a nested table in this trow - myMetadataQString += ""; - myMetadataQString += ""; - myMetadataQString += ""; - int myBandCountInt = getBandCount(); for (int myIteratorInt = 1; myIteratorInt <= myBandCountInt; ++myIteratorInt) { QgsDebugMsg("Raster properties : checking if band " + QString::number(myIteratorInt) + " has stats? "); //band name - myMetadataQString += ""; - myMetadataQString += ""; + myMetadata += "

\n"; + myMetadata += tr("Band"); + myMetadata += "

\n"; + myMetadata += "

"; + myMetadata += getRasterBandName(myIteratorInt); + myMetadata += "

\n"; //band number - myMetadataQString += ""; - myMetadataQString += ""; + myMetadata += "

"; + myMetadata += tr("Band No"); + myMetadata += "

\n"; + myMetadata += "

\n"; + myMetadata += QString::number(myIteratorInt); + myMetadata += "

\n"; //check if full stats for this layer have already been collected if (!hasStats(myIteratorInt)) //not collected { QgsDebugMsg(".....no"); - myMetadataQString += ""; - myMetadataQString += ""; + myMetadata += "

"; + myMetadata += tr("No Stats"); + myMetadata += "

\n"; + myMetadata += "

\n"; + myMetadata += tr("No stats collected yet"); + myMetadata += "

\n"; } else // collected - show full detail { @@ -3758,80 +3745,74 @@ QString QgsRasterLayer::getMetadata() QgsRasterBandStats myRasterBandStats = getRasterBandStats(myIteratorInt); //Min Val - myMetadataQString += ""; - myMetadataQString += ""; + myMetadata += "

"; + myMetadata += tr("Min Val"); + myMetadata += "

\n"; + myMetadata += "

\n"; + myMetadata += QString::number(myRasterBandStats.minVal, 'f',10); + myMetadata += "

\n"; // Max Val - myMetadataQString += ""; - myMetadataQString += ""; + myMetadata += "

"; + myMetadata += tr("Max Val"); + myMetadata += "

\n"; + myMetadata += "

\n"; + myMetadata += QString::number(myRasterBandStats.maxVal, 'f',10); + myMetadata += "

\n"; // Range - myMetadataQString += ""; - myMetadataQString += ""; + myMetadata += "

"; + myMetadata += tr("Range"); + myMetadata += "

\n"; + myMetadata += "

\n"; + myMetadata += QString::number(myRasterBandStats.range, 'f',10); + myMetadata += "

\n"; // Mean - myMetadataQString += ""; - myMetadataQString += ""; + myMetadata += "

"; + myMetadata += tr("Mean"); + myMetadata += "

\n"; + myMetadata += "

\n"; + myMetadata += QString::number(myRasterBandStats.mean, 'f',10); + myMetadata += "

\n"; //sum of squares - myMetadataQString += ""; - myMetadataQString += ""; + myMetadata += "

"; + myMetadata += tr("Sum of squares"); + myMetadata += "

\n"; + myMetadata += "

\n"; + myMetadata += QString::number(myRasterBandStats.sumSqrDev, 'f',10); + myMetadata += "

\n"; //standard deviation - myMetadataQString += ""; - myMetadataQString += ""; + myMetadata += "

"; + myMetadata += tr("Standard Deviation"); + myMetadata += "

\n"; + myMetadata += "

\n"; + myMetadata += QString::number(myRasterBandStats.stdDev, 'f',10); + myMetadata += "

\n"; //sum of all cells - myMetadataQString += ""; - myMetadataQString += ""; + myMetadata += "

"; + myMetadata += tr("Sum of all cells"); + myMetadata += "

\n"; + myMetadata += "

\n"; + myMetadata += QString::number(myRasterBandStats.sum, 'f',10); + myMetadata += "

\n"; //number of cells - myMetadataQString += ""; - myMetadataQString += ""; + myMetadata += "

"; + myMetadata += tr("Cell Count"); + myMetadata += "

\n"; + myMetadata += "

\n"; + myMetadata += QString::number(myRasterBandStats.elementCount); + myMetadata += "

\n"; } } - myMetadataQString += "
"; - myMetadataQString += tr("Property") ; - myMetadataQString += ""; - myMetadataQString += tr("Value"); - myMetadataQString += "
"; - myMetadataQString += tr("Band"); - myMetadataQString += ""; - myMetadataQString += getRasterBandName(myIteratorInt); - myMetadataQString += "
"; - myMetadataQString += tr("Band No"); - myMetadataQString += ""; - myMetadataQString += QString::number(myIteratorInt); - myMetadataQString += "
"; - myMetadataQString += tr("No Stats"); - myMetadataQString += ""; - myMetadataQString += tr("No stats collected yet"); - myMetadataQString += "
"; - myMetadataQString += tr("Min Val"); - myMetadataQString += ""; - myMetadataQString += QString::number(myRasterBandStats.minVal, 'f',10); - myMetadataQString += "
"; - myMetadataQString += tr("Max Val"); - myMetadataQString += ""; - myMetadataQString += QString::number(myRasterBandStats.maxVal, 'f',10); - myMetadataQString += "
"; - myMetadataQString += tr("Range"); - myMetadataQString += ""; - myMetadataQString += QString::number(myRasterBandStats.range, 'f',10); - myMetadataQString += "
"; - myMetadataQString += tr("Mean"); - myMetadataQString += ""; - myMetadataQString += QString::number(myRasterBandStats.mean, 'f',10); - myMetadataQString += "
"; - myMetadataQString += tr("Sum of squares"); - myMetadataQString += ""; - myMetadataQString += QString::number(myRasterBandStats.sumSqrDev, 'f',10); - myMetadataQString += "
"; - myMetadataQString += tr("Standard Deviation"); - myMetadataQString += ""; - myMetadataQString += QString::number(myRasterBandStats.stdDev, 'f',10); - myMetadataQString += "
"; - myMetadataQString += tr("Sum of all cells"); - myMetadataQString += ""; - myMetadataQString += QString::number(myRasterBandStats.sum, 'f',10); - myMetadataQString += "
"; - myMetadataQString += tr("Cell Count"); - myMetadataQString += ""; - myMetadataQString += QString::number(myRasterBandStats.elementCount); - myMetadataQString += "
"; //end of nested table - myMetadataQString += "
"; - return myMetadataQString; + QgsDebugMsg(myMetadata); + return myMetadata; } QString QgsRasterLayer::buildPyramids(RasterPyramidList const & theRasterPyramidList, diff --git a/src/ui/qgsabout.ui b/src/ui/qgsabout.ui index 40e95782feb..57e2c1a5c97 100644 --- a/src/ui/qgsabout.ui +++ b/src/ui/qgsabout.ui @@ -16,12 +16,6 @@ true - - 9 - - - 6 - @@ -32,20 +26,8 @@ About - - 9 - - - 6 - - - 0 - - - 6 - @@ -55,7 +37,7 @@ - ../../images/icons/qgis-icon-60x60.png + :/images/icons/qgis-icon-60x60.png false @@ -63,64 +45,106 @@ - - - 0 + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:16px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:x-large; font-weight:600;"><span style=" font-size:x-large;">Quantum GIS (QGIS)</span></p></body></html> - - 6 + + Qt::AlignCenter - - - - <h2>Quantum GIS (qgis)</h2> - - - Qt::AlignCenter - - - - - - - Version - - - Qt::AlignCenter - - - - + - - - - - + + + + Version + + + Qt::AlignCenter + + + true + - - - QGIS Home Page + + + Qt::Vertical - - false + + + 20 + 21 + + + + + + + + Quantum GIS is licensed under the GNU General Public License + + + Qt::AlignCenter + + + true - - + + - Subscribe to the QGIS-User mailing list + http://www.gnu.org/licenses - - false + + Qt::AlignCenter + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + QGIS Home Page + + + false + + + + + + + Join our user mailing list + + + false + + + + + @@ -128,12 +152,6 @@ What's New - - 9 - - - 6 - @@ -157,72 +175,10 @@ Developers - - 9 - - - 6 - - - - - - - - - 7 - 5 - 0 - 0 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 9 - - - 6 - - - - - - 7 - 7 - 0 - 0 - - - - QFrame::NoFrame - - - QFrame::Plain - - - - - - false - - - Qt::AlignCenter - - - - - - - - - - <h2>QGIS Developers</h2> + + + + true @@ -233,12 +189,6 @@ Providers - - 9 - - - 6 - @@ -249,18 +199,8 @@ Sponsors - - 9 - - - 6 - - - - true - - + @@ -268,12 +208,6 @@ - - 0 - - - 6 - @@ -312,11 +246,12 @@ tabWidget btnQgisUser btnQgisHome - lblUrls buttonCancel txtBrowserPlugins listBox1 - + + + diff --git a/src/ui/qgsaddattrdialogbase.ui b/src/ui/qgsaddattrdialogbase.ui index c2dece3e39c..3ac17317bcd 100644 --- a/src/ui/qgsaddattrdialogbase.ui +++ b/src/ui/qgsaddattrdialogbase.ui @@ -5,8 +5,8 @@ 0 0 - 303 - 171 + 312 + 132 @@ -16,70 +16,18 @@ true - - 9 - - - 6 - - - - - 0 + + + + Name: - - 6 + + mNameEdit - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 40 - 20 - - - - - - - - OK - - - - - - - Cancel - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 60 - 20 - - - - - + - - + + @@ -91,16 +39,13 @@ - - + + - - - - Name: - - - mNameEdit + + + + QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok @@ -110,9 +55,40 @@ mNameEdit mTypeBox - mOkButton - mCancelButton - + + + buttonBox + accepted() + QgsAddAttrDialogBase + accept() + + + 260 + 109 + + + 307 + 68 + + + + + buttonBox + rejected() + QgsAddAttrDialogBase + reject() + + + 196 + 106 + + + 6 + 77 + + + + diff --git a/src/ui/qgsattributeactiondialogbase.ui b/src/ui/qgsattributeactiondialogbase.ui index ad2df933f01..d4a78203d30 100644 --- a/src/ui/qgsattributeactiondialogbase.ui +++ b/src/ui/qgsattributeactiondialogbase.ui @@ -5,80 +5,205 @@ 0 0 - 513 - 432 + 596 + 560 - - 5 - 5 + 0 0 - Form1 + Attribute Actions - - 0 - - - 6 - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 85 - 141 - - - - - - - - Remove the selected action - - - Remove + + + + Action properties + + + + + Enter the name of an action here. The name should be unique (qgis will make it unique if necessary). + + + Name + + + actionName + + + + + + + Enter the action name here + + + Enter the name of an action here. The name should be unique (qgis will make it unique if necessary). + + + + + + + Qt::Horizontal + + + QSizePolicy::Maximum + + + + 40 + 20 + + + + + + + + Enter the action here. This can be any program, script or command that is available on your system. When the action is invoked any set of characters that start with a % and then have the name of a field will be replaced by the value of that field. The special characters %% will be replaced by the value of the field that was selected. Double quote marks group text into single arguments to the program, script or command. Double quotes will be ignored if preceeded by a backslash + + + Action + + + actionAction + + + + + + + Enter the action command here + + + Enter the action here. This can be any program, script or command that is available on your system. When the action is invoked any set of characters that start with a % and then have the name of a field will be replaced by the value of that field. The special characters %% will be replaced by the value of the field that was selected. Double quote marks group text into single arguments to the program, script or command. Double quotes will be ignored if preceeded by a backslash + + + + + + + Browse for action + + + Click to browse for an action + + + Clicking the buttone will let you select an application to use as the action + + + ... + + + + + + + Qt::Horizontal + + + QSizePolicy::Maximum + + + + 40 + 20 + + + + + + + + The valid attribute names for this layer + + + + + + + Inserts the selected field into the action, prepended with a % + + + Insert field + + + + + + + Qt::Horizontal + + + QSizePolicy::Maximum + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + QSizePolicy::Maximum + + + + 40 + 20 + + + + + + + + Captures any output from the action + + + Captures the standard output or error generated by the action and displays it in a dialog box + + + Capture output + + + + + + + Qt::Horizontal + + + QSizePolicy::Maximum + + + + 40 + 20 + + + + + - - - - Move the selected action down - - - Move down - - - - - - - Move the selected action up - - - Move up - - - - + - - 7 - 7 + 0 0 @@ -112,67 +237,7 @@ - - - - Qt::Horizontal - - - - - - - The valid attribute names for this layer - - - - - - - Browse for action commands - - - Browse - - - - - - - Inserts the selected field into the action, prepended with a % - - - Insert field - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 51 - 29 - - - - - - - - Update the selected action - - - Update action - - - - + Inserts the action into the list above @@ -182,62 +247,75 @@ - - + + - Captures any output from the action - - - Captures the standard output or error generated by the action and displays it in a dialog box + Update the selected action - Capture output + Update action - - + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 85 + 20 + + + + + + - Enter the action command here - - - Enter the action here. This can be any program, script or command that is available on your system. When the action is invoked any set of characters that start with a % and then have the name of a field will be replaced by the value of that field. The special characters %% will be replaced by the value of the field that was selected. Double quote marks group text into single arguments to the program, script or command. Double quotes will be ignored if preceeded by a backslash - - - - - - - Enter the action here. This can be any program, script or command that is available on your system. When the action is invoked any set of characters that start with a % and then have the name of a field will be replaced by the value of that field. The special characters %% will be replaced by the value of the field that was selected. Double quote marks group text into single arguments to the program, script or command. Double quotes will be ignored if preceeded by a backslash + Move the selected action up - Action: - - - actionAction + Move up - - + + - Enter the action name here - - - Enter the name of an action here. The name should be unique (qgis will make it unique if necessary). - - - - - - - Enter the name of an action here. The name should be unique (qgis will make it unique if necessary). + Move the selected action down - Name: + Move down - - actionName + + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 85 + 41 + + + + + + + + Remove the selected action + + + Remove @@ -245,17 +323,18 @@ - moveUpButton - moveDownButton - removeButton actionName actionAction browseButton + fieldComboBox + insertFieldButton captureCB insertButton updateButton - insertFieldButton - fieldComboBox + moveUpButton + moveDownButton + attributeActionTable + removeButton diff --git a/src/ui/qgsattributedialogbase.ui b/src/ui/qgsattributedialogbase.ui index a452843540d..9e2154906bf 100644 --- a/src/ui/qgsattributedialogbase.ui +++ b/src/ui/qgsattributedialogbase.ui @@ -5,21 +5,15 @@ 0 0 - 267 - 286 + 329 + 330 Enter Attribute Values - - 9 - - - 6 - - + 2 @@ -41,75 +35,50 @@ - - - - &OK - - - - - - - &Cancel - - - - - - Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok - - QSizePolicy::Expanding - - - - 55 - 27 - - - + mTable - mOkButton - mCancelButton - mOkButton - clicked() + buttonBox + accepted() QgsAttributeDialogBase accept() - 130 - 260 + 277 + 305 - 133 - 142 + 325 + 279 - mCancelButton - clicked() + buttonBox + rejected() QgsAttributeDialogBase reject() - 217 - 260 + 208 + 308 - 133 - 142 + 163 + 284 diff --git a/src/ui/qgsbookmarksbase.ui b/src/ui/qgsbookmarksbase.ui index f37f41abcae..38908751f2c 100644 --- a/src/ui/qgsbookmarksbase.ui +++ b/src/ui/qgsbookmarksbase.ui @@ -5,37 +5,15 @@ 0 0 - 344 - 263 + 440 + 370 Geospatial Bookmarks - - 9 - - - 6 - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 85 - 109 - - - - - + false @@ -68,40 +46,10 @@ - - - - Help - - - - - - - Close the dialog - - - Close - - - - - - - Delete the currently selected bookmark - - - Delete - - - - - - - Zoom to the currently selected bookmark - - - Zoom To + + + + QDialogButtonBox::Close|QDialogButtonBox::Help|QDialogButtonBox::NoButton @@ -109,11 +57,26 @@ - btnZoomTo - btnDelete - btnClose - btnHelp + lstBookmarks + buttonBox - + + + buttonBox + rejected() + QgsBookmarksBase + reject() + + + 211 + 342 + + + 274 + 256 + + + + diff --git a/src/ui/qgscontinuouscolordialogbase.ui b/src/ui/qgscontinuouscolordialogbase.ui index 5686e068422..35cfcb178cc 100644 --- a/src/ui/qgscontinuouscolordialogbase.ui +++ b/src/ui/qgscontinuouscolordialogbase.ui @@ -5,30 +5,20 @@ 0 0 - 425 - 155 + 306 + 205 Continuous color - - 8 + + 0 - - 6 + + 0 - - - - - - - Draw polygon outline - - - @@ -38,13 +28,23 @@ - Classification Field: + Classification field classificationComboBox + + + + + 0 + 20 + + + + @@ -54,31 +54,15 @@ - Minimum Value: + Minimum value btnMinValue - - - - - 0 - 20 - - - - Outline Width: - - - outlinewidthspinbox - - - - - + + 100 @@ -96,15 +80,15 @@ - Maximum Value: + Maximum value btnMaxValue - - + + 100 @@ -113,16 +97,45 @@ - - + + + + Draw polygon outlines + + + + + 0 20 + + Outline width + + + outlinewidthspinbox + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + diff --git a/src/ui/qgsgeomtypedialogbase.ui b/src/ui/qgsgeomtypedialogbase.ui index df6d593ac3b..907ddba56a0 100644 --- a/src/ui/qgsgeomtypedialogbase.ui +++ b/src/ui/qgsgeomtypedialogbase.ui @@ -16,16 +16,10 @@ true - - 9 - - - 6 - - File Format: + File format mFileFormatComboBox @@ -61,7 +55,7 @@ - Attributes: + Attributes mAddAttributeButton @@ -81,12 +75,6 @@ Type - - 9 - - - 6 - diff --git a/src/ui/qgsgraduatedsymboldialogbase.ui b/src/ui/qgsgraduatedsymboldialogbase.ui index 47d82bb44d9..08ec44f27bb 100644 --- a/src/ui/qgsgraduatedsymboldialogbase.ui +++ b/src/ui/qgsgraduatedsymboldialogbase.ui @@ -5,8 +5,8 @@ 0 0 - 388 - 502 + 500 + 437 @@ -25,154 +25,208 @@ graduated Symbol - - 9 + + 0 - - 6 + + 8 - - - - + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 0 + 20 + + + + Classification field + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + - - - - 0 + + + + + 0 + 0 + - - 6 + + + 0 + 20 + - - - - 0 - - - 6 - - - - - - 5 - 5 - 0 - 0 - - - - - 0 - 20 - - - - Classification Field: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 20 - - - - Mode: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 30 - - - - Number of Classes: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - 0 - - - 6 - - - - - - 0 - 20 - - - - - - - - - 0 - 20 - - - - - - - - - 0 - 20 - - - - - - - + - - + + + + + 0 + 0 + + + + + 0 + 20 + + - Delete class + Mode + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - Classify + + + + 0 + 0 + + + + + 0 + 20 + - - + + + + + 0 + 0 + + + + + 0 + 30 + + + + Number of classes + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 0 + 20 + + + + + + + + Qt::Horizontal + + + QSizePolicy::Minimum + + + + 40 + 20 + + + + + + + + + + + 0 + 0 + + + + Classify + + + + + + + Delete class + + + + + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + 1 + + + + + + classificationComboBox + modeComboBox + numberofclassesspinbox + mClassifyButton + mDeleteClassButton + mClassListWidget + diff --git a/src/ui/qgsoptionsbase.ui b/src/ui/qgsoptionsbase.ui index 6f3fb7dab2b..d711a72cfd7 100644 --- a/src/ui/qgsoptionsbase.ui +++ b/src/ui/qgsoptionsbase.ui @@ -5,8 +5,8 @@ 0 0 - 871 - 512 + 617 + 559 @@ -22,12 +22,6 @@ true - - 9 - - - 6 - @@ -37,124 +31,139 @@ &General - - - 11 - - - 6 - - + + - General + Project files - + 11 - - 6 + + 11 + + + 11 + + + 11 - Ask to save project changes when required + Prompt to save project changes when required - Warn me when opening a project file saved with an older version of QGIS + Warn when opening a project file saved with an older version of QGIS - - - - Qt::Vertical + + + + Default Map Appearance (overridden by project properties) - - - 20 - 40 - - - + + + + + Selection color + + + pbnMeasureColour + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 100 + 0 + + + + + + + + + + + Background color + + + pbnCanvasColor + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 100 + 0 + + + + + + + + + - - - - - &Appearance - - - - 11 - - - 6 - - + - &Splash screen + &Application - - 11 - - - 6 - - - - - Hide splash screen at startup - - - - - - - - - - &Icon Theme - - - - 11 - - - 6 - - - - - <b>Note: </b>Theme changes take effect the next time QGIS is started - - - Qt::AlignVCenter - - - - - 0 - 0 + 0 0 - Theme + Icon theme cmbTheme @@ -173,140 +182,42 @@ - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - Default Map Appearance (Overridden by project properties) - - - - 11 - - - 6 - - - + + - Selection Color: + <b>Note: </b>Theme changes take effect the next time QGIS is started - - pbnMeasureColour + + Qt::AlignVCenter - - - - - 100 - 0 - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Background Color: - - - pbnCanvasColor - - - - - - - - 100 - 0 - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - Appearance - - - - 11 - - - 6 - - + - Capitalise layer name + Capitalise layer names in legend + + + + + + + Hide splash screen at startup - + Qt::Vertical - 20 - 40 + 547 + 91 @@ -317,33 +228,31 @@ &Rendering - - - 11 - - - 6 - - + + - &Update during drawing + Rendering behavior - - 11 - - - 6 - - - + + - features + By default new la&yers added to the map should be displayed - + + + + Number of features to draw before updating the display + + + spinBoxUpdateThreshold + + + + Map display will be updated (drawn) after this many features have been read from the data source @@ -356,59 +265,36 @@ - - - - Update display after reading - - - spinBoxUpdateThreshold - - - - + - (Set to 0 to not update the display until all features have been read) + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Note:</span> Use zero to prevent display updates until all features have been rendered</p></body></html> - - - - Initial Visibility - - - - 11 - - - 6 - - - - - By default new la&yers added to the map should be displayed - - - - - - - + - Rendering + Rendering quality - + 11 - - 6 + + 11 + + + 11 + + + 11 @@ -437,7 +323,7 @@ - + Qt::Vertical @@ -457,11 +343,17 @@ &Map tools - + 11 - - 6 + + 11 + + + 11 + + + 11 @@ -469,11 +361,17 @@ Panning and zooming - + 11 - - 6 + + 11 + + + 11 + + + 11 @@ -502,14 +400,14 @@ - Zoom factor: + Zoom factor - Mouse wheel action: + Mouse wheel action @@ -535,11 +433,17 @@ Measure tool - + 11 - - 6 + + 11 + + + 11 + + + 11 @@ -573,7 +477,7 @@ - Rubberband color: + Rubberband color cmbEllipsoid @@ -583,7 +487,7 @@ - Ellipsoid for distance calculations: + Ellipsoid for distance calculations cmbEllipsoid @@ -599,16 +503,25 @@ Search radius - + 11 - - 6 + + 11 + + + 11 + + + 11 - (Specify the search radius as a percentage of the map width) + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Note:</span> Specify the search radius as a percentage of the map width</p></body></html> true @@ -618,7 +531,7 @@ - Search Radius for Identifying Features and displaying Map Tips + Search radius for identifying features and displaying map tips spinBoxIdentifyValue @@ -664,78 +577,54 @@ Digitizing - - 9 - - - 6 - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - + + - Vertex markers + Rubberband - - 9 - - - 6 - - - - 0 + + + Line width - - 6 + + mLineWidthSpinBox - - - - Marker style: - - - - - - - Qt::Horizontal - - - - 281 - 20 - - - - - - - - - 7 - 0 - 0 - 0 - - - - - + + + + + + Line width in pixels + + + 1 + + + + + + + Line colour + + + mLineColourToolButton + + + + + + + + 100 + 0 + + + + + + @@ -746,218 +635,151 @@ Snapping - - 9 - - - 6 - - - - 0 + + + Default snap mode - - 6 - - - - - Default Snap Mode: - - - - - - - Qt::Horizontal - - - - 311 - 20 - - - - - - - - - 7 - 0 - 0 - 0 - - - - - + - - - - 0 + + + + Qt::Horizontal - - 6 + + + 311 + 20 + - - - - Search radius for vertex edits (in layer units): - - - - - - - Qt::Horizontal - - - - 61 - 20 - - - - - - - - 5 - - - 9999.989999999999782 - - - - + - - - - 0 + + + + + 0 + 0 + - - 6 + + + + + + Default snapping tolerance in layer units - - - - Default Snapping Tolerance (in layer units): - - - - - - - Qt::Horizontal - - - - 241 - 20 - - - - - - - - 5 - - - 9999.989999999999782 - - - - + + + + + + Qt::Horizontal + + + + 241 + 20 + + + + + + + + 5 + + + 9999.989999999999782 + + + + + + + Search radius for vertex edits in layer units + + + + + + + Qt::Horizontal + + + + 61 + 20 + + + + + + + + 5 + + + 9999.989999999999782 + + - - + + - Rubberband + Vertex markers - - 9 - - - 6 - - - - 0 + + + Marker style - - 6 + + + + + + Qt::Horizontal - - - - Line Width: - - - mLineWidthSpinBox - - - - - - - Line width in pixels - - - 1 - - - - - - - Qt::Horizontal - - - - 271 - 20 - - - - - - - - Line Colour: - - - mLineColourToolButton - - - - - - - - 100 - 0 - - - - - - - - + + + 281 + 20 + + + + + + + + + 0 + 0 + + + + + + + Qt::Vertical + + + + 547 + 71 + + + + @@ -965,11 +787,17 @@ Pro&jection - + 11 - - 6 + + 11 + + + 11 + + + 11 @@ -1000,30 +828,36 @@ When layer is loaded that has no projection information - + 11 - - 6 + + 11 + + + 11 + + + 11 - Prompt for projection. + Prompt for projection - Project wide default projection will be used. + Project wide default projection will be used - Global default projection displa&yed below will be used. + Global default projection displa&yed below will be used @@ -1037,27 +871,15 @@ Locale - - 9 - - - 6 - - Force Override System Locale + Override system locale true - - 9 - - - 6 - @@ -1074,7 +896,10 @@ - Note: Enabling / changing overide on local requires an application restart. + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Note:</span> Enabling / changing overide on local requires an application restart</p></body></html> true @@ -1103,12 +928,6 @@ Additional Info - - 9 - - - 6 - @@ -1144,20 +963,38 @@ - tabWidget - cbxHideSplash - cmbTheme + chbAskToSaveProjectChanges + chbWarnOldProjectVersion pbnSelectionColour pbnCanvasColor - spinBoxUpdateThreshold + cmbTheme + capitaliseCheckBox + cbxHideSplash chkAddedVisibility + spinBoxUpdateThreshold chkAntiAliasing + chkUseQPixmap + cbxSplitterRedraw + spinBoxIdentifyValue cmbEllipsoid + pbnMeasureColour + cmbWheelAction + spinZoomFactor + mLineWidthSpinBox + mLineColourToolButton + mDefaultSnapModeComboBox + mDefaultSnappingToleranceSpinBox + mSearchRadiusVertexEditSpinBox + mMarkerStyleComboBox radPromptForProjection radUseProjectProjection radUseGlobalProjection txtGlobalWKT pbnSelectProjection + grpLocale + cboLocale + buttonBox + tabWidget diff --git a/src/ui/qgspgquerybuilderbase.ui b/src/ui/qgspgquerybuilderbase.ui index 557ddfc70bd..73c9c4f4727 100644 --- a/src/ui/qgspgquerybuilderbase.ui +++ b/src/ui/qgspgquerybuilderbase.ui @@ -12,9 +12,7 @@ - - 0 - 0 + 0 0 @@ -29,23 +27,139 @@ true - - 11 - - - 6 - + + + + Datasource + + + + + + + + 0 + 0 + + + + Fields + + + + 11 + + + 11 + + + 11 + + + 11 + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">List of fields in this vector file</p></body></html> + + + + + + + + + + + 0 + 0 + + + + Values + + + + 11 + + + 11 + + + 11 + + + 11 + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">List of values for the current field.</p></body></html> + + + true + + + QAbstractItemView::SelectRows + + + true + + + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Take a <span style=" font-weight:600;">sample</span> of records in the vector file</p></body></html> + + + Sample + + + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Retrieve <span style=" font-weight:600;">all</span> the record in the vector file (<span style=" font-style:italic;">if the table is big, the operation can consume some time</span>)</p></body></html> + + + All + + + + + + Operators - + 11 - - 6 + + 11 + + + 11 + + + 11 @@ -148,13 +262,49 @@ + + + + + 32767 + 116 + + + + SQL where clause + + + + 11 + + + 11 + + + 11 + + + 11 + + + + + + + - + 11 - - 6 + + 11 + + + 11 + + + 11 @@ -227,138 +377,6 @@ - - - - - 0 - 0 - 0 - 0 - - - - Values - - - - 11 - - - 6 - - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Retrieve <span style=" font-weight:600;">all</span> the record in the vector file (<span style=" font-style:italic;">if the table is big, the operation can consume some time</span>)</p></body></html> - - - All - - - - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Take a <span style=" font-weight:600;">sample</span> of records in the vector file</p></body></html> - - - Sample - - - - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">List of values for the current field.</p></body></html> - - - true - - - QAbstractItemView::SelectRows - - - true - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - Fields - - - - 11 - - - 6 - - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">List of fields in this vector file</p></body></html> - - - - - - - - - - Datasource: - - - - - - - - 32767 - 116 - - - - SQL where clause - - - - 11 - - - 6 - - - - - - - diff --git a/src/ui/qgsrasterlayerpropertiesbase.ui b/src/ui/qgsrasterlayerpropertiesbase.ui index cb08a6d38a2..3f56c6e42ed 100644 --- a/src/ui/qgsrasterlayerpropertiesbase.ui +++ b/src/ui/qgsrasterlayerpropertiesbase.ui @@ -22,12 +22,6 @@ true - - 9 - - - 6 - @@ -44,23 +38,17 @@ Render as - - 9 - - - 6 - - - - - Single Band Gray - - - - Three Band Color + Three band color + + + + + + + Single band gray @@ -70,15 +58,9 @@ - Color Map + Color map - - 6 - - - 9 - @@ -98,7 +80,7 @@ - Invert Color Map + Invert color map @@ -115,15 +97,9 @@ - RGB Mode Band Selection + RGB mode band selection - - 9 - - - 6 - @@ -239,10 +215,13 @@ - Grayscale Band Selection + Grayscale band selection - + + 6 + + 6 @@ -280,15 +259,9 @@ - RGB Scaling + RGB scaling - - 9 - - - 6 - @@ -299,14 +272,14 @@ - Std Deviation + Std. deviation - Custom Min Max Values + Custom min / max values @@ -596,15 +569,9 @@ - Grayscale Band Scaling + Grayscale band scaling - - 9 - - - 6 - @@ -710,14 +677,14 @@ - Std Deviation + Std. deviation - Custom Min Max Values: + Custom min / max values @@ -773,7 +740,7 @@ - Load Min Max Values From Band + Load min / max values from band @@ -829,10 +796,13 @@ - Contrast Enhancement + Contrast enhancement - + + -1 + + -1 @@ -910,7 +880,7 @@ - Global Transparency + Global transparency @@ -991,7 +961,7 @@ - No Data Value + No data value @@ -1000,7 +970,7 @@ - Reset No Data Value + Reset no data value @@ -1010,20 +980,20 @@ - Custom Transparency Options + Custom transparency options - Transparency Band: + Transparency band - Transparency Layer; + Transparency layer; @@ -1082,7 +1052,7 @@ - Transparent Pixel List + Transparent pixel list @@ -1113,16 +1083,22 @@ - - 6 + + 11 - + + 11 + + + 11 + + 11 - Add Values Manually + Add values manually ... @@ -1138,7 +1114,7 @@ false - Add Values From Display + Add Values from display ... @@ -1151,7 +1127,7 @@ - Remove Selected Row + Remove selected row ... @@ -1164,7 +1140,7 @@ - Default Values + Default values ... @@ -1190,7 +1166,7 @@ - Import From File + Import from file ... @@ -1203,7 +1179,7 @@ - Export To File + Export to file ... @@ -1238,11 +1214,17 @@ Colormap - + 11 - - 6 + + 11 + + + 11 + + + 11 @@ -1272,16 +1254,22 @@ - - 6 + + 11 - + + 11 + + + 11 + + 11 - Number of entries: + Number of entries @@ -1348,16 +1336,22 @@ - - 6 + + 11 - + + 11 + + + 11 + + 11 - Color interpolation: + Color interpolation @@ -1368,16 +1362,22 @@ - - 6 + + 11 - + + 11 + + + 11 + + 11 - Classification mode: + Classification mode @@ -1393,23 +1393,35 @@ General - + 11 - - 6 + + 11 + + + 11 + + + 11 - Spatial Reference System + Spatial reference system - + 11 - - 6 + + 11 + + + 11 + + + 11 @@ -1431,17 +1443,23 @@ - Scale Dependent Visibility + Scale dependent visibility true - + 11 - - 6 + + 11 + + + 11 + + + 11 @@ -1459,7 +1477,7 @@ - Maximum 1: + Maximum spinMaximumScale @@ -1482,7 +1500,7 @@ - Minimum 1: + Minimum spinMinimumScale @@ -1495,16 +1513,22 @@ - DebugInfo + Show debug info - - 6 + + 11 - + + 11 + + + 11 + + 11 @@ -1533,7 +1557,7 @@ - Layer Source: + Layer source leLayerSource @@ -1553,7 +1577,7 @@ - Display Name: + Display name leDisplayName @@ -1562,10 +1586,16 @@ - - 6 + + 11 - + + 11 + + + 11 + + 11 @@ -1574,11 +1604,17 @@ Thumbnail - + 11 - - 6 + + 11 + + + 11 + + + 11 @@ -1621,11 +1657,17 @@ Legend: - + 11 - - 6 + + 11 + + + 11 + + + 11 @@ -1668,11 +1710,17 @@ Palette: - + 11 - - 6 + + 11 + + + 11 + + + 11 @@ -1718,11 +1766,17 @@ Metadata - + 11 - - 6 + + 11 + + + 11 + + + 11 @@ -1734,12 +1788,6 @@ Pyramids - - 9 - - - 6 - @@ -1751,15 +1799,15 @@ <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html> +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;"></p></body></html> - Pyramid Resolutions + Pyramid resolutions @@ -1784,10 +1832,16 @@ p, li { white-space: pre-wrap; } - - 6 + + 11 - + + 11 + + + 11 + + 11 @@ -1809,7 +1863,7 @@ p, li { white-space: pre-wrap; } - Resampling Method + Resampling method cboResamplingMethod @@ -1833,7 +1887,7 @@ p, li { white-space: pre-wrap; } - Build Pyramids + Build pyramids @@ -1846,11 +1900,17 @@ p, li { white-space: pre-wrap; } Histogram - + 11 - - 6 + + 11 + + + 11 + + + 11 @@ -1889,16 +1949,22 @@ p, li { white-space: pre-wrap; } Chart Type - + 11 - - 6 + + 11 + + + 11 + + + 11 - Line Graph + Line graph true @@ -1908,7 +1974,7 @@ p, li { white-space: pre-wrap; } - Bar Chart + Bar chart @@ -1928,30 +1994,36 @@ p, li { white-space: pre-wrap; } Options - + 11 - - 6 + + 11 + + + 11 + + + 11 - Column Count: + Column count - Out Of Range OK? + Out of range OK? - Allow Approximation + Allow approximation true diff --git a/src/ui/qgsuniquevaluedialogbase.ui b/src/ui/qgsuniquevaluedialogbase.ui index d09d4b88e6d..65aab11d078 100644 --- a/src/ui/qgsuniquevaluedialogbase.ui +++ b/src/ui/qgsuniquevaluedialogbase.ui @@ -6,27 +6,39 @@ 0 0 505 - 300 + 408 + + + 0 + 0 + + Form1 - - 9 + + 0 - - 6 + + 8 + + + 0 + + + 0 - - - - - - + + + 0 + 0 + + 0 @@ -34,38 +46,21 @@ - Classification Field: + Classification field mClassificationComboBox - - - - Delete class - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 51 - 25 - - - - - + + + + 0 + 0 + + 0 @@ -74,19 +69,71 @@ - - - - Classify + + + + Qt::Horizontal + + + QSizePolicy::Minimum + + + + 111 + 20 + + + + + + + + + + Classify + + + + + + + Delete class + + + + + + + + + + 0 + 0 + - - + + + + + 0 + 0 + + + + + + + mClassificationComboBox + mClassifyButton + mDeletePushButton + mClassListWidget + diff --git a/src/ui/qgsvectorlayerpropertiesbase.ui b/src/ui/qgsvectorlayerpropertiesbase.ui index 6bad8412e08..b09c49078e7 100644 --- a/src/ui/qgsvectorlayerpropertiesbase.ui +++ b/src/ui/qgsvectorlayerpropertiesbase.ui @@ -5,7 +5,7 @@ 0 0 - 508 + 552 600 @@ -25,12 +25,6 @@ true - - 9 - - - 6 - @@ -44,14 +38,74 @@ Symbology - - 9 - - - 6 - - + + + + + 0 + 0 + + + + + 32767 + 22 + + + + Legend type + + + legendtypecombobox + + + + + + + + 0 + 0 + + + + + 0 + 26 + + + + + 32767 + 22 + + + + + + + + + 0 + 0 + + + + Transparency + + + sliderTransparency + + + + + + + 0 + 0 + + 255 @@ -63,58 +117,20 @@ - - - - Transparency: - - - sliderTransparency - - - - - - - - 32767 - 22 - - - - Legend type: - - - legendtypecombobox - - - - - - - - 270 - 24 - - - - - 32767 - 22 - - - - - + - - 7 - 7 + 0 0 + + QFrame::NoFrame + + + QFrame::Sunken + 1 @@ -129,49 +145,73 @@ General - - 11 - - - 6 - - - - Display name - - - txtDisplayName + + + Options + + + + + Display name + + + txtDisplayName + + + + + + + + + + Display field for the Identify Results dialog box + + + This sets the display field for the Identify Results dialog box + + + Display field + + + displayFieldComboBox + + + + + + + Use this control to set which field is placed at the top level of the Identify Results dialog box. + + + + + + + true + + + + + + + Create Spatial Index + + + + + + + Change SRS + + + + - - - - Display field for the Identify Results dialog box - - - This sets the display field for the Identify Results dialog box - - - Display field - - - displayFieldComboBox - - - - - - - Use this control to set which field is placed at the top level of the Identify Results dialog box. - - - - - - - + Use scale dependent rendering @@ -180,16 +220,22 @@ true - + 11 - - 6 + + 11 + + + 11 + + + 11 - Maximum 1: + Maximum spinMaximumScale @@ -199,7 +245,7 @@ - Minimum 1: + Minimum spinMinimumScale @@ -211,12 +257,12 @@ Minimum scale at which this layer will be displayed. - - 100000000 - 1 + + 100000000 + @@ -224,105 +270,34 @@ Maximum scale at which this layer will be displayed. - - 100000000 - 1 - - - - - - - - - Spatial Index - - - - 11 - - - 6 - - - - - Create Spatial Index - - - pbnIndex - - - - - - - Create - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 141 - 21 - - - - - - - - - - - Spatial Reference System - - - - 11 - - - 6 - - - - - true - - - - - - - Change + + 100000000 - + Subset - + 11 - - 6 + + 11 + + + 11 + + + 11 @@ -370,17 +345,26 @@ Metadata - + 11 - - 6 + + 11 + + + 11 + + + 11 2 + + true + @@ -390,18 +374,10 @@ Labels - - 9 - - - 6 - - - 7 - 0 + 0 0 @@ -414,9 +390,7 @@ - - 7 - 7 + 0 0 @@ -436,18 +410,22 @@ Actions - + 11 - - 6 + + 11 + + + 11 + + + 11 - - 0 - 0 + 0 0 @@ -466,12 +444,21 @@ - - 1 - 3 + + 1 + + + 1 + + + 1 + + + 1 + @@ -516,18 +503,26 @@ - tabWidget legendtypecombobox sliderTransparency txtDisplayName displayFieldComboBox + leSpatialRefSys + pbnIndex + pbnChangeSpatialRefSys + chkUseScaleDependentRendering spinMinimumScale spinMaximumScale - pbnIndex - leSpatialRefSys - pbnChangeSpatialRefSys + txtSubsetSQL pbnQueryBuilder + teMetadata labelCheckBox + pbnLoadDefaultStyle + pbnSaveDefaultStyle + pbnLoadStyle + pbnSaveStyleAs + buttonBox + tabWidget