From a383745fc847003ce407049ffccbc89e20dbad99 Mon Sep 17 00:00:00 2001
From: Mustafa Sakarya <mustafasakarya1986@gmail.com>
Date: Tue, 13 Jul 2010 20:28:01 +0300
Subject: [PATCH] Preferences are modifiable

Set button saves config.pickle file with new values
---
 gui/gui.glade | 77 ++++++++++++++++++++++++++++++++++-------------------------
 gui/main.py   | 45 ++++++++++++++++++++++------------
 2 files changed, 74 insertions(+), 48 deletions(-)

diff --git a/gui/gui.glade b/gui/gui.glade
index 27f7236..c2234a3 100644
--- a/gui/gui.glade
+++ b/gui/gui.glade
@@ -320,55 +320,61 @@
     </child>
   </object>
   <object class="GtkDialog" id="preferences_dialog">
+    <property name="width_request">320</property>
+    <property name="height_request">240</property>
     <property name="border_width">5</property>
     <property name="type_hint">normal</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox2">
+      <object class="GtkVBox" id="preferences_dialog_vbox">
         <property name="visible">True</property>
         <property name="spacing">2</property>
         <child>
-          <object class="GtkVBox" id="vbox2">
+          <object class="GtkComboBoxEntry" id="pd_cb">
             <property name="visible">True</property>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
+            <property name="model">pd_cb_liststore</property>
+            <signal name="changed" handler="on_pd_cb_changed"/>
           </object>
           <packing>
+            <property name="fill">False</property>
             <property name="position">1</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkHSeparator" id="preferences_dialog_hseparator">
+            <property name="height_request">60</property>
+            <property name="visible">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkEntry" id="pd_entry">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="invisible_char">&#x25CF;</property>
+          </object>
+          <packing>
+            <property name="fill">False</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area2">
+          <object class="GtkHButtonBox" id="preferences_dialog_action_area">
             <property name="visible">True</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="bt_preferences_dialog_new">
-                <property name="label" translatable="yes">New</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <signal name="clicked" handler="on_bt_preferences_dialog_new_clicked"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
+              <placeholder/>
             </child>
             <child>
-              <object class="GtkButton" id="bt_preferences_dialog_cancel">
-                <property name="label" translatable="yes">Cancel</property>
+              <object class="GtkButton" id="pd_set_bt">
+                <property name="label" translatable="yes">Set</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <signal name="clicked" handler="on_bt_preferences_dialog_cancel_clicked"/>
+                <signal name="clicked" handler="on_pd_set_bt_clicked"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -377,12 +383,12 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="bt_preferences_dialog_save">
-                <property name="label" translatable="yes">Save</property>
+              <object class="GtkButton" id="pd_close_bt">
+                <property name="label" translatable="yes">Close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <signal name="clicked" handler="on_bt_preferences_dialog_save_clicked"/>
+                <signal name="clicked" handler="on_pd_close_bt_clicked"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -400,9 +406,14 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="0">bt_preferences_dialog_new</action-widget>
-      <action-widget response="0">bt_preferences_dialog_cancel</action-widget>
-      <action-widget response="0">bt_preferences_dialog_save</action-widget>
+      <action-widget response="0">pd_set_bt</action-widget>
+      <action-widget response="0">pd_close_bt</action-widget>
     </action-widgets>
   </object>
+  <object class="GtkListStore" id="pd_cb_liststore">
+    <columns>
+      <!-- column-name gchararray1 -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
 </interface>
diff --git a/gui/main.py b/gui/main.py
index d55bafa..9fafea4 100755
--- a/gui/main.py
+++ b/gui/main.py
@@ -3,7 +3,6 @@ import pygtk
 pygtk.require("2.0")
 import sys
 import gtk
-
 from com import COM
 
 class Main:
@@ -14,10 +13,16 @@ class Main:
         self.about = builder.get_object("aboutdialog1")
         self.tbconnect=builder.get_object("tbconnect")
         self.preferences_dialog=builder.get_object("preferences_dialog")
+        self.preferences_dialog_align= builder.get_object("preferences_dialog_vbox")
+        self.pd_entry=builder.get_object("pd_entry")
+        self.pd_cb=builder.get_object("pd_cb")
+        self.pd_cb_liststore=builder.get_object("pd_cb_liststore")
+        
         builder.connect_signals(self)
 
         self.com=COM()
-        self.tbconnect.set_active(True)        
+        self.tbconnect.set_active(True)
+        self.pd_init()
     def on_btsend_clicked(self, widget, data=None):
         self.com.write([1,2,3])
     def on_tbconnect_clicked(self, widget, data=None):
@@ -27,15 +32,28 @@ class Main:
         else:                  
             self.com.disconnect()
             widget.set_label("      Closed")
-    def on_preferences_dialog_show(self, widget, data=None):
+    def on_pd_cb_changed(self, widget, data=None):
+        entry=self.pd_entry #Preferences dialog combobox
+        cb=self.pd_cb
+        active=cb.get_active_text()
+        entry.set_text(conf.d[active])
+    def pd_init(self):
+        cb=self.pd_cb   #Fill in preferences dialog
+        liststore = self.pd_cb_liststore
         for item in conf.d:
-            print(item,conf.d[item])
-        self.preferences_dialog.show()    
-    def on_bt_preferences_dialog_new_clicked(self, widget, data=None):
-        print(data)
-    def on_bt_preferences_dialog_save_clicked(self, widget, data=None):
-        self.preferences_dialog.hide()
-    def on_bt_preferences_dialog_cancel_clicked(self, widget, data=None):
+            liststore.append([item])
+        cb.set_model(liststore)        
+        cb.set_text_column(0)
+        cb.set_active(0)
+    def on_preferences_dialog_show(self, widget, data=None):     
+        self.preferences_dialog.show()        
+    def on_pd_set_bt_clicked(self, widget, data=None):        
+        entry=self.pd_entry
+        cb=self.pd_cb
+        active=cb.get_active_text()
+        conf.d[active]=entry.get_text()
+        conf.save()
+    def on_pd_close_bt_clicked(self, widget, data=None):
         self.preferences_dialog.hide()
     def on_window1_destroy(self, widget, data=None):
         gtk.main_quit()
@@ -44,10 +62,6 @@ class Main:
     def on_aboutdialog1_response(self, widget, data=None):        
         self.about.hide()
         
-class Preferences:
-    def __init__(self,parent=None):
-        self.parent=parent
-
 class STD:
     def __init__(self,file):
         self.file=file
@@ -73,8 +87,9 @@ class Configure:
     def save(self):
         pickle=self.p
         fpickle=open('config.pickle','w')
+        #self.d['newitem']='newvalue'
         pickle.dump(self.d, fpickle) # Dictionary
-        fpickle.close()
+        fpickle.close()        
 
 conf=Configure()
 
-- 
2.11.4.GIT