Skip to content

Commit

Permalink
As per email thread '[Qgis-developer] Qgis application name' on the Q…
Browse files Browse the repository at this point in the history 
…GIS developer list, I have renamed the application name from qgis to QGIS. THe application name is used by some OSes (e.g. OS X) in menus and other places and the lower case name looks incongruous. A side effect of this however is that all application settings will need to be re-set since the qgis key used by QSettings is now called QGIS and it is case sensitive.

Also remove deprecated widget components from main window and renamed Qgis to QGIS in help-about menu.


git-svn-id: http://svn.osgeo.org/qgis/trunk@9034 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Aug 8, 2008
1 parent fcb537a commit cafc0b8
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 126 deletions.
2 changes: 1 addition & 1 deletion src/app/main.cpp
View file
Expand Up @@ -386,7 +386,7 @@ int main(int argc, char *argv[])
// Set up the QSettings environment must be done after qapp is created
QCoreApplication::setOrganizationName("QuantumGIS");
QCoreApplication::setOrganizationDomain("qgis.org");
QCoreApplication::setApplicationName("qgis");
QCoreApplication::setApplicationName("QGIS");
#ifdef Q_OS_MACX
// Install OpenDocuments AppleEvent handler after application object is initialized
// but before any other event handling (including dialogs or splash screens) occurs.
Expand Down
10 changes: 1 addition & 9 deletions src/app/qgisapp.cpp
View file
Expand Up @@ -633,7 +633,7 @@ void QgisApp::createActions()
mActionHelpContents->setStatusTip(tr("Help Documentation"));
connect(mActionHelpContents, SIGNAL(triggered()), this, SLOT(helpContents()));
//
mActionQgisHomePage= new QAction(getThemeIcon("mActionQgisHomePage.png"), tr("Qgis Home Page"), this);
mActionQgisHomePage= new QAction(getThemeIcon("mActionQgisHomePage.png"), tr("QGIS Home Page"), this);
#ifndef Q_WS_MAC
mActionQgisHomePage->setShortcut(tr("Ctrl+H","QGIS Home Page"));
#endif
Expand Down Expand Up @@ -1326,10 +1326,6 @@ void QgisApp::createCanvas()
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);
setCentralWidget(mMapCanvas);
// set the focus to the map canvas
mMapCanvas->setFocus();
Expand Down Expand Up @@ -1427,13 +1423,9 @@ 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);
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);
return;
Expand Down
138 changes: 22 additions & 116 deletions src/ui/qgisappbase.ui
View file
Expand Up @@ -10,134 +10,40 @@
</rect>
</property>
<property name="windowTitle" >
<string>MainWindow</string>
<string>QGIS</string>
</property>
<property name="windowIcon" >
<iconset>../../images/icons/qgis-icon-16x16.png</iconset>
</property>
<property name="dockNestingEnabled" >
<bool>true</bool>
</property>
<widget class="QWidget" name="centralWidget" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>7</vsizetype>
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<property name="leftMargin" >
<number>9</number>
</property>
<property name="topMargin" >
<number>9</number>
</property>
<property name="rightMargin" >
<number>9</number>
</property>
<property name="bottomMargin" >
<number>9</number>
</property>
<property name="spacing" >
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number>
</property>
<item row="0" column="0" >
<widget class="QSplitter" name="canvasLegendSplit" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>7</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape" >
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow" >
<enum>QFrame::Plain</enum>
</property>
<property name="lineWidth" >
<number>1</number>
</property>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<widget class="QSplitter" name="legendOverviewSplit" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize" >
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<widget class="QToolBox" name="toolBox" >
<property name="font" >
<font>
<family>Lucida Grande</family>
<pointsize>10</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
<underline>false</underline>
<strikeout>false</strikeout>
</font>
</property>
<property name="frameShape" >
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow" >
<enum>QFrame::Raised</enum>
</property>
<property name="currentIndex" >
<number>0</number>
</property>
<widget class="QWidget" name="legendPage" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>386</width>
<height>244</height>
</rect>
</property>
<attribute name="label" >
<string>Legend</string>
</attribute>
</widget>
</widget>
<widget class="QFrame" name="overviewFrame" >
<property name="frameShape" >
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow" >
<enum>QFrame::Raised</enum>
</property>
</widget>
</widget>
<widget class="QTabWidget" name="tabWidget" >
<property name="font" >
<font>
<family>Arial</family>
<pointsize>10</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
<underline>false</underline>
<strikeout>false</strikeout>
</font>
</property>
<property name="tabPosition" >
<enum>QTabWidget::East</enum>
</property>
<property name="tabShape" >
<enum>QTabWidget::Rounded</enum>
</property>
<widget class="QWidget" name="Map View" >
<attribute name="title" >
<string>Map View</string>
</attribute>
</widget>
</widget>
</widget>
</item>
</layout>
</widget>
</widget>
Expand Down

0 comments on commit cafc0b8

Please sign in to comment.