Commit 7bb04513 authored by Ming Rui Zhang's avatar Ming Rui Zhang Committed by Yang Wang

misc: add scroll view to all major widgets

Change-Id: I8588dc9bbf9b0e377d5128b3688221251fa2d003
parent 9bd0b423
......@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>731</width>
<height>1387</height>
<width>528</width>
<height>1350</height>
</rect>
</property>
<property name="windowTitle">
......@@ -179,7 +179,7 @@
<string/>
</property>
<property name="icon">
<iconset>
<iconset resource="../ressources.qrc">
<normaloff>:/images/icons/round-folder-24px.svg</normaloff>:/images/icons/round-folder-24px.svg</iconset>
</property>
</widget>
......@@ -663,7 +663,7 @@
<string/>
</property>
<property name="icon">
<iconset>
<iconset resource="../ressources.qrc">
<normaloff>:/images/icons/round-folder-24px.svg</normaloff>:/images/icons/round-folder-24px.svg</iconset>
</property>
</widget>
......@@ -692,7 +692,7 @@
<string/>
</property>
<property name="icon">
<iconset>
<iconset resource="../ressources.qrc">
<normaloff>:/images/icons/round-folder-24px.svg</normaloff>:/images/icons/round-folder-24px.svg</iconset>
</property>
</widget>
......@@ -721,7 +721,7 @@
<string/>
</property>
<property name="icon">
<iconset>
<iconset resource="../ressources.qrc">
<normaloff>:/images/icons/round-folder-24px.svg</normaloff>:/images/icons/round-folder-24px.svg</iconset>
</property>
</widget>
......@@ -1154,7 +1154,7 @@
<string/>
</property>
<property name="icon">
<iconset>
<iconset resource="../ressources.qrc">
<normaloff>:/images/icons/round-arrow_drop_down-24px.svg</normaloff>:/images/icons/round-arrow_drop_down-24px.svg</iconset>
</property>
<property name="iconSize">
......@@ -1188,7 +1188,7 @@
<string/>
</property>
<property name="icon">
<iconset>
<iconset resource="../ressources.qrc">
<normaloff>:/images/icons/round-arrow_drop_up-24px.svg</normaloff>:/images/icons/round-arrow_drop_up-24px.svg</iconset>
</property>
<property name="iconSize">
......@@ -1307,7 +1307,7 @@
<string/>
</property>
<property name="icon">
<iconset>
<iconset resource="../ressources.qrc">
<normaloff>:/images/icons/round-arrow_drop_down-24px.svg</normaloff>:/images/icons/round-arrow_drop_down-24px.svg</iconset>
</property>
<property name="iconSize">
......@@ -1341,7 +1341,7 @@
<string/>
</property>
<property name="icon">
<iconset>
<iconset resource="../ressources.qrc">
<normaloff>:/images/icons/round-arrow_drop_up-24px.svg</normaloff>:/images/icons/round-arrow_drop_up-24px.svg</iconset>
</property>
<property name="iconSize">
......@@ -1445,6 +1445,8 @@
<tabstop>videoListWidget</tabstop>
<tabstop>audioListWidget</tabstop>
</tabstops>
<resources/>
<resources>
<include location="../ressources.qrc"/>
</resources>
<connections/>
</ui>
......@@ -6,14 +6,29 @@
<rect>
<x>0</x>
<y>0</y>
<width>571</width>
<height>1913</height>
<width>615</width>
<height>1951</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_9">
<property name="spacing">
<number>5</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<spacer name="verticalSpacer_13">
<property name="orientation">
......@@ -1778,7 +1793,7 @@
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
<number>10</number>
</property>
<item>
<layout class="QVBoxLayout" name="verticalLayout_13">
......
......@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>868</width>
<height>561</height>
<width>925</width>
<height>656</height>
</rect>
</property>
<property name="sizePolicy">
......@@ -456,7 +456,7 @@
<string/>
</property>
<property name="currentIndex">
<number>1</number>
<number>0</number>
</property>
<widget class="QWidget" name="welcomePage">
<property name="sizePolicy">
......
This diff is collapsed.
......@@ -264,7 +264,7 @@ SettingsWidget::SettingsWidget(QWidget* parent)
// shortcuts
registerShortcuts();
ui->containerWidget->setVisible(false);
ui->settingsWidgetScrollArea->setVisible(false);
#ifdef Q_OS_LINUX
ui->updateLabel->setVisible(false);
......@@ -291,7 +291,7 @@ SettingsWidget::slotAccountListChanged()
void
SettingsWidget::navigated(bool to)
{
ui->containerWidget->setVisible(to);
ui->settingsWidgetScrollArea->setVisible(to);
if (to) {
setSelected(SettingsMenu::Account);
updateAccountInfoDisplayed();
......
This diff is collapsed.
......@@ -165,6 +165,30 @@ QScrollBar::handle:vertical {
max-width: 0px;
}
QScrollBar:horizontal {
border: 2px solid grey;
background: grey;
height: 10px;
}
QScrollBar::handle:horizontal {
background: white;
min-width: 20px;
border-radius: 10px;
}
QScrollBar::add-line:horizontal {
height: 0px;
}
QScrollBar::sub-line:horizontal {
height: 0px;
}
QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal {
height: 0px;
}
SmartListView {
background-color: white;
border: none;
......@@ -188,6 +212,15 @@ QWidget#messageViewLayoutWidget, QWidget#welcomePage {
background-color: rgba(255, 255, 255, 255);
}
QWidget#newWizardWidgetScrollAreaContents, QWidget#settingsWidgetScrollAreaContents {
background-color: rgba(255, 255, 255, 255);
border: none;
}
QScrollArea#newWizardWidgetScrollArea, QScrollArea#settingsWidgetScrollArea {
border: none;
}
QPushButton#holdButton, QPushButton#chatButton, QPushButton#noMicButton, QPushButton#noVideoButton, QPushButton#hangupButton,
QPushButton#transferButton, QPushButton#addPersonButton, QPushButton#joinButton,
QPushButton#qualityButton, QPushButton#recButton, QPushButton#transferCallButton,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment