All customization and QGIS browser work in one commit.

qgis · May 13, 2011 · 153ad16 · 153ad16
1 parent c087409
commit 153ad16
Show file tree

Hide file tree

Showing 129 changed files with 9,312 additions and 695 deletions.
diff --git a/dbl.txt b/dbl.txt
diff --git a/images/images.qrc b/images/images.qrc
@@ -178,6 +178,8 @@
         <file>themes/default/mIconTableLayer.png</file>
         <file>themes/default/mIconUnknownLayerType.png</file>
         <file>themes/default/mIconWaitingForLayerType.png</file>
+        <file>themes/default/mIconWms.png</file>
+        <file>themes/default/mIconWmsLayer.png</file>
         <file>themes/default/mMapserverExport.png</file>
         <file>themes/default/plugin.png</file>
         <file>themes/default/propertyicons/action.png</file>

diff --git a/images/splash/deblin.png b/images/splash/deblin.png
diff --git a/images/splash/splash.png b/images/splash/splash.png
diff --git a/images/splash/splash.png.orig b/images/splash/splash.png.orig
diff --git a/images/themes/default/customization/calendarwidget.png b/images/themes/default/customization/calendarwidget.png
diff --git a/images/themes/default/customization/checkbox.png b/images/themes/default/customization/checkbox.png
diff --git a/images/themes/default/customization/columnview.png b/images/themes/default/customization/columnview.png
diff --git a/images/themes/default/customization/combobox.png b/images/themes/default/customization/combobox.png
diff --git a/images/themes/default/customization/commandlinkbutton.png b/images/themes/default/customization/commandlinkbutton.png
diff --git a/images/themes/default/customization/dateedit.png b/images/themes/default/customization/dateedit.png
diff --git a/images/themes/default/customization/datetimeedit.png b/images/themes/default/customization/datetimeedit.png
diff --git a/images/themes/default/customization/dial.png b/images/themes/default/customization/dial.png
diff --git a/images/themes/default/customization/dialogbuttonbox.png b/images/themes/default/customization/dialogbuttonbox.png
diff --git a/images/themes/default/customization/dockwidget.png b/images/themes/default/customization/dockwidget.png
diff --git a/images/themes/default/customization/doublespinbox.png b/images/themes/default/customization/doublespinbox.png
diff --git a/images/themes/default/customization/fontcombobox.png b/images/themes/default/customization/fontcombobox.png
diff --git a/images/themes/default/customization/frame.png b/images/themes/default/customization/frame.png
diff --git a/images/themes/default/customization/graphicsview.png b/images/themes/default/customization/graphicsview.png
diff --git a/images/themes/default/customization/groupbox.png b/images/themes/default/customization/groupbox.png
diff --git a/images/themes/default/customization/groupboxcollapsible.png b/images/themes/default/customization/groupboxcollapsible.png
diff --git a/images/themes/default/customization/hscrollbar.png b/images/themes/default/customization/hscrollbar.png
diff --git a/images/themes/default/customization/hslider.png b/images/themes/default/customization/hslider.png
diff --git a/images/themes/default/customization/hsplit.png b/images/themes/default/customization/hsplit.png
diff --git a/images/themes/default/customization/label.png b/images/themes/default/customization/label.png
diff --git a/images/themes/default/customization/lcdnumber.png b/images/themes/default/customization/lcdnumber.png
diff --git a/images/themes/default/customization/line.png b/images/themes/default/customization/line.png
diff --git a/images/themes/default/customization/lineedit.png b/images/themes/default/customization/lineedit.png
diff --git a/images/themes/default/customization/listbox.png b/images/themes/default/customization/listbox.png
diff --git a/images/themes/default/customization/listview.png b/images/themes/default/customization/listview.png
diff --git a/images/themes/default/customization/mdiarea.png b/images/themes/default/customization/mdiarea.png
diff --git a/images/themes/default/customization/plaintextedit.png b/images/themes/default/customization/plaintextedit.png
diff --git a/images/themes/default/customization/progress.png b/images/themes/default/customization/progress.png
diff --git a/images/themes/default/customization/pushbutton.png b/images/themes/default/customization/pushbutton.png
diff --git a/images/themes/default/customization/radiobutton.png b/images/themes/default/customization/radiobutton.png
diff --git a/images/themes/default/customization/scrollarea.png b/images/themes/default/customization/scrollarea.png
diff --git a/images/themes/default/customization/spacer.png b/images/themes/default/customization/spacer.png
diff --git a/images/themes/default/customization/spinbox.png b/images/themes/default/customization/spinbox.png
diff --git a/images/themes/default/customization/tabbar.png b/images/themes/default/customization/tabbar.png
diff --git a/images/themes/default/customization/table.png b/images/themes/default/customization/table.png
diff --git a/images/themes/default/customization/tabwidget.png b/images/themes/default/customization/tabwidget.png
diff --git a/images/themes/default/customization/textedit.png b/images/themes/default/customization/textedit.png
diff --git a/images/themes/default/customization/timeedit.png b/images/themes/default/customization/timeedit.png
diff --git a/images/themes/default/customization/toolbox.png b/images/themes/default/customization/toolbox.png
diff --git a/images/themes/default/customization/toolbutton.png b/images/themes/default/customization/toolbutton.png
diff --git a/images/themes/default/customization/vline.png b/images/themes/default/customization/vline.png
diff --git a/images/themes/default/customization/vscrollbar.png b/images/themes/default/customization/vscrollbar.png
diff --git a/images/themes/default/customization/vslider.png b/images/themes/default/customization/vslider.png
diff --git a/images/themes/default/customization/vspacer.png b/images/themes/default/customization/vspacer.png
diff --git a/images/themes/default/customization/widget.png b/images/themes/default/customization/widget.png
diff --git a/images/themes/default/customization/widgetstack.png b/images/themes/default/customization/widgetstack.png
diff --git a/images/themes/default/customization/wizard.png b/images/themes/default/customization/wizard.png
diff --git a/images/themes/default/mIconWms.png b/images/themes/default/mIconWms.png
diff --git a/images/themes/default/mIconWmsLayer.png b/images/themes/default/mIconWmsLayer.png
diff --git a/python/widgets_tree.py b/python/widgets_tree.py
@@ -0,0 +1,129 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+"""
+Reads .ui files from ../src/ui/ directory and write to stdout an XML describing
+widgets tree.
+
+Python bindings must be compiled and in PYTHONPATH
+
+QGIS libraries must be in LD_LIBRARY_PATH
+
+Output should go to ../resources/customization.xml
+
+"""
+
+import sys
+import os, glob, imp
+from PyQt4.QtGui import *
+from PyQt4.uic import loadUi, compileUi
+from xml.etree.ElementTree import Element, SubElement, Comment, tostring
+from xml.dom import minidom
+
+# qwt_plot is missing somehow but it may depend on installed packages
+from PyQt4 import Qwt5 as qwt_plot
+sys.modules['qwt_plot'] = qwt_plot
+
+# loadUi is looking for custom widget in module which is lowercase version of 
+# the class, which do not exist (AFAIK) -> preload them, problems anyway:
+# missing in gui: QgsColorRampComboBox, QgsRendererRulesTreeWidget,
+# QgsRendererRulesTreeWidget, QgsAttributeTableView
+# and QgsProjectionSelector cannot open db file
+from qgis import gui
+for m in ['qgscolorbutton', 'qgscolorrampcombobox', 'qgsprojectionselector', 'qgslabelpreview', 'qgsrulebasedrendererv2widget', 'qgsattributetableview' ]:
+	sys.modules[m] = gui
+
+class UiInspector:
+	def __init__(self ):
+		self.ui_dir = os.path.abspath ( os.path.join(  os.path.dirname(__file__)	, '../src/ui/*.ui' ) )
+		self.printMsg ( "Loading UI files " + self.ui_dir )
+		# list of widget classes we want to follow 
+		self.follow = [
+			QWidget, QDialog, 
+			QCheckBox, QComboBox, QDial, QPushButton, QLabel, QLCDNumber, QLineEdit, QRadioButton, QScrollBar, QSlider, QSpinBox, QTextEdit,
+			QDateEdit, QTimeEdit, QDateTimeEdit, QListView, QProgressBar, QTableView, QTabWidget, QTextBrowser, QDialogButtonBox,
+      QScrollArea, QGroupBox, QStackedWidget,
+		]
+
+	def printMsg ( self, msg ):
+		sys.stderr.write( msg + "\n" ) 
+
+	def widgetXml(self, element, widget, level = 0, label = None ):
+		#print tostring ( element )
+		#self.printMsg ( "class: " + str( type ( widget ) ) )
+		#self.printMsg ( "objectName: " + widget.objectName() )
+		#self.printMsg ( "windowTitle: " + widget.windowTitle() )
+
+		if not widget.objectName(): return
+
+		lab = label
+		if hasattr( widget, 'text' ):
+			lab = widget.text()
+		if widget.windowTitle():
+			label = widget.windowTitle()
+		if not lab:
+			lab = ''
+
+		lab = unicode(lab).encode("ascii","replace")
+
+		sub_element = SubElement( element, 'widget')
+		sub_element.set('class', widget.__class__.__name__ )
+		sub_element.set('objectName', widget.objectName() )
+		sub_element.set('label', lab )
+
+		#print str ( widget.children () )
+		# tab widget label is stored in QTabWidget->QTabBarPrivate->tabList->QTab ..
+		if type(widget) in [ QTabWidget ]:
+			children = list ( { 'widget': widget.widget(i), 'label':  widget.tabText(i) } for i in range ( 0, widget.count() ) )
+		else:
+			children = list ( { 'widget': c, 'label': None } for c in widget.children () )
+		for child in children:
+			w  = child['widget']
+			if w.isWidgetType() and ( type(w) in self.follow ):
+				self.widgetXml ( sub_element, w, level+1, child['label'] )
+
+
+	def treeXml(self, element ):
+		xml = ''
+    # debug
+		for p in glob.glob( self.ui_dir ):
+		#for p in ['/home/radim/devel/qgis_trunk/src/ui/qgsabout.ui']: 
+		#for p in ['/home/radim/devel/qgis_trunk/src/ui/qgsrasterlayerpropertiesbase.ui']: 
+			self.printMsg ( "Loading " + p )
+			# qgsrasterlayerpropertiesbase.ui is giving: No module named qwt_plot
+			try:
+				widget = loadUi ( p )
+				#print dir ( ui )
+				self.widgetXml ( element, widget )
+			except Exception, e:
+			#except IOError, e:
+				self.printMsg ( str(e) )
+
+		return xml
+
+	def xml( self ) :
+		#xml = "<?xml version='1.0' encoding='UTF-8'?>\n"
+		#xml += "<!DOCTYPE qgiswidgets SYSTEM 'http://mrcc.com/qgiswidgets.dtd'>\n"
+		element = Element('qgiswidgets')
+		self.treeXml( element )
+
+		string =  tostring ( element, 'utf-8' )
+		reparsed = minidom.parseString(string)
+		xml = reparsed.toprettyxml(indent="  ")
+		return xml
+
+
+if __name__ == '__main__':
+	app = QApplication(sys.argv) # required by loadUi
+	inspector = UiInspector()
+	xml = inspector.xml()
+	sys.stdout.write( xml )
+	sys.stdout.flush()
+
+	del app
+	sys.exit(0)
diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-INSTALL(FILES srs.db qgis.db qgis_help.db symbology-ng-style.xml spatialite.db
+INSTALL(FILES srs.db qgis.db qgis_help.db symbology-ng-style.xml spatialite.db customization.xml customization.ini
         DESTINATION ${QGIS_DATA_DIR}/resources)
 
 SUBDIRS(context_help)