Skip to content

Commit 4e05fc3

Browse files
author
timlinux
committed
As per email thread '[Qgis-developer] Qgis application name' on the QGIS 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/qgis@9034 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 150a5de commit 4e05fc3

File tree

3 files changed

+24
-126
lines changed

3 files changed

+24
-126
lines changed

‎src/app/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ int main(int argc, char *argv[])
386386
// Set up the QSettings environment must be done after qapp is created
387387
QCoreApplication::setOrganizationName("QuantumGIS");
388388
QCoreApplication::setOrganizationDomain("qgis.org");
389-
QCoreApplication::setApplicationName("qgis");
389+
QCoreApplication::setApplicationName("QGIS");
390390
#ifdef Q_OS_MACX
391391
// Install OpenDocuments AppleEvent handler after application object is initialized
392392
// but before any other event handling (including dialogs or splash screens) occurs.

‎src/app/qgisapp.cpp

+1-9
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ void QgisApp::createActions()
633633
mActionHelpContents->setStatusTip(tr("Help Documentation"));
634634
connect(mActionHelpContents, SIGNAL(triggered()), this, SLOT(helpContents()));
635635
//
636-
mActionQgisHomePage= new QAction(getThemeIcon("mActionQgisHomePage.png"), tr("Qgis Home Page"), this);
636+
mActionQgisHomePage= new QAction(getThemeIcon("mActionQgisHomePage.png"), tr("QGIS Home Page"), this);
637637
#ifndef Q_WS_MAC
638638
mActionQgisHomePage->setShortcut(tr("Ctrl+H","QGIS Home Page"));
639639
#endif
@@ -1326,10 +1326,6 @@ void QgisApp::createCanvas()
13261326
mMapCanvas->setWhatsThis(tr("Map canvas. This is where raster and vector "
13271327
"layers are displayed when added to the map"));
13281328

1329-
// mMapCanvas->setMinimumWidth(10);
1330-
// QVBoxLayout *myCanvasLayout = new QVBoxLayout;
1331-
// myCanvasLayout->addWidget(mMapCanvas);
1332-
// tabWidget->widget(0)->setLayout(myCanvasLayout);
13331329
setCentralWidget(mMapCanvas);
13341330
// set the focus to the map canvas
13351331
mMapCanvas->setFocus();
@@ -1427,13 +1423,9 @@ void QgisApp::createLegend()
14271423
mMapLegend->setToggleEditingAction(mActionToggleEditing);
14281424

14291425
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."));
1430-
// QVBoxLayout *myLegendLayout = new QVBoxLayout;
1431-
// myLegendLayout->addWidget(mMapLegend);
1432-
// toolBox->widget(0)->setLayout(myLegendLayout);
14331426
mLegendDock = new QDockWidget(tr("Legend"), this);
14341427
mLegendDock->setObjectName("Legend");
14351428
mLegendDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
1436-
// mLegendDock->setFeatures(mLegendDock->features() & ~QDockWidget::DockWidgetClosable);
14371429
mLegendDock->setWidget(mMapLegend);
14381430
addDockWidget(Qt::LeftDockWidgetArea, mLegendDock);
14391431
return;

‎src/ui/qgisappbase.ui

+22-116
Original file line numberDiff line numberDiff line change
@@ -10,134 +10,40 @@
1010
</rect>
1111
</property>
1212
<property name="windowTitle" >
13-
<string>MainWindow</string>
13+
<string>QGIS</string>
14+
</property>
15+
<property name="windowIcon" >
16+
<iconset>../../images/icons/qgis-icon-16x16.png</iconset>
17+
</property>
18+
<property name="dockNestingEnabled" >
19+
<bool>true</bool>
1420
</property>
1521
<widget class="QWidget" name="centralWidget" >
1622
<property name="sizePolicy" >
17-
<sizepolicy>
18-
<hsizetype>7</hsizetype>
19-
<vsizetype>7</vsizetype>
23+
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
2024
<horstretch>0</horstretch>
2125
<verstretch>0</verstretch>
2226
</sizepolicy>
2327
</property>
2428
<layout class="QGridLayout" >
25-
<property name="margin" >
29+
<property name="leftMargin" >
30+
<number>9</number>
31+
</property>
32+
<property name="topMargin" >
33+
<number>9</number>
34+
</property>
35+
<property name="rightMargin" >
36+
<number>9</number>
37+
</property>
38+
<property name="bottomMargin" >
2639
<number>9</number>
2740
</property>
28-
<property name="spacing" >
41+
<property name="horizontalSpacing" >
42+
<number>6</number>
43+
</property>
44+
<property name="verticalSpacing" >
2945
<number>6</number>
3046
</property>
31-
<item row="0" column="0" >
32-
<widget class="QSplitter" name="canvasLegendSplit" >
33-
<property name="sizePolicy" >
34-
<sizepolicy>
35-
<hsizetype>7</hsizetype>
36-
<vsizetype>7</vsizetype>
37-
<horstretch>0</horstretch>
38-
<verstretch>0</verstretch>
39-
</sizepolicy>
40-
</property>
41-
<property name="frameShape" >
42-
<enum>QFrame::NoFrame</enum>
43-
</property>
44-
<property name="frameShadow" >
45-
<enum>QFrame::Plain</enum>
46-
</property>
47-
<property name="lineWidth" >
48-
<number>1</number>
49-
</property>
50-
<property name="orientation" >
51-
<enum>Qt::Horizontal</enum>
52-
</property>
53-
<widget class="QSplitter" name="legendOverviewSplit" >
54-
<property name="sizePolicy" >
55-
<sizepolicy>
56-
<hsizetype>0</hsizetype>
57-
<vsizetype>0</vsizetype>
58-
<horstretch>0</horstretch>
59-
<verstretch>0</verstretch>
60-
</sizepolicy>
61-
</property>
62-
<property name="minimumSize" >
63-
<size>
64-
<width>0</width>
65-
<height>0</height>
66-
</size>
67-
</property>
68-
<property name="orientation" >
69-
<enum>Qt::Vertical</enum>
70-
</property>
71-
<widget class="QToolBox" name="toolBox" >
72-
<property name="font" >
73-
<font>
74-
<family>Lucida Grande</family>
75-
<pointsize>10</pointsize>
76-
<weight>50</weight>
77-
<italic>false</italic>
78-
<bold>false</bold>
79-
<underline>false</underline>
80-
<strikeout>false</strikeout>
81-
</font>
82-
</property>
83-
<property name="frameShape" >
84-
<enum>QFrame::NoFrame</enum>
85-
</property>
86-
<property name="frameShadow" >
87-
<enum>QFrame::Raised</enum>
88-
</property>
89-
<property name="currentIndex" >
90-
<number>0</number>
91-
</property>
92-
<widget class="QWidget" name="legendPage" >
93-
<property name="geometry" >
94-
<rect>
95-
<x>0</x>
96-
<y>0</y>
97-
<width>386</width>
98-
<height>244</height>
99-
</rect>
100-
</property>
101-
<attribute name="label" >
102-
<string>Legend</string>
103-
</attribute>
104-
</widget>
105-
</widget>
106-
<widget class="QFrame" name="overviewFrame" >
107-
<property name="frameShape" >
108-
<enum>QFrame::StyledPanel</enum>
109-
</property>
110-
<property name="frameShadow" >
111-
<enum>QFrame::Raised</enum>
112-
</property>
113-
</widget>
114-
</widget>
115-
<widget class="QTabWidget" name="tabWidget" >
116-
<property name="font" >
117-
<font>
118-
<family>Arial</family>
119-
<pointsize>10</pointsize>
120-
<weight>50</weight>
121-
<italic>false</italic>
122-
<bold>false</bold>
123-
<underline>false</underline>
124-
<strikeout>false</strikeout>
125-
</font>
126-
</property>
127-
<property name="tabPosition" >
128-
<enum>QTabWidget::East</enum>
129-
</property>
130-
<property name="tabShape" >
131-
<enum>QTabWidget::Rounded</enum>
132-
</property>
133-
<widget class="QWidget" name="Map View" >
134-
<attribute name="title" >
135-
<string>Map View</string>
136-
</attribute>
137-
</widget>
138-
</widget>
139-
</widget>
140-
</item>
14147
</layout>
14248
</widget>
14349
</widget>

0 commit comments

Comments
 (0)