mirrors/fort
1
0
Fork 0
mirror of https://github.com/tnodir/fort synced 2024-11-15 05:36:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Migrate to Qt 5.12

Browse Source
This commit is contained in:
Nodir Temirkhodjaev 2018-04-07 13:09:35 +05:00
parent 49075fd6ad
commit 3e54261f58
44 changed files with 111 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
deploy/qt/imports/QtQuick/Controls.2/Button.qml
View File

@ -34,10 +34,10 @@
** **
****************************************************************************/ ****************************************************************************/
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
import QtQuick.Controls.impl 2.4 import QtQuick.Controls.impl 2.5
import QtQuick.Templates 2.4 as T import QtQuick.Templates 2.5 as T
T.Button { T.Button {
id: control id: control
@ -46,11 +46,9 @@ T.Button {
contentItem.implicitWidth + leftPadding + rightPadding) contentItem.implicitWidth + leftPadding + rightPadding)
implicitHeight: Math.max(background ? background.implicitHeight : 0, implicitHeight: Math.max(background ? background.implicitHeight : 0,
contentItem.implicitHeight + topPadding + bottomPadding) contentItem.implicitHeight + topPadding + bottomPadding)
baselineOffset: contentItem.y + contentItem.baselineOffset
padding: 6 padding: 6
leftPadding: padding + 2 horizontalPadding: padding + 2
rightPadding: padding + 2
spacing: 6 spacing: 6
icon.width: 24 icon.width: 24

9
deploy/qt/imports/QtQuick/Controls.2/CheckDelegate.qml
View File

@ -34,10 +34,10 @@
** **
****************************************************************************/ ****************************************************************************/
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Templates 2.4 as T import QtQuick.Templates 2.5 as T
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
import QtQuick.Controls.impl 2.4 import QtQuick.Controls.impl 2.5
T.CheckDelegate { T.CheckDelegate {
id: control id: control
@ -47,7 +47,6 @@ T.CheckDelegate {
implicitHeight: Math.max(background ? background.implicitHeight : 0, implicitHeight: Math.max(background ? background.implicitHeight : 0,
Math.max(contentItem.implicitHeight, Math.max(contentItem.implicitHeight,
indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
baselineOffset: contentItem.y + contentItem.baselineOffset
padding: 12 padding: 12
spacing: 12 spacing: 12

9
deploy/qt/imports/QtQuick/Controls.2/ItemDelegate.qml
View File

@ -34,10 +34,10 @@
** **
****************************************************************************/ ****************************************************************************/
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
import QtQuick.Controls.impl 2.4 import QtQuick.Controls.impl 2.5
import QtQuick.Templates 2.4 as T import QtQuick.Templates 2.5 as T
T.ItemDelegate { T.ItemDelegate {
id: control id: control
@ -47,7 +47,6 @@ T.ItemDelegate {
implicitHeight: Math.max(background ? background.implicitHeight : 0, implicitHeight: Math.max(background ? background.implicitHeight : 0,
Math.max(contentItem.implicitHeight, Math.max(contentItem.implicitHeight,
indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
baselineOffset: contentItem.y + contentItem.baselineOffset
padding: 12 padding: 12
spacing: 8 spacing: 8

9
deploy/qt/imports/QtQuick/Controls.2/MenuBarItem.qml
View File

@ -34,10 +34,10 @@
** **
****************************************************************************/ ****************************************************************************/
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Templates 2.4 as T import QtQuick.Templates 2.5 as T
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
import QtQuick.Controls.impl 2.4 import QtQuick.Controls.impl 2.5
T.MenuBarItem { T.MenuBarItem {
id: control id: control
@ -47,7 +47,6 @@ T.MenuBarItem {
implicitHeight: Math.max(background ? background.implicitHeight : 0, implicitHeight: Math.max(background ? background.implicitHeight : 0,
Math.max(contentItem.implicitHeight, Math.max(contentItem.implicitHeight,
indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
baselineOffset: contentItem.y + contentItem.baselineOffset
spacing: 6 spacing: 6
padding: 6 padding: 6

9
deploy/qt/imports/QtQuick/Controls.2/MenuItem.qml
View File

@ -34,10 +34,10 @@
** **
****************************************************************************/ ****************************************************************************/
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
import QtQuick.Controls.impl 2.4 import QtQuick.Controls.impl 2.5
import QtQuick.Templates 2.4 as T import QtQuick.Templates 2.5 as T
T.MenuItem { T.MenuItem {
id: control id: control
@ -47,7 +47,6 @@ T.MenuItem {
implicitHeight: Math.max(background ? background.implicitHeight : 0, implicitHeight: Math.max(background ? background.implicitHeight : 0,
Math.max(contentItem.implicitHeight, Math.max(contentItem.implicitHeight,
indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
baselineOffset: contentItem.y + contentItem.baselineOffset
padding: 6 padding: 6
spacing: 6 spacing: 6

9
deploy/qt/imports/QtQuick/Controls.2/RadioDelegate.qml
View File

@ -34,10 +34,10 @@
** **
****************************************************************************/ ****************************************************************************/
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
import QtQuick.Controls.impl 2.4 import QtQuick.Controls.impl 2.5
import QtQuick.Templates 2.4 as T import QtQuick.Templates 2.5 as T
T.RadioDelegate { T.RadioDelegate {
id: control id: control
@ -47,7 +47,6 @@ T.RadioDelegate {
implicitHeight: Math.max(background ? background.implicitHeight : 0, implicitHeight: Math.max(background ? background.implicitHeight : 0,
Math.max(contentItem.implicitHeight, Math.max(contentItem.implicitHeight,
indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
baselineOffset: contentItem.y + contentItem.baselineOffset
padding: 12 padding: 12
spacing: 12 spacing: 12

9
deploy/qt/imports/QtQuick/Controls.2/RoundButton.qml
View File

@ -34,10 +34,10 @@
** **
****************************************************************************/ ****************************************************************************/
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
import QtQuick.Controls.impl 2.4 import QtQuick.Controls.impl 2.5
import QtQuick.Templates 2.4 as T import QtQuick.Templates 2.5 as T
T.RoundButton { T.RoundButton {
id: control id: control
@ -46,7 +46,6 @@ T.RoundButton {
contentItem.implicitWidth + leftPadding + rightPadding) contentItem.implicitWidth + leftPadding + rightPadding)
implicitHeight: Math.max(background ? background.implicitHeight : 0, implicitHeight: Math.max(background ? background.implicitHeight : 0,
contentItem.implicitHeight + topPadding + bottomPadding) contentItem.implicitHeight + topPadding + bottomPadding)
baselineOffset: contentItem.y + contentItem.baselineOffset
padding: 6 padding: 6
spacing: 6 spacing: 6

9
deploy/qt/imports/QtQuick/Controls.2/SwipeDelegate.qml
View File

@ -34,10 +34,10 @@
** **
****************************************************************************/ ****************************************************************************/
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
import QtQuick.Controls.impl 2.4 import QtQuick.Controls.impl 2.5
import QtQuick.Templates 2.4 as T import QtQuick.Templates 2.5 as T
T.SwipeDelegate { T.SwipeDelegate {
id: control id: control
@ -47,7 +47,6 @@ T.SwipeDelegate {
implicitHeight: Math.max(background ? background.implicitHeight : 0, implicitHeight: Math.max(background ? background.implicitHeight : 0,
Math.max(contentItem.implicitHeight, Math.max(contentItem.implicitHeight,
indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
baselineOffset: contentItem.y + contentItem.baselineOffset
padding: 12 padding: 12
spacing: 12 spacing: 12

9
deploy/qt/imports/QtQuick/Controls.2/SwitchDelegate.qml
View File

@ -34,10 +34,10 @@
** **
****************************************************************************/ ****************************************************************************/
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Templates 2.4 as T import QtQuick.Templates 2.5 as T
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
import QtQuick.Controls.impl 2.4 import QtQuick.Controls.impl 2.5
T.SwitchDelegate { T.SwitchDelegate {
id: control id: control
@ -47,7 +47,6 @@ T.SwitchDelegate {
implicitHeight: Math.max(background ? background.implicitHeight : 0, implicitHeight: Math.max(background ? background.implicitHeight : 0,
Math.max(contentItem.implicitHeight, Math.max(contentItem.implicitHeight,
indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
baselineOffset: contentItem.y + contentItem.baselineOffset
padding: 12 padding: 12
spacing: 12 spacing: 12

9
deploy/qt/imports/QtQuick/Controls.2/TabButton.qml
View File

@ -34,10 +34,10 @@
** **
****************************************************************************/ ****************************************************************************/
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
import QtQuick.Controls.impl 2.4 import QtQuick.Controls.impl 2.5
import QtQuick.Templates 2.4 as T import QtQuick.Templates 2.5 as T
T.TabButton { T.TabButton {
id: control id: control
@ -46,7 +46,6 @@ T.TabButton {
contentItem.implicitWidth + leftPadding + rightPadding) contentItem.implicitWidth + leftPadding + rightPadding)
implicitHeight: Math.max(background ? background.implicitHeight : 0, implicitHeight: Math.max(background ? background.implicitHeight : 0,
contentItem.implicitHeight + topPadding + bottomPadding) contentItem.implicitHeight + topPadding + bottomPadding)
baselineOffset: contentItem.y + contentItem.baselineOffset
padding: 6 padding: 6
spacing: 6 spacing: 6

9
deploy/qt/imports/QtQuick/Controls.2/ToolButton.qml
View File

@ -34,10 +34,10 @@
** **
****************************************************************************/ ****************************************************************************/
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
import QtQuick.Controls.impl 2.4 import QtQuick.Controls.impl 2.5
import QtQuick.Templates 2.4 as T import QtQuick.Templates 2.5 as T
T.ToolButton { T.ToolButton {
id: control id: control
@ -46,7 +46,6 @@ T.ToolButton {
contentItem.implicitWidth + leftPadding + rightPadding) contentItem.implicitWidth + leftPadding + rightPadding)
implicitHeight: Math.max(background ? background.implicitHeight : 0, implicitHeight: Math.max(background ? background.implicitHeight : 0,
contentItem.implicitHeight + topPadding + bottomPadding) contentItem.implicitHeight + topPadding + bottomPadding)
baselineOffset: contentItem.y + contentItem.baselineOffset
padding: 6 padding: 6
spacing: 6 spacing: 6

4
src/ui/qml/controls/ButtonMenu.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
Button { Button {
id: bt id: bt

4
src/ui/qml/controls/ButtonPopup.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
Button { Button {
id: bt id: bt

4
src/ui/qml/controls/HSeparator.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
Rectangle { Rectangle {

4
src/ui/qml/controls/LinkButton.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
Label { Label {
id: bt id: bt

4
src/ui/qml/controls/ListViewControl.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
ListView { ListView {
id: listView id: listView

4
src/ui/qml/controls/RoundButtonTip.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
RoundButton { RoundButton {
id: bt id: bt

4
src/ui/qml/controls/ScrollBarControl.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
ScrollBar { ScrollBar {

4
src/ui/qml/controls/SpinCombo.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
RowLayout { RowLayout {

4
src/ui/qml/controls/SpinComboRow.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import com.fortfirewall 1.0 import com.fortfirewall 1.0

4
src/ui/qml/controls/SwipeViewControl.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
SwipeView { SwipeView {

4
src/ui/qml/controls/TextAreaFrame.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
Frame { Frame {
id: frame id: frame

4
src/ui/qml/controls/TextContextMenu.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
Menu { Menu {
id: contextMenu id: contextMenu

4
src/ui/qml/controls/TextFieldFrame.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
TextField { TextField {
id: textField id: textField

4
src/ui/qml/controls/VSeparator.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
HSeparator { HSeparator {

4
src/ui/qml/main.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
import "controls" import "controls"
import "pages" import "pages"
import com.fortfirewall 1.0 import com.fortfirewall 1.0

4
src/ui/qml/pages/AddressesPage.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import "../controls" import "../controls"
import "addresses" import "addresses"

4
src/ui/qml/pages/ApplicationsPage.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import "../controls" import "../controls"
import "apps" import "apps"

4
src/ui/qml/pages/BasePage.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
Pane { Pane {
id: page id: page

4
src/ui/qml/pages/BlockedPage.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import "../controls" import "../controls"
import "log" import "log"

4
src/ui/qml/pages/MainPage.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import "../controls" import "../controls"
import com.fortfirewall 1.0 import com.fortfirewall 1.0

4
src/ui/qml/pages/OptionsPage.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import "../controls" import "../controls"
import com.fortfirewall 1.0 import com.fortfirewall 1.0

4
src/ui/qml/pages/SchedulePage.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import "../controls" import "../controls"
import "schedule" import "schedule"

4
src/ui/qml/pages/StatisticsPage.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import "../controls" import "../controls"
import "log" import "log"

4
src/ui/qml/pages/addresses/AddressGroupRow.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import com.fortfirewall 1.0 import com.fortfirewall 1.0

4
src/ui/qml/pages/addresses/AddressesColumn.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import "../../controls" import "../../controls"
import com.fortfirewall 1.0 import com.fortfirewall 1.0

4
src/ui/qml/pages/apps/AppsColumn.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import "../../controls" import "../../controls"
import com.fortfirewall 1.0 import com.fortfirewall 1.0

4
src/ui/qml/pages/apps/AppsTextColumn.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import "../../controls" import "../../controls"
import com.fortfirewall 1.0 import com.fortfirewall 1.0

4
src/ui/qml/pages/apps/SpeedLimitButton.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import "../../controls" import "../../controls"
import com.fortfirewall 1.0 import com.fortfirewall 1.0

4
src/ui/qml/pages/log/AppListView.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
import "../../controls" import "../../controls"
import com.fortfirewall 1.0 import com.fortfirewall 1.0

4
src/ui/qml/pages/log/IpListView.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
import "../../controls" import "../../controls"
import com.fortfirewall 1.0 import com.fortfirewall 1.0

4
src/ui/qml/pages/log/TrafOptionsButton.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import "../../controls" import "../../controls"
import com.fortfirewall 1.0 import com.fortfirewall 1.0

4
src/ui/qml/pages/log/TrafRow.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import com.fortfirewall 1.0 import com.fortfirewall 1.0

4
src/ui/qml/pages/schedule/TaskRow.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.11 import QtQuick 2.12
import QtQuick.Controls 2.4 import QtQuick.Controls 2.5
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import "../../controls" import "../../controls"
import com.fortfirewall 1.0 import com.fortfirewall 1.0