Skip to content

Commit

Permalink
GUI rework (#95)
Browse files Browse the repository at this point in the history 
Signed-off-by: Remigiusz Kołłątaj <remigiusz.kollataj@mobica.com>
  • Loading branch information
@rkollataj
rkollataj committed Nov 25, 2017
1 parent 96901e6 commit f7b3b56
Show file tree
Hide file tree
Showing 107 changed files with 4,328 additions and 201 deletions.
75 changes: 71 additions & 4 deletions CANdevResources.qrc
View file
@@ -1,10 +1,77 @@
<RCC>
<qresource prefix="/images">
<file>files/images/CDN_small.png</file>
<file>files/images/CRS_small.png</file>
<file>files/images/CRV_small.png</file>
<file>files/images/light/CANbus_icon_Add.svg</file>
<file>files/images/light/CANbus_icon_CascadeView.svg</file>
<file>files/images/light/CANbus_icon_Clear.svg</file>
<file>files/images/light/CANbus_icon_CloseSim.svg</file>
<file>files/images/light/CANbus_icon_Combine.svg</file>
<file>files/images/light/CANbus_icon_InputOutput.svg</file>
<file>files/images/light/CANbus_icon_Input.svg</file>
<file>files/images/light/CANbus_icon_Lock.svg</file>
<file>files/images/light/CANbus_icon_NewProject.svg</file>
<file>files/images/light/CANbus_icon_OpenProject.svg</file>
<file>files/images/light/CANbus_icon_OpenSim.svg</file>
<file>files/images/light/CANbus_icon_Output.svg</file>
<file>files/images/light/CANbus_icon_Remove.svg</file>
<file>files/images/light/CANbus_icon_SaveAsProject.svg</file>
<file>files/images/light/CANbus_icon_SaveProject.svg</file>
<file>files/images/light/CANbus_icon_Switch_2.svg</file>
<file>files/images/light/CANbus_icon_Switch.svg</file>
<file>files/images/light/CANbus_icon_TabsView.svg</file>
<file>files/images/light/CANbus_icon_Undock.svg</file>
<file>files/images/light/CANbus_logo.svg</file>
<file>files/images/light/CANbus_icon_CheckBoxOn.svg</file>
<file>files/images/light/CANbus_icon_CheckBoxOff.svg</file>
<file>files/images/light/CANbus_icon_Close.svg</file>
<file>files/images/dark/CANbus_icon_Add.svg</file>
<file>files/images/dark/CANbus_icon_CascadeView.svg</file>
<file>files/images/dark/CANbus_icon_Clear.svg</file>
<file>files/images/dark/CANbus_icon_CloseSim.svg</file>
<file>files/images/dark/CANbus_icon_Combine.svg</file>
<file>files/images/dark/CANbus_icon_InputOutput.svg</file>
<file>files/images/dark/CANbus_icon_Input.svg</file>
<file>files/images/dark/CANbus_icon_Lock.svg</file>
<file>files/images/dark/CANbus_icon_NewProject.svg</file>
<file>files/images/dark/CANbus_icon_OpenProject.svg</file>
<file>files/images/dark/CANbus_icon_OpenSim.svg</file>
<file>files/images/dark/CANbus_icon_Output.svg</file>
<file>files/images/dark/CANbus_icon_Remove.svg</file>
<file>files/images/dark/CANbus_icon_SaveAsProject.svg</file>
<file>files/images/dark/CANbus_icon_SaveProject.svg</file>
<file>files/images/dark/CANbus_icon_Switch_2.svg</file>
<file>files/images/dark/CANbus_icon_Switch.svg</file>
<file>files/images/dark/CANbus_icon_TabsView.svg</file>
<file>files/images/dark/CANbus_icon_Undock.svg</file>
<file>files/images/dark/CANbus_logo.svg</file>
<file>files/images/light/CANbus_icon_start_disabled.png</file>
<file>files/images/light/CANbus_icon_start_enabled.png</file>
<file>files/images/light/CANbus_icon_stop_disabled.png</file>
<file>files/images/light/CANbus_icon_stop_enabled.png</file>
<file>files/images/light/CANbus_icon_CloseSim_disabled.svg</file>
<file>files/images/light/CANbus_icon_SaveAsProject_disabled.svg</file>
<file>files/images/light/CANbus_icon_SaveProject_disabled.svg</file>
<file>files/images/light/CANbus_icon_OpenSim_disabled.svg</file>
<file>files/images/light/CANbus_icon_CascadeView_disabled.svg</file>
<file>files/images/light/CANbus_icon_TabsView_disabled.svg</file>
<file>files/images/light/CANbus_icon_Switch_dark.svg</file>
<file>files/images/dark/CANbus_icon_Close.svg</file>
<file>files/images/dark/CANbus_icon_CheckBoxOff.svg</file>
<file>files/images/dark/CANbus_icon_CheckBoxOn.svg</file>
<file>files/images/dark/CANbus_icon_Close_tab_selected.svg</file>
<file>files/images/dark/CANbus_icon_Close_tab.svg</file>
<file>files/images/light/CANbus_icon_Close_tab_selected.svg</file>
<file>files/images/light/CANbus_icon_Close_tab.svg</file>
<file>files/images/dark/Angle-down-01.svg</file>
<file>files/images/dark/Angle-up-01.svg</file>
<file>files/images/light/Angle-down-01.svg</file>
<file>files/images/light/Angle-up-01.svg</file>
<file>files/images/start_screen.png</file>
<file>files/images/about_screen.png</file>
</qresource>
<qresource prefix="">
<qresource prefix="/">
<file>files/json/projectConfigSchema.json</file>
<file>files/css/darkStyle.css</file>
<file>files/css/lightStyle.css</file>
<file>files/css/toolBar.css</file>
</qresource>
</RCC>
Binary file added doc/CANBus_Styleguide.pdf
View file
Binary file not shown.
Binary file removed doc/wireframe.epgz
View file
Binary file not shown.
Binary file removed doc/wireframe.pdf
View file
Binary file not shown.
224 changes: 224 additions & 0 deletions files/css/darkStyle.css
View file
@@ -0,0 +1,224 @@
QWidget
{
color: #cccccc;
background-color: #1d1d1d;
selection-background-color: #666666;
selection-color: #cccccc;
}

QWidget#centralWidget {
background-color: #1d1d1d;
}

QMenuBar::item {
spacing: 3px;
padding: 1px 4px;
background: transparent;
border-radius: 4px;
}

QMenuBar::item:selected {
background: #666666;
}

QMenuBar::item:pressed {
background: #868686;
}

QMenu {
background-color: "#1d1d1d";
}


QMenu::item:disabled {
color: #888888;
}

QTabBar {
background: #1d1d1d;
}

QTabBar::close-button {
image: url(:/images/files/images/dark/CANbus_icon_Close_tab.svg);
}

QTabBar::close-button:selected {
image: url(:/images/files/images/dark/CANbus_icon_Close_tab_selected.svg);
}

QTabBar::tab {
color: #a6a6a6;
font-weight: bold;
background: #3a3a3a;
margin-right: 5px;
margin-top: 5px;
}

QTabBar::tab:selected {
color: #ffffff;
font-weight: bold;
background: #616161;
}

QMdiSubWindow {
background: #616161;
}

DragWidget {
background: #282828;
}

QTableView QTableCornerButton::section {
background-color: #3a3a3a;
border: 1px solid #3a3a3a;
}

QTableView::item {
background: #1d1d1d;
}

QTableView::item:selected {
background: #3f3f3f;
}

QTableView {
background: #616161;
border : 1px solid #8f8f8f;
gridline-color: #8f8f8f;
color: #e1e1e1;
}

QHeaderView {
background-color: #616161;
}

QHeaderView::section {
background-color: #3a3a3a;
border : 1px solid #8f8f8f;
border-left: 0px;
border-top: 0px;
color: #e1e1e1
}

QCheckBox {
color: #282828;
spacing: 0px;
}

QCheckBox::indicator {
width: 28px;
height: 28px;
}

QCheckBox::indicator:unchecked {
image: url(:/images/files/images/dark/CANbus_icon_CheckBoxOff.svg);
}

QCheckBox::indicator:checked {
image: url(:/images/files/images/dark/CANbus_icon_CheckBoxOn.svg);
}

QPushButton[flat="true"] {
border: none;
margin: 0px;
padding: 0px;
}

QPushButton[flat="true"]:pressed {
border: 2px solid #a6a6a6;
background-color: #616161;
}

QPushButton[flat="true"]:checked {
border: 2px solid #a6a6a6;
background-color: #616161;
}

QPushButton#pbStartNew {
border: 0px;
}

QPushButton#pbStartOpen {
border: 0px;
}

QWidget#CanRawSenderPrivate, #CanRawViewPrivate {
background-color: #616161;
}

QPushButton#pbAdd, #pbDockUndock, #pbRemove, #pbClear, #freezeBox, #pbToggleFilter {
background-color: #616161;
}

QToolButton#toolSwitch {
image: url(:/images/files/images/light/CANbus_icon_Switch_dark.svg);
}

QCheckBox#pbRawLayer, QCheckBox#pbDeviceLayer{
spacing: 43px;
color: #767676;
background: #282828;
}

QCheckBox#pbRawLayer {
spacing: 58px;
}

QCheckBox#pbRawLayer::indicator, QCheckBox#pbDeviceLayer::indicator {
padding-top: 4px;
width: 16px;
height: 16px;
background: #282828;
}

QCheckBox#pbRawLayer::indicator:checked, #pbDeviceLayer::indicator:checked {
image: url(:/images/files/images/dark/Angle-down-01.svg);
}

QCheckBox#pbRawLayer::indicator:unchecked, #pbDeviceLayer::indicator:unchecked {
image: url(:/images/files/images/dark/Angle-up-01.svg);
}

QWidget#startScreen {
image: url(:/images/files/images/start_screen.png);
}

QWidget#rawWidget, #deviceWidget {
background: #282828;
}

QPushButton[type="recentProjectName"], QWidget#recentContainer {
background: #ffffff;
color: #0d6188;
text-align: left;
font-size: 14px;
}

QPushButton[type="recentProjectFile"] {
background: #ffffff;
color: #919191;
text-align: left;
font-size: 12px;
}

QPushButton:pressed[type="recentProjectName"], QPushButton:pressed[type="recentProjectFile"], #pbStartNew, #pbStartOpen {
border: 0px;
background: #ffffff;
}

QLabel[type="aboutLabel"] {
background: #ffffff;
color: #282828;
font-size: 12px;
font-family: "Arial";
}

#PropertyEditorDialog {
background: #616161;
}

#PropertyEditorDialog QSizeGrip {
width: 6px;
height: 6px;
background: #616161;
}

0 comments on commit f7b3b56

Please sign in to comment.