Skip to content
Permalink
Browse files
Merge branch 'master' of https://github.com/qgis/Quantum-GIS
  • Loading branch information
volaya committed Jan 24, 2013
2 parents 4f3e89a + 2a54248 commit d818561dc19d5234077b2b0b1bd78eb01d11a565
Showing with 832 additions and 428 deletions.
  1. +1 −1 cmake/SIPMacros.cmake
  2. +49 −10 i18n/qgis_it.ts
  3. +5 −3 python/console/console_output.py
  4. +5 −3 python/console/console_sci.py
  5. +3 −3 python/console/console_settings.py
  6. +42 −42 python/console/console_settings.ui
  7. +106 −122 python/plugins/fTools/tools/doEliminate.py
  8. +50 −46 python/plugins/fTools/tools/frmEliminate.ui
  9. +12 −2 python/utils.py
  10. +22 −0 src/app/composer/qgscomposerlegendwidget.cpp
  11. +1 −0 src/app/composer/qgscomposerlegendwidget.h
  12. +49 −1 src/app/composer/qgscomposerscalebarwidget.cpp
  13. +2 −0 src/app/composer/qgscomposerscalebarwidget.h
  14. +51 −3 src/app/qgisappstylesheet.cpp
  15. +22 −6 src/app/qgsoptions.cpp
  16. +10 −0 src/app/qgsoptions.h
  17. +0 −1 src/core/composer/qgscomposeritem.cpp
  18. +9 −4 src/core/composer/qgscomposerlegend.cpp
  19. +4 −0 src/core/composer/qgscomposerlegend.h
  20. +12 −8 src/core/composer/qgscomposerscalebar.cpp
  21. +5 −0 src/core/composer/qgscomposerscalebar.h
  22. +1 −1 src/core/composer/qgsdoubleboxscalebarstyle.cpp
  23. +1 −2 src/core/composer/qgsscalebarstyle.cpp
  24. +2 −1 src/core/composer/qgssingleboxscalebarstyle.cpp
  25. +18 −0 src/core/qgsexpression.cpp
  26. +2 −5 src/core/qgsmaplayer.cpp
  27. +5 −8 src/core/raster/qgsrasterlayer.cpp
  28. +1 −0 src/core/raster/qgssinglebandgrayrenderer.cpp
  29. +9 −1 src/gui/qgscollapsiblegroupbox.cpp
  30. +47 −6 src/mapserver/qgswmsserver.cpp
  31. +9 −3 src/mapserver/qgswmsserver.h
  32. +1 −1 src/providers/mssql/qgsmssqldataitems.cpp
  33. +1 −1 src/providers/mssql/qgsmssqlprovider.cpp
  34. +1 −1 src/providers/oracle/qgsoracledataitems.cpp
  35. +1 −1 src/providers/postgres/qgspostgresdataitems.cpp
  36. +1 −1 src/providers/spatialite/qgsspatialitedataitems.cpp
  37. +25 −21 src/ui/qgscomposerlegendwidgetbase.ui
  38. +124 −86 src/ui/qgscomposerscalebarwidgetbase.ui
  39. +62 −34 src/ui/qgsoptionsbase.ui
  40. +12 −0 tests/src/python/test_qgsrasterlayer.py
  41. +44 −0 tests/testdata/raster/raster-pallette-crash2.qml
  42. BIN tests/testdata/raster/raster-pallette-crash2.tif
  43. +5 −0 tests/testdata/raster/raster-pallette-crash2.tif.aux.xml
@@ -105,7 +105,7 @@ MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP)
OUTPUT ${_sip_output_files}
COMMAND ${CMAKE_COMMAND} -E echo ${message}
COMMAND ${CMAKE_COMMAND} -E touch ${_sip_output_files}
COMMAND ${SIP_BINARY_PATH} ${_sip_tags} -e ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} ${_abs_module_sip}
COMMAND ${SIP_BINARY_PATH} ${_sip_tags} -w -e ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} ${_abs_module_sip}
DEPENDS ${_abs_module_sip} ${SIP_EXTRA_FILES_DEPEND}
)
# not sure if type MODULE could be uses anywhere, limit to cygwin for now
@@ -6470,30 +6470,69 @@ Cambiare questa situazione prima, perché il plugin OSM non quale layer è la de
<translation>Esegui comando</translation>
</message>
<message>
<source>Are you sure you want to completely
delete the command history ?</source>
<translation>Sei sicuro di voler concellare completamente
la cronologia dei comandi ?</translation>
<source>Session and file history cleared successfully.</source>
<translation>Storia dei comandi cancellata completamente.</translation>
</message>
<message>
<source>## History saved successfully ##</source>
<translation>## Storia comandi salvata con successo ##</translation>
<source>History saved successfully.</source>
<translation>Storia comandi salvata con successo.</translation>
</message>
<message>
<source>## History cleared successfully ##</source>
<translation>## Storia comandi cancellata con successo ##</translation>
<source>History cleared successfully.</source>
<translation>Storia comandi cancellata con successo.</translation>
</message>
<message>
<source>Script was correctly saved.</source>
<translation>File salvato correttamente.</translation>
</message>
<message>
<source>URL copied to clipboard.</source>
<translation>URL copiata nella clipboard</translation>
</message>
<message>
<source>Connection error: </source>
<translation>Errore di connessione: </translation>
</message>
<message>
<source>## To access Quantum GIS environment from this console
## use qgis.utils.iface object (instance of QgisInterface class). Read help for more info.
## use iface object (instance of QgisInterface class).
## Type help(iface) for more info and list of methods.

</source>
<translation>## Per accedere all&apos;ambiente Quantum GIS da questa console
## usa l&apos;oggetto qgis.utils.iface (istanza della classe QgisInterface). Consulta l&apos;aiuto per ottenere più informazioni.
## usa l&apos;oggetto iface (istanza della classe QgisInterface).
## Digita help(iface) per ottenere più informazioni.

</translation>
</message>
</context>
<context>
<name>SettingsDialogPythonConsole</name>
<message>
<source>Settings Python Console</source>
<translation>Impostazioni Python Console</translation>
</message>
<message>
<location filename="../python/console/console_settings.ui" line="200"/>
<source>Font</source>
<translation>Carattere</translation>
</message>
<message>
<location filename="../python/console/console_settings.ui" line="201"/>
<source>Size</source>
<translation>Dimensione</translation>
</message>
<message>
<location filename="../python/console/console_settings.ui" line="203"/>
<source>Browse</source>
<translation>Sfoglia</translation>
</message>
<message>
<location filename="../python/console/console_settings.ui" line="206"/>
<source>Using preloaded API file</source>
<translation>Usare il file delle API preinstallato</translation>
</message>
</context>
<context>
<name>QGis::UnitType</name>
<message>
@@ -137,7 +137,7 @@ def __init__(self, parent=None):
def insertInitText(self):
txtInit = QCoreApplication.translate("PythonConsole",
"## To access Quantum GIS environment from this console\n"
"## use iface object (instance of QgisInterface class). \n"
"## use iface object (instance of QgisInterface class).\n"
"## Type help(iface) for more info and list of methods.\n\n")
initText = self.setText(txtInit)

@@ -277,9 +277,11 @@ def pastebin(self):
link = i.replace('<a href="',"").strip()
if link:
QApplication.clipboard().setText(link)
self.parent.callWidgetMessageBar('URL copied to clipboard')
msgText = QCoreApplication.translate('PythonConsole', 'URL copied to clipboard.')
self.parent.callWidgetMessageBar(msgText)
except urllib2.URLError, e:
self.parent.callWidgetMessageBar('Connection error: ' + str(e.args))
msgText = QCoreApplication.translate('PythonConsole', 'Connection error: ')
self.parent.callWidgetMessageBar(msgText + str(e.args))

def widgetMessageBar(self, iface, text):
timeout = iface.messageTimeout()
@@ -502,18 +502,20 @@ def runCommand(self, cmd):
if cmd in ('_save', '_clear', '_clearAll', '_pyqgis', '_api'):
if cmd == '_save':
self.writeHistoryFile()
self.parent.callWidgetMessageBar('History saved successfully')
msgText = QCoreApplication.translate('PythonConsole', 'History saved successfully.')
elif cmd == '_clear':
self.clearHistoryFile()
self.parent.callWidgetMessageBar('History cleared successfully')
msgText = QCoreApplication.translate('PythonConsole', 'History cleared successfully.')
elif cmd == '_clearAll':
self.history = QStringList()
self.clearHistoryFile()
self.parent.callWidgetMessageBar('Session and file history cleared successfully')
msgText = QCoreApplication.translate('PythonConsole', 'Session and file history cleared successfully.')
elif cmd == '_pyqgis':
webbrowser.open( "http://www.qgis.org/pyqgis-cookbook/" )
elif cmd == '_api':
webbrowser.open( "http://www.qgis.org/api/" )
if msgText:
self.parent.callWidgetMessageBar(msgText)

self.displayPrompt(False)
else:
@@ -22,12 +22,12 @@
from PyQt4.QtCore import *
from PyQt4.QtGui import *

from ui_console_settings import Ui_SettingsDialog
from ui_console_settings import Ui_SettingsDialogPythonConsole

class optionsDialog(QDialog, Ui_SettingsDialog):
class optionsDialog(QDialog, Ui_SettingsDialogPythonConsole):
def __init__(self, parent):
QDialog.__init__(self, parent)
self.setWindowTitle(QCoreApplication.translate("PythonConsole", "Settings Python Console"))
self.setWindowTitle(QCoreApplication.translate("SettingsDialogPythonConsole", "Settings Python Console"))
#self.iface = iface
self.parent = parent
self.setupUi(self)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>SettingsDialog</class>
<widget class="QDialog" name="SettingsDialog">
<class>SettingsDialogPythonConsole</class>
<widget class="QDialog" name="SettingsDialogPythonConsole">
<property name="windowModality">
<enum>Qt::NonModal</enum>
</property>
@@ -109,43 +109,6 @@
</item>
<item row="5" column="0">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QTableWidget" name="tableWidget">
<property name="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set>
</property>
<property name="tabKeyNavigation">
<bool>false</bool>
</property>
<property name="showDropIndicator" stdset="0">
<bool>false</bool>
</property>
<property name="dragDropOverwriteMode">
<bool>false</bool>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::ExtendedSelection</enum>
</property>
<property name="selectionBehavior">
<enum>QAbstractItemView::SelectItems</enum>
</property>
<property name="verticalScrollMode">
<enum>QAbstractItemView::ScrollPerItem</enum>
</property>
<property name="horizontalScrollMode">
<enum>QAbstractItemView::ScrollPerPixel</enum>
</property>
<property name="rowCount">
<number>0</number>
</property>
<attribute name="horizontalHeaderVisible">
<bool>true</bool>
</attribute>
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
</widget>
</item>
<item row="0" column="1">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
@@ -207,6 +170,43 @@
</item>
</layout>
</item>
<item row="0" column="0">
<widget class="QTableWidget" name="tableWidget">
<property name="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set>
</property>
<property name="tabKeyNavigation">
<bool>false</bool>
</property>
<property name="showDropIndicator" stdset="0">
<bool>false</bool>
</property>
<property name="dragDropOverwriteMode">
<bool>false</bool>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::ExtendedSelection</enum>
</property>
<property name="selectionBehavior">
<enum>QAbstractItemView::SelectItems</enum>
</property>
<property name="verticalScrollMode">
<enum>QAbstractItemView::ScrollPerItem</enum>
</property>
<property name="horizontalScrollMode">
<enum>QAbstractItemView::ScrollPerPixel</enum>
</property>
<property name="rowCount">
<number>0</number>
</property>
<attribute name="horizontalHeaderVisible">
<bool>true</bool>
</attribute>
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
</widget>
</item>
</layout>
</item>
<item row="6" column="0">
@@ -222,7 +222,7 @@
<item row="2" column="0">
<widget class="QCheckBox" name="preloadAPI">
<property name="text">
<string>Use preloaded API file</string>
<string>Using preloaded API file</string>
</property>
<property name="checked">
<bool>true</bool>
@@ -239,7 +239,7 @@
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>SettingsDialog</receiver>
<receiver>SettingsDialogPythonConsole</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
@@ -255,7 +255,7 @@
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>SettingsDialog</receiver>
<receiver>SettingsDialogPythonConsole</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">

0 comments on commit d818561

Please sign in to comment.