Changeset View
Changeset View
Standalone View
Standalone View
applets/systemtray/package/contents/ui/ExpandedRepresentation.qml
| Show All 13 Lines | |||||
| 14 | * You should have received a copy of the GNU Library General Public | 14 | * You should have received a copy of the GNU Library General Public | ||
| 15 | * License along with this program; if not, write to the | 15 | * License along with this program; if not, write to the | ||
| 16 | * Free Software Foundation, Inc., | 16 | * Free Software Foundation, Inc., | ||
| 17 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | 17 | * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
| 18 | */ | 18 | */ | ||
| 19 | 19 | | |||
| 20 | import QtQuick 2.1 | 20 | import QtQuick 2.1 | ||
| 21 | import QtQuick.Layouts 1.1 | 21 | import QtQuick.Layouts 1.1 | ||
| 22 | import QtQuick.Window 2.13 | ||||
| 22 | import org.kde.plasma.core 2.0 as PlasmaCore | 23 | import org.kde.plasma.core 2.0 as PlasmaCore | ||
| 23 | import org.kde.plasma.components 2.0 as PlasmaComponents | 24 | import org.kde.plasma.components 2.0 as PlasmaComponents | ||
| 24 | import org.kde.plasma.extras 2.0 as PlasmaExtras | 25 | import org.kde.plasma.extras 2.0 as PlasmaExtras | ||
| 25 | 26 | | |||
| 26 | Item { | 27 | Item { | ||
| 27 | id: expandedRepresentation | 28 | id: expandedRepresentation | ||
| 28 | 29 | | |||
| 29 | //set width/height to avoid an useless Dialog resize | 30 | //set width/height to avoid an useless Dialog resize | ||
| 30 | width: Layout.minimumWidth | 31 | width: Layout.minimumWidth | ||
| 31 | height: Layout.minimumHeight | 32 | height: Layout.minimumHeight | ||
| 32 | Layout.minimumWidth: units.gridUnit * 24 | 33 | Layout.minimumWidth: units.gridUnit * 24 | ||
| 33 | Layout.minimumHeight: units.gridUnit * 21 | 34 | Layout.minimumHeight: plasmoid.configuration.sidebar ? Screen.desktopAvailableHeight : units.gridUnit * 21 | ||
| 34 | Layout.preferredWidth: Layout.minimumWidth | 35 | Layout.preferredWidth: Layout.minimumWidth | ||
| 35 | Layout.preferredHeight: Layout.minimumHeight * 1.5 | 36 | Layout.preferredHeight: plasmoid.configuration.sidebar ? Screen.desktopAvailableHeight : Layout.minimumHeight * 1.5 | ||
| 36 | 37 | | |||
| 37 | property alias activeApplet: container.activeApplet | 38 | property alias activeApplet: container.activeApplet | ||
| 38 | property alias hiddenLayout: hiddenItemsView.layout | 39 | property alias hiddenLayout: hiddenItemsView.layout | ||
| 39 | 40 | | |||
| 41 | RowLayout { | ||||
| 42 | anchors.top: parent.top | ||||
| 43 | anchors.right: parent.right | ||||
| 44 | | ||||
| 45 | PlasmaComponents.ToolButton { | ||||
| 46 | id: sidebarButton | ||||
| 47 | width: Math.round(units.gridUnit * 1.25) | ||||
| 48 | height: width | ||||
| 49 | checkable: true | ||||
| 50 | checked: plasmoid.configuration.sidebar | ||||
| 51 | onCheckedChanged: plasmoid.configuration.sidebar = checked | ||||
| 52 | iconSource: "transform-move-vertical" | ||||
| 53 | tooltip: i18n("Sidebar Mode") | ||||
| 54 | } | ||||
| 55 | | ||||
| 40 | PlasmaComponents.ToolButton { | 56 | PlasmaComponents.ToolButton { | ||
| 41 | id: pinButton | 57 | id: pinButton | ||
| 42 | anchors.right: parent.right | | |||
| 43 | width: Math.round(units.gridUnit * 1.25) | 58 | width: Math.round(units.gridUnit * 1.25) | ||
| 44 | height: width | 59 | height: width | ||
| 45 | checkable: true | 60 | checkable: true | ||
| 46 | checked: plasmoid.configuration.pin | 61 | checked: plasmoid.configuration.pin | ||
| 47 | onCheckedChanged: plasmoid.configuration.pin = checked | 62 | onCheckedChanged: plasmoid.configuration.pin = checked | ||
| 48 | iconSource: "window-pin" | 63 | iconSource: "window-pin" | ||
| 49 | z: 2 | | |||
| 50 | tooltip: i18n("Keep Open") | 64 | tooltip: i18n("Keep Open") | ||
| 51 | } | 65 | } | ||
| 66 | } | ||||
| 52 | 67 | | |||
| 53 | PlasmaExtras.Heading { | 68 | PlasmaExtras.Heading { | ||
ngraham: Now that you added a RowLayout, this could go inside it rather than being positioned with… | |||||
It seems to me like this whole file can be rewritten with layouts (as opposed to using anchors). The problem I'm having is that even a minimal touch (putting the heading in the row layout) breaks stuff. So I've set out to just rewrite the whole thing. So far it's not great, but not awful either. filipf: It seems to me like this whole file can be rewritten with layouts (as opposed to using anchors). | |||||
| 54 | id: heading | 69 | id: heading | ||
| 55 | level: 1 | 70 | level: 1 | ||
| 56 | 71 | | |||
| 57 | anchors { | 72 | anchors { | ||
| 58 | left: parent.left | 73 | left: parent.left | ||
| 59 | top: parent.top | 74 | top: parent.top | ||
| 60 | right: parent.right | 75 | right: parent.right | ||
| 61 | topMargin: hiddenItemsView.visible ? units.smallSpacing : 0 | 76 | topMargin: hiddenItemsView.visible ? units.smallSpacing : 0 | ||
| ▲ Show 20 Lines • Show All 83 Lines • Show Last 20 Lines | |||||
Now that you added a RowLayout, this could go inside it rather than being positioned with anchors