--- a/gui/src/SettingsDialog.cpp	Tue Mar 13 19:11:52 2012 -0400
+++ b/gui/src/SettingsDialog.cpp	Fri Mar 16 20:02:13 2012 +0530
@@ -85,7 +85,7 @@
 
 SettingsDialog::~SettingsDialog ()
 {
-  QSettings *settings = ResourceManager::instance ()->settings ();
+  /*QSettings *settings = ResourceManager::instance ()->settings ();
   settings->setValue ("useCustomFileEditor", ui->useCustomFileEditor->isChecked ());
   settings->setValue ("customFileEditor", ui->customFileEditor->text ());
   settings->setValue ("editor/showLineNumbers", ui->editor_showLineNumbers->isChecked ());
@@ -105,6 +105,37 @@
   settings->setValue ("proxyHostName", ui->proxyHostName->text ());
   settings->setValue ("proxyPort", ui->proxyPort->text ());
   settings->setValue ("proxyUserName", ui->proxyUserName->text ());
-  settings->setValue ("proxyPassword", ui->proxyPassword->text ());
+  settings->setValue ("proxyPassword", ui->proxyPassword->text ());*/
   delete ui;
 }
+
+void SettingsDialog::on_Save_clicked()
+{
+    QSettings *settings = ResourceManager::instance ()->settings ();
+    settings->setValue ("useCustomFileEditor", ui->useCustomFileEditor->isChecked ());
+    settings->setValue ("customFileEditor", ui->customFileEditor->text ());
+    settings->setValue ("editor/showLineNumbers", ui->editor_showLineNumbers->isChecked ());
+    settings->setValue ("editor/highlightCurrentLine", ui->editor_highlightCurrentLine->isChecked ());
+    settings->setValue ("editor/codeCompletion", ui->editor_codeCompletion->isChecked ());
+    settings->setValue ("editor/fontName", ui->editor_fontName->currentFont().family());
+    settings->setValue ("editor/fontSize", ui->editor_fontSize->value());
+    settings->setValue ("editor/longWindowTitle", ui->editor_longWindowTitle->isChecked());
+    settings->setValue ("showFilenames", ui->showFilenames->isChecked ());
+    settings->setValue ("showFileSize", ui->showFileSize->isChecked ());
+    settings->setValue ("showFileType", ui->showFileType->isChecked ());
+    settings->setValue ("showLastModified", ui->showLastModified->isChecked ());
+    settings->setValue ("showHiddenFiles", ui->showHiddenFiles->isChecked ());
+    settings->setValue ("useAlternatingRowColors", ui->useAlternatingRowColors->isChecked ());
+    settings->setValue ("useProxyServer", ui->useProxyServer->isChecked ());
+    settings->setValue ("proxyType", ui->proxyType->currentText ());
+    settings->setValue ("proxyHostName", ui->proxyHostName->text ());
+    settings->setValue ("proxyPort", ui->proxyPort->text ());
+    settings->setValue ("proxyUserName", ui->proxyUserName->text ());
+    settings->setValue ("proxyPassword", ui->proxyPassword->text ());
+    this->close();
+}
+
+void SettingsDialog::on_Discard_clicked()
+{
+    this->close();
+}
diff -r 80e8c03548a4 gui/src/SettingsDialog.h
--- a/gui/src/SettingsDialog.h	Tue Mar 13 19:11:52 2012 -0400
+++ b/gui/src/SettingsDialog.h	Fri Mar 16 20:02:13 2012 +0530
@@ -32,6 +32,11 @@
   explicit SettingsDialog (QWidget * parent);
   ~SettingsDialog ();
 
+private slots:
+    void on_Save_clicked();
+
+    void on_Discard_clicked();
+
 private:
   Ui::SettingsDialog * ui;
 };
diff -r 80e8c03548a4 gui/src/SettingsDialog.ui
--- a/gui/src/SettingsDialog.ui	Tue Mar 13 19:11:52 2012 -0400
+++ b/gui/src/SettingsDialog.ui	Fri Mar 16 20:02:13 2012 +0530
@@ -32,7 +32,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>3</number>
      </property>
      <widget class="QWidget" name="tab_4">
       <attribute name="title">
@@ -417,8 +417,67 @@
      </widget>
     </widget>
    </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="Discard">
+       <property name="text">
+        <string>Discard</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="Save">
+       <property name="text">
+        <string>Save Changes</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>tabWidget</tabstop>
+  <tabstop>shortcutTableWidget</tabstop>
+  <tabstop>addShortcutButton</tabstop>
+  <tabstop>removeShortCutButton</tabstop>
+  <tabstop>useCustomFileEditor</tabstop>
+  <tabstop>customFileEditor</tabstop>
+  <tabstop>editor_showLineNumbers</tabstop>
+  <tabstop>editor_highlightCurrentLine</tabstop>
+  <tabstop>editor_codeCompletion</tabstop>
+  <tabstop>editor_longWindowTitle</tabstop>
+  <tabstop>editor_fontName</tabstop>
+  <tabstop>editor_fontSize</tabstop>
+  <tabstop>showFilenames</tabstop>
+  <tabstop>showFileSize</tabstop>
+  <tabstop>showFileType</tabstop>
+  <tabstop>showLastModified</tabstop>
+  <tabstop>showHiddenFiles</tabstop>
+  <tabstop>useAlternatingRowColors</tabstop>
+  <tabstop>useProxyServer</tabstop>
+  <tabstop>proxyType</tabstop>
+  <tabstop>proxyHostName</tabstop>
+  <tabstop>proxyPort</tabstop>
+  <tabstop>proxyUserName</tabstop>
+  <tabstop>proxyPassword</tabstop>
+  <tabstop>Discard</tabstop>
+  <tabstop>Save</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>
@@ -572,12 +631,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>249</x>
-     <y>112</y>
+     <x>261</x>
+     <y>134</y>
     </hint>
     <hint type="destinationlabel">
-     <x>249</x>
-     <y>112</y>
+     <x>261</x>
+     <y>134</y>
     </hint>
    </hints>
   </connection>
@@ -636,12 +695,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>249</x>
-     <y>137</y>
+     <x>261</x>
+     <y>162</y>
     </hint>
     <hint type="destinationlabel">
-     <x>249</x>
-     <y>137</y>
+     <x>261</x>
+     <y>162</y>
     </hint>
    </hints>
   </connection>