From b1e653060a8fe5d736c40e970bc686563bf7419a Mon Sep 17 00:00:00 2001 From: Vesa Date: Tue, 4 Mar 2014 12:09:28 +0200 Subject: [PATCH 1/2] Sidebar: rotate icons to normal orientation, fixes #183 --- src/gui/MainWindow.cpp | 10 +++++----- src/gui/plugin_browser.cpp | 2 +- src/gui/widgets/SideBarWidget.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index 125c5efd2..f09024fd1 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -99,24 +99,24 @@ MainWindow::MainWindow( void ) : configManager::inst()->factoryProjectsDir(), "*.mmp *.mmpz *.xml *.mid *.flp", tr( "My projects" ), - embed::getIconPixmap( "project_file" ), + embed::getIconPixmap( "project_file" ).transformed( QTransform().rotate( 90 ) ), splitter ) ); sideBar->appendTab( new fileBrowser( configManager::inst()->userSamplesDir() + "*" + configManager::inst()->factorySamplesDir(), "*", tr( "My samples" ), - embed::getIconPixmap( "sample_file" ), + embed::getIconPixmap( "sample_file" ).transformed( QTransform().rotate( 90 ) ), splitter ) ); sideBar->appendTab( new fileBrowser( configManager::inst()->userPresetsDir() + "*" + configManager::inst()->factoryPresetsDir(), "*.xpf *.cs.xml *.xiz", tr( "My presets" ), - embed::getIconPixmap( "preset_file" ), + embed::getIconPixmap( "preset_file" ).transformed( QTransform().rotate( 90 ) ), splitter ) ); sideBar->appendTab( new fileBrowser( QDir::homePath(), "*", tr( "My home" ), - embed::getIconPixmap( "home" ), + embed::getIconPixmap( "home" ).transformed( QTransform().rotate( 90 ) ), splitter ) ); QFileInfoList drives = QDir::drives(); QStringList root_paths; @@ -130,7 +130,7 @@ MainWindow::MainWindow( void ) : #else tr( "Root directory" ), #endif - embed::getIconPixmap( "computer" ), + embed::getIconPixmap( "computer" ).transformed( QTransform().rotate( 90 ) ), splitter, #ifdef LMMS_BUILD_WIN32 true diff --git a/src/gui/plugin_browser.cpp b/src/gui/plugin_browser.cpp index 649f36add..431d41b70 100644 --- a/src/gui/plugin_browser.cpp +++ b/src/gui/plugin_browser.cpp @@ -45,7 +45,7 @@ bool pluginBefore( const Plugin::Descriptor& d1, const Plugin::Descriptor& d2 ) pluginBrowser::pluginBrowser( QWidget * _parent ) : SideBarWidget( tr( "Instrument plugins" ), - embed::getIconPixmap( "plugins" ), _parent ) + embed::getIconPixmap( "plugins" ).transformed( QTransform().rotate( 90 ) ), _parent ) { setWindowTitle( tr( "Instrument browser" ) ); m_view = new QWidget( contentParent() ); diff --git a/src/gui/widgets/SideBarWidget.cpp b/src/gui/widgets/SideBarWidget.cpp index d9cf21b60..ae8f1a739 100644 --- a/src/gui/widgets/SideBarWidget.cpp +++ b/src/gui/widgets/SideBarWidget.cpp @@ -71,7 +71,7 @@ void SideBarWidget::paintEvent( QPaintEvent * ) p.drawText( tx, ty, m_title ); p.drawLine( tx, ty+4, width()-4, ty+4 ); - p.drawPixmap( 2, 2, m_icon ); + p.drawPixmap( 2, 2, m_icon.transformed( QTransform().rotate( -90 ) ) ); } From 549f8eb5366a184f08228f0bd2784af2f97aac24 Mon Sep 17 00:00:00 2001 From: Vesa Date: Tue, 4 Mar 2014 12:35:48 +0200 Subject: [PATCH 2/2] New computer icon --- data/themes/default/computer.png | Bin 1432 -> 1684 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/data/themes/default/computer.png b/data/themes/default/computer.png index af7346a84522e6bc11104ec2527b5f3bf957c98d..f449ecb6b507ab8a843e6f6c3ed6299023153d08 100644 GIT binary patch delta 1609 zcmV-P2DbT_3zQ9zI|~iT000fi0k5^kOp!(>e+CgrL_t(og}s+uh+S6|$A4?@eUhe1 z({xM|Coyd@vET>Tl44a1m|~@%PlEU)g}z7&iVwBWQlEUPPkpk8P^ze?P!!*)2%?A} zR*0bZ5gHQX45e){NoShO*?XChN_}kD5X$xCg*;-`<}kvdPfLeeP#7{3L$dK-dkq? zDu_9d5sVvVhN)tzs47JZTFL~lWJ)P$TgPWPQ%c6n0EYEw3L(&SyGSt+QzXPl903Fv zKnwuXFw@405=%j2H8O#Zl(t6*Qg5kif6fK)0YFRuDJ4=$BMUKBAVC(x;f;YIB&tdX zp&1im2*eFAP6ELp?+6Ya?SuW0I@Mp?-V03CPJ(%$dEBM^S&gs6ha8Z5GX+? zAwV-yKMFEk$TQXB(4AtupE07o~6Dbi}T!+Ldrf7+1$aT{~^Gc9BeTJGogRQyI1pr!fOt_jb z)$7;*r7jU-LIg~WP)hZ1yQZWjYRg#gDSrnr!_NdCpQoaQAlGMW5Fx}0D8)!h9i`;z zop>`gY-IJjcQZuo{Q@Yj|D9c_e{RY`jHGcVNZZ&@(;B}fvly!?syaH{9H&03M!Rhw zD=UaEU`QqBnyt(!^Tw#-80LYXI=%}6CQWWJ5G~*-;_i^DQFp^rY6Q&K*v>%CJsX=F z#MIHHL`>aSltv}Anoy(Xm?@?<)`C(p+A7{o6)~5B=0ed-Y3l@_@7dVce;_r(p-ZGN zNHI=QY*MR~JKg{kGpuBa>QsJpGPvFFbpZN)i#OlAN=$tP(Z{I{gyww+$PP`)XC+x% zPbdqFlv!VxSjweL006eGT_dK5CZ)tgN=k^iR>Psb*X(R*;A3-AGfWFwbfIfb4QgPe zdEWpn08lH4LTwW@VWLIMe~cI-62d}Xn6ogHXEVcmSgrOAH_Th|4RTyiMgve9qS%z; z?pQRUMcll_|9Sx4Ha1n%Yl}8hTpI{8+#DP7W_B+!P_(KfInf==aWgC$!L@lG#@b#b zJ#1zRZF*cAJ3g?{zOy3$&GiM~v1&h9B$yL|v=B&}55{s(L70!;e~z=lkep+96f<88 z%VG!$9wB<$(2O|qK7@cut&)h0?YVjb3?9zr1yjRSXL-^A8!zxFuCkKV!YV|Q?P`Mq3N zUE|El=Qwlr9N&KCe_Ooz%Ia5v^MLNKM`4nH0%wKUSbp>V{Y(39diP)Ye(OD>)nQPL zLp=zsakXZ@Ef>b2wdKJ`bxN0BTYvpj-rW2vQHezxw4Zf2U8s^n_3-rPB`hKhKtzT0&!_+DfdB3fe{#TI{Pk}g z@E3mZq67Z@AOFk&fA+Z_I^a(~^BuqE-jDbD4=z6q>>lijyL0H!%8^@__Wtdur@ry7 zm6c<3UB|Ajf1~RXT^r3p2$=g=->cWxdz$;U4)4eBnYFbwUij&cw*GVe{AV^c)_?Er z8bm~P-@NN5pE`B_o_$M8+;{KYys@##hd+21>sQ|3*wG_gT))iWLkGEh`3lGGd>>b@ zZSkQGyq{8(kDmAl?#`)`A43p6_u&165cuNfKT8aOe}}*H1!9bR<;xFo`+)=8eb0$* z-)&3J1A9e8i|2&l=w|Jdq>Uk+m}+bd zxzYDM&wuyXer@%__by$0?d!69_)gEczmZPIfn=DDWgCz=7;gnfZ92N$=<2$T)eGmI zOgAzfw+uOO?$!L!NPXK$~*1!Ju*VVTGm+1wJqlVS400000NkvXX Hu0mjf@_H1t delta 1355 zcmV-R1+@B<4VVj%I|~DL000Aa0e#hi%#lVXe+3muL_t(|+U-}%P8>%RJ^dJl8HRa4 zjBN=|FhoimiB&M!#Op+|Y;W=h&MFavtXNvIrT7DI6uux*lzadm0LjKkC`w==EXx6h z!8~SQUOm&@)#Y1vs@+X1B8$lKBEHO_x@x-aJ$35d?ixc%i8pB`;VpsxHvyZF(nJD+ ze}}VX>F*@L$7?X-;lqdi*u{%hW^fRL1j8_JczB4hu`viC(C&0luh)BB$4O65Por9` z!nSQ#mIc!^88n9xzdpy<@9^+2wzjrl7fMBI=K2hVhH@ws3Osp!ejZDY9--Ik;rRF% zTYpy42i1MtxN!sP>+49T(~KAqZsXT+e-epOXTRg)<2X1tfbF>+8mA3-o{xQ6-G|q% zvE$H^PQLy57l2m@fWRxKmd8wLSl7hdr0j&B?$5JNJC#ZyU&tdnn89E=&4aB>4(yYi z8fRBw*qHhJOC~^zrGKhbga~}CTh+HTfdqqJfB24DCcuvQ!vT4)na%Ybf*qY9e;|o~ z>q-@b!9*<8N=-ykVBHELDB+JpvMX*APUUEmvRvDGJXAymi!_XUj$o^PNhtcXAm1ZXy!EWa|<4->?vz)rUd&-W0T<6CGs61D{b z1q%}{mVht<&{ZF%;cgtn9?@`Sw5CI{ASXJ5(J`pp(E7Gzui9{gX*Oeh6f(|-i+S(d^{HhG~e*%lYio?fv9Ov1} z$_lo(w?hRadM;JM$q5?GCT~Ti)q?N&xc}e*uYR+#g|5@Z)2C0dv$Mm2|HFZV=Wc9l zsDln{K(gG0;kSV@u0K0F zo5H`CEk)q(Jp0S8e;?Pdua8^fckWlp-a(QC*%9XO0$!4U} zX&WLCmPPF8ep3j++em&)I&z(m8a};O0$0$e5VBS~wNINZ3}>^S+`9E?#lCm%9@nf!v*^g&&^XARNZ@ymmfTq>}C~1cm78WWnf9#2LCO26umQt0TsI_k8m9?az)3#a25n z04NcPgbcwUoDk}C&#AtL-`WZj6BE|l++2yaYIJXJZ?s5OzIt_JYT~_-(&$Kfe}Dhv zMfG`|4zY}mH4wGxvuDSYfE}%7K=7GB!nvU#H3CV7*JN*hoW5}aF9B^px)m%xZVCVZ N002ovPDHLkV1m|!hZO(-