Experimental support for Mac OS X.

GNS3 · May 14, 2014 · 18550ed · 18550ed
1 parent 465c9c9
commit 18550ed
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 13 deletions.
diff --git a/README.rst b/README.rst
@@ -33,3 +33,28 @@ Mac OS X
 --------
 
 DMG package is not available yet.
+
+You can manually install using the following steps (experimental):
+
+First install homebrew `http://brew.sh/`_.
+
+Then install GNS3 dependencies.
+
+.. code:: bash
+
+   brew install python3
+   brew install qt
+   brew install sip --without-python --with-python3
+   brew install pyqt --without-python --with-python3
+
+Finally, install both the GUI & server from the source.
+
+.. code:: bash
+
+   cd gns3-gui-master
+   python3 setup.py install
+
+.. code:: bash
+
+   cd gns3-server-master
+   python3 setup.py install
diff --git a/gns3/main_window.py b/gns3/main_window.py
@@ -84,6 +84,7 @@ def __init__(self, parent=None):
         self.uiDocksMenu.addAction(self.uiTopologySummaryDockWidget.toggleViewAction())
         self.uiDocksMenu.addAction(self.uiCaptureDockWidget.toggleViewAction())
         self.uiDocksMenu.addAction(self.uiConsoleDockWidget.toggleViewAction())
+        self.uiDocksMenu.addAction(self.uiNodesDockWidget.toggleViewAction())
 
         # load initial stuff once the event loop isn't busy
         QtCore.QTimer.singleShot(0, self.startupLoading)

diff --git a/gns3/modules/iou/ui/iou_device_configuration_page_ui.py b/gns3/modules/iou/ui/iou_device_configuration_page_ui.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file '/home/grossmj/git/gns3-gui/gns3/modules/iou/ui/iou_device_configuration_page.ui'
+# Form implementation generated from reading ui file '/home/grossmj/workspace/git/gns3-gui/gns3/modules/iou/ui/iou_device_configuration_page.ui'
 #
-# Created: Wed May  7 15:37:55 2014
-#      by: PyQt4 UI code generator 4.10.4
+# Created: Wed May 14 15:50:18 2014
+#      by: PyQt4 UI code generator 4.10
 #
 # WARNING! All changes made in this file will be lost!
 

diff --git a/gns3/modules/iou/ui/iou_device_preferences_page_ui.py b/gns3/modules/iou/ui/iou_device_preferences_page_ui.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file '/home/grossmj/git/gns3-gui/gns3/modules/iou/ui/iou_device_preferences_page.ui'
+# Form implementation generated from reading ui file '/home/grossmj/workspace/git/gns3-gui/gns3/modules/iou/ui/iou_device_preferences_page.ui'
 #
-# Created: Wed May  7 13:53:20 2014
-#      by: PyQt4 UI code generator 4.10.4
+# Created: Wed May 14 15:50:18 2014
+#      by: PyQt4 UI code generator 4.10
 #
 # WARNING! All changes made in this file will be lost!
 

diff --git a/gns3/modules/vpcs/ui/vpcs_preferences_page_ui.py b/gns3/modules/vpcs/ui/vpcs_preferences_page_ui.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file '/home/jbbowen/Desktop/Toptal/github/gns3-gui/gns3/modules/vpcs/ui/vpcs_preferences_page.ui'
+# Form implementation generated from reading ui file '/home/grossmj/workspace/git/gns3-gui/gns3/modules/vpcs/ui/vpcs_preferences_page.ui'
 #
-# Created: Tue May 13 14:41:22 2014
-#      by: PyQt4 UI code generator 4.10.4
+# Created: Wed May 14 15:50:18 2014
+#      by: PyQt4 UI code generator 4.10
 #
 # WARNING! All changes made in this file will be lost!
 

diff --git a/gns3/ui/main_window.ui b/gns3/ui/main_window.ui
@@ -38,7 +38,7 @@ background-none;
 </string>
   </property>
   <property name="unifiedTitleAndToolBarOnMac">
-   <bool>true</bool>
+   <bool>false</bool>
   </property>
   <widget class="QWidget" name="uiCentralWidget">
    <layout class="QGridLayout">
@@ -282,7 +282,7 @@ background-none;
     <enum>LeftToolBarArea</enum>
    </attribute>
    <attribute name="toolBarBreak">
-    <bool>false</bool>
+    <bool>true</bool>
    </attribute>
    <addaction name="uiBrowseRoutersAction"/>
    <addaction name="separator"/>

diff --git a/gns3/ui/main_window_ui.py b/gns3/ui/main_window_ui.py
@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file '/home/grossmj/workspace/git/gns3-gui/gns3/ui/main_window.ui'
 #
-# Created: Tue Apr 29 17:59:09 2014
+# Created: Wed May 14 15:50:18 2014
 #      by: PyQt4 UI code generator 4.10
 #
 # WARNING! All changes made in this file will be lost!
@@ -47,7 +47,7 @@ def setupUi(self, MainWindow):
 "}\n"
 "\n"
 ""))
-        MainWindow.setUnifiedTitleAndToolBarOnMac(True)
+        MainWindow.setUnifiedTitleAndToolBarOnMac(False)
         self.uiCentralWidget = QtGui.QWidget(MainWindow)
         self.uiCentralWidget.setObjectName(_fromUtf8("uiCentralWidget"))
         self.gridlayout = QtGui.QGridLayout(self.uiCentralWidget)
@@ -128,6 +128,7 @@ def setupUi(self, MainWindow):
         self.uiBrowsersToolBar.setToolButtonStyle(QtCore.Qt.ToolButtonIconOnly)
         self.uiBrowsersToolBar.setObjectName(_fromUtf8("uiBrowsersToolBar"))
         MainWindow.addToolBar(QtCore.Qt.LeftToolBarArea, self.uiBrowsersToolBar)
+        MainWindow.insertToolBarBreak(self.uiBrowsersToolBar)
         self.uiControlToolBar = QtGui.QToolBar(MainWindow)
         self.uiControlToolBar.setIconSize(QtCore.QSize(32, 32))
         self.uiControlToolBar.setToolButtonStyle(QtCore.Qt.ToolButtonIconOnly)