Changeset 354 for trunk


Ignore:
Timestamp:
03/30/12 00:21:06 (8 years ago)
Author:
sc
Message:

Interface_Design:

  • removed "Connect" button
Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Puzzlebox/Synapse/Interface_Design.py

    r331 r354  
    33# Form implementation generated from reading ui file 'interface/puzzlebox_synapse_interface_design.ui' 
    44# 
    5 # Created: Sat Mar 24 22:12:23 2012 
     5# Created: Thu Mar 29 13:20:53 2012 
    66#      by: pyside-uic 0.2.13 running on PySide 1.0.8 
    77# 
     
    7474                self.textLabelBluetoothStatus.setWordWrap(False) 
    7575                self.textLabelBluetoothStatus.setObjectName("textLabelBluetoothStatus") 
    76                 self.pushButtonBluetoothConnect = QtGui.QPushButton(self.tabThinkGearConnectServer) 
    77                 self.pushButtonBluetoothConnect.setGeometry(QtCore.QRect(82, 196, 86, 31)) 
    78                 self.pushButtonBluetoothConnect.setCheckable(True) 
    79                 self.pushButtonBluetoothConnect.setObjectName("pushButtonBluetoothConnect") 
    8076                self.lineEditThinkGearHost = QtGui.QLineEdit(self.tabThinkGearConnectServer) 
    8177                self.lineEditThinkGearHost.setGeometry(QtCore.QRect(50, 280, 119, 26)) 
     
    211207                self.comboBoxDeviceSelect.addItem("") 
    212208                self.pushButtonBluetoothSearch = QtGui.QPushButton(self.tabThinkGearConnectServer) 
    213                 self.pushButtonBluetoothSearch.setGeometry(QtCore.QRect(8, 196, 66, 31)) 
     209                self.pushButtonBluetoothSearch.setGeometry(QtCore.QRect(8, 196, 160, 27)) 
    214210                self.pushButtonBluetoothSearch.setCheckable(False) 
    215211                self.pushButtonBluetoothSearch.setObjectName("pushButtonBluetoothSearch") 
     
    326322"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" 
    327323"p, li { white-space: pre-wrap; }\n" 
    328 "</style></head><body style=\" font-family:\'Sans\'; font-size:10pt; font-weight:400; font-style:normal;\">\n" 
    329 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600;\">Server Daemon</span></p></body></html>", None, QtGui.QApplication.UnicodeUTF8)) 
     324"</style></head><body style=\" font-family:\'Cantarell\'; font-size:11pt; font-weight:400; font-style:normal;\">\n" 
     325"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'Sans\'; font-size:10pt; font-weight:600;\">Server</span></p></body></html>", None, QtGui.QApplication.UnicodeUTF8)) 
    330326                self.textLabelThinkGearPort.setText(QtGui.QApplication.translate("Form", "<p align=\"center\">Port</p>", None, QtGui.QApplication.UnicodeUTF8)) 
    331327                self.textLabelBluetoothAddress.setText(QtGui.QApplication.translate("Form", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" 
     
    338334                self.pushButtonThinkGearConnect.setText(QtGui.QApplication.translate("Form", "Start", None, QtGui.QApplication.UnicodeUTF8)) 
    339335                self.textLabelBluetoothStatus.setText(QtGui.QApplication.translate("Form", "<p align=\"center\">Status: Disconnected</p>", None, QtGui.QApplication.UnicodeUTF8)) 
    340                 self.pushButtonBluetoothConnect.setText(QtGui.QApplication.translate("Form", "Connect", None, QtGui.QApplication.UnicodeUTF8)) 
    341336                self.lineEditThinkGearHost.setText(QtGui.QApplication.translate("Form", "N/A", None, QtGui.QApplication.UnicodeUTF8)) 
    342337                self.textLabelMeditation.setText(QtGui.QApplication.translate("Form", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" 
  • trunk/interface/puzzlebox_synapse_interface_design.ui

    r281 r354  
    130130&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; 
    131131p, li { white-space: pre-wrap; } 
    132 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt; 
    133 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Server Daemon&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> 
     132&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt; 
     133&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt; font-weight:600;&quot;&gt;Server&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> 
    134134     </property> 
    135135     <property name="alignment"> 
     
    243243     </property> 
    244244    </widget> 
    245     <widget class="QPushButton" name="pushButtonBluetoothConnect"> 
    246      <property name="geometry"> 
    247       <rect> 
    248        <x>82</x> 
    249        <y>196</y> 
    250        <width>86</width> 
    251        <height>31</height> 
    252       </rect> 
    253      </property> 
    254      <property name="text"> 
    255       <string>Connect</string> 
    256      </property> 
    257      <property name="checkable"> 
    258       <bool>true</bool> 
    259      </property> 
    260     </widget> 
    261245    <widget class="QLineEdit" name="lineEditThinkGearHost"> 
    262246     <property name="geometry"> 
     
    799783      </rect> 
    800784     </property> 
     785     <item> 
     786      <property name="text"> 
     787       <string>EmoComposer</string> 
     788      </property> 
     789     </item> 
     790     <item> 
     791      <property name="text"> 
     792       <string>Emotiv Headset</string> 
     793      </property> 
     794     </item> 
    801795     <item> 
    802796      <property name="text"> 
     
    810804       <x>8</x> 
    811805       <y>196</y> 
    812        <width>66</width> 
    813        <height>31</height> 
     806       <width>160</width> 
     807       <height>27</height> 
    814808      </rect> 
    815809     </property> 
     
    833827      </rect> 
    834828     </property> 
     829     <item> 
     830      <property name="text"> 
     831       <string>Emotiv EPOC</string> 
     832      </property> 
     833     </item> 
    835834     <item> 
    836835      <property name="text"> 
     
    882881p, li { white-space: pre-wrap; } 
    883882&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt; 
    884 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> 
     883&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> 
    885884     </property> 
    886885    </widget> 
  • trunk/scripts/build-interface.sh

    r307 r354  
    44#pyuic4 --output=../puzzlebox_synapse_interface_design.py --indent=0 puzzlebox_synapse_interface_design.ui 
    55 
    6 pyuic4 --output=Puzzlebox/Synapse/Interface_Design.py --indent=0 interface/puzzlebox_synapse_interface_design.ui 
     6#pyuic4 --output=Puzzlebox/Synapse/Interface_Design.py --indent=0 interface/puzzlebox_synapse_interface_design.ui 
     7pyside-uic --output=Puzzlebox/Synapse/Interface_Design.py --indent=0 interface/puzzlebox_synapse_interface_design.ui 
    78 
    89python scripts/update-interface-pyside.py Puzzlebox/Synapse/Interface_Design.py Puzzlebox/Synapse/Interface_Design.py 
Note: See TracChangeset for help on using the changeset viewer.