[QGIS Commit] r12454 - in trunk/qgis: resources/context_help
src/app src/gui/symbology-ng src/helpviewer src/ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Mon Dec 14 14:36:58 EST 2009
Author: jef
Date: 2009-12-14 14:36:57 -0500 (Mon, 14 Dec 2009)
New Revision: 12454
Added:
trunk/qgis/resources/context_help/QgsCustomProjectionDialog-en_US
trunk/qgis/resources/context_help/QgsOptions-en_US
trunk/qgis/resources/context_help/QgsSpatiaLiteSourceSelect-en_US
trunk/qgis/resources/context_help/QgsStyleV2ManagerDialog-en_US
Modified:
trunk/qgis/src/app/qgscustomprojectiondialog.h
trunk/qgis/src/app/qgsoptions.h
trunk/qgis/src/gui/symbology-ng/qgsstylev2managerdialog.h
trunk/qgis/src/helpviewer/CMakeLists.txt
trunk/qgis/src/ui/qgscustomprojectiondialogbase.ui
trunk/qgis/src/ui/qgsoptionsbase.ui
trunk/qgis/src/ui/qgsstylev2managerdialogbase.ui
Log:
add context help for qgis options, style manager, spatialite selection and custom projection and application icon to help viewer
Added: trunk/qgis/resources/context_help/QgsCustomProjectionDialog-en_US
===================================================================
--- trunk/qgis/resources/context_help/QgsCustomProjectionDialog-en_US (rev 0)
+++ trunk/qgis/resources/context_help/QgsCustomProjectionDialog-en_US 2009-12-14 19:36:57 UTC (rev 12454)
@@ -0,0 +1 @@
+<h3>Custom Coordinate Reference System Definition</h3>
Added: trunk/qgis/resources/context_help/QgsOptions-en_US
===================================================================
--- trunk/qgis/resources/context_help/QgsOptions-en_US (rev 0)
+++ trunk/qgis/resources/context_help/QgsOptions-en_US 2009-12-14 19:36:57 UTC (rev 12454)
@@ -0,0 +1 @@
+<h3>Options</h3>
Added: trunk/qgis/resources/context_help/QgsSpatiaLiteSourceSelect-en_US
===================================================================
--- trunk/qgis/resources/context_help/QgsSpatiaLiteSourceSelect-en_US (rev 0)
+++ trunk/qgis/resources/context_help/QgsSpatiaLiteSourceSelect-en_US 2009-12-14 19:36:57 UTC (rev 12454)
@@ -0,0 +1 @@
+<h3>Add SpatiaLite Tables</h3>
Added: trunk/qgis/resources/context_help/QgsStyleV2ManagerDialog-en_US
===================================================================
--- trunk/qgis/resources/context_help/QgsStyleV2ManagerDialog-en_US (rev 0)
+++ trunk/qgis/resources/context_help/QgsStyleV2ManagerDialog-en_US 2009-12-14 19:36:57 UTC (rev 12454)
@@ -0,0 +1 @@
+<h3>Style Manager</h3>
Modified: trunk/qgis/src/app/qgscustomprojectiondialog.h
===================================================================
--- trunk/qgis/src/app/qgscustomprojectiondialog.h 2009-12-14 14:36:34 UTC (rev 12453)
+++ trunk/qgis/src/app/qgscustomprojectiondialog.h 2009-12-14 19:36:57 UTC (rev 12454)
@@ -19,6 +19,8 @@
#define QGSCUSTOMCRSDIALOG_H
#include "ui_qgscustomprojectiondialogbase.h"
+#include "qgscontexthelp.h"
+
class QDir;
/**
@@ -48,8 +50,10 @@
void on_pbnNew_clicked();
void on_pbnSave_clicked();
+ void on_buttonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }
+
//
- // Contol population
+ // Control population
//
/* These two methods will be deprecated
void getProjList();
Modified: trunk/qgis/src/app/qgsoptions.h
===================================================================
--- trunk/qgis/src/app/qgsoptions.h 2009-12-14 14:36:34 UTC (rev 12453)
+++ trunk/qgis/src/app/qgsoptions.h 2009-12-14 19:36:57 UTC (rev 12454)
@@ -21,6 +21,7 @@
#include "ui_qgsoptionsbase.h"
#include "qgisgui.h"
+#include "qgscontexthelp.h"
/**
@@ -100,6 +101,8 @@
*/
void on_mBtnRemoveSVGPath_clicked();
+ void on_buttonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }
+
protected:
//! Populates combo box with ellipsoids
void getEllipsoidList();
Modified: trunk/qgis/src/gui/symbology-ng/qgsstylev2managerdialog.h
===================================================================
--- trunk/qgis/src/gui/symbology-ng/qgsstylev2managerdialog.h 2009-12-14 14:36:34 UTC (rev 12453)
+++ trunk/qgis/src/gui/symbology-ng/qgsstylev2managerdialog.h 2009-12-14 19:36:57 UTC (rev 12454)
@@ -5,6 +5,7 @@
#include <QDialog>
#include "ui_qgsstylev2managerdialogbase.h"
+#include "qgscontexthelp.h"
class QgsStyleV2;
@@ -25,6 +26,8 @@
//! called when the dialog is going to be closed
void onFinished();
+ void on_buttonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }
+
protected:
//! populate combo box with known style items (symbols, color ramps)
Modified: trunk/qgis/src/helpviewer/CMakeLists.txt
===================================================================
--- trunk/qgis/src/helpviewer/CMakeLists.txt 2009-12-14 14:36:34 UTC (rev 12453)
+++ trunk/qgis/src/helpviewer/CMakeLists.txt 2009-12-14 19:36:57 UTC (rev 12454)
@@ -19,7 +19,32 @@
#SET (HELP_RCCS qgsgps_plugin.qrc)
+IF (WIN32)
+ IF (MSVC)
+ SET (HELP_SRCS ${HELP_SRCS} ${CMAKE_CURRENT_SOURCE_DIR}/../app/qgis_win32.rc)
+ ELSE(MSVC)
+ # Icon for windows MINGW
+ # Note: can't include .rc directly to source files
+ # as it's ignored when used MinGW
+
+ IF (NOT WINDRES)
+ FIND_PROGRAM(WINDRES windres)
+ IF (NOT WINDRES)
+ MESSAGE(FATAL_ERROR "windres not found - aborting")
+ ENDIF (NOT WINDRES)
+ ENDIF (NOT WINDRES)
+ #############################################################
+ # application icon
+ # resource compilation for MinGW
+ ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/icon.o
+ COMMAND ${WINDRES} -I${CMAKE_CURRENT_SOURCE_DIR} -i${CMAKE_CURRENT_SOURCE_DIR}/../app/qgis_win32.rc
+ -o ${CMAKE_CURRENT_BINARY_DIR}/icon.o )
+ SET(QGIS_APP_SRCS ${QGIS_APP_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/icon.o)
+ ENDIF (MSVC)
+ENDIF (WIN32)
+
+
########################################################
# Build
@@ -54,12 +79,12 @@
)
ELSE (${QTVERSION} STRLESS "4.3.0")
TARGET_LINK_LIBRARIES(qgis_help
- ${QT_QTCORE_LIBRARY}
- ${QT_QTGUI_LIBRARY}
- ${QT_QTNETWORK_LIBRARY}
- ${QT_QTSVG_LIBRARY}
- ${QT_QTXML_LIBRARY}
- ${QT_QTWEBKIT_LIBRARY}
+ ${QT_QTCORE_LIBRA}
+ ${QT_QTGUI_LIBRARY}
+ ${QT_QTNETWORK_LIBRARY}
+ ${QT_QTSVG_LIBRARY}
+ ${QT_QTXML_LIBRARY}
+ ${QT_QTWEBKIT_LIBRARY}
)
ENDIF (${QTVERSION} STRLESS "4.3.0")
Modified: trunk/qgis/src/ui/qgscustomprojectiondialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgscustomprojectiondialogbase.ui 2009-12-14 14:36:34 UTC (rev 12453)
+++ trunk/qgis/src/ui/qgscustomprojectiondialogbase.ui 2009-12-14 19:36:57 UTC (rev 12454)
@@ -270,7 +270,7 @@
<item row="2" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
- <set>QDialogButtonBox::Ok</set>
+ <set>QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
Modified: trunk/qgis/src/ui/qgsoptionsbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsoptionsbase.ui 2009-12-14 14:36:34 UTC (rev 12453)
+++ trunk/qgis/src/ui/qgsoptionsbase.ui 2009-12-14 19:36:57 UTC (rev 12454)
@@ -1243,7 +1243,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
- <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
Modified: trunk/qgis/src/ui/qgsstylev2managerdialogbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsstylev2managerdialogbase.ui 2009-12-14 14:36:34 UTC (rev 12453)
+++ trunk/qgis/src/ui/qgsstylev2managerdialogbase.ui 2009-12-14 19:36:57 UTC (rev 12454)
@@ -93,7 +93,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
- <set>QDialogButtonBox::Close</set>
+ <set>QDialogButtonBox::Close|QDialogButtonBox::Help</set>
</property>
</widget>
</item>
More information about the QGIS-commit
mailing list