Skip to content
Permalink
Browse files

add context help for qgis options, style manager, spatialite selectio…

…n and custom projection and application icon to help viewer

git-svn-id: http://svn.osgeo.org/qgis/trunk@12454 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef
jef committed Dec 14, 2009
1 parent 28deb31 commit 5795c35c86316190d23737ec9561d3904d5743c8
@@ -0,0 +1 @@
<h3>Custom Coordinate Reference System Definition</h3>
@@ -0,0 +1 @@
<h3>Options</h3>
@@ -0,0 +1 @@
<h3>Add SpatiaLite Tables</h3>
@@ -0,0 +1 @@
<h3>Style Manager</h3>
@@ -19,6 +19,8 @@
#define QGSCUSTOMCRSDIALOG_H

#include "ui_qgscustomprojectiondialogbase.h"
#include "qgscontexthelp.h"

class QDir;

/**
@@ -48,8 +50,10 @@ class QgsCustomProjectionDialog : public QDialog, private Ui::QgsCustomProjectio
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();
@@ -21,6 +21,7 @@

#include "ui_qgsoptionsbase.h"
#include "qgisgui.h"
#include "qgscontexthelp.h"


/**
@@ -100,6 +101,8 @@ class QgsOptions : public QDialog, private Ui::QgsOptionsBase
*/
void on_mBtnRemoveSVGPath_clicked();

void on_buttonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }

protected:
//! Populates combo box with ellipsoids
void getEllipsoidList();
@@ -5,6 +5,7 @@
#include <QDialog>

#include "ui_qgsstylev2managerdialogbase.h"
#include "qgscontexthelp.h"

class QgsStyleV2;

@@ -25,6 +26,8 @@ class GUI_EXPORT QgsStyleV2ManagerDialog : public QDialog, private Ui::QgsStyleV
//! 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)
@@ -19,6 +19,31 @@ SET (HELP_MOC_HDRS

#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 @@ IF (${QTVERSION} STRLESS "4.3.0")
)
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")

@@ -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>
@@ -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>
@@ -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>

0 comments on commit 5795c35

Please sign in to comment.
You can’t perform that action at this time.