From f8511152e33ffa62ac3bbf02dd6702e4f00c438e Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 21 Aug 2014 11:53:11 +0200 Subject: [PATCH] * Updated 'What's New' design. --- .../whatsnew_0_8/WhatsNewWidget_0_8.ui | 1711 ++++------------- src/viewpages/whatsnew_0_8/WhatsNew_0_8.cpp | 154 +- src/viewpages/whatsnew_0_8/WhatsNew_0_8.h | 4 +- src/viewpages/whatsnew_0_8/resources.qrc | 6 + 4 files changed, 443 insertions(+), 1432 deletions(-) diff --git a/src/viewpages/whatsnew_0_8/WhatsNewWidget_0_8.ui b/src/viewpages/whatsnew_0_8/WhatsNewWidget_0_8.ui index f69644527..50f20dbee 100644 --- a/src/viewpages/whatsnew_0_8/WhatsNewWidget_0_8.ui +++ b/src/viewpages/whatsnew_0_8/WhatsNewWidget_0_8.ui @@ -6,20 +6,14 @@ 0 0 - 965 - 600 + 847 + 3378 - - - 0 - 0 - - - Form + Form - + 0 @@ -27,1365 +21,426 @@ 0 - - - - 0 - 0 - + + + Qt::Horizontal - + + + 40 + 20 + + + + + + + + + 800 + 0 + + + + + 800 + 16777215 + + + - 0 + 64 - - 0 - - - 16 - - - 0 - - - 0 + + 64 - + + 1 + + 0 + + + + WHAT'S NEW + + + + + + + An overview of the changes and additions since 0.7 + + + 8 + + + + + + + + + 0 + + + 0 + + + 32 + 0 - - - - - 0 - 0 - + + + + PushButton - - - 0 - 79 - - - - - 8 - - - 0 - - - - - - 0 - 0 - - - - - 64 - 100 - - - - border-width: 2px; -border-style: solid; -border-radius: 4px; -border-color: white; -color: white; -border-bottom: none; -border-bottom-right-radius: 0px; -border-bottom-left-radius: 0px; -background-color:#292f34; - - - - 8 - - - 8 - - - 8 - - - 8 - - - 16 - - - - - - 75 - true - - - - border-style: none; - - - Inbox - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 64 - 64 - - - - - 64 - 64 - - - - border-style:none; -margin-bottom: 4px; - - - - - - - - - - - - - - 64 - 100 - - - - border-width: 2px; -border-style: solid; -border-radius: 4px; -border-color: grey; -color: grey; - - - - 8 - - - 8 - - - - - - 75 - true - - - - border:none - - - Open URL - - - Qt::AlignCenter - - - - - - - - 64 - 64 - - - - - 64 - 64 - - - - border: none; - - - - - - :/whatsnew_0_8/data/images/universal-link-icon.png - - - true - - - - - - - - - - - 64 - 79 - - - - border-width: 2px; -border-style: solid; -border-radius: 4px; -border-color: grey; -color: grey; - - - - 8 - - - 8 - - - - - - 75 - true - - - - border: none; - - - Trending - - - Qt::AlignCenter - - - - - - - - 64 - 64 - - - - - 64 - 64 - - - - border: none; - - - - - - - - - - - - - - 64 - 100 - - - - border-width: 2px; -border-style: solid; -border-radius: 4px; -border-color: grey; -color: grey; - - - - 8 - - - 8 - - - - - - 75 - true - - - - border: none; - - - Beats - - - Qt::AlignCenter - - - - - - - - 64 - 64 - - - - - 64 - 64 - - - - border: none; - - - - - - - - - - - - - - 64 - 79 - - - - border-width: 2px; -border-style: solid; -border-radius: 4px; -border-color: grey; -color: grey; - - - - 8 - - - 8 - - - - - - 75 - true - - - - border: none; - - - GMusic - - - Qt::AlignCenter - - - - - - - - 64 - 64 - - - - - 64 - 64 - - - - border: none; - - - - - - :/whatsnew_0_8/data/images/gmusic.png - - - true - - - - - - - - - - - 64 - 79 - - - - border-width: 2px; -border-style: solid; -border-radius: 4px; -border-color: grey; -color: grey; - - - - 8 - - - 8 - - - - - - 75 - true - - - - border: none; - - - IPv6+ - - - Qt::AlignCenter - - - - - - - - 64 - 64 - - - - - 64 - 64 - - - - border: none; - - - - - - - - - - - - - - 64 - 79 - - - - border-width: 2px; -border-style: solid; -border-radius: 4px; -border-color: grey; -color: grey; - - - - 8 - - - 8 - - - - - - 75 - true - - - - border: none; - - - Design - - - Qt::AlignCenter - - - - - - - - 64 - 64 - - - - - 64 - 64 - - - - border: none; - - - - - - :/whatsnew_0_8/data/images/design.png - - - true - - - - - - - - - - - 64 - 79 - - - - border-width: 2px; -border-style: solid; -border-radius: 4px; -border-color: grey; -color: grey; - - - - 8 - - - 8 - - - - - - 75 - true - - - - border: none; - - - Android - - - Qt::AlignCenter - - - - - - - - 64 - 64 - - - - - 64 - 64 - - - - border: none; - - - - - - :/whatsnew_0_8/data/images/android.png - - - true - - - - - - - - - - - - - true - - - - 0 - 0 - - - - - 820 - 0 - - - - - 720 - 16777215 - - - - border-width: 2px; -border-style: solid; -border-radius: 4px; -border-color: white; -padding: 2px; -color: white; -background-color:#292f34; - - - - 0 - - - - border: none; - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - Send your friends songs you think they should check out. Just drag and drop them onto your friend's avatar to send. All of the songs your friends send you will show up in your Inbox. - - - false - - - true - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 20 - - - - - - - - - 0 - 0 - - - - border-width: 1px; -border-radius: 0px; -border-style: solid; -border-color: #ccc; - - - - - - - :/whatsnew_0_8/data/images/inbox-screenshot.png - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - 0 - - - - - - - Qt::Vertical - - - QSizePolicy::MinimumExpanding - - - - 20 - 20 - - - - - - - - - border: none; - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - Love that your friends and influencers are posting music links across the web and your social networks but hate that they are links for music services you don’t use? Just drag Rdio, Deezer, Beats Music and other music service URLs into Tomahawk and have them automatically play from your preferred source. - - - false - - - true - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 20 - - - - - - - - - 0 - 0 - - - - :/whatsnew_0_8/data/images/universal-link-network.png - - - - - - - Qt::Vertical - - - QSizePolicy::MinimumExpanding - - - - 20 - 20 - - - - - - - - - border: none; - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - Get a quick look at all of the songs, playlists and artists that are trending across your network. Check out the hot songs your friends are listening to, and their playlists that are trending with their friends. Or just listen to a dynamic playlist of your network’s latest Loves, most Loved or top played songs - from last week to all-time. - - - false - - - true - - - - - - - Qt::Vertical - - - QSizePolicy::Minimum - - - - 20 - 20 - - - - - - - - - 0 - 0 - - - - border-width: 1px; -border-radius: 0px; -border-style: solid; -border-color: #ccc; - - - - :/whatsnew_0_8/data/images/trending.png - - - - - - - Qt::Vertical - - - QSizePolicy::MinimumExpanding - - - - 20 - 20 - - - - - - - - - border: none; - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - Beats Music (recently acquired by Apple) is now available as a resolver. This means that Beats Music subscribers can enjoy Tomahawk Stations playlists from their friends that use other services, and can easily drop Spotify, Rdio and other service links into Tomahawk and have those playlists, albums and tracks stream from your Beats account. Welcome Beats Music subscribers! - - - false - - - true - - - - - - - Qt::Vertical - - - QSizePolicy::MinimumExpanding - - - - 20 - 20 - - - - - - - - - 0 - 0 - - - - :/whatsnew_0_8/data/images/beatsmusic.png - - - - - - - Qt::Vertical - - - - 20 - 20 - - - - - - - - - border: none; - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - Google Music is another of our latest supported services - both for your music you've uploaded to the Google Music "locker" as well as their full streaming catalog for your Google Play Music All Access subscribers. - - - false - - - true - - - - - - - Qt::Vertical - - - QSizePolicy::MinimumExpanding - - - - 20 - 20 - - - - - - - - - 0 - 0 - - - - :/whatsnew_0_8/data/images/gmusic-banner.png - - - - - - - Qt::Vertical - - - - 20 - 20 - - - - - - - - - border: none; - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - Tomahawk now supports multiple IP addresses (IPv6). This improves the discoverability and connection between Tomahawk users on the same local network - particularly large networks often found in work and university settings. - - - false - - - true - - - - - - - Qt::Vertical - - - - 20 - 20 - - - - - - - - - 0 - 0 - - - - - - - :/whatsnew_0_8/data/images/networking.png - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - border: none; - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - Lots of new views - artist pages, album pages, track pages and more. A new Loved Widget shows what friends have loved tracks throughout the app. Some cleaner fonts, some new colors. Retina display support and more. - - - false - - - true - - - - - - - Qt::Vertical - - - QSizePolicy::MinimumExpanding - - - - 20 - 20 - - - - - - - - - 0 - 0 - - - - border-width: 1px; -border-radius: 0px; -border-style: solid; -border-color: #ccc; - - - :/whatsnew_0_8/data/images/design-screenshot.png - - - - - - - Qt::Vertical - - - - 20 - 20 - - - - - - - - - border: none; - - - - 0 - - - 0 - - - - - - border: none; - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - <html><head/><body><p>Tomahawk for Android is now in beta! All of the same resolvers are supported in the Android app - plus a couple of additional ones in Rdio &amp; Deezer. Create a <a href="https://hatchet.is/beta"><span style=" text-decoration: underline; color:#fff;">Hatchet</span></a> account to sync all of your playlists from your desktop to your mobile. Find current and future music influencers with Hatchet accounts (from across a range of music service providers) and follow them to discover and hear what they love. Even when you are listening to other music apps, Tomahawk can capture all of that playback data and add it to your Hatchet profile.</p></body></html> - - - false - - - true - - - - - - - - 0 - 0 - - - - - - - :/whatsnew_0_8/data/images/tomahawk-android.png - - - - - - - Qt::Vertical - - - - 20 - 10 - - - - - - - - - Qt::Vertical + + + PushButton - - QSizePolicy::MinimumExpanding + + + + + + PushButton - - - 20 - 10 - + + + + + + PushButton - + + + + + + PushButton + + + + + + + PushButton + + + + + + 24 + + + 0 + + + + + Inbox + + + + + + + + 0 + 0 + + + + border-width: 1px; +border-radius: 0px; +border-style: solid; +border-color: #ccc; + + + + + + + :/whatsnew_0_8/data/images/inbox-screenshot.png + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + 0 + + + + + + + <html><head/><body><p>Send tracks to your friends just by dragging it onto their avatar in the Tomahawk sidebar. Check out what your friends think you should listen to in your inbox.</p></body></html> + + + true + + + + + + + + + 24 + + + 0 + + + + + Universal Link Support + + + + + + + + 0 + 0 + + + + :/whatsnew_0_8/data/images/universal-link-network.png + + + + + + + <html><head/><body><p>Love that your friends and influencers are posting music links across the web and your social networks but hate that they are links for music services you don't use? Just drag Rdio, Deezer, Beats Music or other music service URLs into Tomahawk and have them automatically play from your preferred source.</p></body></html> + + + true + + + + + + + + + 24 + + + 0 + + + + + Beats Music + + + + + + + + 0 + 0 + + + + :/whatsnew_0_8/data/images/beatsmusic.png + + + + + + + <html><head/><body><p>Beats Music (recently aquired by Apple) is now available as a resolver. This means that Beats Music subscribers can enjoy all their stations, playlists and service links resolved and streamed from Beats Music. Welcome aboard!</p></body></html> + + + true + + + + + + + + + 24 + + + 0 + + + + + Google Music + + + + + + + + 0 + 0 + + + + :/whatsnew_0_8/data/images/gmusic-banner.png + + + + + + + <html><head/><body><p>Google Music is another of our latest supported services - both for the music you've uploaded to Google Music as well as their full streaming catalog for Google Play Music All Access subscribers. Every song and playlist that you search and add to Tomahawk can now be streamed from your Google Play Music account.</p></body></html> + + + true + + + + + + + + + 24 + + + 0 + + + + + Android + + + + + + + + 0 + 0 + + + + :/whatsnew_0_8/data/images/tomahawk-android.png + + + + + + + <html><head/><body><p>Tomahawk for Android is now in beta! The majority of the same resolvers are supported in the Android app - plus a couple of additional ones in Rdio &amp; Deezer. Create a Hatchet account to sync all of your playlists from your desktop to your mobile. Find current and future music influencers and follow them to discover and hear what they love. Even when you are listening to other music apps, Tomahawk can capture all of that playback data and add it to your Hatchet profile.</p></body></html> + + + true + + + + + + + + + 24 + + + 0 + + + + + Connectivity + + + + + + + + 0 + 0 + + + + :/whatsnew_0_8/data/images/networking.png + + + + + + + <html><head/><body><p>Tomahawk now supports IPv6 and multiple local IP addresses. This improves the discoverability and connection between Tomahawk users on the same local network - particularly large networks often found in work and university settings.</p></body></html> + + + true + + + + + + + + + Qt::Vertical + + + + 20 + 1 + + + + - - - - 16777215 - 1 - - + Qt::Horizontal - - - - - + - 16777215 - 1 + 40 + 20 - - Qt::Horizontal - - + - ClickableLabel + CaptionLabel QLabel -
widgets/ClickableLabel.h
+
widgets/CaptionLabel.h
+ + + ImageButton + QPushButton +
widgets/ImageButton.h
 + diff --git a/src/viewpages/whatsnew_0_8/WhatsNew_0_8.cpp b/src/viewpages/whatsnew_0_8/WhatsNew_0_8.cpp index e24b5ab01..2ee636fa2 100644 --- a/src/viewpages/whatsnew_0_8/WhatsNew_0_8.cpp +++ b/src/viewpages/whatsnew_0_8/WhatsNew_0_8.cpp @@ -1,6 +1,7 @@ /* === This file is part of Tomahawk Player - === * * Copyright 2014, Uwe L. Korn + * Copyright 2014, Christian Muehlhaeuser * * Tomahawk is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -30,25 +31,6 @@ using namespace Tomahawk; using namespace Tomahawk::Widgets; -const char* activeWidgetThumbStylesheet = "QWidget {" - "border-width: 2px;" - "border-style: solid;" - "border-radius: 4px;" - "border-color: white;" - "color: white;" - "border-bottom: none;" - "border-bottom-right-radius: 0px;" - "border-bottom-left-radius: 0px;" - "background-color:#292f34;" - "}"; - -const char* inactiveWidgetThumbStylesheet = " QWidget {" - "border-width: 2px;" - "border-style: solid;" - "border-radius: 4px;" - "border-color: grey;" - "color: grey;" - "}"; WhatsNew_0_8::WhatsNew_0_8( QWidget* parent ) { @@ -61,6 +43,7 @@ WhatsNew_0_8::~WhatsNew_0_8() } + bool WhatsNew_0_8::addPageItem() const { @@ -82,17 +65,13 @@ WhatsNewWidget_0_8::WhatsNewWidget_0_8( QWidget* parent ) QWidget* widget = new QWidget; ui->setupUi( widget ); - ui->lineAbove->setStyleSheet( QString( "QFrame { border: 1px solid black; }" ) ); - ui->lineBelow->setStyleSheet( QString( "QFrame { border: 1px solid %1; }" ).arg( TomahawkStyle::HEADER_BACKGROUND.name() ) ); - - { QScrollArea* area = new QScrollArea(); area->setWidgetResizable( true ); area->setWidget( widget ); QPalette pal = palette(); - pal.setBrush( backgroundRole(), TomahawkStyle::HEADER_BACKGROUND ); + pal.setBrush( backgroundRole(), Qt::white ); area->setPalette( pal ); area->setAutoFillBackground( true ); area->setFrameShape( QFrame::NoFrame ); @@ -105,81 +84,72 @@ WhatsNewWidget_0_8::WhatsNewWidget_0_8( QWidget* parent ) } { - QPalette pal = palette(); - pal.setBrush( backgroundRole(), TomahawkStyle::PAGE_BACKGROUND ); - ui->widget->setPalette( pal ); - ui->widget->setAutoFillBackground( true ); + ui->inboxButton->setFixedSize( QSize( 80, 80 ) ); + QPixmap inboxPixmap = ImageRegistry::instance()->pixmap( ":/whatsnew_0_8/data/images/inboxbutton.png", ui->inboxButton->size() ); + ui->inboxButton->setPixmap( inboxPixmap ); + connect( ui->inboxButton, SIGNAL( clicked() ), SLOT( inboxBoxClicked() ) ); } { - QPixmap inboxPixmap = ImageRegistry::instance()->pixmap( RESPATH "images/inbox.svg", QSize( 64, 64 ) ); - ui->inboxBoxImage->setPixmap( inboxPixmap ); - - connect( ui->inboxBoxHeader, SIGNAL( clicked() ), SLOT( inboxBoxClicked() ) ); - connect( ui->inboxBoxImage, SIGNAL( clicked() ), SLOT( inboxBoxClicked() ) ); + ui->linkButton->setFixedSize( QSize( 80, 80 ) ); + QPixmap pixmap = ImageRegistry::instance()->pixmap( ":/whatsnew_0_8/data/images/connectivitybutton.png", ui->inboxButton->size() ); + ui->linkButton->setPixmap( pixmap ); + connect( ui->linkButton, SIGNAL( clicked() ), SLOT( urlLookupBoxClicked() ) ); } { - connect( ui->urlLookupBoxHeader, SIGNAL( clicked() ), SLOT( urlLookupBoxClicked() ) ); - connect( ui->urlLookupBoxImage, SIGNAL( clicked() ), SLOT( urlLookupBoxClicked() ) ); + ui->beatsButton->setFixedSize( QSize( 80, 80 ) ); + QPixmap beatsPixmap = ImageRegistry::instance()->pixmap( ":/whatsnew_0_8/data/images/beatsbutton.png", ui->inboxButton->size() ); + ui->beatsButton->setPixmap( beatsPixmap ); + connect( ui->beatsButton, SIGNAL( clicked() ), SLOT( beatsBoxClicked() ) ); } { - QPixmap trendingPixmap = ImageRegistry::instance()->pixmap( RESPATH "images/trending.svg", QSize( 64, 64 ) ); - ui->trendingBoxImage->setPixmap( trendingPixmap ); - - connect( ui->trendingBoxHeader, SIGNAL( clicked() ), SLOT( trendingBoxClicked() ) ); - connect( ui->trendingBoxImage, SIGNAL( clicked() ), SLOT( trendingBoxClicked() ) ); + ui->googleButton->setFixedSize( QSize( 80, 80 ) ); + QPixmap pixmap = ImageRegistry::instance()->pixmap( ":/whatsnew_0_8/data/images/googlebutton.png", ui->inboxButton->size() ); + ui->googleButton->setPixmap( pixmap ); + connect( ui->googleButton, SIGNAL( clicked() ), SLOT( gmusicBoxClicked() ) ); } { - QPixmap beatsPixmap = ImageRegistry::instance()->pixmap( RESPATH "images/beatsmusic.svg", QSize( 64, 64 ) ); - ui->beatsBoxImage->setPixmap( beatsPixmap ); - - connect( ui->beatsBoxHeader, SIGNAL( clicked() ), SLOT( beatsBoxClicked() ) ); - connect( ui->beatsBoxImage, SIGNAL( clicked() ), SLOT( beatsBoxClicked() ) ); + ui->androidButton->setFixedSize( QSize( 80, 80 ) ); + QPixmap pixmap = ImageRegistry::instance()->pixmap( ":/whatsnew_0_8/data/images/androidbutton.png", ui->inboxButton->size() ); + ui->androidButton->setPixmap( pixmap ); + connect( ui->androidButton, SIGNAL( clicked() ), SLOT( androidBoxClicked() ) ); } { - // TODO: Add GMusic Pixmap - - connect( ui->gmusicBoxHeader, SIGNAL( clicked() ), SLOT( gmusicBoxClicked() ) ); - connect( ui->gmusicBoxImage, SIGNAL( clicked() ), SLOT( gmusicBoxClicked() ) ); + ui->networkButton->setFixedSize( QSize( 80, 80 ) ); + QPixmap networkingPixmap = ImageRegistry::instance()->pixmap( ":/whatsnew_0_8/data/images/networkbutton.png", ui->inboxButton->size() ); + ui->networkButton->setPixmap( networkingPixmap ); + connect( ui->networkButton, SIGNAL( clicked() ), SLOT( networkingBoxClicked() ) ); } { - QPixmap networkingPixmap = ImageRegistry::instance()->pixmap( RESPATH "images/ipv6-logo.svg", QSize( 64, 64 ) ); - ui->networkingBoxImage->setPixmap( networkingPixmap ); - - connect( ui->networkingBoxHeader, SIGNAL( clicked() ), SLOT( networkingBoxClicked() ) ); - connect( ui->networkingBoxImage, SIGNAL( clicked() ), SLOT( networkingBoxClicked() ) ); - } - - { - connect( ui->designBoxHeader, SIGNAL( clicked() ), SLOT( designBoxClicked() ) ); - connect( ui->designBoxImage, SIGNAL( clicked() ), SLOT( designBoxClicked() ) ); - } - - { - connect( ui->androidBoxHeader, SIGNAL( clicked() ), SLOT( androidBoxClicked() ) ); - connect( ui->androidBoxImage, SIGNAL( clicked() ), SLOT( androidBoxClicked() ) ); - } - - { - QFont font = ui->label_2->font(); - - int fontSize = TomahawkUtils::defaultFontSize() + 2; - font.setPointSize( fontSize ); - font.setFamily( "Titillium Web" ); + QFont font = ui->label->font(); + font.setWeight( QFont::Light ); + font.setPointSize( 48 ); + ui->label->setFont( font ); + ui->label->setStyleSheet( "QLabel { color: rgba( 0, 0, 0, 60% ) }" ); + font.setWeight( QFont::Normal ); + font.setPointSize( 11 ); ui->label_2->setFont( font ); + ui->label_2->setStyleSheet( "QLabel { color: rgba( 0, 0, 0, 30% ) }" ); + + font.setPointSize( 12 ); ui->label_3->setFont( font ); + ui->label_3->setStyleSheet( "QLabel { color: rgba( 0, 0, 0, 65% ) }" ); ui->label_5->setFont( font ); + ui->label_5->setStyleSheet( "QLabel { color: rgba( 0, 0, 0, 65% ) }" ); + ui->label_6->setFont( font ); + ui->label_6->setStyleSheet( "QLabel { color: rgba( 0, 0, 0, 65% ) }" ); ui->label_7->setFont( font ); + ui->label_7->setStyleSheet( "QLabel { color: rgba( 0, 0, 0, 65% ) }" ); + ui->label_8->setFont( font ); + ui->label_8->setStyleSheet( "QLabel { color: rgba( 0, 0, 0, 65% ) }" ); ui->label_9->setFont( font ); - ui->label_11->setFont( font ); - ui->label_13->setFont( font ); - ui->label_17->setFont( font ); + ui->label_9->setStyleSheet( "QLabel { color: rgba( 0, 0, 0, 65% ) }" ); } } @@ -230,56 +200,38 @@ WhatsNewWidget_0_8::changeEvent( QEvent* e ) void WhatsNewWidget_0_8::inboxBoxClicked() { - activateBox( ui->inboxBox, 0 ); + activateBox( ui->inboxCaption, 0 ); } void WhatsNewWidget_0_8::urlLookupBoxClicked() { - activateBox( ui->urlLookupBox, 1 ); -} - - -void -WhatsNewWidget_0_8::trendingBoxClicked() -{ - activateBox( ui->trendingBox, 2 ); + activateBox( ui->linkCaption, 1 ); } void WhatsNewWidget_0_8::beatsBoxClicked() { - activateBox( ui->beatsBox, 3 ); } void WhatsNewWidget_0_8::gmusicBoxClicked() { - activateBox( ui->gmusicBox, 4 ); } void WhatsNewWidget_0_8::networkingBoxClicked() { - activateBox( ui->networkingBox, 5 ); -} - - -void -WhatsNewWidget_0_8::designBoxClicked() -{ - activateBox( ui->designBox, 6 ); } void WhatsNewWidget_0_8::androidBoxClicked() { - activateBox( ui->androidBox, 8 ); } @@ -288,32 +240,32 @@ WhatsNewWidget_0_8::activateBox( QWidget* widget, int activeIndex ) { deactivateAllBoxes(); - widget->layout()->setContentsMargins( 8, 8, 8, 16 ); +/* widget->layout()->setContentsMargins( 8, 8, 8, 16 ); widget->setStyleSheet( activeWidgetThumbStylesheet ); - ui->stackedWidget->setCurrentIndex( activeIndex ); + ui->stackedWidget->setCurrentIndex( activeIndex );*/ } void WhatsNewWidget_0_8::deactivateBox( QWidget* widget ) { - widget->layout()->setContentsMargins( 8, 8, 8, 8 ); - widget->setStyleSheet( inactiveWidgetThumbStylesheet ); +/* widget->layout()->setContentsMargins( 8, 8, 8, 8 ); + widget->setStyleSheet( inactiveWidgetThumbStylesheet );*/ } void WhatsNewWidget_0_8::deactivateAllBoxes() { - deactivateBox( ui->inboxBox ); +/* deactivateBox( ui->inboxBox ); deactivateBox( ui->urlLookupBox ); deactivateBox( ui->trendingBox ); deactivateBox( ui->beatsBox ); deactivateBox( ui->gmusicBox ); deactivateBox( ui->networkingBox ); deactivateBox( ui->designBox ); - deactivateBox( ui->androidBox ); + deactivateBox( ui->androidBox );*/ } diff --git a/src/viewpages/whatsnew_0_8/WhatsNew_0_8.h b/src/viewpages/whatsnew_0_8/WhatsNew_0_8.h index d162f2d94..a7fd6acd7 100644 --- a/src/viewpages/whatsnew_0_8/WhatsNew_0_8.h +++ b/src/viewpages/whatsnew_0_8/WhatsNew_0_8.h @@ -57,11 +57,9 @@ protected: private slots: void inboxBoxClicked(); void urlLookupBoxClicked(); - void trendingBoxClicked(); void beatsBoxClicked(); void gmusicBoxClicked(); void networkingBoxClicked(); - void designBoxClicked(); void androidBoxClicked(); private: @@ -95,7 +93,7 @@ public: int sortValue() { return 1; } - bool showInfoBar() const { return true; } + bool showInfoBar() const { return false; } }; diff --git a/src/viewpages/whatsnew_0_8/resources.qrc b/src/viewpages/whatsnew_0_8/resources.qrc index 5167aca96..0453bd726 100644 --- a/src/viewpages/whatsnew_0_8/resources.qrc +++ b/src/viewpages/whatsnew_0_8/resources.qrc @@ -12,5 +12,11 @@ data/images/android.png data/images/tomahawk-android.png data/images/networking.png + data/images/connectivitybutton.png + data/images/androidbutton.png + data/images/googlebutton.png + data/images/beatsbutton.png + data/images/networkbutton.png + data/images/inboxbutton.png