rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#6338 Auto Config hint widget with link to open Settings dialog

This commit is contained in:
Nick Bolton 2018-08-08 16:47:45 +01:00
parent aad0ac25d1
commit 934824433d
5 changed files with 101 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/res/Synergy.qrc
View File

@ -54,5 +54,6 @@
<file>image/spinning-wheel.gif</file>
<file>icons/16x16/padlock.png</file>
<file>icons/16x16/synergy-transfering.png</file>
<file>icons/16x16/auto-config.png</file>
</qresource>
</RCC>

BIN
src/gui/res/icons/16x16/auto-config.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 610 B

8
src/gui/src/MainWindow.cpp
View File

@ -1251,6 +1251,7 @@ void MainWindow::updateAutoConfigWidgets()
m_pLabelServerName->hide();
m_pLineEditHostname->hide();
m_pWidgetAutoConfig->hide();
}
else {
m_pLabelServerName->show();
@ -1258,6 +1259,8 @@ void MainWindow::updateAutoConfigWidgets()
m_pLabelAutoDetected->hide();
m_pComboServerList->hide();
m_pWidgetAutoConfig->show();
}
}
@ -1403,3 +1406,8 @@ void MainWindow::secureSocket(bool secureSocket)
m_pLabelPadlock->hide();
}
}
void MainWindow::on_m_pLabelAutoConfig_linkActivated(const QString &)
{
m_pActionSettings->trigger();
}

2
src/gui/src/MainWindow.h
View File

@ -237,6 +237,8 @@ private slots:
void on_m_pButtonApply_clicked();
void on_windowShown();
void on_m_pLabelAutoConfig_linkActivated(const QString &link);
signals:
void windowShown();
};

93
src/gui/src/MainWindowBase.ui
View File

@ -129,6 +129,81 @@
</layout>
</widget>
</item>
<item>
<widget class="QWidget" name="m_pWidgetAutoConfig" native="true">
<property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
</size>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_6">
<property name="leftMargin">
<number>2</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>8</number>
</property>
<item>
<widget class="QLabel" name="m_pIconAutoConfig">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>16</width>
<height>20</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>244</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../res/Synergy.qrc">:/res/icons/16x16/auto-config.png</pixmap>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="m_pLabelAutoConfig">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Manual Config mode active, consider using Auto Config instead (&lt;a href=&quot;#&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#007af4;&quot;&gt;Settings&lt;/span&gt;&lt;/a&gt;)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
</property>
</widget>
</item>
<item>
<spacer name="m_pSpacerAutoConfig">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="m_pGroupServer">
<property name="sizePolicy">
@ -314,12 +389,24 @@
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="m_pLineEditHostname">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>Hostname or IP address of the server computer.</string>
</property>
</widget>
</item>
<item row="3" column="1">
<item row="4" column="1">
<widget class="QComboBox" name="m_pComboServerList">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
@ -329,13 +416,13 @@
</property>
<property name="minimumSize">
<size>
<width>120</width>
<width>200</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="3" column="0">
<item row="4" column="0">
<widget class="QLabel" name="m_pLabelAutoDetected">
<property name="text">
<string>Server:</string>