Skip to content

Commit

Permalink
Numerous changes in GUI HIG revision:
Browse files Browse the repository at this point in the history
 - use buttonbox instead of free roaming buttons
 - All labels updated for consistency
 - improve alignment and layouts for unique vale, cont col, etc in vector props
 - use style sheets in vect and raster properties and update these reports so they are visually consistent with each other
 - In qgsabout clean up layout and also show addition info relating to qt db and image plugins in providers tab (which will be renamed)

Please note this work is ongoing and not the final product yet.


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8431 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed May 14, 2008
1 parent b6ee23c commit ba15c14
Show file tree
Hide file tree
Showing 30 changed files with 2,078 additions and 2,139 deletions.
6 changes: 6 additions & 0 deletions images/images.qrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<RCC>
<qresource prefix="/images" >
<file>icons/qgis-icon-16x16.png</file>
<file>icons/qgis-icon-60x60.png</file>
</qresource>
</RCC>
10 changes: 4 additions & 6 deletions src/app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -230,16 +230,14 @@ 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
qgis_gui
)
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)
Expand Down
93 changes: 50 additions & 43 deletions src/app/qgisapp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include <QDesktopWidget>
#include <QDialog>
#include <QDir>
#include <QDockWidget>
#include <QEvent>
#include <QFile>
#include <QFileInfo>
Expand Down Expand Up @@ -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() )
{
Expand Down Expand Up @@ -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();
Expand All @@ -327,8 +329,8 @@ static void customSrsValidation_(QgsSpatialRefSys* srs)
setTheme(mThemeName);
updateRecentProjectPaths();
createCanvas();
createOverview();
createLegend();
createOverview();
createMapTips();

mComposer = new QgsComposer(this); // Map composer
Expand Down Expand Up @@ -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();
Expand All @@ -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();
//
Expand Down Expand Up @@ -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);
}
*/}


//////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -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();

Expand Down Expand Up @@ -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
Expand All @@ -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;
}

Expand Down Expand Up @@ -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()
Expand All @@ -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 ///////////////

Expand All @@ -1527,33 +1543,27 @@ 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)
// versionString += "\nThis is a Windows preview release - not for production use";
#endif

abt->setVersion(versionString);
QString urls = "<p align=\"center\">" +
tr("Quantum GIS is licensed under the GNU General Public License") +
"</p><p align=\"center\">" +
tr("http://www.gnu.org/licenses") +
"</p>";
abt->setURLs(urls);
QString whatsNew = "<html><body>" + tr("Version") + " ";
whatsNew += QGis::qgisVersion;
whatsNew += "<h3>" + tr("New features") + "</h3>" +
Expand Down Expand Up @@ -1589,9 +1599,6 @@ void QgisApp::about()

abt->setWhatsNew(whatsNew);

// add the available plugins to the list
QString providerInfo = "<b>" + tr("Available Data Provider Plugins") + "</b><br>";
abt->setPluginInfo(providerInfo + QgsProviderRegistry::instance()->pluginList(true));
QApplication::restoreOverrideCursor();
}
abt->show();
Expand Down Expand Up @@ -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);
}
}

Expand Down
9 changes: 6 additions & 3 deletions src/app/qgisapp.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class QMenu;
class QPixmap;
class QSplashScreen;
class QValidator;
class QActionGroup;

class QgisAppInterface;
class QgsClipboard;
Expand All @@ -52,7 +53,6 @@ class QgsRasterLayer;
class QgsRect;
class QgsVectorLayer;

#include <ui_qgisappbase.h>
#include <QMainWindow>
#include <QAbstractSocket>

Expand All @@ -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:
Expand Down Expand Up @@ -535,7 +535,10 @@ public slots:
QMenu *mSettingsMenu;
QMenu *mHelpMenu;

class Tools
QDockWidget *mLegendDock;
QDockWidget *mOverviewDock;

class Tools
{
public:
QgsMapTool* mZoomIn;
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgisappinterface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ QWidget * QgisAppInterface::getMainWindow()

QToolBox* QgisAppInterface::getToolBox()
{
return qgis->toolBox;
return NULL;
}

void QgisAppInterface::refreshLegend(QgsMapLayer *l)
Expand Down
Loading

0 comments on commit ba15c14

Please sign in to comment.