Attachment 283031 Details for Bug 418561 – small addition to mainwindow when calling sambaUserData

[patch] small addition to mainwindow when calling sambaUserData

scs-mainwindow-stokes-1.patch (text/plain), 5.44 KB, created by Adam Stokes on 2007-12-10 18:11:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Stokes

Created: 2007-12-10 18:11:20 UTC

Size: 5.44 KB

patch

obsolete

>--- system-config-samba-1.2.39/src/mainWindow.py	2006-03-29 08:13:29.000000000 -0500
>+++ system-config-samba-stokes/src/mainWindow.py	2007-12-10 11:08:52.000000000 -0500
>@@ -43,7 +43,7 @@
> ## Icon for windows
> ##
> 
>-iconPixbuf = None      
>+iconPixbuf = None
> try:
>     iconPixbuf = gtk.gdk.pixbuf_new_from_file("/usr/share/system-config-samba/pixmaps/system-config-samba.png")
> except:
>@@ -58,7 +58,7 @@
>         else:
>             self.xml = gtk.glade.XML ("/usr/share/system-config-samba/system-config-samba.glade", domain="system-config-samba")
> 
>-            
>+
> #        [0 dir, 1 hosts, 2 permissions, 3 visibility, 4 description, 5 sambaDataObject]
>         self.share_store = gtk.ListStore(gobject.TYPE_STRING,
>                 gobject.TYPE_STRING,
>@@ -83,14 +83,14 @@
>         self.samba_backend = sambaBackend.SambaBackend()
> 
>         #Initialize Samba User Backend
>-        self.samba_user_data = sambaUserData.SambaUserData(self)
>+        self.samba_user_data = sambaUserData.SambaUserData(self, self.samba_data)
> 
>         #Initialize Samba User Window
>         self.samba_user_win = sambaUserWin.SambaUserWin(self, self.xml, self.samba_user_data, self.main_window)
> 
>         self.basic_preferences_win = basicPreferencesWin.BasicPreferencesWin(self, self.xml, self.samba_data, self.samba_backend, self.main_window)
>         self.share_win = shareWindow.ShareWindow(self, self.xml, self.samba_data, self.samba_user_data, self.samba_backend, self.main_window)
>-        
>+
>         self.toplevel_vbox = gtk.VBox(False)
>         self.menu_bar = gtk.MenuBar()
> 
>@@ -111,7 +111,7 @@
>         self.share_view.append_column(col)
>         col = gtk.TreeViewColumn(_("Visibility"), gtk.CellRendererText(), text=3)
>         self.share_view.append_column(col)
>-        col = gtk.TreeViewColumn(_("Description"), gtk.CellRendererText(), text=4)   
>+        col = gtk.TreeViewColumn(_("Description"), gtk.CellRendererText(), text=4)
>         col.set_spacing(235)
>         self.share_view.append_column(col)
> 
>@@ -138,7 +138,7 @@
>                 ])
>             self.menu_bar = item_fac.get_widget('<main>')
> 
>-            self.actionMenu = self.menu_bar.get_children()[0].get_submenu()        
>+            self.actionMenu = self.menu_bar.get_children()[0].get_submenu()
>             self.propertiesMenu = self.actionMenu.get_children()[1]
>             self.deleteMenu = self.actionMenu.get_children()[2]
> 
>@@ -158,10 +158,10 @@
>             image, label = self.delete_button.get_children()[0].get_children()
>             label.set_text(_("_Delete"))
>             label.set_use_underline(True)
>-        
>+
>             self.toolbar.insert_stock('gtk-help', _("View help"), None, self.onHelpClicked, None, 3)
> 
>-            self.toplevel_vbox.pack_start(self.menu_bar, False)        
>+            self.toplevel_vbox.pack_start(self.menu_bar, False)
>             self.toplevel_vbox.pack_start(self.toolbar, False)
>         else:
>             ui_string = """<ui>
>@@ -233,7 +233,7 @@
> 
>         self.selected_row = -1
>         self.changed = False
>-        
>+
>         self.create_handler = None
>         self.modify_handler = None
> 
>@@ -243,7 +243,7 @@
>         self.share_view.get_selection().connect("changed", self.onShareListSelectRow)
>         self.share_view.connect ("row_activated", self.onShareListActivate)
>         self.share_view.get_selection().unselect_all()
>-        
>+
>         if gtk.__dict__.has_key ("main"):
>             gtk.main ()
>         else:
>@@ -263,7 +263,7 @@
>                 continue
>             section = samba_data.sections_dict[section_name]
>             #print "filling UI with section", repr (section)
>- 
>+
>             iter = self.share_store.append ()
>             self.share_store.set_value (iter, 2, _("Read Only"))
>             self.share_store.set_value (iter, 3, _("Visible"))
>@@ -274,7 +274,7 @@
> 
>             for token in section.content:
>                 if token.type == sambaToken.SambaToken.SAMBA_TOKEN_KEYVAL:
>-                    
>+
>                     if token.keyname == "path":
>                         self.share_store.set_value (iter, 0, token.keyval)
>                     elif token.keyname == "read only":
>@@ -329,11 +329,11 @@
>         if iter != None:
>             section = self.share_store.get_value (iter, 5)
>             self.share_win.showEditWindow (iter, section)
>-        
>+
>     def onDeleteButtonClicked(self, *args):
>         self.changed = True
> 
>-        
>+
>         store, iter = self.share_view.get_selection().get_selected()
>         section = self.share_store.get_value(iter, 5)
>         #print "deleting", section
>@@ -362,7 +362,7 @@
>         self.share_view.get_selection().unselect_all()
> 
>         status = self.samba_backend.isSmbRunning()
>-        
>+
>         result = None
>         if not status:
>             #smb is not running, so ask the user if they want to start it
>@@ -376,7 +376,7 @@
>             dlg.set_transient_for(self.main_window)
>             result = dlg.run()
>             dlg.destroy()
>-                                                           
>+
>             if result == gtk.RESPONSE_YES:
>                 #Start smb if the user says 'yes'
>                 if not self.debug_flag:
>@@ -443,7 +443,7 @@
>     def onHelpClicked(self, *args):
>         help_page = "file:///usr/share/doc/system-config-samba-" + "@VERSION@" + "/index.html"
>         path = "/usr/bin/htmlview"
>-        
>+
>         if path == None:
>             dlg = gtk.MessageDialog(None, 0, gtk.MESSAGE_WARNING, gtk.BUTTONS_OK,
>                                     (_("Help is not available.")))

Actions: View | Diff

Attachments on bug 418561: 283011 | 283031