owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'new-layout' into develop

Browse Source 
Conflicts:
	src/ui/audio/Audio.cpp
This commit is contained in:
emeric
2014-12-20 15:32:56 +01:00
parent 784b73fc5a 6b4a9ef38a
commit 79f0a244be
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/audio/Audio.cpp
+12 -2
View File
@@ -73,9 +73,11 @@ _playQueue(nullptr)
Wt::WHBoxLayout* trackControls = new Wt::WHBoxLayout(); Wt::WHBoxLayout* trackControls = new Wt::WHBoxLayout();
Wt::WPushButton* playBtn = new Wt::WPushButton("Play"); Wt::WPushButton* playBtn = new Wt::WPushButton("Play");
playBtn->setStyleClass("btn-sm");
trackControls->addWidget(playBtn); trackControls->addWidget(playBtn);
Wt::WPushButton* addBtn = new Wt::WPushButton("Add"); Wt::WPushButton* addBtn = new Wt::WPushButton("Add");
addBtn->setStyleClass("btn-sm");
trackControls->addWidget(addBtn); trackControls->addWidget(addBtn);
trackControls->addWidget(new Wt::WText("Total duration: "), 1); trackControls->addWidget(new Wt::WText("Total duration: "), 1);
@@ -93,8 +95,10 @@ _playQueue(nullptr)
Wt::Dbo::Transaction transaction(_db.getSession()); Wt::Dbo::Transaction transaction(_db.getSession());
Database::User::pointer user = _db.getCurrentUser(); Database::User::pointer user = _db.getCurrentUser();
Wt::WContainerWidget* playQueueContainer = new Wt::WContainerWidget();
playQueueContainer->setStyleClass("playqueue");
Wt::WVBoxLayout* playQueueLayout = new Wt::WVBoxLayout(); Wt::WVBoxLayout* playQueueLayout = new Wt::WVBoxLayout();
playQueueLayout->setContentsMargins(5,5,5,5); playQueueContainer->setLayout(playQueueLayout);
_mediaPlayer = new AudioMediaPlayer(); _mediaPlayer = new AudioMediaPlayer();
playQueueLayout->addWidget(_mediaPlayer); playQueueLayout->addWidget(_mediaPlayer);
@@ -104,15 +108,21 @@ _playQueue(nullptr)
Wt::WHBoxLayout* playlistControls = new Wt::WHBoxLayout(); Wt::WHBoxLayout* playlistControls = new Wt::WHBoxLayout();
Wt::WPushButton *saveBtn = new Wt::WPushButton("Save"); Wt::WPushButton *saveBtn = new Wt::WPushButton("Save");
saveBtn->setStyleClass("btn-sm");
playlistControls->addWidget(saveBtn); playlistControls->addWidget(saveBtn);
Wt::WPushButton *loadBtn = new Wt::WPushButton("Load"); Wt::WPushButton *loadBtn = new Wt::WPushButton("Load");
loadBtn->setStyleClass("btn-sm");
playlistControls->addWidget(loadBtn); playlistControls->addWidget(loadBtn);
Wt::WPushButton *upBtn = new Wt::WPushButton("UP"); Wt::WPushButton *upBtn = new Wt::WPushButton("UP");
upBtn->setStyleClass("btn-sm");
playlistControls->addWidget(upBtn); playlistControls->addWidget(upBtn);
Wt::WPushButton *downBtn = new Wt::WPushButton("DO"); Wt::WPushButton *downBtn = new Wt::WPushButton("DO");
downBtn->setStyleClass("btn-sm");
playlistControls->addWidget(downBtn); playlistControls->addWidget(downBtn);
Wt::WPushButton *delBtn = new Wt::WPushButton("DEL"); Wt::WPushButton *delBtn = new Wt::WPushButton("DEL");
delBtn->setStyleClass("btn-sm");
playlistControls->addWidget(delBtn); playlistControls->addWidget(delBtn);
delBtn->clicked().connect(_playQueue, &PlayQueue::delSelected); delBtn->clicked().connect(_playQueue, &PlayQueue::delSelected);
@@ -145,7 +155,7 @@ _playQueue(nullptr)
playQueueLayout->addLayout(playlistControls); playQueueLayout->addLayout(playlistControls);
mainLayout->addLayout(playQueueLayout, 0, 0, 2, 1); mainLayout->addWidget(playQueueContainer, 0, 0, 2, 1);
} }
mainLayout->setRowStretch(1, 1); mainLayout->setRowStretch(1, 1);
src/ui/docroot/css/lms.css
+5
View File
@@ -14,6 +14,11 @@ div.contents {
padding: 0px 12px 6px; padding: 0px 12px 6px;
} }
.playqueue {
background-color: #BBB;
border-radius: 10px;
}
.playqueue-playing { .playqueue-playing {
background-color: rgba(202, 167, 66, 1); background-color: rgba(202, 167, 66, 1);
} }