SF.net SVN: fclient:[847] trunk/fclient/fclient/impl/tpls
Status: Pre-Alpha
Brought to you by:
jurner
From: <jU...@us...> - 2008-08-01 23:55:43
|
Revision: 847 http://fclient.svn.sourceforge.net/fclient/?rev=847&view=rev Author: jUrner Date: 2008-08-01 23:55:52 +0000 (Fri, 01 Aug 2008) Log Message: ----------- some ui changes Modified Paths: -------------- trunk/fclient/fclient/impl/tpls/MainWindowTpl.ui trunk/fclient/fclient/impl/tpls/PrefsSingleAppTpl.ui trunk/fclient/fclient/impl/tpls/Ui_MainWindowTpl.py trunk/fclient/fclient/impl/tpls/Ui_PrefsSingleAppTpl.py trunk/fclient/fclient/impl/tpls/Ui_ViewWidgetTpl.py trunk/fclient/fclient/impl/tpls/ViewWidgetTpl.ui Modified: trunk/fclient/fclient/impl/tpls/MainWindowTpl.ui =================================================================== --- trunk/fclient/fclient/impl/tpls/MainWindowTpl.ui 2008-08-01 23:53:07 UTC (rev 846) +++ trunk/fclient/fclient/impl/tpls/MainWindowTpl.ui 2008-08-01 23:55:52 UTC (rev 847) @@ -5,8 +5,8 @@ <rect> <x>0</x> <y>0</y> - <width>800</width> - <height>600</height> + <width>774</width> + <height>591</height> </rect> </property> <property name="windowTitle" > @@ -17,17 +17,18 @@ <rect> <x>0</x> <y>0</y> - <width>800</width> - <height>577</height> + <width>774</width> + <height>568</height> </rect> </property> + <zorder>frame</zorder> </widget> <widget class="QStatusBar" name="statusbar" > <property name="geometry" > <rect> <x>0</x> - <y>577</y> - <width>800</width> + <y>568</y> + <width>774</width> <height>23</height> </rect> </property> Modified: trunk/fclient/fclient/impl/tpls/PrefsSingleAppTpl.ui =================================================================== --- trunk/fclient/fclient/impl/tpls/PrefsSingleAppTpl.ui 2008-08-01 23:53:07 UTC (rev 846) +++ trunk/fclient/fclient/impl/tpls/PrefsSingleAppTpl.ui 2008-08-01 23:55:52 UTC (rev 847) @@ -13,7 +13,14 @@ <string>Form</string> </property> <layout class="QGridLayout" name="gridLayout" > - <item row="0" column="0" colspan="2" > + <item row="0" column="0" > + <widget class="QLabel" name="fieldHeader_3" > + <property name="text" > + <string>Single application:</string> + </property> + </widget> + </item> + <item row="1" column="0" colspan="2" > <widget class="QLabel" name="label" > <property name="text" > <string>The gui uses a socket connection to enshure only one instance is running at a time. Use the boxes below to adjust host and port of the connection to your needs.</string> @@ -29,31 +36,39 @@ </property> </widget> </item> - <item row="1" column="0" > - <layout class="QVBoxLayout" name="verticalLayout" > + <item row="2" column="0" > + <layout class="QHBoxLayout" name="horizontalLayout" > <item> - <widget class="QLabel" name="fieldHeader" > - <property name="text" > - <string>Single application host: </string> - </property> - </widget> + <layout class="QVBoxLayout" name="verticalLayout" > + <item> + <widget class="QLabel" name="fieldName" > + <property name="text" > + <string>Host: </string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="fieldName_2" > + <property name="text" > + <string>Port: </string> + </property> + </widget> + </item> + </layout> </item> <item> - <widget class="QLineEdit" name="edHost" /> + <layout class="QVBoxLayout" name="verticalLayout_2" > + <item> + <widget class="QLineEdit" name="edHost" /> + </item> + <item> + <widget class="QSpinBox" name="spinPort" /> + </item> + </layout> </item> - <item> - <widget class="QLabel" name="fieldHeader_2" > - <property name="text" > - <string>Single application port: </string> - </property> - </widget> - </item> - <item> - <widget class="QSpinBox" name="spinPort" /> - </item> </layout> </item> - <item row="1" column="1" > + <item row="2" column="1" > <spacer name="horizontalSpacer" > <property name="orientation" > <enum>Qt::Horizontal</enum> @@ -66,7 +81,7 @@ </property> </spacer> </item> - <item row="2" column="0" > + <item row="3" column="0" > <spacer name="verticalSpacer" > <property name="orientation" > <enum>Qt::Vertical</enum> Modified: trunk/fclient/fclient/impl/tpls/Ui_MainWindowTpl.py =================================================================== --- trunk/fclient/fclient/impl/tpls/Ui_MainWindowTpl.py 2008-08-01 23:53:07 UTC (rev 846) +++ trunk/fclient/fclient/impl/tpls/Ui_MainWindowTpl.py 2008-08-01 23:55:52 UTC (rev 847) @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file '/home/me/src/proj/fclient/trunk/fclient/src/fclient/tpls/MainWindowTpl.ui' +# Form implementation generated from reading ui file '/home/me/src/fclient/trunk/fclient/fclient/impl/tpls/MainWindowTpl.ui' # -# Created: Wed Jul 16 11:46:00 2008 +# Created: Sat Aug 2 01:50:59 2008 # by: PyQt4 UI code generator 4.4.3-snapshot-20080705 # # WARNING! All changes made in this file will be lost! @@ -12,13 +12,13 @@ class Ui_MainWindow(object): def setupUi(self, MainWindow): MainWindow.setObjectName("MainWindow") - MainWindow.resize(800, 600) + MainWindow.resize(774, 591) self.centralwidget = QtGui.QWidget(MainWindow) - self.centralwidget.setGeometry(QtCore.QRect(0, 0, 800, 577)) + self.centralwidget.setGeometry(QtCore.QRect(0, 0, 774, 568)) self.centralwidget.setObjectName("centralwidget") MainWindow.setCentralWidget(self.centralwidget) self.statusbar = QtGui.QStatusBar(MainWindow) - self.statusbar.setGeometry(QtCore.QRect(0, 577, 800, 23)) + self.statusbar.setGeometry(QtCore.QRect(0, 568, 774, 23)) self.statusbar.setObjectName("statusbar") MainWindow.setStatusBar(self.statusbar) self.action_Preferences = QtGui.QAction(MainWindow) Modified: trunk/fclient/fclient/impl/tpls/Ui_PrefsSingleAppTpl.py =================================================================== --- trunk/fclient/fclient/impl/tpls/Ui_PrefsSingleAppTpl.py 2008-08-01 23:53:07 UTC (rev 846) +++ trunk/fclient/fclient/impl/tpls/Ui_PrefsSingleAppTpl.py 2008-08-01 23:55:52 UTC (rev 847) @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file '/home/me/src/fclient/trunk/fclient/fclient/impl/tpls/PrefsSingleAppTpl.ui' # -# Created: Thu Jul 31 20:31:58 2008 +# Created: Fri Aug 1 10:08:05 2008 # by: PyQt4 UI code generator 4.4.3-snapshot-20080705 # # WARNING! All changes made in this file will be lost! @@ -15,40 +15,50 @@ PrefsSingleApp.resize(533, 399) self.gridLayout = QtGui.QGridLayout(PrefsSingleApp) self.gridLayout.setObjectName("gridLayout") + self.fieldHeader_3 = QtGui.QLabel(PrefsSingleApp) + self.fieldHeader_3.setObjectName("fieldHeader_3") + self.gridLayout.addWidget(self.fieldHeader_3, 0, 0, 1, 1) self.label = QtGui.QLabel(PrefsSingleApp) self.label.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop) self.label.setWordWrap(True) self.label.setTextInteractionFlags(QtCore.Qt.TextSelectableByKeyboard|QtCore.Qt.TextSelectableByMouse) self.label.setObjectName("label") - self.gridLayout.addWidget(self.label, 0, 0, 1, 2) + self.gridLayout.addWidget(self.label, 1, 0, 1, 2) + self.horizontalLayout = QtGui.QHBoxLayout() + self.horizontalLayout.setObjectName("horizontalLayout") self.verticalLayout = QtGui.QVBoxLayout() self.verticalLayout.setObjectName("verticalLayout") - self.fieldHeader = QtGui.QLabel(PrefsSingleApp) - self.fieldHeader.setObjectName("fieldHeader") - self.verticalLayout.addWidget(self.fieldHeader) + self.fieldName = QtGui.QLabel(PrefsSingleApp) + self.fieldName.setObjectName("fieldName") + self.verticalLayout.addWidget(self.fieldName) + self.fieldName_2 = QtGui.QLabel(PrefsSingleApp) + self.fieldName_2.setObjectName("fieldName_2") + self.verticalLayout.addWidget(self.fieldName_2) + self.horizontalLayout.addLayout(self.verticalLayout) + self.verticalLayout_2 = QtGui.QVBoxLayout() + self.verticalLayout_2.setObjectName("verticalLayout_2") self.edHost = QtGui.QLineEdit(PrefsSingleApp) self.edHost.setObjectName("edHost") - self.verticalLayout.addWidget(self.edHost) - self.fieldHeader_2 = QtGui.QLabel(PrefsSingleApp) - self.fieldHeader_2.setObjectName("fieldHeader_2") - self.verticalLayout.addWidget(self.fieldHeader_2) + self.verticalLayout_2.addWidget(self.edHost) self.spinPort = QtGui.QSpinBox(PrefsSingleApp) self.spinPort.setObjectName("spinPort") - self.verticalLayout.addWidget(self.spinPort) - self.gridLayout.addLayout(self.verticalLayout, 1, 0, 1, 1) + self.verticalLayout_2.addWidget(self.spinPort) + self.horizontalLayout.addLayout(self.verticalLayout_2) + self.gridLayout.addLayout(self.horizontalLayout, 2, 0, 1, 1) spacerItem = QtGui.QSpacerItem(251, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.gridLayout.addItem(spacerItem, 1, 1, 1, 1) + self.gridLayout.addItem(spacerItem, 2, 1, 1, 1) spacerItem1 = QtGui.QSpacerItem(20, 218, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout.addItem(spacerItem1, 2, 0, 1, 1) + self.gridLayout.addItem(spacerItem1, 3, 0, 1, 1) self.retranslateUi(PrefsSingleApp) QtCore.QMetaObject.connectSlotsByName(PrefsSingleApp) def retranslateUi(self, PrefsSingleApp): PrefsSingleApp.setWindowTitle(QtGui.QApplication.translate("PrefsSingleApp", "Form", None, QtGui.QApplication.UnicodeUTF8)) + self.fieldHeader_3.setText(QtGui.QApplication.translate("PrefsSingleApp", "Single application:", None, QtGui.QApplication.UnicodeUTF8)) self.label.setText(QtGui.QApplication.translate("PrefsSingleApp", "The gui uses a socket connection to enshure only one instance is running at a time. Use the boxes below to adjust host and port of the connection to your needs.", None, QtGui.QApplication.UnicodeUTF8)) - self.fieldHeader.setText(QtGui.QApplication.translate("PrefsSingleApp", "Single application host: ", None, QtGui.QApplication.UnicodeUTF8)) - self.fieldHeader_2.setText(QtGui.QApplication.translate("PrefsSingleApp", "Single application port: ", None, QtGui.QApplication.UnicodeUTF8)) + self.fieldName.setText(QtGui.QApplication.translate("PrefsSingleApp", "Host: ", None, QtGui.QApplication.UnicodeUTF8)) + self.fieldName_2.setText(QtGui.QApplication.translate("PrefsSingleApp", "Port: ", None, QtGui.QApplication.UnicodeUTF8)) if __name__ == "__main__": Modified: trunk/fclient/fclient/impl/tpls/Ui_ViewWidgetTpl.py =================================================================== --- trunk/fclient/fclient/impl/tpls/Ui_ViewWidgetTpl.py 2008-08-01 23:53:07 UTC (rev 846) +++ trunk/fclient/fclient/impl/tpls/Ui_ViewWidgetTpl.py 2008-08-01 23:55:52 UTC (rev 847) @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file '/home/me/src/proj/fclient/trunk/fclient/src/fclient/tpls/ViewWidgetTpl.ui' +# Form implementation generated from reading ui file '/home/me/src/fclient/trunk/fclient/fclient/impl/tpls/ViewWidgetTpl.ui' # -# Created: Sun Jul 13 00:07:25 2008 -# by: PyQt4 UI code generator 4.3.3 +# Created: Fri Aug 1 18:03:14 2008 +# by: PyQt4 UI code generator 4.4.3-snapshot-20080705 # # WARNING! All changes made in this file will be lost! @@ -12,56 +12,28 @@ class Ui_ViewWidget(object): def setupUi(self, ViewWidget): ViewWidget.setObjectName("ViewWidget") - ViewWidget.resize(QtCore.QSize(QtCore.QRect(0,0,530,629).size()).expandedTo(ViewWidget.minimumSizeHint())) - - self.gridlayout = QtGui.QGridLayout(ViewWidget) - self.gridlayout.setMargin(0) - self.gridlayout.setSpacing(0) - self.gridlayout.setObjectName("gridlayout") - - self.Splitter = QtGui.QSplitter(ViewWidget) - self.Splitter.setOrientation(QtCore.Qt.Vertical) - self.Splitter.setObjectName("Splitter") - - self.frameTop = QtGui.QFrame(self.Splitter) - self.frameTop.setFrameShape(QtGui.QFrame.NoFrame) - self.frameTop.setFrameShadow(QtGui.QFrame.Plain) - self.frameTop.setLineWidth(0) - self.frameTop.setObjectName("frameTop") - - self.gridlayout1 = QtGui.QGridLayout(self.frameTop) - self.gridlayout1.setMargin(0) - self.gridlayout1.setSpacing(0) - self.gridlayout1.setObjectName("gridlayout1") - - self.tabTop = QtGui.QTabWidget(self.frameTop) + ViewWidget.resize(530, 237) + self.gridLayout = QtGui.QGridLayout(ViewWidget) + self.gridLayout.setMargin(0) + self.gridLayout.setSpacing(0) + self.gridLayout.setObjectName("gridLayout") + self.splitter = QtGui.QSplitter(ViewWidget) + self.splitter.setOrientation(QtCore.Qt.Vertical) + self.splitter.setObjectName("splitter") + self.tabTop = QtGui.QTabWidget(self.splitter) self.tabTop.setObjectName("tabTop") - + self.tab = QtGui.QWidget() + self.tab.setGeometry(QtCore.QRect(0, 0, 526, 72)) + self.tab.setObjectName("tab") + self.tabTop.addTab(self.tab, "") + self.tabBottom = QtGui.QTabWidget(self.splitter) + self.tabBottom.setObjectName("tabBottom") self.tab_3 = QtGui.QWidget() + self.tab_3.setGeometry(QtCore.QRect(0, 0, 526, 103)) self.tab_3.setObjectName("tab_3") - self.tabTop.addTab(self.tab_3,"") - self.gridlayout1.addWidget(self.tabTop,0,0,1,1) + self.tabBottom.addTab(self.tab_3, "") + self.gridLayout.addWidget(self.splitter, 0, 0, 1, 1) - self.frameBottom = QtGui.QFrame(self.Splitter) - self.frameBottom.setFrameShape(QtGui.QFrame.NoFrame) - self.frameBottom.setFrameShadow(QtGui.QFrame.Plain) - self.frameBottom.setLineWidth(0) - self.frameBottom.setObjectName("frameBottom") - - self.gridlayout2 = QtGui.QGridLayout(self.frameBottom) - self.gridlayout2.setMargin(0) - self.gridlayout2.setSpacing(0) - self.gridlayout2.setObjectName("gridlayout2") - - self.tabBottom = QtGui.QTabWidget(self.frameBottom) - self.tabBottom.setObjectName("tabBottom") - - self.tab_5 = QtGui.QWidget() - self.tab_5.setObjectName("tab_5") - self.tabBottom.addTab(self.tab_5,"") - self.gridlayout2.addWidget(self.tabBottom,0,0,1,1) - self.gridlayout.addWidget(self.Splitter,0,0,1,1) - self.retranslateUi(ViewWidget) self.tabTop.setCurrentIndex(0) self.tabBottom.setCurrentIndex(0) @@ -69,11 +41,10 @@ def retranslateUi(self, ViewWidget): ViewWidget.setWindowTitle(QtGui.QApplication.translate("ViewWidget", "Form", None, QtGui.QApplication.UnicodeUTF8)) - self.tabTop.setTabText(self.tabTop.indexOf(self.tab_3), QtGui.QApplication.translate("ViewWidget", "Tab 1", None, QtGui.QApplication.UnicodeUTF8)) - self.tabBottom.setTabText(self.tabBottom.indexOf(self.tab_5), QtGui.QApplication.translate("ViewWidget", "Tab 1", None, QtGui.QApplication.UnicodeUTF8)) + self.tabTop.setTabText(self.tabTop.indexOf(self.tab), QtGui.QApplication.translate("ViewWidget", "Tab 1", None, QtGui.QApplication.UnicodeUTF8)) + self.tabBottom.setTabText(self.tabBottom.indexOf(self.tab_3), QtGui.QApplication.translate("ViewWidget", "Tab 1", None, QtGui.QApplication.UnicodeUTF8)) - if __name__ == "__main__": import sys app = QtGui.QApplication(sys.argv) @@ -82,3 +53,4 @@ ui.setupUi(ViewWidget) ViewWidget.show() sys.exit(app.exec_()) + Modified: trunk/fclient/fclient/impl/tpls/ViewWidgetTpl.ui =================================================================== --- trunk/fclient/fclient/impl/tpls/ViewWidgetTpl.ui 2008-08-01 23:53:07 UTC (rev 846) +++ trunk/fclient/fclient/impl/tpls/ViewWidgetTpl.ui 2008-08-01 23:55:52 UTC (rev 847) @@ -6,121 +6,59 @@ <x>0</x> <y>0</y> <width>530</width> - <height>629</height> + <height>237</height> </rect> </property> <property name="windowTitle" > <string>Form</string> </property> - <layout class="QGridLayout" > - <property name="leftMargin" > + <layout class="QGridLayout" name="gridLayout" > + <property name="margin" > <number>0</number> </property> - <property name="topMargin" > + <property name="spacing" > <number>0</number> </property> - <property name="rightMargin" > - <number>0</number> - </property> - <property name="bottomMargin" > - <number>0</number> - </property> - <property name="horizontalSpacing" > - <number>0</number> - </property> - <property name="verticalSpacing" > - <number>0</number> - </property> <item row="0" column="0" > - <widget class="QSplitter" name="Splitter" > + <widget class="QSplitter" name="splitter" > <property name="orientation" > <enum>Qt::Vertical</enum> </property> - <widget class="QFrame" name="frameTop" > - <property name="frameShape" > - <enum>QFrame::NoFrame</enum> - </property> - <property name="frameShadow" > - <enum>QFrame::Plain</enum> - </property> - <property name="lineWidth" > + <widget class="QTabWidget" name="tabTop" > + <property name="currentIndex" > <number>0</number> </property> - <layout class="QGridLayout" > - <property name="leftMargin" > - <number>0</number> + <widget class="QWidget" name="tab" > + <property name="geometry" > + <rect> + <x>0</x> + <y>0</y> + <width>526</width> + <height>72</height> + </rect> </property> - <property name="topMargin" > - <number>0</number> - </property> - <property name="rightMargin" > - <number>0</number> - </property> - <property name="bottomMargin" > - <number>0</number> - </property> - <property name="horizontalSpacing" > - <number>0</number> - </property> - <property name="verticalSpacing" > - <number>0</number> - </property> - <item row="0" column="0" > - <widget class="QTabWidget" name="tabTop" > - <property name="currentIndex" > - <number>0</number> - </property> - <widget class="QWidget" name="tab_3" > - <attribute name="title" > - <string>Tab 1</string> - </attribute> - </widget> - </widget> - </item> - </layout> + <attribute name="title" > + <string>Tab 1</string> + </attribute> + </widget> </widget> - <widget class="QFrame" name="frameBottom" > - <property name="frameShape" > - <enum>QFrame::NoFrame</enum> - </property> - <property name="frameShadow" > - <enum>QFrame::Plain</enum> - </property> - <property name="lineWidth" > + <widget class="QTabWidget" name="tabBottom" > + <property name="currentIndex" > <number>0</number> </property> - <layout class="QGridLayout" > - <property name="leftMargin" > - <number>0</number> + <widget class="QWidget" name="tab_3" > + <property name="geometry" > + <rect> + <x>0</x> + <y>0</y> + <width>526</width> + <height>103</height> + </rect> </property> - <property name="topMargin" > - <number>0</number> - </property> - <property name="rightMargin" > - <number>0</number> - </property> - <property name="bottomMargin" > - <number>0</number> - </property> - <property name="horizontalSpacing" > - <number>0</number> - </property> - <property name="verticalSpacing" > - <number>0</number> - </property> - <item row="0" column="0" > - <widget class="QTabWidget" name="tabBottom" > - <property name="currentIndex" > - <number>0</number> - </property> - <widget class="QWidget" name="tab_5" > - <attribute name="title" > - <string>Tab 1</string> - </attribute> - </widget> - </widget> - </item> - </layout> + <attribute name="title" > + <string>Tab 1</string> + </attribute> + </widget> </widget> </widget> </item> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |