eyecreate/Arbitrateor
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove some of old styling for new bootstrap css.

Browse Source
This commit is contained in:
Kevin Whitaker
2017-02-18 17:20:09 -05:00
parent 6d038acf56
commit 25e4961f1a
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/WebInterface.cpp
View File

@@ -35,6 +35,7 @@ WebInterface::WebInterface(const Wt::WEnvironment& env) : Wt::WApplication(env)
priv_int = new internal; priv_int = new internal;
this->useStyleSheet(Wt::WLink("/resources/font-awesome/css/font-awesome.min.css")); this->useStyleSheet(Wt::WLink("/resources/font-awesome/css/font-awesome.min.css"));
setTheme(new Wt::WBootstrapTheme()); setTheme(new Wt::WBootstrapTheme());
((Wt::WBootstrapTheme*)theme())->setVersion(Wt::WBootstrapTheme::Version3);
setTitle("Arbitrateor - Audio Jukebox"); setTitle("Arbitrateor - Audio Jukebox");
enableUpdates(true); enableUpdates(true);
priv_int->playerUI = new PlayerInterface(this); priv_int->playerUI = new PlayerInterface(this);

9
src/ui/PlayerInterface.cpp
View File

@@ -43,6 +43,7 @@ PlayerInterface::PlayerInterface(WebInterface* app)
trackProgress->setInterval(1000); trackProgress->setInterval(1000);
trackProgress->timeout().connect(this,&PlayerInterface::updateProgressFromTimer); trackProgress->timeout().connect(this,&PlayerInterface::updateProgressFromTimer);
currentTrackDetails = new TrackDetails(); currentTrackDetails = new TrackDetails();
currentTrackDetails->setMinimumSize(Wt::WLength(100,Wt::WLength::Pixel),Wt::WLength(100,Wt::WLength::Pixel));
playpause = new Wt::WPushButton(); playpause = new Wt::WPushButton();
playpause->setTextFormat(Wt::XHTMLText); playpause->setTextFormat(Wt::XHTMLText);
playpause->decorationStyle().font().setFamily(Wt::WFont::Default,"FontAwesome"); playpause->decorationStyle().font().setFamily(Wt::WFont::Default,"FontAwesome");
@@ -67,10 +68,11 @@ PlayerInterface::PlayerInterface(WebInterface* app)
interfaceLayout->addWidget(playControlWidget); interfaceLayout->addWidget(playControlWidget);
interfaceLayout->addWidget(currentTrackProgress); interfaceLayout->addWidget(currentTrackProgress);
interfaceLayout->addLayout(voteControlLayout); interfaceLayout->addLayout(voteControlLayout);
playControlWidget->decorationStyle().setBorder(Wt::WBorder::Outset); playControlWidget->addStyleClass("panel");
playControlWidget->decorationStyle().setBackgroundColor(Wt::WColor("#00B200")); playControlWidget->addStyleClass("panel-default");
playControlWidget->decorationStyle().setBackgroundColor(Wt::WColor("gainsboro"));
playControlLayout->addWidget(playpause,0,Wt::AlignmentFlag::AlignLeft | Wt::AlignmentFlag::AlignMiddle); playControlLayout->addWidget(playpause,0,Wt::AlignmentFlag::AlignLeft | Wt::AlignmentFlag::AlignMiddle);
playControlLayout->addWidget(currentTrackDetails); playControlLayout->addWidget(currentTrackDetails,0,Wt::AlignmentFlag::AlignCenter | Wt::AlignmentFlag::AlignMiddle);
playControlLayout->addWidget(skipControls,0,Wt::AlignmentFlag::AlignRight | Wt::AlignmentFlag::AlignMiddle); playControlLayout->addWidget(skipControls,0,Wt::AlignmentFlag::AlignRight | Wt::AlignmentFlag::AlignMiddle);
} }
@@ -170,4 +172,5 @@ void PlayerInterface::updateDetailsFromServer(AudioTrack track)
updateSkipDeniedFromServer(); updateSkipDeniedFromServer();
} }
currentTrackDetails->updateWithTrackDetails(track); currentTrackDetails->updateWithTrackDetails(track);
} }

5
src/ui/TrackDetails.cpp
View File

@@ -24,8 +24,10 @@
TrackDetails::TrackDetails() TrackDetails::TrackDetails()
{ {
this->setMaximumSize(Wt::WLength::Auto,Wt::WLength(200, Wt::WLength::Pixel)); this->setMaximumSize(Wt::WLength::Auto,Wt::WLength(200, Wt::WLength::Pixel));
this->decorationStyle().setBorder(Wt::WBorder::Ridge); //this->decorationStyle().setBorder(Wt::WBorder::Ridge);
this->decorationStyle().setBackgroundColor(Wt::WColor("#6FFF6F")); this->decorationStyle().setBackgroundColor(Wt::WColor("#6FFF6F"));
this->addStyleClass("panel");
this->addStyleClass("panel-default");
mainLayout = new Wt::WHBoxLayout(); mainLayout = new Wt::WHBoxLayout();
this->setLayout(mainLayout); this->setLayout(mainLayout);
metaLayout = new Wt::WVBoxLayout(); metaLayout = new Wt::WVBoxLayout();
@@ -33,6 +35,7 @@ TrackDetails::TrackDetails()
albumCover = new Wt::WImage(); albumCover = new Wt::WImage();
albumCover->setMinimumSize(Wt::WLength(75,Wt::WLength::Pixel),Wt::WLength(75,Wt::WLength::Pixel)); albumCover->setMinimumSize(Wt::WLength(75,Wt::WLength::Pixel),Wt::WLength(75,Wt::WLength::Pixel));
albumCover->setMaximumSize(Wt::WLength(200,Wt::WLength::Pixel),Wt::WLength(200,Wt::WLength::Pixel)); albumCover->setMaximumSize(Wt::WLength(200,Wt::WLength::Pixel),Wt::WLength(200,Wt::WLength::Pixel));
albumCover->addStyleClass("img-rounded");
mainLayout->addWidget(albumCover); mainLayout->addWidget(albumCover);
mainLayout->addSpacing(Wt::WLength(10, Wt::WLength::Pixel)); mainLayout->addSpacing(Wt::WLength(10, Wt::WLength::Pixel));
mainLayout->addLayout(metaLayout); mainLayout->addLayout(metaLayout);