Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move core and gui classes into a 'lmms' namespace #2064

Closed
wants to merge 6 commits into from
Closed

Move core and gui classes into a 'lmms' namespace #2064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2b51b79
add src/* into lmms namespace, except gui
Wallacoloo May 15, 2015
5d2ba29
add src/gui/* into lmms namespace
Wallacoloo May 15, 2015
4e87371
update includes for lmms namespace change
Wallacoloo May 16, 2015
c334250
Minor fixes for lmms namespace change
Wallacoloo May 17, 2015
ea2cafd
update plugins for lmms namespace change
Wallacoloo May 18, 2015
870ee16
Update theme to work with namespace change
Wallacoloo May 20, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
74 changes: 37 additions & 37 deletions data/themes/default/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ QMdiArea {
background-image: url(resources:background_artwork.png);
}

AutomationEditor {
lmms--AutomationEditor {
background-color: rgb(0, 0, 0);
color: #e0e0e0;
qproperty-vertexColor: #ff77af;
Expand Down Expand Up @@ -51,7 +51,7 @@ QToolTip {
color: #4afd85;
}

TextFloat {
lmms--TextFloat {
border-radius: 4px;
background: qlineargradient(spread:reflect, x1:0.5, y1:0.5, x2:0.5, y2:0, stop:0 rgba(0, 0, 0, 255), stop:1 rgba(50, 50, 50, 220));
opacity: 175;
Expand Down Expand Up @@ -109,7 +109,7 @@ QMenu::indicator:selected {
background-color: #747474;
}

PianoRoll {
lmms--PianoRoll {
background-color: rgb(0, 0, 0);
qproperty-gridColor: rgb( 128, 128, 128 );
qproperty-noteModeColor: rgb( 255, 255, 255 );
Expand All @@ -119,14 +119,14 @@ PianoRoll {

/* main toolbar oscilloscope - can have transparent bg now */

VisualizationWidget {
lmms--VisualizationWidget {
background: none;
border: none;
}

/* main toolbar cpu load widget - this can have transparent bg now */

CPULoadWidget {
lmms--CPULoadWidget {
border: none;
background: url(resources:cpuload_bg.png);
}
Expand Down Expand Up @@ -255,21 +255,21 @@ QScrollBar::down-arrow:vertical:disabled { background-image: url(resources:sbarr

/* background for song editor and bb-editor */

TrackContainerView QFrame{
lmms--TrackContainerView QFrame {
background-color: #49515b;
}

/* autoscroll, loop, stop behaviour toggle buttons */

NStateButton {
lmms--NStateButton {
max-height: 26px;
max-width: 26px;
min-height: 26px;
min-width: 26px;
}

/* track background colors */
TrackContentWidget {
lmms--TrackContentWidget {
qproperty-darkerColor: qlineargradient(x1:0, y1:0, x2:0, y2:1,
stop:0 rgb( 50, 50, 50 ), stop:0.33 rgb( 20, 20, 20 ), stop:1 rgb( 15, 15, 15 ) );
qproperty-lighterColor: qlineargradient(x1:0, y1:0, x2:0, y2:1,
Expand All @@ -279,7 +279,7 @@ TrackContentWidget {

/* gear button in tracks */

TrackOperationsWidget > QPushButton {
lmms--TrackOperationsWidget > QPushButton {
max-height: 26px;
max-width: 26px;
min-height: 26px;
Expand All @@ -288,21 +288,21 @@ TrackOperationsWidget > QPushButton {
border:none;
}

TrackOperationsWidget > QPushButton::menu-indicator {
lmms--TrackOperationsWidget > QPushButton::menu-indicator {
image: url(resources:trackop.png);
subcontrol-origin: padding;
subcontrol-position: center;
position: relative;
top: 2px;
}

TrackOperationsWidget > QPushButton::menu-indicator:hover {
lmms--TrackOperationsWidget > QPushButton::menu-indicator:hover {
image: url(resources:trackop_h.png);
}


TrackOperationsWidget > QPushButton::menu-indicator:pressed,
TrackOperationsWidget > QPushButton::menu-indicator:checked
lmms--TrackOperationsWidget > QPushButton::menu-indicator:pressed,
lmms--TrackOperationsWidget > QPushButton::menu-indicator:checked
{
image: url(resources:trackop_c.png);
position: relative;
Expand All @@ -317,21 +317,21 @@ TrackOperationsWidget > QPushButton::menu-indicator:checked

/* font sizes */

nameLabel, effectLabel, sf2InstrumentView > QLabel {
lmms--nameLabel, lmms--effectLabel, sf2InstrumentView > QLabel {
font-size:10px;
}

/* main toolbar sliders (master vol, master pitch) */

AutomatableSlider::groove:vertical {
lmms--AutomatableSlider::groove:vertical {
background: rgba(0,0,0, 128);
border: 1px inset rgba(100,100,100, 64);
border-radius: 2px;
width: 2px;
margin: 2px 2px;
}

AutomatableSlider::handle:vertical {
lmms--AutomatableSlider::handle:vertical {
background: none;
border-image: url(resources:main_slider.png);
width: 26px;
Expand All @@ -342,13 +342,13 @@ AutomatableSlider::handle:vertical {

/* window that shows up when you add effects */

EffectSelectDialog QScrollArea {
lmms--EffectSelectDialog QScrollArea {
background: #5b6571;
}

/* the inner boxes in LADSPA effect windows */

EffectControlDialog QGroupBox {
lmms--EffectControlDialog QGroupBox {
background: #49515b;
margin-top: 1ex;
padding: 10px 2px 1px;
Expand All @@ -358,7 +358,7 @@ EffectControlDialog QGroupBox {

/* the inner box titles when present (channel 1, channel 2...) */

EffectControlDialog QGroupBox::title {
lmms--EffectControlDialog QGroupBox::title {
subcontrol-origin: margin;
subcontrol-position: top left;
background: #7b838d;
Expand Down Expand Up @@ -436,7 +436,7 @@ QToolButton:checked {

/* track label buttons - the part that contains the icon and track title */

TrackLabelButton {
lmms--TrackLabelButton {
background-color: #5b6571;
color: #c9c9c9;
font-size: 11px;
Expand All @@ -446,105 +446,105 @@ TrackLabelButton {
padding: 2px 1px;
}

TrackLabelButton:hover {
lmms--TrackLabelButton:hover {
background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:0.5, stop:0 #5b6571, stop:0.75 #7b838d, stop:1 #7b838d );
color: white;
border: 1px solid rgba(0,0,0,64);
padding: 1px 0px;
margin: 0px;
}

TrackLabelButton:pressed {
lmms--TrackLabelButton:pressed {
background: qlineargradient(spread:reflect, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 #49515b, stop:0.3 #5b6571, stop:1 #6b7581 );
color: white;
border: 1px solid rgba(0,0,0,64);
padding: 2px 0px 0px;
font-weight: bold;
}

TrackLabelButton:checked {
lmms--TrackLabelButton:checked {
background: qlineargradient(spread:reflect, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 #49515b, stop:0.3 #5b6571, stop:1 #6b7581 );
color: white;
border: 1px solid rgba(0,0,0,128);
padding: 2px 0px 0px;
font-weight: bold;
}

TrackLabelButton:checked:hover {
lmms--TrackLabelButton:checked:hover {
background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:0.5, stop:0 #5b6571, stop:0.75 #7b838d, stop:1 #7b838d );
}

TrackLabelButton:checked:pressed {
lmms--TrackLabelButton:checked:pressed {
background: qlineargradient(spread:reflect, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 #49515b, stop:0.3 #5b6571, stop:1 #6b7581 );
}

/* sidebar, sidebar buttons */

SideBar {
lmms--SideBar {
background: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop: 0 #98a2a7, stop: 1.0 #5b646f);
}

SideBar QToolButton {
lmms--SideBar QToolButton {
font-size: 12px;
}

/* font sizes for text buttons */

FxMixerView QPushButton, EffectRackView QPushButton, ControllerRackView QPushButton {
lmms--FxMixerView QPushButton, lmms--EffectRackView QPushButton, lmms--ControllerRackView QPushButton {
font-size: 10px;
}

FxLine {
lmms--FxLine {
background: #5b6571;
color: #e0e0e0;
qproperty-backgroundActive: qlineargradient(spread:reflect, x1:0, y1:0, x2:1, y2:0,
stop:0 #7b838d, stop:1 #6b7581 );
}

/* persistent peak markers for fx peak meters */
Fader {
lmms--Fader {
qproperty-peakGreen: rgb( 74, 253, 133);
qproperty-peakRed: rgb( 255, 100, 100);
}

TimeLine {
lmms--TimeLine {
font-size: 8px;
}

QTreeView {
alternate-background-color: #747474;
}

TrackContainerView QLabel
lmms--TrackContainerView QLabel
{
background: none;
}

/* Patterns */

/* instrument pattern */
PatternView {
lmms--PatternView {
color: rgb( 119, 199, 216 );
qproperty-fgColor: rgb( 187, 227, 236 );
qproperty-textColor: rgb( 255, 255, 255 );
}

/* sample track pattern */
SampleTCOView {
lmms--SampleTCOView {
color: rgb( 74, 253, 133 );
qproperty-fgColor: rgb( 187, 227, 236 );
qproperty-textColor: rgb( 255, 60, 60 );
}

/* automation pattern */
AutomationPatternView {
lmms--AutomationPatternView {
color: #99afff;
qproperty-fgColor: rgb( 204, 215, 255 );
qproperty-textColor: rgb( 255, 255, 255 );
}

/* bb-pattern */
BBTCOView {
lmms--BBTCOView {
color: rgb( 128, 182, 175 ); /* default colour for bb-tracks, used when the colour hasn't been defined by the user */
qproperty-textColor: rgb( 255, 255, 255 );
}
Expand Down Expand Up @@ -747,7 +747,7 @@ NesInstrumentView Knob {

/* palette information */

LmmsPalette {
lmms--LmmsPalette {
qproperty-background: #5b6571;
qproperty-windowText: #f0f0f0;
qproperty-base: #808080;
Expand Down
7 changes: 6 additions & 1 deletion include/AboutDialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
#include "ui_about_dialog.h"


namespace lmms
{


class AboutDialog : public QDialog, public Ui::AboutDialog
{
public:
Expand All @@ -39,5 +43,6 @@ class AboutDialog : public QDialog, public Ui::AboutDialog
} ;


#endif
}

#endif
7 changes: 7 additions & 0 deletions include/ActionGroup.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@

#include <QActionGroup>


namespace lmms
{


/// \brief Convenience subclass of QActionGroup
///
/// This class provides the same functionality as QActionGroup, but in addition
Expand All @@ -54,4 +59,6 @@ private slots:
QList<QAction*> m_actions;
};


}
#endif
11 changes: 10 additions & 1 deletion include/AudioAlsa.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,16 @@
#include "AudioDevice.h"


class LcdSpinBox;
class QLineEdit;


namespace lmms
{


class LcdSpinBox;


class AudioAlsa : public AudioDevice, public QThread
{
public:
Expand Down Expand Up @@ -94,6 +100,9 @@ class AudioAlsa : public AudioDevice, public QThread

} ;



}
#endif

#endif
5 changes: 5 additions & 0 deletions include/AudioDevice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@
#include "TabWidget.h"


namespace lmms
{


class AudioPort;


Expand Down Expand Up @@ -180,4 +184,5 @@ class AudioDevice
} ;


}
#endif
5 changes: 5 additions & 0 deletions include/AudioDummy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@
#include "MicroTimer.h"


namespace lmms
{


class AudioDummy : public AudioDevice, public QThread
{
public:
Expand Down Expand Up @@ -113,4 +117,5 @@ class AudioDummy : public AudioDevice, public QThread
} ;


}
#endif
Loading