=== modified file 'src/check-header-compile.in' (properties changed: +x to -x)
=== modified file 'src/extension/dbus/builddocs.sh' (properties changed: +x to -x)
=== modified file 'src/extension/internal/filter/filter-all.cpp' (properties changed: +x to -x)
=== modified file 'src/ui/dialog/document-properties.cpp'
--- src/ui/dialog/document-properties.cpp	2012-07-15 05:51:35 +0000
+++ src/ui/dialog/document-properties.cpp	2012-09-27 13:25:35 +0000
@@ -22,6 +22,8 @@
 # include <config.h>
 #endif
 
+#include <stdio.h>
+
 #include "document-properties.h"
 #include "display/canvas-grid.h"
 #include "document.h"
@@ -201,7 +203,7 @@
  * widget in columns 2-3; (non-0, 0) means label in columns 1-3; and
  * (non-0, non-0) means two widgets in columns 2 and 3.
  */
-inline void attach_all(Gtk::Table &table, Gtk::Widget *const arr[], unsigned const n, int start = 0)
+inline void attach_all(Gtk::Table &table, Gtk::Widget *const arr[], unsigned const n, int start = 0,int docum_prop_flag=0)
 {
     for (unsigned i = 0, r = start; i < n; i += 2)
     {
@@ -214,14 +216,26 @@
         }
         else
         {
-            if (arr[i+1]) {
+            if (arr[i+1]) 
+            {
                 Gtk::AttachOptions yoptions = (Gtk::AttachOptions)0;
-                if (dynamic_cast<Inkscape::UI::Widget::PageSizer*>(arr[i+1])) {
+                if (dynamic_cast<Inkscape::UI::Widget::PageSizer*>(arr[i+1])) 
+                {
                     // only the PageSizer in Document Properties|Page should be stretched vertically
                     yoptions = Gtk::FILL|Gtk::EXPAND;
                 }
-                table.attach(*arr[i+1], 1, 3, r, r+1,
-                      Gtk::FILL|Gtk::EXPAND, yoptions, 0,0);
+                
+                if(docum_prop_flag)
+                {
+                    if( i==(n-4) || i==(n-6) )                               
+                        table.attach(*arr[i+1], 2, 3, r, r+1,
+                          Gtk::FILL|Gtk::EXPAND, yoptions, 0,0);
+                    else  table.attach(*arr[i+1], 1, 3, r, r+1,
+                          Gtk::FILL|Gtk::EXPAND, yoptions, 0,0);
+                }
+                else  table.attach(*arr[i+1], 1, 3, r, r+1,
+                          Gtk::FILL|Gtk::EXPAND, yoptions, 0,0);
+                
             }
             else if (arr[i])
             {
@@ -270,7 +284,16 @@
         _rcp_bord._label,  &_rcp_bord,
     };
 
-    attach_all(_page_page.table(), widget_array, G_N_ELEMENTS(widget_array));
+    //_rcb_canb="Show Border" Registered Check Box (RCB)
+    //_rcb_shad="Show Page Shadow" RCB
+    //_rcb_bord="Border on top of drawing" RCB
+
+    std::list<Gtk::Widget*> slave;
+    slave.push_back(&_rcb_bord);
+    slave.push_back(&_rcb_shad);
+    _rcb_canb.setSlaveWidgets(slave);    
+
+    attach_all(_page_page.table(), widget_array, G_N_ELEMENTS(widget_array),0,1);
 }
 
 void DocumentProperties::build_guides()
@@ -1192,10 +1215,19 @@
     //-----------------------------------------------------------page page
     _rcp_bg.setRgba32 (nv->pagecolor);
     _rcb_canb.setActive (nv->showborder);
+    if(nv->showborder)
+    {
     _rcb_bord.setActive (nv->borderlayer == SP_BORDER_LAYER_TOP);
     _rcp_bord.setRgba32 (nv->bordercolor);
-    _rcb_shad.setActive (nv->showpageshadow);
-
+    //_rcb_shad.setActive (nv->showpageshadow);
+    _rcb_shad.set_sensitive (nv->showpageshadow);
+    }
+    //else
+    //{
+    //_rcb_canb.setGray(&_rcb_bord,true);
+    //_rcp_bord.setRgba32 (nv->bordercolor);
+    //_rcb_canb.setGray(&_rcb_shad,true);
+    //}
     if (nv->doc_units)
         _rum_deflt.setUnit (nv->doc_units);
 
@@ -1336,8 +1368,8 @@
  */
 static void on_repr_attr_changed(Inkscape::XML::Node *, gchar const *, gchar const *, gchar const *, bool, gpointer data)
 {
-    if (DocumentProperties *dialog = static_cast<DocumentProperties *>(data))
-        dialog->update();
+   if (DocumentProperties *dialog = static_cast<DocumentProperties *>(data))
+   dialog->update();
 }
 
 

=== modified file 'src/ui/widget/registered-widget.cpp'
--- src/ui/widget/registered-widget.cpp	2012-04-28 15:49:30 +0000
+++ src/ui/widget/registered-widget.cpp	2012-09-23 19:54:28 +0000
@@ -78,6 +78,12 @@
 }
 
 void
+RegisteredCheckButton::setGray (RegisteredCheckButton* A,bool b) //gtk_widget_set_sensitive            (GtkWidget *widget, gboolean sensitive);
+{
+        gtk_widget_set_sensitive((GtkWidget*)A,!b);
+}
+
+void
 RegisteredCheckButton::on_toggled()
 {
     if (setProgrammatically) {

=== modified file 'src/ui/widget/registered-widget.h'
--- src/ui/widget/registered-widget.h	2012-04-09 16:52:04 +0000
+++ src/ui/widget/registered-widget.h	2012-09-27 13:25:51 +0000
@@ -139,7 +139,9 @@
     RegisteredCheckButton (const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, Registry& wr, bool right=true, Inkscape::XML::Node* repr_in=NULL, SPDocument *doc_in=NULL);
 
     void setActive (bool);
-
+    //-----------------------------
+    void setGray (RegisteredCheckButton*,bool);
+    //-----------------------------
     std::list<Gtk::Widget*> _slavewidgets;
 
     // a slave button is only sensitive when the master button is active