From 1762c7a8429fe7946ef321a874e7b8a5dbdc17af Mon Sep 17 00:00:00 2001
From: csoler <retroshare.project@gmail.com>
Date: Sat, 3 Nov 2012 14:30:04 +0000
Subject: [PATCH] finally fixed layout. Bloody Qt

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5769 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-gui/src/gui/ShareDialog.cpp |  10 +-
 retroshare-gui/src/gui/ShareDialog.ui  | 148 ++++++++++++++-----------
 2 files changed, 89 insertions(+), 69 deletions(-)

diff --git a/retroshare-gui/src/gui/ShareDialog.cpp b/retroshare-gui/src/gui/ShareDialog.cpp
index c3b13a580..397415df4 100644
--- a/retroshare-gui/src/gui/ShareDialog.cpp
+++ b/retroshare-gui/src/gui/ShareDialog.cpp
@@ -48,12 +48,12 @@ ShareDialog::ShareDialog(std::string filename, QWidget *parent, Qt::WFlags flags
 
     ui.okButton->setEnabled(false);
 
-	 QVBoxLayout *hbox = new QVBoxLayout(ui.shareflags_GB) ;
+	 QHBoxLayout *hbox = new QHBoxLayout(ui.shareflags_GB) ;
 
 	 groupselectionbox = new GroupSelectionBox(ui.shareflags_GB);
-//	 groupflagsbox = new GroupFlagsWidget(ui.shareflags_GB) ;
+	 groupflagsbox = new GroupFlagsWidget(ui.shareflags_GB) ;
 
-//	 hbox->addWidget(groupflagsbox) ;
+	 hbox->addWidget(groupflagsbox) ;
 	 hbox->addWidget(groupselectionbox) ;
 
 	 ui.shareflags_GB->setLayout(hbox) ;
@@ -75,7 +75,7 @@ ShareDialog::ShareDialog(std::string filename, QWidget *parent, Qt::WFlags flags
                 ui.browseButton->setDisabled(true);
                 ui.virtualpath_lineEdit->setText(QString::fromUtf8(it->virtualname.c_str()));
 
- //               groupflagsbox->setFlags(it->shareflags) ;
+					 groupflagsbox->setFlags(it->shareflags) ;
                 groupselectionbox->setSelectedGroups(it->parent_groups) ;
 
                 break;
@@ -103,7 +103,7 @@ void ShareDialog::addDirectory()
     SharedDirInfo sdi ;
     sdi.filename = ui.localpath_lineEdit->text().toUtf8().constData();
     sdi.virtualname = ui.virtualpath_lineEdit->text().toUtf8().constData();
-//    sdi.shareflags = groupflagsbox->flags() ;
+    sdi.shareflags = groupflagsbox->flags() ;
 	 sdi.parent_groups = groupselectionbox->selectedGroups() ;
 
     if (ui.localpath_lineEdit->isEnabled()) 
diff --git a/retroshare-gui/src/gui/ShareDialog.ui b/retroshare-gui/src/gui/ShareDialog.ui
index 73d32109f..8b84eedc0 100644
--- a/retroshare-gui/src/gui/ShareDialog.ui
+++ b/retroshare-gui/src/gui/ShareDialog.ui
@@ -35,6 +35,9 @@
      <property name="lineWidth">
       <number>1</number>
      </property>
+     <zorder>groupBox</zorder>
+     <zorder>frame_2</zorder>
+     <zorder>groupBox</zorder>
     </widget>
    </item>
    <item row="1" column="0">
@@ -45,17 +48,14 @@
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <property name="topMargin">
-       <number>6</number>
-      </property>
-      <item row="0" column="0" colspan="6">
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
        <widget class="QGroupBox" name="groupBox">
         <property name="title">
          <string>Share Folder</string>
         </property>
-        <layout class="QGridLayout" name="gridLayout_6">
-         <item row="0" column="0">
+        <layout class="QVBoxLayout" name="verticalLayout_2">
+         <item>
           <layout class="QGridLayout" name="gridLayout_4">
            <item row="0" column="0">
             <widget class="QLabel" name="label">
@@ -108,67 +108,87 @@
            </item>
           </layout>
          </item>
-         <item row="1" column="0">
-          <widget class="QGroupBox" name="shareflags_GB">
-           <property name="title">
-            <string>Share Flags</string>
-           </property>
-           <layout class="QVBoxLayout" name="verticalLayout"/>
-          </widget>
-         </item>
         </layout>
        </widget>
       </item>
-      <item row="1" column="1">
-       <widget class="QPushButton" name="okButton">
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>200</width>
-          <height>200</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>OK</string>
-        </property>
-        <property name="iconSize">
-         <size>
-          <width>16</width>
-          <height>16</height>
-         </size>
-        </property>
-        <property name="checkable">
-         <bool>false</bool>
-        </property>
-        <property name="default">
-         <bool>true</bool>
-        </property>
-       </widget>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QGroupBox" name="shareflags_GB">
+          <property name="title">
+           <string>Share Flags</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
       </item>
-      <item row="1" column="3">
-       <spacer>
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>191</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="1" column="2">
-       <widget class="QPushButton" name="closeButton">
-        <property name="text">
-         <string>Cancel</string>
-        </property>
-       </widget>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QPushButton" name="okButton">
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>200</width>
+            <height>200</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>OK</string>
+          </property>
+          <property name="iconSize">
+           <size>
+            <width>16</width>
+            <height>16</height>
+           </size>
+          </property>
+          <property name="checkable">
+           <bool>false</bool>
+          </property>
+          <property name="default">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="closeButton">
+          <property name="text">
+           <string>Cancel</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>191</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
       </item>
      </layout>
     </widget>