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

Now with more screens about to be added, move main interface to tab widgets.

Browse Source
This commit is contained in:
Kevin Whitaker
2017-02-19 15:42:34 -05:00
parent 48a33d31ec
commit 4f2eb8232d
5 changed files with 68 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -9,7 +9,7 @@ find_package(Wt REQUIRED)
find_package(Groove REQUIRED)
find_package(TagLib REQUIRED)
add_executable(arbitrateor src/main.cpp src/WebInterface.cpp src/GroovePlayer.cpp src/ui/LoginInterface.cpp src/ui/PlayerInterface.cpp src/ui/TrackDetails.cpp)
add_executable(arbitrateor src/main.cpp src/WebInterface.cpp src/GroovePlayer.cpp src/ui/LoginInterface.cpp src/ui/PlayerInterface.cpp src/ui/TrackDetails.cpp src/ui/RequestInterface.cpp)
target_link_libraries(arbitrateor ${Wt_LIBRARIES} ${GROOVE_LIBRARY} ${GROOVE_FINGERPRINT_LIBRARY} ${GROOVE_PLAYER_LIBRARY} ${TAGLIB_LIBRARY} pthread boost_system stdc++fs) #TODO get threading links based on platform. Remove gcc experimental fs when official c++17 exists.
install(TARGETS arbitrateor RUNTIME DESTINATION bin)

9
src/ui/PlayerInterface.cpp
View File

@@ -66,6 +66,11 @@ PlayerInterface::PlayerInterface(WebInterface* app)
skipControls->addWidget(skipRequest);
skipControls->addWidget(skipDeny);
mainDisplay = new Wt::WTabWidget();
voteMetaContainer = new Wt::WContainerWidget();
voteMetaLayout = new Wt::WVBoxLayout();
voteMetaContainer->setLayout(voteMetaLayout);
voteControlContainer = new Wt::WContainerWidget();
voteControlContainer->setMaximumSize(Wt::WLength(75,Wt::WLength::Percentage),Wt::WLength::Auto);
voteControlContainer->decorationStyle().setBackgroundColor(Wt::WColor("lightsteelblue"));
@@ -117,10 +122,12 @@ PlayerInterface::PlayerInterface(WebInterface* app)
interfaceLayout->addWidget(playControlWidget);
interfaceLayout->addWidget(currentTrackProgress);
interfaceLayout->addWidget(voteControlContainer,0,Wt::AlignmentFlag::AlignCenter);
interfaceLayout->addWidget(mainDisplay);
mainDisplay->addTab(voteMetaContainer,"Up Next",Wt::WTabWidget::PreLoading);
playControlWidget->addStyleClass("panel");
playControlWidget->addStyleClass("panel-default");
playControlWidget->decorationStyle().setBackgroundColor(Wt::WColor("gainsboro"));
voteMetaLayout->addWidget(voteControlContainer,0,Wt::AlignmentFlag::AlignCenter);
playControlLayout->addWidget(playpause,0,Wt::AlignmentFlag::AlignLeft | Wt::AlignmentFlag::AlignMiddle);
playControlLayout->addWidget(currentTrackDetails,0,Wt::AlignmentFlag::AlignCenter | Wt::AlignmentFlag::AlignMiddle);
playControlLayout->addWidget(skipControls,0,Wt::AlignmentFlag::AlignRight | Wt::AlignmentFlag::AlignMiddle);

6
src/ui/PlayerInterface.h
View File

@@ -21,6 +21,7 @@
#define PLAYERINTERFACE_H
#include <Wt/WContainerWidget>
#include <Wt/WTabWidget>
#include <Wt/WHBoxLayout>
#include <Wt/WVBoxLayout>
#include "../WebInterface.h"
@@ -52,7 +53,12 @@ public:
Wt::WPushButton* skipRequest;
Wt::WPushButton* skipDeny;
//TabView
Wt::WTabWidget* mainDisplay;
//Vote Controls
Wt::WContainerWidget* voteMetaContainer;
Wt::WVBoxLayout* voteMetaLayout;
Wt::WContainerWidget* voteControlContainer;
Wt::WContainerWidget* voteTracksContainer;
Wt::WText* voteHeader;

20
src/ui/RequestInterface.cpp Normal file
View File

@@ -0,0 +1,20 @@
/*
* Copyright (C) 2017 Kevin Whitaker <eyecreate@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
*/
#include "RequestInterface.h"

33
src/ui/RequestInterface.h Normal file
View File

@@ -0,0 +1,33 @@
/*
* Copyright (C) 2017 Kevin Whitaker <eyecreate@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
*/
#ifndef REQUESTINTERFACE_H
#define REQUESTINTERFACE_H
#include <Wt/WContainerWidget>
#include "../WebInterface.h"
class RequestInterface : public Wt::WContainerWidget
{
public:
RequestInterface(WebInterface* app);
WebInterface* app;
};
#endif // REQUESTINTERFACE_H