Merge pull request #376 from lazyDesertMan/master

#375 Add checkbox for sharing when adding a printer

Author: zdohnal

newprinter.py

@@ -250,6 +250,7 @@ def __init__(self):
                               "entNPName",
                               "entNPDescription",
                               "entNPLocation",
+                              "isSharedCbx",
                               "tvNPDevices",
                               "ntbkNPType",
                               "lblNPDeviceDescription",
@@ -621,6 +622,19 @@ def init(self, dialog_mode, device_uri=None, name=None, ppd=None,
             nonfatalException (e)
             return False
 
+        self.cups._begin_operation (_("fetching server settings"))
+        try:
+            server_settings = self.cups.adminGetServerSettings()
+        except cups.IPPError as e:
+            (e, m) = e.args
+            show_IPP_Error(e, m, self._parent)
+            self.cups._end_operation ()
+            raise
+
+        self.cups._end_operation ()
+        self.isShared = server_settings.get (cups.CUPS_SERVER_SHARE_PRINTERS,
+                                                '0') == '1'
+
         try:
             self.printers = cupshelpers.getPrinters (self.cups)
         except cups.IPPError as e:
@@ -754,6 +768,7 @@ def _initialisePPDMode (self):
     def _initialiseWidgetsForMode (self, mode_name):
         self.entNPName.set_text (self.makeNameUnique (mode_name))
         self.entNPName.grab_focus ()
+        self.isSharedCbx.set_active(self.isShared)
         for widget in [self.entNPLocation,
                        self.entNPDescription,
                        self.entSMBURI, self.entSMBUsername,
@@ -4320,8 +4335,10 @@ def on_btnNPApply_clicked(self, widget):
             name = self.entNPName.get_text()
             location = self.entNPLocation.get_text()
             info = self.entNPDescription.get_text()
+            isShared = self.isSharedCbx.get_active()
         else:
             name = self._name
+            isShared = self.isShared
 
         ppd = self.ppd
 
@@ -4391,6 +4408,7 @@ def on_btnNPApply_clicked(self, widget):
                 cupshelpers.activateNewPrinter (self.cups, name)
                 self.cups.setPrinterLocation(name, location)
                 self.cups.setPrinterInfo(name, info)
+                self.cups.setPrinterShared(name, isShared)
             except cups.IPPError as e:
                 (e, msg) = e.args
                 self.show_IPP_Error(e, msg)

ui/NewPrinterWindow.ui

@@ -219,6 +219,36 @@
                         <property name="position">2</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkFrame" id="isSharedFrame">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="label-xalign">0</property>
+                        <property name="shadow-type">none</property>
+                        <child>
+                          <object class="GtkCheckButton" id="isSharedCbx">
+                            <property name="label" translatable="yes">Use sharing</property>
+                            <property name="visible">True</property>
+                            <property name="can-focus">True</property>
+                            <property name="receives-default">False</property>
+                            <property name="draw-indicator">True</property>
+                          </object>
+                        </child>
+                        <child type="label">
+                          <object class="GtkLabel" id="isSharedTitle">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Shared&lt;/b&gt;</property>
+                            <property name="use-markup">True</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">True</property>