Hide clone button for now

diff --git a/src/ipypbx/main.py b/src/ipypbx/main.py
index 2aca140..c38d394 100644 (file)
--- a/src/ipypbx/main.py
+++ b/src/ipypbx/main.py
@@ -16,30 +16,47 @@
 # along with IPyPBX.  If not, see <http://www.gnu.org/licenses/>.
 
 import sys
-from ipypbx import ui
+from ipypbx import controllers, state, ui
 from PyQt4 import QtCore, QtGui
 
 
 class MainWindow(QtGui.QMainWindow):
+    """
+    Main application window.
+    """
     def __init__(self):
         QtGui.QMainWindow.__init__(self)
+        
+        locale = QtCore.QLocale.system().name()
+        print "Locale is", locale
+        
+        translator = QtCore.QTranslator()
+    
+        if translator.load("ipypbx_%s" % locale.toLower(), "ipypbx/locale"):
+            app.installTranslator(translator)
+        else:
+            print "Translation not found"
 
         self.ui = ui.Ui_MainWindow()
         self.ui.setupUi(self)
 
+        self.connections = controllers.ConnectionsHandler(self)
 
-if __name__ == '__main__':
-    app = QtGui.QApplication(sys.argv)
-    locale = QtCore.QLocale.system().name()
-    print "Locale is", locale
+        signals_data = (
+            (self.ui.connectionList, 'activated(QModelIndex)',
+             self.connections.select),
+#            (self.ui.connectionClone, 'clicked()', self.connections.clone),
+            (self.ui.connectionSave, 'clicked()', self.connections.save),
+            (self.ui.connectionAdd, 'clicked()', self.connections.add),
+            )
 
-    translator = QtCore.QTranslator()
-    
-    if translator.load("ipypbx_%s" % locale.toLower(), "ipypbx/locale"):
-        app.installTranslator(translator)
-    else:
-        print "Translation not found"
+        for sender, signal, receiver in signals_data:
+            QtCore.QObject.connect(sender, QtCore.SIGNAL(signal), receiver)
 
+
+
+if __name__ == '__main__':
+    app = QtGui.QApplication(sys.argv)
     win = MainWindow()
     win.show()
 

diff --git a/src/ipypbx/models.py b/src/ipypbx/models.py
index 0db15cc..229c9f6 100644 (file)
--- a/src/ipypbx/models.py
+++ b/src/ipypbx/models.py
@@ -17,7 +17,7 @@
 
 
 from axiom.item import Item
-from axiom.attribute import boolean, integer, reference, text
+from axiom.attributes import boolean, integer, reference, text
 
 
 class Connection(Item):

diff --git a/src/ipypbx/state.py b/src/ipypbx/state.py
index 4c0915f..6ae8319 100644 (file)
--- a/src/ipypbx/state.py
+++ b/src/ipypbx/state.py
@@ -25,7 +25,7 @@ PREFIX = os.path.expanduser('~/.ipypbx')
 
 # Create it if necessary.
 if not os.path.exists(PREFIX):
-    os.path.mkdir(PREFIX, mode='0700')
+    os.mkdir(PREFIX, 0700)
 
 # Initialize sqlite DB file.
 store = Store(os.path.join(PREFIX, 'ipypbx.db'))
@@ -38,3 +38,5 @@ gateways = []
 endpoints = []
 extensions = []
 
+
+currentConnection = None

diff --git a/src/ipypbx/ui.py b/src/ipypbx/ui.py
index d84ab5e..9b6b6cc 100644 (file)
--- a/src/ipypbx/ui.py
+++ b/src/ipypbx/ui.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file 'ui/layout.ui'
+# Form implementation generated from reading ui file '../ui/layout.ui'
 #
-# Created: Wed Apr  7 17:30:53 2010
+# Created: Wed Apr  7 22:35:56 2010
 #      by: PyQt4 UI code generator 4.7.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -16,7 +16,7 @@ class Ui_MainWindow(object):
         self.centralwidget = QtGui.QWidget(MainWindow)
         self.centralwidget.setObjectName("centralwidget")
         self.tabWidget = QtGui.QTabWidget(self.centralwidget)
-        self.tabWidget.setGeometry(QtCore.QRect(-2, 0, 811, 491))
+        self.tabWidget.setGeometry(QtCore.QRect(-2, -1, 811, 491))
         self.tabWidget.setMinimumSize(QtCore.QSize(800, 480))
         self.tabWidget.setObjectName("tabWidget")
         self.connectionsTab = QtGui.QWidget()
@@ -36,15 +36,18 @@ class Ui_MainWindow(object):
         self.label_5.setObjectName("label_5")
         self.formLayout_7.setWidget(0, QtGui.QFormLayout.LabelRole, self.label_5)
         self.connectionName = QtGui.QLineEdit(self.layoutWidget)
+        self.connectionName.setMaxLength(100)
         self.connectionName.setObjectName("connectionName")
         self.formLayout_7.setWidget(0, QtGui.QFormLayout.FieldRole, self.connectionName)
         self.connectionLocalIpAddress = QtGui.QLineEdit(self.layoutWidget)
+        self.connectionLocalIpAddress.setInputMethodHints(QtCore.Qt.ImhNone)
         self.connectionLocalIpAddress.setObjectName("connectionLocalIpAddress")
         self.formLayout_7.setWidget(1, QtGui.QFormLayout.FieldRole, self.connectionLocalIpAddress)
         self.label_11 = QtGui.QLabel(self.layoutWidget)
         self.label_11.setObjectName("label_11")
         self.formLayout_7.setWidget(2, QtGui.QFormLayout.LabelRole, self.label_11)
         self.connectionLocalPort = QtGui.QLineEdit(self.layoutWidget)
+        self.connectionLocalPort.setInputMethodHints(QtCore.Qt.ImhDigitsOnly)
         self.connectionLocalPort.setObjectName("connectionLocalPort")
         self.formLayout_7.setWidget(2, QtGui.QFormLayout.FieldRole, self.connectionLocalPort)
         self.label_13 = QtGui.QLabel(self.layoutWidget)
@@ -75,10 +78,6 @@ class Ui_MainWindow(object):
         self.connectionClone.setFlat(False)
         self.connectionClone.setObjectName("connectionClone")
         self.gridLayout.addWidget(self.connectionClone, 1, 0, 1, 1)
-        self.connectionConnect = QtGui.QPushButton(self.layoutWidget)
-        self.connectionConnect.setEnabled(False)
-        self.connectionConnect.setObjectName("connectionConnect")
-        self.gridLayout.addWidget(self.connectionConnect, 1, 1, 1, 1)
         self.tabWidget.addTab(self.connectionsTab, "")
         self.sipProfilesTab = QtGui.QWidget()
         self.sipProfilesTab.setMaximumSize(QtCore.QSize(796, 16777215))
@@ -388,7 +387,6 @@ class Ui_MainWindow(object):
         self.connectionAdd.setText(QtGui.QApplication.translate("MainWindow", "Add", None, QtGui.QApplication.UnicodeUTF8))
         self.connectionSave.setText(QtGui.QApplication.translate("MainWindow", "Save", None, QtGui.QApplication.UnicodeUTF8))
         self.connectionClone.setText(QtGui.QApplication.translate("MainWindow", "Clone", None, QtGui.QApplication.UnicodeUTF8))
-        self.connectionConnect.setText(QtGui.QApplication.translate("MainWindow", "Connect", None, QtGui.QApplication.UnicodeUTF8))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.connectionsTab), QtGui.QApplication.translate("MainWindow", "Connections", None, QtGui.QApplication.UnicodeUTF8))
         self.label_9.setText(QtGui.QApplication.translate("MainWindow", "Name", None, QtGui.QApplication.UnicodeUTF8))
         self.label_6.setText(QtGui.QApplication.translate("MainWindow", "External RTP IP", None, QtGui.QApplication.UnicodeUTF8))

diff --git a/ui/layout.ui b/ui/layout.ui
index e7a3eea..61a72d5 100644 (file)
--- a/ui/layout.ui
+++ b/ui/layout.ui
@@ -18,7 +18,7 @@
     <property name="geometry">
      <rect>
       <x>-2</x>
-      <y>0</y>
+      <y>-1</y>
       <width>811</width>
       <height>491</height>
      </rect>
@@ -62,10 +62,18 @@
           </widget>
          </item>
          <item row="0" column="1">
-          <widget class="QLineEdit" name="connectionName"/>
+          <widget class="QLineEdit" name="connectionName">
+           <property name="maxLength">
+            <number>100</number>
+           </property>
+          </widget>
          </item>
          <item row="1" column="1">
-          <widget class="QLineEdit" name="connectionLocalIpAddress"/>
+          <widget class="QLineEdit" name="connectionLocalIpAddress">
+           <property name="inputMethodHints">
+            <set>Qt::ImhNone</set>
+           </property>
+          </widget>
          </item>
          <item row="2" column="0">
           <widget class="QLabel" name="label_11">
@@ -75,7 +83,11 @@
           </widget>
          </item>
          <item row="2" column="1">
-          <widget class="QLineEdit" name="connectionLocalPort"/>
+          <widget class="QLineEdit" name="connectionLocalPort">
+           <property name="inputMethodHints">
+            <set>Qt::ImhDigitsOnly</set>
+           </property>
+          </widget>
          </item>
          <item row="4" column="0">
           <widget class="QLabel" name="label_13">
@@ -136,16 +148,6 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="1">
-        <widget class="QPushButton" name="connectionConnect">
-         <property name="enabled">
-          <bool>false</bool>
-         </property>
-         <property name="text">
-          <string>Connect</string>
-         </property>
-        </widget>
-       </item>
       </layout>
      </widget>
     </widget>