Skip to content

Commit 2ddd176

Browse files
author
jef
committed
merge r10521 to version 1.0
git-svn-id: http://svn.osgeo.org/qgis/branches/Version-1_0@10522 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent a39455e commit 2ddd176

File tree

1 file changed

+25
-8
lines changed

1 file changed

+25
-8
lines changed

‎src/app/qgisapp.cpp

+25-8
Original file line numberDiff line numberDiff line change
@@ -945,7 +945,7 @@ void QgisApp::createActions()
945945
#ifdef Q_WS_MAC
946946
mActionHelpContents->setShortcut( tr( "Ctrl+?" ) );
947947
#else
948-
mActionHelpContents->setShortcut( tr( "F1" ) );
948+
mActionHelpContents->setShortcut( tr( "F1" ) );
949949
#endif
950950
mActionHelpContents->setShortcutContext( Qt::WindowShortcut );
951951
mActionHelpContents->setStatusTip( tr( "Help Documentation" ) );
@@ -1634,7 +1634,7 @@ void QgisApp::createOverview()
16341634

16351635
QBitmap overviewPanBmp = QBitmap::fromData( QSize( 16, 16 ), pan_bits );
16361636
QBitmap overviewPanBmpMask = QBitmap::fromData( QSize( 16, 16 ), pan_mask_bits );
1637-
mOverviewMapCursor = new QCursor( overviewPanBmp, overviewPanBmpMask, 0, 0 ); //set upper left corner as hot spot - this is better when extent marker is small; hand won't cover the marker
1637+
mOverviewMapCursor = new QCursor( overviewPanBmp, overviewPanBmpMask, 0, 0 ); //set upper left corner as hot spot - this is better when extent marker is small; hand won't cover the marker
16381638
overviewCanvas->setCursor( *mOverviewMapCursor );
16391639
// QVBoxLayout *myOverviewLayout = new QVBoxLayout;
16401640
// myOverviewLayout->addWidget(overviewCanvas);
@@ -1804,23 +1804,40 @@ void QgisApp::saveWindowState()
18041804
// store window and toolbar positions
18051805
QSettings settings;
18061806
// store the toolbar/dock widget settings using Qt4 settings API
1807-
settings.setValue( "/UI/state", this->saveState() );
1807+
settings.setValue( "/UI/state", saveState() );
18081808

18091809
// store window geometry
18101810
settings.setValue( "/UI/geometry", saveGeometry() );
18111811

18121812
QgsPluginRegistry::instance()->unloadAll();
18131813
}
18141814

1815+
static const unsigned char defaultUIgeometry[] =
1816+
{
1817+
0x01, 0xd9, 0xd0, 0xcb, 0x00, 0x01, 0x00, 0x00, 0xff, 0xff, 0xff, 0xfc, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x04, 0xb8, 0x00, 0x00, 0x03, 0x22, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x43, 0x00, 0x00, 0x02, 0xaf, 0x00, 0x00, 0x02, 0x22, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00
1818+
};
1819+
1820+
static const unsigned char defaultUIstate[] =
1821+
{
1822+
0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x87, 0xfc, 0x02, 0x00, 0x00, 0x00, 0x03, 0xfb, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x4c, 0x00, 0x65, 0x00, 0x67, 0x00, 0x65, 0x00, 0x6e, 0x00, 0x64, 0x01, 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x02, 0x87, 0x00, 0x00, 0x00, 0x72, 0x00, 0xff, 0xff, 0xff, 0xfb, 0x00, 0x00, 0x00, 0x10, 0x00, 0x4f, 0x00, 0x76, 0x00, 0x65, 0x00, 0x72, 0x00, 0x76, 0x00, 0x69, 0x00, 0x65, 0x00, 0x77, 0x00, 0x00, 0x00, 0x01, 0xf4, 0x00, 0x00, 0x00, 0x2a, 0x00, 0x00, 0x00, 0x14, 0x00, 0xff, 0xff, 0xff, 0xfb, 0x00, 0x00, 0x00, 0x22, 0x00, 0x43, 0x00, 0x6f, 0x00, 0x6f, 0x00, 0x72, 0x00, 0x64, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x61, 0x00, 0x74, 0x00, 0x65, 0x00, 0x43, 0x00, 0x61, 0x00, 0x70, 0x00, 0x74, 0x00, 0x75, 0x00, 0x72, 0x00, 0x65, 0x00, 0x00, 0x00, 0x01, 0x7e, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x7e, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x03, 0xaf, 0x00, 0x00, 0x02, 0x87, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0xfc, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x16, 0x00, 0x46, 0x00, 0x69, 0x00, 0x6c, 0x00, 0x65, 0x00, 0x54, 0x00, 0x6f, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x42, 0x00, 0x61, 0x00, 0x72, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x4c, 0x00, 0x61, 0x00, 0x79, 0x00, 0x65, 0x00, 0x72, 0x00, 0x54, 0x00, 0x6f, 0x00, 0x6f, 0x00, 0x6c, 0x00, 0x42, 0x00, 0x61, 0x00, 0x72, 0x01, 0x00, 0x00, 0x01, 0x90, 0x00, 0x00, 0x00, 0xbe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x41, 0x00, 0x74, 0x00, 0x74, 0x00, 0x72, 0x00, 0x69, 0x00, 0x62, 0x00, 0x75, 0x00, 0x74, 0x00, 0x65, 0x00, 0x73, 0x01, 0x00, 0x00, 0x02, 0x4e, 0x00, 0x00, 0x01, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x48, 0x00, 0x65, 0x00, 0x6c, 0x00, 0x70, 0x00, 0x00, 0x00, 0x03, 0xd9, 0x00, 0x00, 0x00, 0xdd, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x50, 0x00, 0x6c, 0x00, 0x75, 0x00, 0x67, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x73, 0x01, 0x00, 0x00, 0x03, 0x75, 0x00, 0x00, 0x01, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x14, 0x00, 0x44, 0x00, 0x69, 0x00, 0x67, 0x00, 0x69, 0x00, 0x74, 0x00, 0x69, 0x00, 0x7a, 0x00, 0x69, 0x00, 0x6e, 0x00, 0x67, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x4d, 0x00, 0x61, 0x00, 0x70, 0x00, 0x20, 0x00, 0x4e, 0x00, 0x61, 0x00, 0x76, 0x00, 0x69, 0x00, 0x67, 0x00, 0x61, 0x00, 0x74, 0x00, 0x69, 0x00, 0x6f, 0x00, 0x6e, 0x01, 0x00, 0x00, 0x02, 0x1c, 0x00, 0x00, 0x02, 0x99, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00
1823+
};
1824+
1825+
18151826
void QgisApp::restoreWindowState()
18161827
{
18171828
// restore the toolbar and dock widgets postions using Qt4 settings API
18181829
QSettings settings;
1819-
QVariant vstate = settings.value( "/UI/state" );
1820-
this->restoreState( vstate.toByteArray() );
1830+
1831+
if ( !restoreState( settings.value( "/UI/state", QByteArray::fromRawData(( char * )defaultUIstate, sizeof defaultUIstate ) ).toByteArray() ) )
1832+
{
1833+
QgsDebugMsg( "restore of UI state failed" );
1834+
}
18211835

18221836
// restore window geometry
1823-
restoreGeometry( settings.value( "/UI/geometry" ).toByteArray() );
1837+
if ( !restoreGeometry( settings.value( "/UI/geometry", QByteArray::fromRawData(( char * )defaultUIgeometry, sizeof defaultUIgeometry ) ).toByteArray() ) )
1838+
{
1839+
QgsDebugMsg( "restore of UI geometry failed" );
1840+
}
18241841
}
18251842
///////////// END OF GUI SETUP ROUTINES ///////////////
18261843

@@ -1858,12 +1875,12 @@ void QgisApp::about()
18581875
tr( "QGIS 1.0.2 is a bug fix release for the stable version of QGIS."
18591876
"A summary of the improvements can be found at "
18601877
"https://trac.osgeo.org/qgis/query?status=closed&milestone=Version+1.0.2"
1861-
);
1878+
);
18621879
whatsNew += "<h3>" + tr( "Changes" ) + "</h3>" +
18631880
tr( "QGIS 1.0.1 is a bug fix release for the stable version of QGIS."
18641881
"A summary of the improvements can be found at "
18651882
"https://trac.osgeo.org/qgis/query?status=closed&milestone=Version+1.0.1"
1866-
);
1883+
);
18671884
whatsNew += "<h3>" + tr( "New features" ) + "</h3>" +
18681885
tr( "The QGIS 1.0 release includes over 265 bug fixes and enhancements "
18691886
"over the QGIS 0.11.0 release. In addition we have added "

0 commit comments

Comments
 (0)