kamil

diff -Naur old-GNS3-0.7.4-src//src/GNS3/Ui/ConfigurationPages/Page_PreferencesDynamips.py GNS3-0.7.4-src/src/GNS3/Ui/ConfigurationPages/Page_PreferencesDynamips.py--- old-GNS3-0.7.4-src//src/GNS3/Ui/ConfigurationPages/Page_PreferencesDynamips.py	2011-11-12 06:06:49.719658384 +0100+++ GNS3-0.7.4-src/src/GNS3/Ui/ConfigurationPages/Page_PreferencesDynamips.py	2011-11-12 06:07:43.333988111 +0100@@ -53,8 +53,8 @@             self.conf = systemDynamipsConf()          # Default path to dynamips executable-        if self.conf.path == '' and sys.platform.startswith('win'):-            self.conf.path = unicode('dynamips-wxp.exe')+        if self.conf.path == '':+            self.conf.path = unicode('dynamips')                      # Default path to working directory         if self.conf.workdir == '':diff -Naur old-GNS3-0.7.4-src//src/GNS3/Ui/ConfigurationPages/Page_PreferencesGeneral.py GNS3-0.7.4-src/src/GNS3/Ui/ConfigurationPages/Page_PreferencesGeneral.py--- old-GNS3-0.7.4-src//src/GNS3/Ui/ConfigurationPages/Page_PreferencesGeneral.py	2011-11-12 06:06:49.719658384 +0100+++ GNS3-0.7.4-src/src/GNS3/Ui/ConfigurationPages/Page_PreferencesGeneral.py	2011-11-12 06:08:22.945492901 +0100@@ -89,29 +89,14 @@                          # Defaults terminal command         if self.conf.term_cmd == '':-            if sys.platform.startswith('darwin'):-                self.conf.term_cmd = unicode("/usr/bin/osascript -e 'tell application \"terminal\" to do script with command \"telnet %h %p ; exit\"'")-            elif sys.platform.startswith('win'):-                self.conf.term_cmd = unicode('putty.exe -telnet %h %p')-                self.conf.use_shell = False-            else:-                self.conf.term_cmd = unicode("xterm -T %d -e 'telnet %h %p' >/dev/null 2>&1 &")+             self.conf.term_cmd = unicode("xterm -T %d -e 'telnet %h %p' >/dev/null 2>&1 &")+             self.comboBoxPreconfigTerminalCommands.setCurrentIndex(7)          if self.conf.project_path == '':-            if os.environ.has_key("TEMP"):-                self.conf.project_path = unicode(os.environ["TEMP"], errors='replace')-            elif os.environ.has_key("TMP"):-                self.conf.project_path = unicode(os.environ["TMP"],  errors='replace')-            else:-                self.conf.project_path = unicode('/tmp', errors='replace')+             self.conf.project_path = unicode(os.path.expanduser('~') + '/projects', errors='replace')          if self.conf.ios_path == '':-            if os.environ.has_key("TEMP"):-                self.conf.ios_path = unicode(os.environ["TEMP"], errors='replace')-            elif os.environ.has_key("TMP"):-                self.conf.ios_path = unicode(os.environ["TMP"],  errors='replace')-            else:-                self.conf.ios_path = unicode('/tmp', errors='replace')+             self.conf.ios_path = unicode(os.path.expanduser('~') + '/images', errors='replace')          self.lineEditTermCommand.setText(self.conf.term_cmd)         self.ProjectPath.setText(os.path.normpath(self.conf.project_path))diff -Naur old-GNS3-0.7.4-src//src/GNS3/Ui/ConfigurationPages/Page_PreferencesQemu.py GNS3-0.7.4-src/src/GNS3/Ui/ConfigurationPages/Page_PreferencesQemu.py--- old-GNS3-0.7.4-src//src/GNS3/Ui/ConfigurationPages/Page_PreferencesQemu.py	2011-11-12 06:06:49.720658372 +0100+++ GNS3-0.7.4-src/src/GNS3/Ui/ConfigurationPages/Page_PreferencesQemu.py	2011-11-12 06:07:57.521810741 +0100@@ -94,11 +94,7 @@          # Default path to qemuwrapper         if self.conf.qemuwrapper_path == '':-            if sys.platform.startswith('win'):-                self.conf.qemuwrapper_path = unicode('qemuwrapper.exe')-            else:-                path = os.getcwd() + '/qemuwrapper/qemuwrapper.py'-                self.conf.qemuwrapper_path = unicode(path, errors='replace')+            self.conf.qemuwrapper_path = unicode('/usr/share/gns3/qemuwrapper/qemuwrapper.py', errors='replace')                  # Default path to working directory         if self.conf.qemuwrapper_workdir == '':