dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename some UI stuff

Browse Source
This commit is contained in:
Jonas Kvinge
2018-08-09 21:49:18 +02:00
parent 57f6f40e7d
commit 08fcedd925
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/mainwindow.cpp
View File

@@ -215,7 +215,7 @@ MainWindow::MainWindow(Application *app, SystemTrayIcon *tray_icon, OSD *osd, co
ui_->multi_loading_indicator->SetTaskManager(app_->task_manager()); ui_->multi_loading_indicator->SetTaskManager(app_->task_manager());
status_view_->SetApplication(app_); status_view_->SetApplication(app_);
ui_->now_playing->SetApplication(app_); ui_->widget_playing->SetApplication(app_);
int volume = app_->player()->GetVolume(); int volume = app_->player()->GetVolume();
ui_->volume->setValue(volume); ui_->volume->setValue(volume);
@@ -233,8 +233,8 @@ MainWindow::MainWindow(Application *app, SystemTrayIcon *tray_icon, OSD *osd, co
ui_->tabs->addTab(tidal_search_view_, IconLoader::Load("tidal"), tr("Tidal", "Tidal")); ui_->tabs->addTab(tidal_search_view_, IconLoader::Load("tidal"), tr("Tidal", "Tidal"));
//ui_->tabs->AddSpacer(); //ui_->tabs->AddSpacer();
// Add the now playing widget to the fancy tab widget // Add the playing widget to the fancy tab widget
ui_->tabs->addBottomWidget(ui_->now_playing); ui_->tabs->addBottomWidget(ui_->widget_playing);
//ui_->tabs->SetBackgroundPixmap(QPixmap(":/pictures/strawberry-background.png")); //ui_->tabs->SetBackgroundPixmap(QPixmap(":/pictures/strawberry-background.png"));
@@ -608,11 +608,11 @@ MainWindow::MainWindow(Application *app, SystemTrayIcon *tray_icon, OSD *osd, co
ui_->track_slider->SetApplication(app); ui_->track_slider->SetApplication(app);
// Now playing widget // Playing widget
qLog(Debug) << "Creating now playing widget"; qLog(Debug) << "Creating playing widget";
ui_->now_playing->set_ideal_height(ui_->status_bar->sizeHint().height() + ui_->player_controls->sizeHint().height()); ui_->widget_playing->set_ideal_height(ui_->status_bar->sizeHint().height() + ui_->player_controls->sizeHint().height());
connect(app_->player(), SIGNAL(Stopped()), ui_->now_playing, SLOT(Stopped())); connect(app_->player(), SIGNAL(Stopped()), ui_->widget_playing, SLOT(Stopped()));
//connect(ui_->now_playing, SIGNAL(ShowAboveStatusBarChanged(bool)), SLOT(PlayingWidgetPositionChanged(bool))); //connect(ui_->widget_playing, SIGNAL(ShowAboveStatusBarChanged(bool)), SLOT(PlayingWidgetPositionChanged(bool)));
connect(ui_->action_console, SIGNAL(triggered()), SLOT(ShowConsole())); connect(ui_->action_console, SIGNAL(triggered()), SLOT(ShowConsole()));
PlayingWidgetPositionChanged(); PlayingWidgetPositionChanged();
@@ -858,9 +858,9 @@ void MainWindow::resizeEvent(QResizeEvent*) { SaveGeometry(); }
void MainWindow::TabSwitched() { void MainWindow::TabSwitched() {
if (ui_->tabs->currentIndex() > 0) if (ui_->tabs->currentIndex() > 0)
ui_->now_playing->SetEnabled(); ui_->widget_playing->SetEnabled();
else else
ui_->now_playing->SetDisabled(); ui_->widget_playing->SetDisabled();
SaveGeometry(); SaveGeometry();

8
src/core/mainwindow.ui
View File

@@ -40,7 +40,7 @@
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<widget class="QWidget" name="sidebar_layout"> <widget class="QWidget" name="sidebar_layout">
<layout class="QVBoxLayout" name="verticalLayout_4"> <layout class="QVBoxLayout" name="layout_left">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
@@ -48,12 +48,12 @@
<widget class="FancyTabWidget" name="tabs" native="true"/> <widget class="FancyTabWidget" name="tabs" native="true"/>
</item> </item>
<item> <item>
<widget class="PlayingWidget" name="now_playing" native="true"/> <widget class="PlayingWidget" name="widget_playing" native="true"/>
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="playlist_layout"> <widget class="QWidget" name="playlist_layout">
<layout class="QVBoxLayout" name="verticalLayout_7"> <layout class="QVBoxLayout" name="layout_right">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
@@ -70,7 +70,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_4"> <layout class="QHBoxLayout" name="layout_bottom">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>

1
src/device/deviceviewcontainer.cpp
View File

@@ -20,6 +20,7 @@
#include "config.h" #include "config.h"
#include <QtGlobal>
#include <QWidget> #include <QWidget>
#include <QColor> #include <QColor>
#include <QFrame> #include <QFrame>