diff options
author | Camila <hello@camila.codes> | 2021-12-04 00:24:18 +0300 |
---|---|---|
committer | Matthieu Gallien (Rebase PR Action) <matthieu_gallien@yahoo.fr> | 2022-01-13 13:39:11 +0300 |
commit | 82aed71d09adcae1bd965667863bcbca27bf96d3 (patch) | |
tree | 234efc8645f71a5256ac25d2a2600d02a2748629 /src | |
parent | c08a2917421eba87dd58e6bef403e0a84d55d5d6 (diff) |
Just trying to make the sahre dialog look nicer.
Signed-off-by: Camila <hello@camila.codes>
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/sharedialog.cpp | 4 | ||||
-rw-r--r-- | src/gui/sharedialog.ui | 169 | ||||
-rw-r--r-- | src/gui/sharelinkwidget.ui | 17 | ||||
-rw-r--r-- | src/gui/shareusergroupwidget.ui | 2 | ||||
-rw-r--r-- | src/gui/shareuserline.ui | 11 |
5 files changed, 117 insertions, 86 deletions
diff --git a/src/gui/sharedialog.cpp b/src/gui/sharedialog.cpp index fb312734b..1330729cd 100644 --- a/src/gui/sharedialog.cpp +++ b/src/gui/sharedialog.cpp @@ -236,12 +236,12 @@ void ShareDialog::slotSharesFetched(const QList<QSharedPointer<Share>> &shares) void ShareDialog::slotAdjustScrollWidgetSize() { auto count = this->findChildren<ShareLinkWidget *>().count(); - count = count > 3 ? 3 : count; + count = count >= 6 ? 6 : count; auto height = _linkWidgetList.size() > 0 ? _linkWidgetList.at(_linkWidgetList.size() - 1)->sizeHint().height() : 0; _ui->scrollAreaLinks->setFixedWidth(_ui->verticalLayout->sizeHint().width()); _ui->scrollAreaLinks->setFixedHeight(height * count); _ui->scrollAreaLinks->setVisible(height > 0); - _ui->scrollAreaLinks->setFrameShape(count > 3 ? QFrame::StyledPanel : QFrame::NoFrame); + _ui->scrollAreaLinks->setFrameShape(count > 6 ? QFrame::StyledPanel : QFrame::NoFrame); } ShareDialog::~ShareDialog() diff --git a/src/gui/sharedialog.ui b/src/gui/sharedialog.ui index 6410c5203..abaddada2 100644 --- a/src/gui/sharedialog.ui +++ b/src/gui/sharedialog.ui @@ -6,16 +6,22 @@ <rect> <x>0</x> <y>0</y> - <width>400</width> + <width>387</width> <height>222</height> </rect> </property> <layout class="QVBoxLayout" name="shareDialogVerticalLayout"> + <property name="spacing"> + <number>9</number> + </property> <property name="sizeConstraint"> <enum>QLayout::SetFixedSize</enum> </property> <item> <layout class="QVBoxLayout" name="verticalLayout"> + <property name="spacing"> + <number>6</number> + </property> <property name="sizeConstraint"> <enum>QLayout::SetFixedSize</enum> </property> @@ -117,84 +123,91 @@ </layout> </item> <item> - <widget class="QScrollArea" name="scrollAreaLinks"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="styleSheet"> - <string notr="true"/> - </property> - <property name="frameShape"> - <enum>QFrame::NoFrame</enum> - </property> - <property name="frameShadow"> - <enum>QFrame::Plain</enum> - </property> - <property name="horizontalScrollBarPolicy"> - <enum>Qt::ScrollBarAlwaysOff</enum> - </property> - <property name="sizeAdjustPolicy"> - <enum>QAbstractScrollArea::AdjustIgnored</enum> - </property> - <property name="widgetResizable"> - <bool>true</bool> - </property> - <widget class="QWidget" name="scrollAreaWidgetContentsLinks"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>68</width> - <height>68</height> - </rect> - </property> - </widget> - </widget> - </item> - <item> - <widget class="QScrollArea" name="scrollAreaUsers"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="styleSheet"> - <string notr="true"/> - </property> - <property name="frameShape"> - <enum>QFrame::NoFrame</enum> - </property> - <property name="frameShadow"> - <enum>QFrame::Plain</enum> - </property> - <property name="lineWidth"> - <number>1</number> - </property> - <property name="horizontalScrollBarPolicy"> - <enum>Qt::ScrollBarAlwaysOff</enum> - </property> - <property name="sizeAdjustPolicy"> - <enum>QAbstractScrollArea::AdjustIgnored</enum> - </property> - <property name="widgetResizable"> - <bool>true</bool> + <layout class="QVBoxLayout" name="scrollBarsVerticalLayout"> + <property name="spacing"> + <number>12</number> </property> - <widget class="QWidget" name="scrollAreaWidgetContentsUsers"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>68</width> - <height>68</height> - </rect> - </property> - <layout class="QVBoxLayout" name="scrollAreaVerticalLayout"/> - </widget> - </widget> + <item> + <widget class="QScrollArea" name="scrollAreaLinks"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="styleSheet"> + <string notr="true"/> + </property> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Plain</enum> + </property> + <property name="horizontalScrollBarPolicy"> + <enum>Qt::ScrollBarAlwaysOff</enum> + </property> + <property name="sizeAdjustPolicy"> + <enum>QAbstractScrollArea::AdjustIgnored</enum> + </property> + <property name="widgetResizable"> + <bool>true</bool> + </property> + <widget class="QWidget" name="scrollAreaWidgetContentsLinks"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>365</width> + <height>68</height> + </rect> + </property> + </widget> + </widget> + </item> + <item> + <widget class="QScrollArea" name="scrollAreaUsers"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="styleSheet"> + <string notr="true"/> + </property> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Plain</enum> + </property> + <property name="lineWidth"> + <number>1</number> + </property> + <property name="horizontalScrollBarPolicy"> + <enum>Qt::ScrollBarAlwaysOff</enum> + </property> + <property name="sizeAdjustPolicy"> + <enum>QAbstractScrollArea::AdjustIgnored</enum> + </property> + <property name="widgetResizable"> + <bool>true</bool> + </property> + <widget class="QWidget" name="scrollAreaWidgetContentsUsers"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>365</width> + <height>68</height> + </rect> + </property> + <layout class="QVBoxLayout" name="scrollAreaVerticalLayout"/> + </widget> + </widget> + </item> + </layout> </item> </layout> </item> diff --git a/src/gui/sharelinkwidget.ui b/src/gui/sharelinkwidget.ui index f6765b2e2..4cc42b122 100644 --- a/src/gui/sharelinkwidget.ui +++ b/src/gui/sharelinkwidget.ui @@ -6,7 +6,7 @@ <rect> <x>0</x> <y>0</y> - <width>365</width> + <width>400</width> <height>238</height> </rect> </property> @@ -17,8 +17,23 @@ </sizepolicy> </property> <layout class="QVBoxLayout" name="verticalLayout"> + <property name="spacing"> + <number>0</number> + </property> + <property name="leftMargin"> + <number>6</number> + </property> + <property name="rightMargin"> + <number>6</number> + </property> <item> <layout class="QHBoxLayout" name="horizontalLayout"> + <property name="spacing"> + <number>6</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> <item> <widget class="QLabel" name="shareLinkIconLabel"> <property name="text"> diff --git a/src/gui/shareusergroupwidget.ui b/src/gui/shareusergroupwidget.ui index e5f5c9a6f..4aa9b1693 100644 --- a/src/gui/shareusergroupwidget.ui +++ b/src/gui/shareusergroupwidget.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>350</width> - <height>70</height> + <height>106</height> </rect> </property> <property name="sizePolicy"> diff --git a/src/gui/shareuserline.ui b/src/gui/shareuserline.ui index 5067a3120..9576b41a7 100644 --- a/src/gui/shareuserline.ui +++ b/src/gui/shareuserline.ui @@ -6,7 +6,7 @@ <rect> <x>0</x> <y>0</y> - <width>899</width> + <width>400</width> <height>310</height> </rect> </property> @@ -28,8 +28,11 @@ <layout class="QVBoxLayout" name="verticalLayout"> <item> <layout class="QHBoxLayout" name="horizontalLayout_2"> + <property name="spacing"> + <number>6</number> + </property> <property name="rightMargin"> - <number>0</number> + <number>22</number> </property> <item> <widget class="QLabel" name="avatar"> @@ -75,11 +78,11 @@ <enum>Qt::Horizontal</enum> </property> <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> + <enum>QSizePolicy::Minimum</enum> </property> <property name="sizeHint" stdset="0"> <size> - <width>40</width> + <width>20</width> <height>20</height> </size> </property> |