Skip to content

Commit

Permalink
[sextante] added some extra space in modeler for inputs tab
Browse files Browse the repository at this point in the history
  • Loading branch information
volaya committed Mar 28, 2013
1 parent 7a1c644 commit da57be0
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 29 deletions.
7 changes: 2 additions & 5 deletions python/plugins/sextante/SextantePlugin.py
Expand Up @@ -16,14 +16,14 @@
* *
***************************************************************************
"""
import shutil

__author__ = 'Victor Olaya'
__date__ = 'August 2012'
__copyright__ = '(C) 2012, Victor Olaya'
# This will get replaced with a git SHA1 when you do a git archive
__revision__ = '$Format:%H$'

import shutil
import os, sys
import inspect
from PyQt4.QtCore import *
Expand All @@ -32,19 +32,16 @@
from sextante.core.Sextante import Sextante
from sextante.core.QGisLayers import QGisLayers
from sextante.core.SextanteUtils import SextanteUtils

from sextante.gui.SextanteToolbox import SextanteToolbox
from sextante.gui.HistoryDialog import HistoryDialog
from sextante.gui.ConfigDialog import ConfigDialog
from sextante.gui.ResultsDialog import ResultsDialog

from sextante.modeler.ModelerDialog import ModelerDialog

import sextante.resources_rc

cmd_folder = os.path.split(inspect.getfile( inspect.currentframe() ))[0]
if cmd_folder not in sys.path:
sys.path.insert(0, cmd_folder)
sys.path.insert(0, cmd_folder)

class SextantePlugin:

Expand Down
20 changes: 18 additions & 2 deletions python/plugins/sextante/ui/DlgModeler.ui
Expand Up @@ -26,8 +26,14 @@
<enum>Qt::Horizontal</enum>
</property>
<widget class="QTabWidget" name="tabWidget">
<property name="minimumSize">
<size>
<width>300</width>
<height>0</height>
</size>
</property>
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
Expand All @@ -48,6 +54,11 @@
<attribute name="headerVisible">
<bool>false</bool>
</attribute>
<column>
<property name="text">
<string notr="true">1</string>
</property>
</column>
</widget>
</item>
</layout>
Expand Down Expand Up @@ -78,12 +89,17 @@
<attribute name="headerVisible">
<bool>false</bool>
</attribute>
<column>
<property name="text">
<string notr="true">1</string>
</property>
</column>
</widget>
</item>
</layout>
</widget>
</widget>
<widget class="QWidget" name="">
<widget class="QWidget" name="layoutWidget">
<layout class="QGridLayout" name="gridLayout">
<property name="spacing">
<number>2</number>
Expand Down
52 changes: 30 additions & 22 deletions python/plugins/sextante/ui/ui_DlgModeler.py
Expand Up @@ -2,8 +2,8 @@

# Form implementation generated from reading ui file 'DlgModeler.ui'
#
# Created: Thu Dec 13 18:41:08 2012
# by: PyQt4 UI code generator 4.9.1
# Created: Thu Mar 28 15:45:09 2013
# by: PyQt4 UI code generator 4.9.6
#
# WARNING! All changes made in this file will be lost!

Expand All @@ -12,7 +12,16 @@
try:
_fromUtf8 = QtCore.QString.fromUtf8
except AttributeError:
_fromUtf8 = lambda s: s
def _fromUtf8(s):
return s

try:
_encoding = QtGui.QApplication.UnicodeUTF8
def _translate(context, text, disambig):
return QtGui.QApplication.translate(context, text, disambig, _encoding)
except AttributeError:
def _translate(context, text, disambig):
return QtGui.QApplication.translate(context, text, disambig)

class Ui_DlgModeler(object):
def setupUi(self, DlgModeler):
Expand All @@ -26,6 +35,7 @@ def setupUi(self, DlgModeler):
self.splitter.setOrientation(QtCore.Qt.Horizontal)
self.splitter.setObjectName(_fromUtf8("splitter"))
self.tabWidget = QtGui.QTabWidget(self.splitter)
self.tabWidget.setMinimumSize(QtCore.QSize(300, 0))
self.tabWidget.setObjectName(_fromUtf8("tabWidget"))
self.tab = QtGui.QWidget()
self.tab.setObjectName(_fromUtf8("tab"))
Expand All @@ -36,6 +46,7 @@ def setupUi(self, DlgModeler):
self.inputsTree = QtGui.QTreeWidget(self.tab)
self.inputsTree.setAlternatingRowColors(True)
self.inputsTree.setObjectName(_fromUtf8("inputsTree"))
self.inputsTree.headerItem().setText(0, _fromUtf8("1"))
self.inputsTree.header().setVisible(False)
self.verticalLayout_2.addWidget(self.inputsTree)
self.tabWidget.addTab(self.tab, _fromUtf8(""))
Expand All @@ -45,32 +56,29 @@ def setupUi(self, DlgModeler):
self.verticalLayout_3.setSpacing(2)
self.verticalLayout_3.setMargin(0)
self.verticalLayout_3.setObjectName(_fromUtf8("verticalLayout_3"))
try:
from qgis.gui import QgsFilterLineEdit
self.searchBox = QgsFilterLineEdit(self.tab_2)
except ImportError:
self.searchBox = QtGui.QLineEdit(self.tab_2)
self.searchBox = QgsFilterLineEdit(self.tab_2)
self.searchBox.setObjectName(_fromUtf8("searchBox"))
self.verticalLayout_3.addWidget(self.searchBox)
self.algorithmTree = QtGui.QTreeWidget(self.tab_2)
self.algorithmTree.setAlternatingRowColors(True)
self.algorithmTree.setObjectName(_fromUtf8("algorithmTree"))
self.algorithmTree.headerItem().setText(0, _fromUtf8("1"))
self.algorithmTree.header().setVisible(False)
self.verticalLayout_3.addWidget(self.algorithmTree)
self.tabWidget.addTab(self.tab_2, _fromUtf8(""))
self.widget = QtGui.QWidget(self.splitter)
self.widget.setObjectName(_fromUtf8("widget"))
self.gridLayout = QtGui.QGridLayout(self.widget)
self.layoutWidget = QtGui.QWidget(self.splitter)
self.layoutWidget.setObjectName(_fromUtf8("layoutWidget"))
self.gridLayout = QtGui.QGridLayout(self.layoutWidget)
self.gridLayout.setSpacing(2)
self.gridLayout.setMargin(0)
self.gridLayout.setObjectName(_fromUtf8("gridLayout"))
self.textName = QtGui.QLineEdit(self.widget)
self.textName = QtGui.QLineEdit(self.layoutWidget)
self.textName.setObjectName(_fromUtf8("textName"))
self.gridLayout.addWidget(self.textName, 0, 0, 1, 1)
self.textGroup = QtGui.QLineEdit(self.widget)
self.textGroup = QtGui.QLineEdit(self.layoutWidget)
self.textGroup.setObjectName(_fromUtf8("textGroup"))
self.gridLayout.addWidget(self.textGroup, 0, 1, 1, 1)
self.view = QtGui.QGraphicsView(self.widget)
self.view = QtGui.QGraphicsView(self.layoutWidget)
self.view.setObjectName(_fromUtf8("view"))
self.gridLayout.addWidget(self.view, 1, 0, 1, 2)
self.verticalLayout.addWidget(self.splitter)
Expand All @@ -81,17 +89,17 @@ def setupUi(self, DlgModeler):
self.verticalLayout.addWidget(self.buttonBox)

self.retranslateUi(DlgModeler)
self.tabWidget.setCurrentIndex(0)
self.tabWidget.setCurrentIndex(1)
QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("accepted()")), DlgModeler.accept)
QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("rejected()")), DlgModeler.reject)
QtCore.QMetaObject.connectSlotsByName(DlgModeler)

def retranslateUi(self, DlgModeler):
DlgModeler.setWindowTitle(QtGui.QApplication.translate("DlgModeler", "SEXTANTE modeler", None, QtGui.QApplication.UnicodeUTF8))
self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), QtGui.QApplication.translate("DlgModeler", "Inputs", None, QtGui.QApplication.UnicodeUTF8))
self.searchBox.setToolTip(QtGui.QApplication.translate("DlgModeler", "Enter algorithm name to filter list", None, QtGui.QApplication.UnicodeUTF8))
self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), QtGui.QApplication.translate("DlgModeler", "Algorithms", None, QtGui.QApplication.UnicodeUTF8))
self.textName.setToolTip(QtGui.QApplication.translate("DlgModeler", "Enter model name here", None, QtGui.QApplication.UnicodeUTF8))
self.textGroup.setToolTip(QtGui.QApplication.translate("DlgModeler", "Enter group name here", None, QtGui.QApplication.UnicodeUTF8))

DlgModeler.setWindowTitle(_translate("DlgModeler", "SEXTANTE modeler", None))
self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), _translate("DlgModeler", "Inputs", None))
self.searchBox.setToolTip(_translate("DlgModeler", "Enter algorithm name to filter list", None))
self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), _translate("DlgModeler", "Algorithms", None))
self.textName.setToolTip(_translate("DlgModeler", "Enter model name here", None))
self.textGroup.setToolTip(_translate("DlgModeler", "Enter group name here", None))

from qgis.gui import QgsFilterLineEdit

0 comments on commit da57be0

Please sign in to comment.