From 478f2828e465e33f7730bab2fab07fbd42eccf66 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Thu, 27 Jul 2017 15:52:16 +0200 Subject: [PATCH] RadioControl removed from automotive example. It is not yet used and will confuse readers. Probably becomes reverted once development of this demo continues --- examples/automotive/MainWindow.cpp | 5 -- examples/automotive/RadioControl.cpp | 67 ------------------ examples/automotive/RadioControl.h | 15 ---- examples/automotive/automotive.pro | 2 - .../ic_airplanemode_active_white_18dp_2x.png | Bin 319 -> 0 bytes .../images/ic_build_white_24dp_2x.png | Bin 344 -> 0 bytes .../images/ic_extension_white_48dp_2x.png | Bin 628 -> 0 bytes .../images/ic_fast_forward_white_18dp_2x.png | Bin 258 -> 0 bytes .../images/ic_fast_rewind_white_18dp_2x.png | Bin 273 -> 0 bytes .../images/ic_pan_tool_white_48dp_2x.png | Bin 618 -> 0 bytes .../images/ic_skip_next_white_18dp_1x.png | Bin 134 -> 0 bytes .../images/ic_skip_previous_white_18dp_2x.png | Bin 201 -> 0 bytes .../images/ic_star_rate_white_18dp_2x.png | Bin 305 -> 0 bytes 13 files changed, 89 deletions(-) delete mode 100644 examples/automotive/RadioControl.cpp delete mode 100644 examples/automotive/RadioControl.h delete mode 100644 examples/automotive/images/ic_airplanemode_active_white_18dp_2x.png delete mode 100644 examples/automotive/images/ic_build_white_24dp_2x.png delete mode 100644 examples/automotive/images/ic_extension_white_48dp_2x.png delete mode 100644 examples/automotive/images/ic_fast_forward_white_18dp_2x.png delete mode 100644 examples/automotive/images/ic_fast_rewind_white_18dp_2x.png delete mode 100644 examples/automotive/images/ic_pan_tool_white_48dp_2x.png delete mode 100644 examples/automotive/images/ic_skip_next_white_18dp_1x.png delete mode 100644 examples/automotive/images/ic_skip_previous_white_18dp_2x.png delete mode 100644 examples/automotive/images/ic_star_rate_white_18dp_2x.png diff --git a/examples/automotive/MainWindow.cpp b/examples/automotive/MainWindow.cpp index d1d64758..e076c28b 100644 --- a/examples/automotive/MainWindow.cpp +++ b/examples/automotive/MainWindow.cpp @@ -1,6 +1,5 @@ #include "MainWindow.h" #include "ButtonBar.h" -#include "RadioControl.h" #include "SoundControl.h" #include "SkinFactory.h" @@ -57,10 +56,6 @@ QQuickItem* MainWindow::headerBar() const QQuickItem* MainWindow::mainContent() const { -// RadioControl* radioControl = new RadioControl( m_layout ); -// m_layout->setRetainSizeWhenHidden( radioControl, true ); -// radioControl->setVisible( false ); - return new SoundControl(); } diff --git a/examples/automotive/RadioControl.cpp b/examples/automotive/RadioControl.cpp deleted file mode 100644 index a549eb90..00000000 --- a/examples/automotive/RadioControl.cpp +++ /dev/null @@ -1,67 +0,0 @@ -#include "RadioControl.h" - -#include -#include -#include -#include -#include -#include -#include - -RadioControl::RadioControl( QQuickItem* parent ): - QskControl( parent ), - m_currentBand( "FM" ) -{ - setMargins( QMarginsF( 40, 30, 40, 30 ) ); - setAutoLayoutChildren( true ); - - QskLinearBox* outterLayout = new QskLinearBox( Qt::Vertical, this ); - outterLayout->setAutoAddChildren( true ); - - QskTabBar* favoritesBar = new QskTabBar( outterLayout ); - favoritesBar->addTab( "AM" ); - favoritesBar->addTab( "FM" ); - favoritesBar->addTab( "DAB" ); - - outterLayout->addSpacer( 80 ); - outterLayout->setMargins( QMarginsF( 150, 0, 150, 0 ) ); - outterLayout->setAlignment( 2, Qt::AlignHCenter ); - - QskPushButton* frequencyButton = new QskPushButton( outterLayout ); - frequencyButton->setAutoLayoutChildren( true ); - frequencyButton->setFlat( true ); - frequencyButton->setBackgroundColor( QColor( 183, 210, 255 ) ); - frequencyButton->setEnabled( false ); - frequencyButton->setFixedWidth( 400 ); - - QskLinearBox* frequencyLayout = new QskLinearBox( Qt::Horizontal, frequencyButton ); - frequencyLayout->setAutoAddChildren( true ); - frequencyLayout->setMargins( QMarginsF( 150, 20, 150, 20 ) ); - - QskTextLabel* bandLabel = new QskTextLabel( m_currentBand, frequencyLayout ); - QskTextLabel* frequencyLabel = new QskTextLabel( "87.50", frequencyLayout ); - QskTextLabel* hzLabel = new QskTextLabel( "MHz", frequencyLayout ); - - QskLinearBox* tuneLayout = new QskLinearBox( Qt::Horizontal, outterLayout ); - tuneLayout->setAutoLayoutChildren( true ); - - QskPushButton* prevTuneButton = new QskPushButton( tuneLayout ); - QImage prevTuneImage( ":/images/ic_skip_previous_white_18dp_2x.png" ); - QskGraphic prevTuneGraphic = QskGraphic::fromImage( prevTuneImage ); - prevTuneButton->setGraphic( prevTuneGraphic ); - - QskPushButton* prevSearchButton = new QskPushButton( tuneLayout ); - QImage prevSearchImage( ":/images/ic_fast_rewind_white_18dp_2x.png" ); - QskGraphic prevSearchGraphic = QskGraphic::fromImage( prevSearchImage ); - prevSearchButton->setGraphic( prevSearchGraphic ); - - QskPushButton* nextSearchButton = new QskPushButton( tuneLayout ); - QImage nextSearchImage( ":/images/ic_fast_forward_white_18dp_2x.png" ); - QskGraphic nextSearchGraphic = QskGraphic::fromImage( nextSearchImage ); - nextSearchButton->setGraphic( nextSearchGraphic ); - - QskPushButton* nextTuneButton = new QskPushButton( tuneLayout ); - QImage nextTuneImage( ":/images/ic_skip_next_white_18dp_1x.png" ); - QskGraphic nextTuneGraphic = QskGraphic::fromImage( nextTuneImage ); - nextTuneButton->setGraphic( nextTuneGraphic ); -} diff --git a/examples/automotive/RadioControl.h b/examples/automotive/RadioControl.h deleted file mode 100644 index b205cd9c..00000000 --- a/examples/automotive/RadioControl.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef RADIOCONTROL_H -#define RADIOCONTROL_H - -#include - -class RadioControl : public QskControl -{ -public: - RadioControl( QQuickItem* parent = nullptr ); - -private: - QString m_currentBand; -}; - -#endif // RADIOCONTROL_H diff --git a/examples/automotive/automotive.pro b/examples/automotive/automotive.pro index c378a541..95b6d7db 100644 --- a/examples/automotive/automotive.pro +++ b/examples/automotive/automotive.pro @@ -4,7 +4,6 @@ TARGET = automotive HEADERS += \ ButtonBar.h \ - RadioControl.h \ SoundControl.h \ SkinFactory.h \ DefaultSkin.h \ @@ -13,7 +12,6 @@ HEADERS += \ SOURCES += \ ButtonBar.cpp \ - RadioControl.cpp \ SoundControl.cpp \ SkinFactory.cpp \ DefaultSkin.cpp \ diff --git a/examples/automotive/images/ic_airplanemode_active_white_18dp_2x.png b/examples/automotive/images/ic_airplanemode_active_white_18dp_2x.png deleted file mode 100644 index 4f8165f13ba281ea348e9af7c44884fd7cbc054c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 319 zcmV-F0l@x=P)VU#up|IV4LBS9jJSZpZ%y?R8 zQdv{0y45t$hI_xOnCS(YQx(^fVt3G}9WOd}X)y`Pxz^O5`%Y-g1_ECudS}%!`D2Y!bYTm@k%$K;B`4U4jPvXboRe*>Y qA0T4KX9$mYGc#(exI|m+$J8&SUCOM6gL_W^00004cH9LMpHA(!_e;ev)N9UTNAOG-;iC4)HhMP#yXpruzY_!3$ybPxnZyQqtFaA?WW za8E<$-M6K#GzmMAB zmcP4UeK7!aQvOv!T|Xe@ehg z%K>|6=s*tmj)pGefFEcmmjiNCBnK1*@XG)b0~lb*0Y433fF%d~GJszOh-ptxmmWjD z>IRfKF>eXk^nYicW$rlzp}S$-XIgxsfB*?~`8N6jG!T5o-FIkcO%8a7hOTMI=k;%B zXiE-wiH45kfIb?!k^@%IP_e{-RWx)d2kfAsLpk6K4Q)yR9W<25f5<+dp}zD|VjB(Z zNiXJ}s#xuIrI*v&3ch|uUv@*&;XNTMxa5#c8f9)NAJLhf6;|2dY_V?Yf1@A+1k3<# zfdK~i%#a>k!KSJJa6(J4sa61xlrs=-stN!(kL8=H2EahRscHb6$Tw9TfR=ny)d2V+ z-&Az~hJsC1)dNqxiZ<0;4j3~_-HIm3b2%Vomf969O8as^j0+BMwB&#qqu_wV_woDF zpn#7={x3j`a6tf$glImmpu`+-L4I$5oOAYR1$du0*fD_rF@OOKV1PeB*Sf0@Hp;~S O0000;JXm#s;NEog1p$7;7DUsP0l5u(5ELXPpF07*qo IM6N<$f+xjghyVZp diff --git a/examples/automotive/images/ic_fast_rewind_white_18dp_2x.png b/examples/automotive/images/ic_fast_rewind_white_18dp_2x.png deleted file mode 100644 index 3d754e27a6470570efe012fe5d54abf8805a7457..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmV+s0q*{ZP)d~p9k$6dcrn+cj{M-u0qjO`(m4_P(2;$&_ekG X(kPxZC$QW$00000NkvXXu0mjflx%Sy diff --git a/examples/automotive/images/ic_pan_tool_white_48dp_2x.png b/examples/automotive/images/ic_pan_tool_white_48dp_2x.png deleted file mode 100644 index e872653dd6888f58c047d9ff1ba0162d418601a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 618 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z+~v@;uuoF`1UF@k4&IQ>%+;n zw&mX5_I8G}dD*UwI}3x%-K5P{07cI3?|pUs>$y8m{%w5j{cPUyAQwp?nWxI~mR?Op zn?!wY9$cTheB~P#$ufpNjvC4A6CT8?zG3M5w7zfFPC>g*>+OIP(@ZE{x?fPc!NgqX ztM_a<0gXq~uQ4dx?UGAOF{v?q{^uUOMFf|ABg78e;Ht^>bP0l+XkKAc+ii diff --git a/examples/automotive/images/ic_skip_next_white_18dp_1x.png b/examples/automotive/images/ic_skip_next_white_18dp_1x.png deleted file mode 100644 index 26434a0205f85ada4c1ded13570ae488bf2f9e76..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|md_7$pLp07OCrBK5u>VN@ zdUhXI-v9mo!`&YJ|9`*1_u~Km^Z%<0hOsbZ|Kk=6`||()<^SuBXcR5HvFrSQVNT0G i5)Ty=)C|}K85lU`W}d0$oPPpnFoUP7pUXO@geCwHelqO< diff --git a/examples/automotive/images/ic_skip_previous_white_18dp_2x.png b/examples/automotive/images/ic_skip_previous_white_18dp_2x.png deleted file mode 100644 index 23faeeb0264f26fee6a64ad9af46cece572394d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8Lp1Wy;okP61PlNSm)849o_?>l%T zkXgz`grV0#Ie;;QLG%LKto;2;7-cqhs2lqnv2NTEE56Zq`jb=hC#!UPx_oM_t*%L# zleAiaGqbwggElc6fv^_`r0-mqV||G0ZAGK>tU||#g`&zXEz@iS85hr0b}Gt_EBo{L z^xpr9&fzY6GRo7!*3JAgVNFc6;$fatjYIm}3)5$rX*=ry-NxYQ>gTe~DWM4fws}NQ diff --git a/examples/automotive/images/ic_star_rate_white_18dp_2x.png b/examples/automotive/images/ic_star_rate_white_18dp_2x.png deleted file mode 100644 index a182ef2137d93ed676849b7686b0cf427ff9e9a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 305 zcmV-10nYx3P)(Gm^OREtBx zMFIz@UmWa0T)c7)$DrYUpOpAdC{olkP^F@2;DLMjV;Q3$Uz}o`$QO4QxAMaxUl^Y( z$Op%S4&;L?LKm{fJ^{7@_7smLZm@ApL6b2kYGtQP=aZc!!H$qLhAw$4Oi#&PSjPyv$1)CTH4)ud01{fQ1!5Q#K zNxx9$38>2+Y2K-mRRnW1=#r8xR@qSuc3Dv(@khP^ZVry3X%}bB00000NkvXXu0mjf D$liB=