Multiple changes

1) Main now auto executes
2) Images relocated to match structure of rest of sambagtk
3) Modified sam.py to show newstyle connect dialog to maintain consistancy

diff --git a/images/samba-logo-small.png b/images/samba-logo-small.png
deleted file mode 100644 (file)
index 8c2e20b..0000000
Binary files a/images/samba-logo-small.png and /dev/null differ

diff --git a/images/network-folder-alternate.png b/sambagtk/images/network-folder-alternate.png
similarity index 100%
rename from images/network-folder-alternate.png
rename to sambagtk/images/network-folder-alternate.png

diff --git a/images/network-folder-blue.png b/sambagtk/images/network-folder-blue.png
similarity index 100%
rename from images/network-folder-blue.png
rename to sambagtk/images/network-folder-blue.png

diff --git a/images/network-folder.png b/sambagtk/images/network-folder.png
similarity index 100%
rename from images/network-folder.png
rename to sambagtk/images/network-folder.png

diff --git a/images/network-pipe-alt.png b/sambagtk/images/network-pipe-alt.png
similarity index 100%
rename from images/network-pipe-alt.png
rename to sambagtk/images/network-pipe-alt.png

diff --git a/images/network-pipe.png b/sambagtk/images/network-pipe.png
similarity index 100%
rename from images/network-pipe.png
rename to sambagtk/images/network-pipe.png

diff --git a/images/network-printer.png b/sambagtk/images/network-printer.png
similarity index 100%
rename from images/network-printer.png
rename to sambagtk/images/network-printer.png

diff --git a/images/network.png b/sambagtk/images/network.png
similarity index 100%
rename from images/network.png
rename to sambagtk/images/network.png

diff --git a/images/samba-logo-old.png b/sambagtk/images/samba-logo-old.png
similarity index 100%
rename from images/samba-logo-old.png
rename to sambagtk/images/samba-logo-old.png

diff --git a/sambagtk/images/samba-logo-small.png b/sambagtk/images/samba-logo-small.png
index 475cc269d0209ae645ac0140d007fca2b63be3cf..8c2e20b1b450db91d2b13a409952b26d45edfaa8 100644 (file)
Binary files a/sambagtk/images/samba-logo-small.png and b/sambagtk/images/samba-logo-small.png differ

diff --git a/images/samba-logo-vertical.png b/sambagtk/images/samba-logo-vertical.png
similarity index 100%
rename from images/samba-logo-vertical.png
rename to sambagtk/images/samba-logo-vertical.png

diff --git a/sambagtk/main.py b/sambagtk/main.py
index d96b6842018495aed049e1f62cf34dc6457f8a22..df75b33c8596ccb70b23e7127d05cad724da5cca 100644 (file)
--- a/sambagtk/main.py
+++ b/sambagtk/main.py
@@ -550,11 +550,11 @@ def ParseArgs(argv):
             arguments.update({"connect_now":True})
     return (arguments)
 
-"""
+
 if __name__ == "__main__":
     arguments = ParseArgs(sys.argv[1:])
     gtk.gdk.threads_init()
     main_window = SambaUtilities(arguments)
     sys.stdout = main_window #redirect print statements to the write() function of this class
     gtk.main()
-"""
+

diff --git a/sambagtk/pygwshare.py b/sambagtk/pygwshare.py
index 17c780a63a5325b5e3ee40ebb4871a2104c99bd8..c1c05516ef8c6c6de3f97a44f315dc40b53b1255 100644 (file)
--- a/sambagtk/pygwshare.py
+++ b/sambagtk/pygwshare.py
@@ -808,7 +808,7 @@ class ShareWindow(gtk.Window):
                     0x04000000:('SV_TYPE_CLUSTER_VS_NT','Virtual Server Cluster')
                     }
 
-            label_data = server_typedict.get(self.server_info.server_type,('','Unknown'))[1]
+            label_data = server_typedict.get(self.server_info.server_type,('','Multiple Capablities'))[1]
             self.srvinfo_type_label.set_text(label_data)
             self.srvinfo_upath_label.set_text(self.server_info.userpath.upper())
             self.srvinfo_to_label.set_text(str(self.server_info.disc))
@@ -1330,8 +1330,8 @@ class ShareWindow(gtk.Window):
         # main window
         self.set_title("Samba-Gtk Share Management Interface")
         self.set_default_size(800, 600)
-        self.icon_filename = os.path.join(sys.path[0],"..", "images", "network.png")
-        self.share_icon_filename = os.path.join(sys.path[0],"..", "images", "network.png")
+        self.icon_filename = os.path.join(sys.path[0], "images", "network.png")
+        self.share_icon_filename = os.path.join(sys.path[0], "images", "network.png")
         self.icon_pixbuf = gtk.gdk.pixbuf_new_from_file(self.icon_filename)
         self.set_icon(self.icon_pixbuf)
 

diff --git a/sambagtk/pysrvsvc.py b/sambagtk/pysrvsvc.py
index d159201d48d2a383dd22318f4f62d719a779a42f..e3baa827048bfa06b38c8d1d888ead0cc99f1d44 100644 (file)
--- a/sambagtk/pysrvsvc.py
+++ b/sambagtk/pysrvsvc.py
@@ -75,7 +75,7 @@ class srvsvcConnectDialog(gtk.Dialog):
 
         self.artwork = gtk.VBox()
 
-        self.samba_image_filename = os.path.join(sys.path[0],"..", 'images',
+        self.samba_image_filename = os.path.join(sys.path[0],'images',
                 'samba-logo-small.png')
         self.samba_image = gtk.Image()
         self.samba_image.set_from_file(self.samba_image_filename)
@@ -378,7 +378,7 @@ class ShareAddEditDialog(gtk.Dialog):
         self.icon_name = ["network-folder","network-printer",
                             "network","network-pipe"][self.stype]
         self.icon_filename = \
-        os.path.join(sys.path[0], "..","images",''.join([self.icon_name,'.png']))
+        os.path.join(sys.path[0],"images",''.join([self.icon_name,'.png']))
         self.set_icon_from_file(self.icon_filename)
         self.vbox.set_spacing(3)
         self.set_border_width(5)
@@ -416,7 +416,7 @@ class ShareAddEditDialog(gtk.Dialog):
         #vertical logo
         vbox = gtk.VBox()
         vbox.set_border_width(5)
-        samba_image_filename = os.path.join(sys.path[0],"..", 'images',
+        samba_image_filename = os.path.join(sys.path[0],'images',
                 'samba-logo-vertical.png')
         samba_image = gtk.Image()
         samba_image.set_from_file(samba_image_filename)
@@ -649,7 +649,7 @@ class DeleteDialog(gtk.Dialog):
         self.icon_name = ["network-folder","network-printer",
                             "network","network-pipe"][self.stype]
         self.icon_filename = \
-        os.path.join(sys.path[0],"..", "images",''.join([self.icon_name,'.png']))
+        os.path.join(sys.path[0],"images",''.join([self.icon_name,'.png']))
         self.set_icon_from_file(self.icon_filename)
         self.vbox.set_spacing(3)
         self.set_border_width(5)
@@ -683,7 +683,7 @@ class DeleteDialog(gtk.Dialog):
         #vertical logo
         vbox = gtk.VBox()
         vbox.set_border_width(5)
-        samba_image_filename = os.path.join(sys.path[0], "..",'images',
+        samba_image_filename = os.path.join(sys.path[0],'images',
                 'samba-logo-vertical.png')
         samba_image = gtk.Image()
         samba_image.set_from_file(samba_image_filename)
@@ -835,7 +835,7 @@ class ShareWizardDialog(ShareAddEditDialog):
 
         vbox = gtk.VBox()
         vbox.set_border_width(5)
-        samba_image_filename = os.path.join(sys.path[0],"..", 'images',
+        samba_image_filename = os.path.join(sys.path[0],'images',
                 'samba-logo-small.png')
         samba_image = gtk.Image()
         samba_image.set_from_file(samba_image_filename)

diff --git a/sambagtk/sam.py b/sambagtk/sam.py
index 18449975d275d9a38425047d32a8b601660d42a2..0c7fa3ddf98297bc0e24d6e714738b15eaa79fef 100644 (file)
--- a/sambagtk/sam.py
+++ b/sambagtk/sam.py
@@ -534,11 +534,32 @@ class SAMConnectDialog(gtk.Dialog):
         self.set_border_width(5)
         self.set_icon_name(gtk.STOCK_CONNECT)
         self.set_resizable(False)
+        self.set_decorated(True)
 
         # server frame
 
         self.vbox.set_spacing(5)
 
+        self.artwork = gtk.VBox()
+
+        self.samba_image_filename = os.path.join(sys.path[0],"..", 'images',
+                'samba-logo-small.png')
+        self.samba_image = gtk.Image()
+        self.samba_image.set_from_file(self.samba_image_filename)
+        self.artwork.pack_start(self.samba_image, True, True, 0)
+
+        label = gtk.Label('Opening Windows to A Wider World')
+        box = gtk.HBox()
+        box.pack_start(label, True, True, 0)
+        self.artwork.pack_start(box, True, True, 0)
+
+        label = gtk.Label('Samba Control Center')
+        box = gtk.HBox()
+        box.pack_start(label, True, True, 0)
+        self.artwork.pack_start(box, True, True, 0)
+
+        self.vbox.pack_start(self.artwork, False, True, 0)
+
         self.server_frame = gtk.Frame("Server")
         self.vbox.pack_start(self.server_frame, False, True, 0)