From c7e5596cc3e6a854c514f0a4108295b8300d84b1 Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig <jens.bache-wiig@nokia.com> Date: Mon, 21 Feb 2011 11:31:31 +0100 Subject: [PATCH] More re-organization of desktop --- components/Button.qml | 4 ++-- components/ButtonRow.qml | 2 +- components/CheckBox.qml | 4 ++-- components/ChoiceList.qml | 4 ++-- components/GroupBox.qml | 4 ++-- components/ProgressBar.qml | 4 ++-- components/RadioButton.qml | 4 ++-- components/ScrollArea.qml | 4 ++-- components/ScrollBar.qml | 4 ++-- components/Slider.qml | 4 ++-- components/SpinBox.qml | 4 ++-- components/Switch.qml | 4 ++-- components/TabBar.qml | 4 ++-- components/TabFrame.qml | 4 ++-- components/TextArea.qml | 4 ++-- components/TextField.qml | 4 ++-- components/TextScrollArea.qml | 4 ++-- components/ToolBar.qml | 4 ++-- components/ToolButton.qml | 4 ++-- components/{src.pro => components.pro} | 0 examples/Gallery.qml | 2 +- examples/images/folder_new.png | Bin 0 -> 1199 bytes src/Button.qml | 4 ++-- src/ButtonRow.qml | 2 +- src/CheckBox.qml | 4 ++-- src/ChoiceList.qml | 4 ++-- src/GroupBox.qml | 4 ++-- src/ProgressBar.qml | 4 ++-- src/RadioButton.qml | 4 ++-- src/ScrollArea.qml | 4 ++-- src/ScrollBar.qml | 4 ++-- src/Slider.qml | 4 ++-- src/SpinBox.qml | 4 ++-- src/Switch.qml | 4 ++-- src/TabBar.qml | 4 ++-- src/TabFrame.qml | 4 ++-- src/TextArea.qml | 4 ++-- src/TextField.qml | 4 ++-- src/TextScrollArea.qml | 4 ++-- src/ToolBar.qml | 4 ++-- src/ToolButton.qml | 4 ++-- src/widgets/Button.qml | 4 ++-- src/widgets/ButtonRow.qml | 2 +- src/widgets/CheckBox.qml | 4 ++-- src/widgets/ChoiceList.qml | 4 ++-- src/widgets/GroupBox.qml | 4 ++-- src/widgets/ProgressBar.qml | 4 ++-- src/widgets/RadioButton.qml | 4 ++-- src/widgets/ScrollArea.qml | 4 ++-- src/widgets/ScrollBar.qml | 4 ++-- src/widgets/Slider.qml | 4 ++-- src/widgets/SpinBox.qml | 4 ++-- src/widgets/Switch.qml | 4 ++-- src/widgets/TabBar.qml | 4 ++-- src/widgets/TabFrame.qml | 4 ++-- src/widgets/TextArea.qml | 4 ++-- src/widgets/TextField.qml | 4 ++-- src/widgets/TextScrollArea.qml | 4 ++-- src/widgets/ToolBar.qml | 4 ++-- src/widgets/ToolButton.qml | 4 ++-- 60 files changed, 112 insertions(+), 112 deletions(-) rename components/{src.pro => components.pro} (100%) create mode 100644 examples/images/folder_new.png diff --git a/components/Button.qml b/components/Button.qml index 496d37df2..8f2e01d26 100644 --- a/components/Button.qml +++ b/components/Button.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" Components.Button { id:button diff --git a/components/ButtonRow.qml b/components/ButtonRow.qml index 623c5f442..7123b415b 100644 --- a/components/ButtonRow.qml +++ b/components/ButtonRow.qml @@ -1,5 +1,5 @@ import QtQuick 1.0 -import "../../../components" as Components +import "custom" as Components Components.ButtonRow { } diff --git a/components/CheckBox.qml b/components/CheckBox.qml index 632dce2d4..6bca05d7b 100644 --- a/components/CheckBox.qml +++ b/components/CheckBox.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" // jb : Size should not depend on background, we should make it consistent diff --git a/components/ChoiceList.qml b/components/ChoiceList.qml index 5015fbefb..31a7602ca 100644 --- a/components/ChoiceList.qml +++ b/components/ChoiceList.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" Components.ChoiceList { id:choicelist diff --git a/components/GroupBox.qml b/components/GroupBox.qml index 0d45810d1..fcac43e2a 100644 --- a/components/GroupBox.qml +++ b/components/GroupBox.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" Item { width:200 diff --git a/components/ProgressBar.qml b/components/ProgressBar.qml index bf29bcac9..786d37ec5 100644 --- a/components/ProgressBar.qml +++ b/components/ProgressBar.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" Components.ProgressBar { id:progressbar diff --git a/components/RadioButton.qml b/components/RadioButton.qml index 3c2c3e547..1de216815 100644 --- a/components/RadioButton.qml +++ b/components/RadioButton.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" // jb : Size should not depend on background, we should make it consistent diff --git a/components/ScrollArea.qml b/components/ScrollArea.qml index 3a904ddeb..4a88bcd6e 100644 --- a/components/ScrollArea.qml +++ b/components/ScrollArea.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" FocusScope { id:scrollarea diff --git a/components/ScrollBar.qml b/components/ScrollBar.qml index ea822b62e..59e762b2b 100644 --- a/components/ScrollBar.qml +++ b/components/ScrollBar.qml @@ -1,6 +1,6 @@ import QtQuick 1.1 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" MouseArea { id:scrollbar diff --git a/components/Slider.qml b/components/Slider.qml index c6b9c9151..18e05d95f 100644 --- a/components/Slider.qml +++ b/components/Slider.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" // jens: ContainsMouse breaks drag functionality diff --git a/components/SpinBox.qml b/components/SpinBox.qml index 2db428cef..7ca6816a0 100644 --- a/components/SpinBox.qml +++ b/components/SpinBox.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" Components.SpinBox { id:spinbox diff --git a/components/Switch.qml b/components/Switch.qml index b82817c9f..5d661ec3d 100644 --- a/components/Switch.qml +++ b/components/Switch.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" Components.Switch { id:widget diff --git a/components/TabBar.qml b/components/TabBar.qml index 2d891256f..e04681cc9 100644 --- a/components/TabBar.qml +++ b/components/TabBar.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" Item { diff --git a/components/TabFrame.qml b/components/TabFrame.qml index 01896e753..e8489a169 100644 --- a/components/TabFrame.qml +++ b/components/TabFrame.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" Item{ id: tabWidget diff --git a/components/TextArea.qml b/components/TextArea.qml index 93ad8f3d9..069720394 100644 --- a/components/TextArea.qml +++ b/components/TextArea.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" Components.TextArea { id:textarea diff --git a/components/TextField.qml b/components/TextField.qml index 260584e95..83ea724d8 100644 --- a/components/TextField.qml +++ b/components/TextField.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" Components.TextField { id:textfield diff --git a/components/TextScrollArea.qml b/components/TextScrollArea.qml index 2a7deab68..28a8d737d 100644 --- a/components/TextScrollArea.qml +++ b/components/TextScrollArea.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" ScrollArea { id:area diff --git a/components/ToolBar.qml b/components/ToolBar.qml index ce61382ee..095887e2f 100644 --- a/components/ToolBar.qml +++ b/components/ToolBar.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" QStyleBackground { id:styleitem diff --git a/components/ToolButton.qml b/components/ToolButton.qml index 98b2dfebf..c439f2d34 100644 --- a/components/ToolButton.qml +++ b/components/ToolButton.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" Components.Button { id:button diff --git a/components/src.pro b/components/components.pro similarity index 100% rename from components/src.pro rename to components/components.pro diff --git a/examples/Gallery.qml b/examples/Gallery.qml index 3f4e39e53..615991330 100644 --- a/examples/Gallery.qml +++ b/examples/Gallery.qml @@ -1,5 +1,5 @@ import QtQuick 1.0 -import "widgets" +import "../components" Rectangle { width: 540 diff --git a/examples/images/folder_new.png b/examples/images/folder_new.png new file mode 100644 index 0000000000000000000000000000000000000000..8d8bb9bd768d8e8ab785d95483ead02ae6800dc5 GIT binary patch literal 1199 zcmV;g1W@~lP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H101k9TSaeirbZlh+MsI9nWpZ;NRH|S>0000NbVXQnL3MO!Z*l-k zVQ_CCLt$)TZDDR?a%E}Xks2xh001d;MObu1WpiV4X>fFDZ*BlWVRL0<Aa7<MN?~ht zVjxp=Wod3@av)@7b7^O8po9f;000BJNkl<ZNQteLO^6&t6vuznRnt8)&TMwwuc%3g z2L+Xg#E;-dLX;fTm|zS9BAz685^_-q9uyG|f}n_a(2IhCBC^TJQ#K*NgBpV$m_(v6 zF_>g`c6MfW=cA{)s-B0L%+9*2hHM@b)l|QFzxV#Hs#}Q&%d^*l_WY_}>aDt3Kzece zdac!cscYUPuC`9W*HJk92_px7S~kFycI-lAJK{H5*Ic8E&yrT&@tI8VfYQZJ^~l(l zmwip|#uxVO*{fCXra&~m+D)M1J<q-M(o_YJ-N2KO!4!9)i@N~{((3y=LS69o(vGrO zId*svK%9I1q0Ns(S_gRVJHz3<CyrYKCr=*#c)D6YRLJYc6$)i;#1wY6Gc7ztQu%<| z%y&DLl1=G}{I<c{8{aGdSnG2joc`^XMY0r&{j9rVbuJV9ywwc6OOU;Hp@YhjUvn5_ zmSlGSu)Fa5e&B{+0l-;iW~wBuWYH*3O%mybvOb5M`wVbPbq9Q%v^M5~Aos%}iJWyz zPnT&lnhUmh??_V18P(#pwbv7wBlyxQWQX7A(KiM^NB!bn;@KZtgZ+2Eya-^er8GH7 zlC*j|g9-v3-n@mitA`mX97b^#d=1<bC_pSCF-RR`hQG?I@|iw=uCEvH;=Vmk_YbTv z^=7?SSd7u!zu^H^j*c=>Dx=aIqXmef0C9hk*2YO{UlA4_C6ix|QhDZT75Y{knO;zV zv+nIDwr*o+Xk<RT0tAvIrcx~-;+dSeiBNA~Me-5N@`spkluS5CYx+HE6D1(W!Ed+l z;A8C=T|gYSMuNaIIeC7G=JoW+8O}}J!${vsiuq|GV&Vj1n`bT_pe1)QG4*-ZzYDO| z5=A+jv;PSIur9}i$}L25F=3`HX`JRsZH}R#eyp88Ve^30k;@fGlK6iC-D=3tOpEiu z3}|hzc0S22AnjCOOy-IKOPPqrrb_^9>IedjUM9eK|1T0*i-^A_6{Jg5fY7Kn>iICt z0`2?LKBu5iorT^=AeX<i(tZ*V>h&5TG%mXZ?KsMa$kgwrf2GxI;;lnGC<)NYV01`m za%95-+3-3-lf~!|tqgdDcY;eT&3cV<f1E+Ql$25iz$m2@5LK(QhsMXppV_!^MhC$^ z)4eit&U5tW_pVy49t0w#lrtSQ^zq{-zHrWOI)DDs%~ut@W6fss?6G5~#sE!6WCeu4 zAaHAEUXE3OQ$QI=l!%~|3TQVxL#HpxFb|}F6%pV4>34c@%}hFh{|2rA&Q3Ns=Tray N002ovPDHLkV1nxxBC7xZ literal 0 HcmV?d00001 diff --git a/src/Button.qml b/src/Button.qml index 496d37df2..8f2e01d26 100644 --- a/src/Button.qml +++ b/src/Button.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" Components.Button { id:button diff --git a/src/ButtonRow.qml b/src/ButtonRow.qml index 623c5f442..7123b415b 100644 --- a/src/ButtonRow.qml +++ b/src/ButtonRow.qml @@ -1,5 +1,5 @@ import QtQuick 1.0 -import "../../../components" as Components +import "custom" as Components Components.ButtonRow { } diff --git a/src/CheckBox.qml b/src/CheckBox.qml index 632dce2d4..6bca05d7b 100644 --- a/src/CheckBox.qml +++ b/src/CheckBox.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" // jb : Size should not depend on background, we should make it consistent diff --git a/src/ChoiceList.qml b/src/ChoiceList.qml index 5015fbefb..31a7602ca 100644 --- a/src/ChoiceList.qml +++ b/src/ChoiceList.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" Components.ChoiceList { id:choicelist diff --git a/src/GroupBox.qml b/src/GroupBox.qml index 0d45810d1..fcac43e2a 100644 --- a/src/GroupBox.qml +++ b/src/GroupBox.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" Item { width:200 diff --git a/src/ProgressBar.qml b/src/ProgressBar.qml index bf29bcac9..786d37ec5 100644 --- a/src/ProgressBar.qml +++ b/src/ProgressBar.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" Components.ProgressBar { id:progressbar diff --git a/src/RadioButton.qml b/src/RadioButton.qml index 3c2c3e547..1de216815 100644 --- a/src/RadioButton.qml +++ b/src/RadioButton.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" // jb : Size should not depend on background, we should make it consistent diff --git a/src/ScrollArea.qml b/src/ScrollArea.qml index 3a904ddeb..4a88bcd6e 100644 --- a/src/ScrollArea.qml +++ b/src/ScrollArea.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" FocusScope { id:scrollarea diff --git a/src/ScrollBar.qml b/src/ScrollBar.qml index ea822b62e..59e762b2b 100644 --- a/src/ScrollBar.qml +++ b/src/ScrollBar.qml @@ -1,6 +1,6 @@ import QtQuick 1.1 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" MouseArea { id:scrollbar diff --git a/src/Slider.qml b/src/Slider.qml index c6b9c9151..18e05d95f 100644 --- a/src/Slider.qml +++ b/src/Slider.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" // jens: ContainsMouse breaks drag functionality diff --git a/src/SpinBox.qml b/src/SpinBox.qml index 2db428cef..7ca6816a0 100644 --- a/src/SpinBox.qml +++ b/src/SpinBox.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" Components.SpinBox { id:spinbox diff --git a/src/Switch.qml b/src/Switch.qml index b82817c9f..5d661ec3d 100644 --- a/src/Switch.qml +++ b/src/Switch.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" Components.Switch { id:widget diff --git a/src/TabBar.qml b/src/TabBar.qml index 2d891256f..e04681cc9 100644 --- a/src/TabBar.qml +++ b/src/TabBar.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" Item { diff --git a/src/TabFrame.qml b/src/TabFrame.qml index 01896e753..e8489a169 100644 --- a/src/TabFrame.qml +++ b/src/TabFrame.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" Item{ id: tabWidget diff --git a/src/TextArea.qml b/src/TextArea.qml index 93ad8f3d9..069720394 100644 --- a/src/TextArea.qml +++ b/src/TextArea.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" Components.TextArea { id:textarea diff --git a/src/TextField.qml b/src/TextField.qml index 260584e95..83ea724d8 100644 --- a/src/TextField.qml +++ b/src/TextField.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" Components.TextField { id:textfield diff --git a/src/TextScrollArea.qml b/src/TextScrollArea.qml index 2a7deab68..28a8d737d 100644 --- a/src/TextScrollArea.qml +++ b/src/TextScrollArea.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" ScrollArea { id:area diff --git a/src/ToolBar.qml b/src/ToolBar.qml index ce61382ee..095887e2f 100644 --- a/src/ToolBar.qml +++ b/src/ToolBar.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" QStyleBackground { id:styleitem diff --git a/src/ToolButton.qml b/src/ToolButton.qml index 98b2dfebf..c439f2d34 100644 --- a/src/ToolButton.qml +++ b/src/ToolButton.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" Components.Button { id:button diff --git a/src/widgets/Button.qml b/src/widgets/Button.qml index 496d37df2..8f2e01d26 100644 --- a/src/widgets/Button.qml +++ b/src/widgets/Button.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" Components.Button { id:button diff --git a/src/widgets/ButtonRow.qml b/src/widgets/ButtonRow.qml index 623c5f442..7123b415b 100644 --- a/src/widgets/ButtonRow.qml +++ b/src/widgets/ButtonRow.qml @@ -1,5 +1,5 @@ import QtQuick 1.0 -import "../../../components" as Components +import "custom" as Components Components.ButtonRow { } diff --git a/src/widgets/CheckBox.qml b/src/widgets/CheckBox.qml index 632dce2d4..6bca05d7b 100644 --- a/src/widgets/CheckBox.qml +++ b/src/widgets/CheckBox.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" // jb : Size should not depend on background, we should make it consistent diff --git a/src/widgets/ChoiceList.qml b/src/widgets/ChoiceList.qml index 5015fbefb..31a7602ca 100644 --- a/src/widgets/ChoiceList.qml +++ b/src/widgets/ChoiceList.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" Components.ChoiceList { id:choicelist diff --git a/src/widgets/GroupBox.qml b/src/widgets/GroupBox.qml index 0d45810d1..fcac43e2a 100644 --- a/src/widgets/GroupBox.qml +++ b/src/widgets/GroupBox.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" Item { width:200 diff --git a/src/widgets/ProgressBar.qml b/src/widgets/ProgressBar.qml index bf29bcac9..786d37ec5 100644 --- a/src/widgets/ProgressBar.qml +++ b/src/widgets/ProgressBar.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" Components.ProgressBar { id:progressbar diff --git a/src/widgets/RadioButton.qml b/src/widgets/RadioButton.qml index 3c2c3e547..1de216815 100644 --- a/src/widgets/RadioButton.qml +++ b/src/widgets/RadioButton.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" // jb : Size should not depend on background, we should make it consistent diff --git a/src/widgets/ScrollArea.qml b/src/widgets/ScrollArea.qml index 3a904ddeb..4a88bcd6e 100644 --- a/src/widgets/ScrollArea.qml +++ b/src/widgets/ScrollArea.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" FocusScope { id:scrollarea diff --git a/src/widgets/ScrollBar.qml b/src/widgets/ScrollBar.qml index ea822b62e..59e762b2b 100644 --- a/src/widgets/ScrollBar.qml +++ b/src/widgets/ScrollBar.qml @@ -1,6 +1,6 @@ import QtQuick 1.1 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" MouseArea { id:scrollbar diff --git a/src/widgets/Slider.qml b/src/widgets/Slider.qml index c6b9c9151..18e05d95f 100644 --- a/src/widgets/Slider.qml +++ b/src/widgets/Slider.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" // jens: ContainsMouse breaks drag functionality diff --git a/src/widgets/SpinBox.qml b/src/widgets/SpinBox.qml index 2db428cef..7ca6816a0 100644 --- a/src/widgets/SpinBox.qml +++ b/src/widgets/SpinBox.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" Components.SpinBox { id:spinbox diff --git a/src/widgets/Switch.qml b/src/widgets/Switch.qml index b82817c9f..5d661ec3d 100644 --- a/src/widgets/Switch.qml +++ b/src/widgets/Switch.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" Components.Switch { id:widget diff --git a/src/widgets/TabBar.qml b/src/widgets/TabBar.qml index 2d891256f..e04681cc9 100644 --- a/src/widgets/TabBar.qml +++ b/src/widgets/TabBar.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" Item { diff --git a/src/widgets/TabFrame.qml b/src/widgets/TabFrame.qml index 01896e753..e8489a169 100644 --- a/src/widgets/TabFrame.qml +++ b/src/widgets/TabFrame.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" Item{ id: tabWidget diff --git a/src/widgets/TextArea.qml b/src/widgets/TextArea.qml index 93ad8f3d9..069720394 100644 --- a/src/widgets/TextArea.qml +++ b/src/widgets/TextArea.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" Components.TextArea { id:textarea diff --git a/src/widgets/TextField.qml b/src/widgets/TextField.qml index 260584e95..83ea724d8 100644 --- a/src/widgets/TextField.qml +++ b/src/widgets/TextField.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" Components.TextField { id:textfield diff --git a/src/widgets/TextScrollArea.qml b/src/widgets/TextScrollArea.qml index 2a7deab68..28a8d737d 100644 --- a/src/widgets/TextScrollArea.qml +++ b/src/widgets/TextScrollArea.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" ScrollArea { id:area diff --git a/src/widgets/ToolBar.qml b/src/widgets/ToolBar.qml index ce61382ee..095887e2f 100644 --- a/src/widgets/ToolBar.qml +++ b/src/widgets/ToolBar.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" QStyleBackground { id:styleitem diff --git a/src/widgets/ToolButton.qml b/src/widgets/ToolButton.qml index 98b2dfebf..c439f2d34 100644 --- a/src/widgets/ToolButton.qml +++ b/src/widgets/ToolButton.qml @@ -1,6 +1,6 @@ import QtQuick 1.0 -import "../../../components" as Components -import "../plugin" +import "custom" as Components +import "plugin" Components.Button { id:button -- GitLab